From c8f5aecbe72a09e4ac630ba05abf31aaa1dce245 Mon Sep 17 00:00:00 2001 From: Michal Vasilek Date: Fri, 12 Nov 2021 13:25:09 +0100 Subject: [PATCH 1/2] yelp-tools: add a missing dependency --- srcpkgs/yelp-tools/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/yelp-tools/template b/srcpkgs/yelp-tools/template index 96b854281302..4395d70ab31b 100644 --- a/srcpkgs/yelp-tools/template +++ b/srcpkgs/yelp-tools/template @@ -1,11 +1,11 @@ # Template file for 'yelp-tools' pkgname=yelp-tools version=40.0 -revision=1 +revision=2 build_style=meson hostmakedepends="pkg-config itstool libxslt python3-lxml" makedepends="yelp-xsl" -depends="itstool libxslt yelp-xsl" +depends="itstool libxslt yelp-xsl python3-lxml" short_desc="Tools for creating Yelp documentation" maintainer="Enno Boland " license="GPL-2.0-or-later" From 4fc9241060b39e098855647f2e19bd767f140120 Mon Sep 17 00:00:00 2001 From: Michal Vasilek Date: Fri, 12 Nov 2021 13:23:33 +0100 Subject: [PATCH 2/2] viking: switch to gtk3 --- srcpkgs/viking/patches/32bit-test.patch | 11 +++++++++++ srcpkgs/viking/template | 16 ++++++---------- 2 files changed, 17 insertions(+), 10 deletions(-) create mode 100644 srcpkgs/viking/patches/32bit-test.patch diff --git a/srcpkgs/viking/patches/32bit-test.patch b/srcpkgs/viking/patches/32bit-test.patch new file mode 100644 index 000000000000..b9d4fbc6fa7a --- /dev/null +++ b/srcpkgs/viking/patches/32bit-test.patch @@ -0,0 +1,11 @@ +--- 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 9cd2eff9e11c..45eb34de2bb6 100644 --- a/srcpkgs/viking/template +++ b/srcpkgs/viking/template @@ -1,17 +1,13 @@ # Template file for 'viking' pkgname=viking version=1.9 -revision=1 +revision=2 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="docbook-xsl 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" +configure_args="--disable-mapnik" +hostmakedepends="glib-devel pkg-config gettext intltool itstool libxslt docbook-xsl" +makedepends="gtk+3-devel libcurl-devel geoclue2-devel sqlite-devel file-devel + libgexiv2-devel liboauth-devel gpsd-devel libzip-devel nettle-devel" +checkdepends="yelp-tools" short_desc="Open/source GPS data editor and analyzer" maintainer="Orphaned " license="GPL-2.0-or-later"