.gitignore

@@ -1,4 +1,3 @@
+/viking-*.tar.bz2
 /autogen.sh
-/viking-1.11.tar.gz
-/viking-viking-1.11.tar.gz
-/viking-2a2420963e4b913d0b37dcf8801dc3695ca72a6c.tar.gz
+/443fe78cb097ae2196517fc726595b57cb9418c4.patch

0000-Declare-vik_aggregate_layer_new-parameter.patch

@@ -0,0 +1,48 @@
+From 00af919af53652b2bc0fba5361e6be68b185f58d Mon Sep 17 00:00:00 2001
+From: Otto Liljalaakso <otto.liljalaakso@iki.fi>
+Date: Wed, 29 Jan 2025 00:55:18 +0200
+Subject: [PATCH] Declare vik_aggregate_layer_new parameter
+
+
+diff --git a/src/vikaggregatelayer.h b/src/vikaggregatelayer.h
+index ffe71320..500fe29b 100644
+--- a/src/vikaggregatelayer.h
++++ b/src/vikaggregatelayer.h
+@@ -45,7 +45,7 @@ GType vik_aggregate_layer_get_type ();
+ typedef struct _VikAggregateLayer VikAggregateLayer;
+ 
+ void vik_aggregate_layer_uninit ();
+-VikAggregateLayer *vik_aggregate_layer_new ();
++VikAggregateLayer *vik_aggregate_layer_new ( VikViewport *vvp );
+ void vik_aggregate_layer_add_layer ( VikAggregateLayer *val, VikLayer *l, gboolean allow_reordering );
+ void vik_aggregate_layer_insert_layer ( VikAggregateLayer *val, VikLayer *l, GtkTreeIter *replace_layer );
+ void vik_aggregate_layer_move_layer ( VikAggregateLayer *val, GtkTreeIter *child_iter, gboolean up );
+diff --git a/src/viklayerspanel.c b/src/viklayerspanel.c
+index 2ec210a4..e4382fdf 100644
+--- a/src/viklayerspanel.c
++++ b/src/viklayerspanel.c
+@@ -537,7 +537,7 @@ static void vik_layers_panel_init ( VikLayersPanel *vlp )
+   vlp->hbox = gtk_hbox_new ( TRUE, 2 );
+   vlp->vt = vik_treeview_new ( );
+ 
+-  vlp->toplayer = vik_aggregate_layer_new ();
++  vlp->toplayer = vik_aggregate_layer_new ( NULL );
+   vik_layer_rename ( VIK_LAYER(vlp->toplayer), _("Top Layer"));
+   g_signal_connect_swapped ( G_OBJECT(vlp->toplayer), "update", G_CALLBACK(layers_panel_emit_update), vlp );
+ 
+diff --git a/test/vik2vik.c b/test/vik2vik.c
+index 8e2a0acb..ebc5bcb8 100644
+--- a/test/vik2vik.c
++++ b/test/vik2vik.c
+@@ -39,7 +39,7 @@ int main(int argc, char *argv[])
+   // Also get lots of warnings about no actual drawing GCs available
+   // but for file processing this seems to be good enough
+   VikLoadType_t lt;
+-  VikAggregateLayer* agg = vik_aggregate_layer_new ();
++  VikAggregateLayer* agg = vik_aggregate_layer_new ( NULL );
+   VikViewport* vp = vik_viewport_new ();
+ 
+   lt = a_file_load_stream ( stdin, NULL, agg, vp, NULL, TRUE, FALSE, NULL, "NotUsedName" );
+-- 
+2.48.1
+

sources

@@ -1 +1,3 @@
-SHA512 (viking-2a2420963e4b913d0b37dcf8801dc3695ca72a6c.tar.gz) = 94eb5f5f211ed4f1645a0b7b4d9ce3adeaffdf1502f3a9367bc99a37b9ad2e739337b7920766ac5b9719aca1ad95fab368b8343550420fda5cebbdcce5cdc795
+SHA512 (viking-1.10.tar.bz2) = d04877306fb3a4e6902297d8971ca72d30418727f110b8b9bc937b2738b95975a7f41a4c969cc19cf403e73339476ff46d7ccbae77e03c5b1cf5bcac891485e5
+SHA512 (autogen.sh) = 66f4f4ffbc7dc2343918c7fb0d58e3d503d811d71b655f435b3d5bdf6ac5fbe304a349ddc5370a53c2fb5bc4142707e7eab160c35038ca82aadc13294eb02ea0
+SHA512 (443fe78cb097ae2196517fc726595b57cb9418c4.patch) = 0101392cdeaa52d03ac092a83968ab59380e65671bc2988d97ba148e7e89c566f3aa520320b5410a4aec943b4c0cd15fb092be30a05e7bd1c8b6a01032f3ef0d

viking.spec

@@ -1,18 +1,18 @@
 Name:           viking
-
-%global forgeurl https://github.com/viking-gps/viking
-%global version0 1.11
-%global commit 2a2420963e4b913d0b37dcf8801dc3695ca72a6c
-%forgemeta
-Version:        %forgeversion
+Version:        1.10
 Release:        %autorelease
 Summary:        GPS data editor and analyzer
 
 License:        GPL-2.0-or-later
-URL:            %forgeurl
-
-Source0:        %forgesource
-
+URL:            https://viking.sourceforge.net/
+Source0:        https://downloads.sourceforge.net/viking/viking-%{version}.tar.bz2
+# SourceForge is not good for fetching individual files and patches. Resort to
+# upstream's GitHub mirror.
+Source1:        https://raw.githubusercontent.com/viking-gps/viking/refs/tags/viking-%{version}/autogen.sh
+Patch:          https://github.com/viking-gps/viking/commit/443fe78cb097ae2196517fc726595b57cb9418c4.patch
+# Make compatible with C23
+# Backported from https://github.com/viking-gps/viking/pull/316
+Patch:          0000-Declare-vik_aggregate_layer_new-parameter.patch
 # Fails to build on s390x, not needed for multilib
 ExcludeArch:    s390x %{ix86}
 
@@ -30,7 +30,7 @@ BuildRequires:  gnome-doc-utils
 BuildRequires:  libexif-devel
 BuildRequires:  bzip2-devel
 BuildRequires:  file-devel
-BuildRequires:  libgexiv2_0.14-devel
+BuildRequires:  libgexiv2-devel
 BuildRequires:  sqlite-devel
 BuildRequires:  docbook-utils
 BuildRequires:  docbook-style-xsl
@@ -44,8 +44,6 @@ BuildRequires:  desktop-file-utils
 BuildRequires:  gettext
 BuildRequires:  json-glib-devel
 BuildRequires:  yelp-tools
-BuildRequires:  xxd
-BuildRequires:  libnova-devel
 
 Requires:       hicolor-icon-theme
 Requires:       gpsbabel
@@ -58,12 +56,15 @@ geotag images, create routes using OSRM, see real-time GPS position, make maps
 using Mapnik, control items, etc.
 
 %prep
-%forgeautosetup -p 1
+%autosetup -p1
+cp %{SOURCE1} . && chmod +x autogen.sh
 NOCONFIGURE=1 ./autogen.sh
-# Convert TODO to utf-8
-mv TODO timestamp
-iconv -f ISO-8859-1 -t UTF-8 -o TODO timestamp
-touch -r timestamp TODO
+# Convert to utf-8
+for file in ChangeLog NEWS TODO; do
+    mv $file timestamp
+    iconv -f ISO-8859-1 -t UTF-8 -o $file timestamp
+    touch -r timestamp $file
+done
 
 %build
 %configure