From 31e60780b5ee9e2c9b0789910751fde4822568b5 Mon Sep 17 00:00:00 2001 From: Johannes Heimansberg Date: Tue, 26 Oct 2021 12:19:54 +0200 Subject: [PATCH] viking: update to 1.9. --- ...14f554825b1350a0ad349ffc0b7920a528c6.patch | 25 ------------------- ...97b0766243f937d11a4a4cbd6ab5aaac4e0f.patch | 24 ------------------ srcpkgs/viking/template | 15 +++++------ 3 files changed, 8 insertions(+), 56 deletions(-) delete mode 100644 srcpkgs/viking/patches/7ff014f554825b1350a0ad349ffc0b7920a528c6.patch delete mode 100644 srcpkgs/viking/patches/da4e97b0766243f937d11a4a4cbd6ab5aaac4e0f.patch diff --git a/srcpkgs/viking/patches/7ff014f554825b1350a0ad349ffc0b7920a528c6.patch b/srcpkgs/viking/patches/7ff014f554825b1350a0ad349ffc0b7920a528c6.patch deleted file mode 100644 index b7159a98b76d..000000000000 --- a/srcpkgs/viking/patches/7ff014f554825b1350a0ad349ffc0b7920a528c6.patch +++ /dev/null @@ -1,25 +0,0 @@ -upstream: yes - -From 7ff014f554825b1350a0ad349ffc0b7920a528c6 Mon Sep 17 00:00:00 2001 -From: Nikolay Korotkiy -Date: Tue, 4 Feb 2020 21:12:47 +0000 -Subject: [PATCH] Fix build without mapnik - -Signed-off-by: Rob Norris ---- - src/viklayer.c | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/src/viklayer.c b/src/viklayer.c -index dc0ab1ff..3070157f 100644 ---- a/src/viklayer.c -+++ b/src/viklayer.c -@@ -36,7 +36,7 @@ extern VikLayerInterface vik_dem_layer_interface; - #ifdef HAVE_LIBMAPNIK - extern VikLayerInterface vik_mapnik_layer_interface; - #endif --#ifdef HAVE_LIBMAPNIK -+#ifdef HAVE_LIBGEOCLUE_2 - extern VikLayerInterface vik_geoclue_layer_interface; - #endif - diff --git a/srcpkgs/viking/patches/da4e97b0766243f937d11a4a4cbd6ab5aaac4e0f.patch b/srcpkgs/viking/patches/da4e97b0766243f937d11a4a4cbd6ab5aaac4e0f.patch deleted file mode 100644 index 2ef4c0589bb7..000000000000 --- a/srcpkgs/viking/patches/da4e97b0766243f937d11a4a4cbd6ab5aaac4e0f.patch +++ /dev/null @@ -1,24 +0,0 @@ -upstream: yes - -From da4e97b0766243f937d11a4a4cbd6ab5aaac4e0f Mon Sep 17 00:00:00 2001 -From: Rob Norris -Date: Sun, 9 Feb 2020 11:28:30 +0000 -Subject: [PATCH] Github #80: Fix build with '--with-libexif' - ---- - src/geotag_exif.c | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/src/geotag_exif.c b/src/geotag_exif.c -index 0e879a39..6e9514a7 100644 ---- a/src/geotag_exif.c -+++ b/src/geotag_exif.c -@@ -362,7 +362,7 @@ VikWaypoint* a_geotag_create_waypoint_from_file ( const gchar *filename, VikCoor - // Not worried if none of the other fields exist, as can default the values to something - // - -- gdouble alt = VIK_DEFAULT_ALTITUDE; -+ gdouble alt = NAN; - ee = exif_content_get_entry (ed->ifd[EXIF_IFD_GPS], EXIF_TAG_GPS_ALTITUDE); - if ( ee && ee->components == 1 && ee->format == EXIF_FORMAT_RATIONAL ) { - alt = Rational2Double ( ee->data, diff --git a/srcpkgs/viking/template b/srcpkgs/viking/template index b02ad7498482..24cfe2913c87 100644 --- a/srcpkgs/viking/template +++ b/srcpkgs/viking/template @@ -1,22 +1,23 @@ # Template file for 'viking' pkgname=viking -version=1.8 -revision=2 +version=1.9 +revision=1 build_style=gnu-configure configure_args="--disable-realtime-gps-tracking --disable-bluemarble --disable-bing --disable-terraserver --disable-spotmaps --disable-expedia --disable-mapnik --enable-magic --enable-bzip2 --enable-mbtiles --with-libexif" -hostmakedepends="gdk-pixbuf-devel intltool pkg-config" -makedepends="file-devel gnome-doc-utils gtk+-devel libcurl-devel libexif-devel - libgexiv2-devel sqlite-devel bzip2-devel geoclue2-devel liboauth-devel - nettle-devel" +hostmakedepends="gdk-pixbuf-devel glib-devel itstool intltool libxslt pkg-config" +makedepends="file-devel glib-devel gnome-doc-utils gtk+-devel + libcurl-devel libexif-devel libgexiv2-devel sqlite-devel bzip2-devel + geoclue2-devel liboauth-devel nettle-devel" +checkdepends="python3-lxml 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=855cbccd5f17ef0dc6d7e2d080a4b20383a079dfb882edd04dba602297030fa8 +checksum=fe4acf3d24121d6f3097d17ea704b42c0336a8f693151886b8b26e308dbfcb3b CFLAGS="-fcommon"