From ea9f14e4af462b17f10d3dcdec5181ad937b044f Mon Sep 17 00:00:00 2001 From: Piraty Date: Mon, 16 Jun 2025 00:43:48 +0200 Subject: [PATCH] navit: rebuild for gpsd-3.36.1_1 disable python bindings, they fail to build --- ..._debug-Fix-Wincompatible-pointer-typ.patch | 34 +++++++++++++++++++ srcpkgs/navit/template | 9 ++--- 2 files changed, 36 insertions(+), 7 deletions(-) create mode 100644 srcpkgs/navit/patches/0001-Fix-graphics-svg_debug-Fix-Wincompatible-pointer-typ.patch diff --git a/srcpkgs/navit/patches/0001-Fix-graphics-svg_debug-Fix-Wincompatible-pointer-typ.patch b/srcpkgs/navit/patches/0001-Fix-graphics-svg_debug-Fix-Wincompatible-pointer-typ.patch new file mode 100644 index 00000000000..0cb49f39faa --- /dev/null +++ b/srcpkgs/navit/patches/0001-Fix-graphics-svg_debug-Fix-Wincompatible-pointer-typ.patch @@ -0,0 +1,34 @@ +From 016d6b357484ea34337f0c80ce74e77601cf3d1a Mon Sep 17 00:00:00 2001 +From: Bastian Koppelmann +Date: Tue, 30 Aug 2022 12:50:05 +0200 +Subject: [PATCH] Fix:graphics:svg_debug: Fix -Wincompatible-pointer-types +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +we are assigning a char* to int*. So lets explicitly cast it to int*. +This fixes: + +graphics_svg_debug.c:173:16: warning: assignment to ‘unsigned int *’ from incompatible pointer type ‘unsigned char *’ [-Wincompatible-pointer-types] + 173 | gc->dashed = dash_list; + | ^ +--- + navit/graphics/svg_debug/graphics_svg_debug.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/navit/graphics/svg_debug/graphics_svg_debug.c b/navit/graphics/svg_debug/graphics_svg_debug.c +index 348906ad8..23ce4a297 100644 +--- a/navit/graphics/svg_debug/graphics_svg_debug.c ++++ b/navit/graphics/svg_debug/graphics_svg_debug.c +@@ -170,7 +170,7 @@ static void svg_debug_gc_set_linewidth(struct graphics_gc_priv *gc, int w) { + + static void svg_debug_gc_set_dashes(struct graphics_gc_priv *gc, int w, + int offset, unsigned char *dash_list, int n) { +- gc->dashed = dash_list; ++ gc->dashed = (unsigned int*)dash_list; + gc->is_dashed = TRUE; + if (gc->graphics_gc_methods_proxy->gc_set_dashes) { + gc->graphics_gc_methods_proxy->gc_set_dashes(gc->graphics_gc_priv_proxy, +-- +2.50.0 + diff --git a/srcpkgs/navit/template b/srcpkgs/navit/template index 257747c2bdb..c781c011055 100644 --- a/srcpkgs/navit/template +++ b/srcpkgs/navit/template @@ -1,22 +1,17 @@ # Template file for 'navit' pkgname=navit version=0.5.6 -revision=7 +revision=8 build_style=cmake configure_args="-DLIBDIR=lib/navit -DSAMPLE_MAP=n -Wno-dev" hostmakedepends="pkg-config qt5-host-tools qt5-qmake" makedepends="sdl12-compat-devel qt5-devel gpsd-devel imlib2-devel dbus-glib-devel fontconfig-devel zlib-devel libpng-devel qt5-declarative-devel qt5-svg-devel qt5-location-devel SDL_ttf-devel SDL_image-devel libfreeglut-devel gtk+-devel - pango-devel atk-devel gdk-pixbuf-devel qt5-sensors-devel qt5-multimedia-devel - python3-devel" + pango-devel atk-devel gdk-pixbuf-devel qt5-sensors-devel qt5-multimedia-devel" short_desc="Turn-by-turn Navigation Software" maintainer="Toyam Cox " license="GPL-2.0-only, LGPL-2.0-only" homepage="http://www.navit-project.org/" distfiles="https://github.com/navit-gps/navit/archive/v${version}.tar.gz" checksum=043688e0b34504ca4ee80fb6a80895b938eae41e4031d0977dd30c20c20f1714 - -pre_configure() { - sed -i -e 's/\(GET_FILENAME_COMPONENT (LIB_DIR ${LIBDIR}\) NAME/\1 DIRECTORY/' CMakeLists.txt -}