gentoo auto-resync : 27:06:2024 - 07:59:39

4 files changed, 38 insertions, 4 deletions

diff --git a/sci-geosciences/viking/Manifest b/sci-geosciences/viking/Manifest
index 8f3eb1566540..c0fcf1756d9c 100644
--- a/sci-geosciences/viking/Manifest
+++ b/sci-geosciences/viking/Manifest
@@ -1,4 +1,5 @@
+AUX viking-1.10-terraserver.patch 1286 BLAKE2B a10fb99632db730a03b1e34d2f3021ff5ab02905676052b409b25577b7f7e03f90572ddf201b0b6345b80c3704cc30582b266a613144cfb21e30afd7b9a78a88 SHA512 82a868cdd85b1d1886fa4b8e86fef5bf67b283453e5bb160b9fc9b15685727cab558f2b73f61c1a8e63e8bb366cfc0c22abca68865aba9fbc45bb6fc5153ec36
 DIST viking-1.10.tar.gz 6014926 BLAKE2B 667a5cd854449f54c6f5969118a445903cafae4e8f046f14b6802f53a76c217cf960dd11876ed237112026f96da2906bb68b2474ba4e72696bd8b8a082cf7189 SHA512 8d0b3b46e139b8c03730140d89e8eaf6f1dbcde504011710d122e5239d11d1115464b087edd531228be199286605df0deb3f4b75fae0222128b0f5098344527e
 DIST viking.pdf 383200 BLAKE2B 388129023e62008de2d2c402a72aa1e4a1834f99e6666bb9deedb5f5c32e8b94edeadf5a40e7b1f941aacc0057d4dcfbaf13c3098eb4efa02e3a1a8e00288201 SHA512 481c88afd43783475366d41cd46a7fa5fdbcd20fec27b3ce286fb8abe1e9efbb4164def0d19fca2380fa95b5b97e9472f25ff5e10f8d95261e85b7c4a52d29ee
-EBUILD viking-1.10.ebuild 2051 BLAKE2B 51692a09fbfe7343fdbfbe0416882750fef2bed1ac71abc430201205923581ddf18e3fe80c4fb4fed7819432b4baec2dee57316f3aa2e642a096c56e072ef9fc SHA512 f0cecea28b66e0f1b07b832d6561d10299ef815d6ce89d990d161a5318bf64a78851be611f6268a27de7d2529847a27ec766e19982780c910b8b8a1898df2d50
-MISC metadata.xml 734 BLAKE2B 7fd63ec5238ee628cb9f6cb485643fb7f029e83735d3e85b79ea2c27e3c4d50698c6fc1b67d122a4261f0ff0b6271b3001102d07a7495c0ab58d54b7feec94a5 SHA512 a0568859ea1fedda5839ed1d055097687210d938867473e31be9c5331d6d1b1b26305049d5fee9d36e945343cd2dcd08951eb5921d0683a69433b2cd6539c209
+EBUILD viking-1.10.ebuild 2100 BLAKE2B 4346b9649e6252d5f69a809d44437237f9382b1ce58289468e3e09d4558a996db763ae30d79c8fabf01d00490357f3b8debeb362a4ef887060dcc313dbff3e80 SHA512 96b280af85f57f1ca63e9e05f38aaf7739fe42d95137859fbd64e1b19c879f2d8f0fe8200b0c8f7e06e0dbc6bc3b4d0d1e25eed00c6990ec3afd1d7f5f4494b6
+MISC metadata.xml 793 BLAKE2B 21b6c3d0751f98fd8d90b260b54b9a3ef004b35f9fbb088dd664f60a72a1618df90464288075043d30754d95ebea1aa6e261ce3a280fda005a029c4dd4dac971 SHA512 9e436dedcc783f3c0c1c678905ec1381f7fe56f50480680448401b4ce06ccaffbc954debd52bb98af8008df468220482f155ee53db071e6b8b5adf1a6d600da5
diff --git a/sci-geosciences/viking/files/viking-1.10-terraserver.patch b/sci-geosciences/viking/files/viking-1.10-terraserver.patch
new file mode 100644
index 000000000000..143f80af838e
--- /dev/null
+++ b/sci-geosciences/viking/files/viking-1.10-terraserver.patch
@@ -0,0 +1,31 @@
+From 71e5d6bb1b2f9481788ce7d54d5124f468515852 Mon Sep 17 00:00:00 2001
+From: Rob Norris <rw_norris@hotmail.com>
+Date: Thu, 24 Mar 2022 19:26:37 +0000
+Subject: [PATCH] Maintain terraserver code building
+
+---
+ src/terraservermapsource.c | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/src/terraservermapsource.c b/src/terraservermapsource.c
+index 8d9edfac..0e8cf09a 100644
+--- a/src/terraservermapsource.c
++++ b/src/terraservermapsource.c
+@@ -32,7 +32,7 @@ static gboolean _is_mbtiles ( VikMapSource *self );
+ 
+ static gchar *_get_uri( VikMapSourceDefault *self, MapCoord *src );
+ static gchar *_get_hostname( VikMapSourceDefault *self );
+-static DownloadFileOptions *_get_download_options( VikMapSourceDefault *self );
++static DownloadFileOptions *_get_download_options( VikMapSourceDefault *self, MapCoord *src );
+ 
+ /* FIXME Huge gruik */
+ static DownloadFileOptions terraserver_options = { FALSE, FALSE, NULL, 0, NULL, NULL, 0, a_check_map_file, NULL, FALSE, FALSE, NULL };
+@@ -247,7 +247,7 @@ _get_hostname( VikMapSourceDefault *self )
+ }
+ 
+ static DownloadFileOptions *
+-_get_download_options( VikMapSourceDefault *self )
++_get_download_options( VikMapSourceDefault *self, MapCoord *src )
+ {
+ 	g_return_val_if_fail (TERRASERVER_IS_MAP_SOURCE(self), NULL);
+ 
diff --git a/sci-geosciences/viking/metadata.xml b/sci-geosciences/viking/metadata.xml
index d113d8a61afa..10d05ec65b71 100644
--- a/sci-geosciences/viking/metadata.xml
+++ b/sci-geosciences/viking/metadata.xml
@@ -21,5 +21,6 @@
   </use>
   <upstream>
     <remote-id type="sourceforge">viking</remote-id>
+    <remote-id type="github">viking-gps/viking</remote-id>
   </upstream>
 </pkgmetadata>
diff --git a/sci-geosciences/viking/viking-1.10.ebuild b/sci-geosciences/viking/viking-1.10.ebuild
index 35fb8f0196c1..f3cde20cb986 100644
--- a/sci-geosciences/viking/viking-1.10.ebuild
+++ b/sci-geosciences/viking/viking-1.10.ebuild
@@ -7,14 +7,15 @@ inherit autotools xdg-utils
 
 DESCRIPTION="GPS data editor and analyzer"
 HOMEPAGE="https://github.com/viking-gps/viking/"
-IUSE="doc +exif libexif geoclue gps +magic nls oauth"
 SRC_URI="
 	https://github.com/viking-gps/${PN}/archive/${P}.tar.gz
 	doc? ( https://github.com/viking-gps/${PN}/releases/download/${P}/${PN}.pdf )"
+S="${WORKDIR}/${PN}-${P}"
 
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
+IUSE="doc +exif libexif geoclue gps +magic nls oauth"
 
 COMMONDEPEND="
 	app-arch/bzip2
@@ -47,7 +48,7 @@ DEPEND="${COMMONDEPEND}
 	sys-devel/gettext
 "
 
-S="${WORKDIR}/${PN}-${P}"
+PATCHES=( "${FILESDIR}/${P}-terraserver.patch" )
 
 src_prepare() {
 	default