diff --git a/srcpkgs/viking/patches/0001-test-remove-ubsan-from-AM_CFLAGS.patch b/srcpkgs/viking/patches/0001-test-remove-ubsan-from-AM_CFLAGS.patch new file mode 100644 index 00000000000000..a19ca47c65f317 --- /dev/null +++ b/srcpkgs/viking/patches/0001-test-remove-ubsan-from-AM_CFLAGS.patch @@ -0,0 +1,13 @@ +diff --git a/test/Makefile.in b/test/Makefile.in +index fbe2801..3714842 100644 +--- a/test/Makefile.in ++++ b/test/Makefile.in +@@ -659,7 +659,7 @@ top_srcdir = @top_srcdir@ + + # Ideally want to use -fsanitize=address and/or -fsanitize=leak too; + # but either bugs in Viking or GTK libs not auto cleaning up - means can't use +-AM_CFLAGS = -Wall -fsanitize=undefined -fstack-protector-all \ ++AM_CFLAGS = -Wall -fstack-protector-all \ + -I$(top_srcdir)/src \ + $(PACKAGE_CFLAGS) $(GTK_CFLAGS) + diff --git a/srcpkgs/viking/patches/32bit-test.patch b/srcpkgs/viking/patches/32bit-test.patch deleted file mode 100644 index b9d4fbc6fa7ab3..00000000000000 --- a/srcpkgs/viking/patches/32bit-test.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- a/test/check_parse_latlon.sh -+++ b/test/check_parse_latlon.sh -@@ -46,7 +46,7 @@ check_success "S34.56 E008.56" "-34.56000 8.56000" - # DMM - check_success "N 34° 12.3456 W 123° 45.6789" "34.20576 -123.76131" - check_success "S 34° 12.3456 E 123° 45.6789" "-34.20576 123.76131" --check_success "S034° 12.3456 W003° 45.6789" "-34.20576 -3.76131" -+check_success "S034° 12.3456 W003° 45.6788" "-34.20576 -3.76131" - # DMS - check_success "S034° 12 34 W003° 45 54" "-34.20944 -3.76500" - # Not sure if 'invalid' minute/second values should be accepted diff --git a/srcpkgs/viking/template b/srcpkgs/viking/template index 81e0f6903aa31e..99d2e2b2225157 100644 --- a/srcpkgs/viking/template +++ b/srcpkgs/viking/template @@ -1,24 +1,18 @@ # Template file for 'viking' pkgname=viking -version=1.9 -revision=3 +version=1.11 +revision=1 build_style=gnu-configure -configure_args="--disable-mapnik" -hostmakedepends="glib-devel pkg-config gettext intltool itstool libxslt docbook-xsl" +configure_args="--disable-mapnik --disable-ubsan" +hostmakedepends="glib-devel pkg-config gettext intltool itstool libxslt docbook-xsl xxd" makedepends="gtk+3-devel libcurl-devel geoclue2-devel sqlite-devel file-devel - libgexiv2-devel liboauth-devel gpsd-devel libzip-devel nettle-devel" + libgexiv2-devel liboauth-devel gpsd-devel libzip-devel nettle-devel libnova-devel" checkdepends="yelp-tools" short_desc="Open/source GPS data editor and analyzer" maintainer="Orphaned " license="GPL-2.0-or-later" homepage="https://sourceforge.net/projects/viking" distfiles="${SOURCEFORGE_SITE}/viking/viking-${version}.tar.bz2" -checksum=fe4acf3d24121d6f3097d17ea704b42c0336a8f693151886b8b26e308dbfcb3b +checksum=fe21d5c111ef20877d1cd95b1a4bc34faae9dd3a17bac923f418e1271a3cfc91 CFLAGS="-fcommon" - -post_patch() { - vsed -i -e '/DATADIRNAME=/s/=.*/=share/' \ - -e '/localedir=.*eval/s,=.*,=/usr/share/locale,' \ - configure -}