commit: 94b3774fa74e57354acc7a747de56984103b3af6 Author: Hans de Graaff <graaff <AT> gentoo <DOT> org> AuthorDate: Wed Jun 26 11:53:55 2024 +0000 Commit: Hans de Graaff <graaff <AT> gentoo <DOT> org> CommitDate: Wed Jun 26 11:55:04 2024 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=94b3774f
sci-geosciences/viking: backport compilation fix Closes: https://bugs.gentoo.org/930262 Signed-off-by: Hans de Graaff <graaff <AT> gentoo.org> .../viking/files/viking-1.10-terraserver.patch | 31 ++++++++++++++++++++++ sci-geosciences/viking/viking-1.10.ebuild | 5 ++-- 2 files changed, 34 insertions(+), 2 deletions(-) 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 <[email protected]> +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/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
