[rpms/viking] rawhide: Patch to build on F45 (rhbz#2505114)

[rpms/viking] rawhide: Patch to build on F45 (rhbz#2505114)

[@ 2026-07-25 9:56 UTC (permalink / raw)]

A new commit has been pushed.

Repo   : rpms/viking
Branch : rawhide
Commit : ea40f6d149fef4e80375adc0af0f523ed1e2605b
Author : Göran Uddeborg <goeran@uddeborg.se>
Date   : 2026-07-25T11:14:22+02:00
Stats  : +51/-2 in 2 file(s)
URL    : https://src.fedoraproject.org/rpms/viking/c/ea40f6d149fef4e80375adc0af0f523ed1e2605b?branch=rawhide

Log:
Patch to build on F45 (rhbz#2505114)

---
diff --git a/nettle-4.patch b/nettle-4.patch
new file mode 100644
index 0000000..3eeea81
--- /dev/null
+++ b/nettle-4.patch
@@ -0,0 +1,46 @@
+diff --git a/configure.ac b/configure.ac
+index 8f665e36..abed70da 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -512,7 +512,7 @@ AC_CACHE_CHECK([whether to enable MD5 Hash support],
+                [ac_cv_enable_nettle], [ac_cv_enable_nettle=yes])
+ case $ac_cv_enable_nettle in
+   yes)
+-    AC_CHECK_HEADER([nettle/md5-compat.h],[],[AC_MSG_ERROR([nettle/md5-compat.h is needed but not found - you will need to install package 'nettle-dev' or similar. The feature can be disabled with --disable-nettle])])
++    AC_CHECK_HEADER([nettle/md5.h],[],[AC_MSG_ERROR([nettle/md5.h is needed but not found - you will need to install package 'nettle-dev' or similar. The feature can be disabled with --disable-nettle])])
+     AC_CHECK_LIB([nettle], [main], [],
+       if test "$ac_mingw32" = "yes"; then
+         [LIBS="-lnettle $LIBS"
+diff --git a/src/md5_hash.c b/src/md5_hash.c
+index eaec8355..6508c636 100644
+--- a/src/md5_hash.c
++++ b/src/md5_hash.c
+@@ -26,7 +26,8 @@
+ #include "config.h"
+ #endif
+ #ifdef HAVE_LIBNETTLE
+-#include <nettle/md5-compat.h>
++#include <nettle/version.h>
++#include <nettle/md5.h>
+ #endif
+ 
+ /**
+@@ -37,10 +38,14 @@ char *md5_hash(const char *message)
+ 	char *answer = NULL;
+ #ifdef HAVE_LIBNETTLE
+ 	unsigned char result[16];
+-	MD5_CTX ctx;
+-	MD5Init ( &ctx );
+-	MD5Update ( &ctx, (const unsigned char*)message, strlen(message) );
+-	MD5Final ( &result[0], &ctx );
++	struct md5_ctx ctx;
++	md5_init ( &ctx );
++	md5_update ( &ctx, strlen(message), (const unsigned char*)message );
++#if defined(NETTLE_VERSION_MAJOR) && NETTLE_VERSION_MAJOR >= 4
++	md5_digest ( &ctx, &result[0] );
++#else
++	md5_digest ( &ctx, MD5_DIGEST_SIZE, &result[0] );
++#endif
+ 	/*
+ 	g_printf ( "%s: of string '%s' is: ", __FUNCTION__, message );
+ 	for(int i = 0; i < 16; i++)

diff --git a/viking.spec b/viking.spec
index 874fe61..ded65f1 100644
--- a/viking.spec
+++ b/viking.spec
@@ -12,6 +12,9 @@ License:        GPL-2.0-or-later
 URL:            %forgeurl
 
 Source0:        %forgesource
+# https://github.com/viking-gps/viking/issues/387
+# https://github.com/viking-gps/viking/pull/388
+Patch0:         nettle-4.patch
 
 # Fails to build on s390x, not needed for multilib
 ExcludeArch:    s390x %{ix86}
@@ -30,7 +33,7 @@ BuildRequires:  gnome-doc-utils
 BuildRequires:  libexif-devel
 BuildRequires:  bzip2-devel
 BuildRequires:  file-devel
-BuildRequires:  libgexiv2-devel
+BuildRequires:  libgexiv2_0.14-devel
 BuildRequires:  sqlite-devel
 BuildRequires:  docbook-utils
 BuildRequires:  docbook-style-xsl
@@ -58,7 +61,7 @@ geotag images, create routes using OSRM, see real-time GPS position, make maps
 using Mapnik, control items, etc.
 
 %prep
-%forgeautosetup
+%forgeautosetup -p 1
 NOCONFIGURE=1 ./autogen.sh
 # Convert TODO to utf-8
 mv TODO timestamp