[bug#77193,v2] gnu: gnunet: Update to 0.24.0.

Message ID 6d5d0361f26493ccb887cca6ef96d935cc15ecb7.1748856395.git.andreas@enge.fr
State New
Headers
Series [bug#77193,v2] gnu: gnunet: Update to 0.24.0. |

Commit Message

Andreas Enge June 2, 2025, 9:26 a.m. UTC
  From: Noé Lopez <noelopez@free.fr>

* gnu/packages/gnunet.scm (gnunet): Update to 0.24.0.
Restore working tests.
[build-system]: Switch to meson-build-system.

Change-Id: I60bc22150ba678f0bc552df4e9cbeb1c6eb1d79a
Signed-off-by: Andreas Enge <andreas@enge.fr>
---
Hello Noé,

here is an updated patch, also with an expanded commit message.

The dependent package guile-gnunet (still) fails.
The other dependent package gnunet-gtk newly fails with this error
message:
starting phase `configure'
usage: meson [-h]
             {setup,configure,dist,install,introspect,init,test,wrap,subprojects,rewrite,compile,devenv,env2mfile,format,fmt,help}
             ...
meson: error: unrecognized arguments: --with-libunique --with-qrencode --with-gnunet=/gnu/store/q4zy0lm60hwihfbblq936rsripdxis2v-gnunet-0.24.0
error: in phase 'configure': uncaught exception:
%exception #<&invoke-error program: "meson" arguments: ("setup" "--prefix=/gnu/store/mwd980rahqkhrh95gky156glp0dpggbi-gnunet-gtk-0.23.0" "--buildtype=debugoptimized" "-Dc_link_args=-Wl,-rpath=/gnu/store/mwd980rahqkhrh95gky156glp0dpggbi-gnunet-gtk-0.23.0/lib" "-Dcpp_link_args=-Wl,-rpath=/gnu/store/mwd980rahqkhrh95gky156glp0dpggbi-gnunet-gtk-0.23.0/lib" "--with-libunique" "--with-qrencode" "--with-gnunet=/gnu/store/q4zy0lm60hwihfbblq936rsripdxis2v-gnunet-0.24.0" "/tmp/guix-build-gnunet-gtk-0.23.0.drv-0/gnunet-gtk-0.23.0") exit-status: 2 term-signal: #f stop-signal: #f>
phase `configure' failed after 0.4 seconds
command "meson" "setup" "--prefix=/gnu/store/mwd980rahqkhrh95gky156glp0dpggbi-gnunet-gtk-0.23.0" "--buildtype=debugoptimized" "-Dc_link_args=-Wl,-rpath=/gnu/store/mwd980rahqkhrh95gky156glp0dpggbi-gnunet-gtk-0.23.0/lib" "-Dcpp_link_args=-Wl,-rpath=/gnu/store/mwd980rahqkhrh95gky156glp0dpggbi-gnunet-gtk-0.23.0/lib" "--with-libunique" "--with-qrencode" "--with-gnunet=/gnu/store/q4zy0lm60hwihfbblq936rsripdxis2v-gnunet-0.24.0" "/tmp/guix-build-gnunet-gtk-0.23.0.drv-0/gnunet-gtk-0.23.0" failed with status 2
build process 10 exited with status 256

Could you maybe have a look?

Andreas


 gnu/packages/gnunet.scm | 27 +++++----------------------
 1 file changed, 5 insertions(+), 22 deletions(-)


base-commit: 9539773875695431134a0f31c50eba5fcd1563b5
  

Patch

diff --git a/gnu/packages/gnunet.scm b/gnu/packages/gnunet.scm
index 0d6c006da9..463521cede 100644
--- a/gnu/packages/gnunet.scm
+++ b/gnu/packages/gnunet.scm
@@ -82,7 +82,8 @@  (define-module (gnu packages gnunet)
   #:use-module (guix deprecation)
   #:use-module (guix download)
   #:use-module (guix git-download)
-  #:use-module (guix build-system gnu))
+  #:use-module (guix build-system gnu)
+  #:use-module (guix build-system meson))
 
 (define-public libextractor
   (package
@@ -192,7 +193,7 @@  (define-public libmicrohttpd
 (define-public gnunet
   (package
     (name "gnunet")
-    (version "0.23.0")
+    (version "0.24.0")
     (source
      (origin
        (method url-fetch)
@@ -200,8 +201,8 @@  (define-public gnunet
                            ".tar.gz"))
        (sha256
         (base32
-         "0ypnsn81fp3iqi8rgsbcvfnz9iwmaxd1h71mphak8ska2kabdim4"))))
-    (build-system gnu-build-system)
+         "0mrw2qp62wfpg8w7cfkjmx9kii4lmckqgpzdpq3cprik92gjz186"))))
+    (build-system meson-build-system)
     (inputs
      (list bluez
            glpk
@@ -238,24 +239,6 @@  (define-public gnunet
       #:parallel-tests? #f              ;parallel tests aren't supported
       #:phases
       #~(modify-phases %standard-phases
-          (add-after 'unpack 'disable-problematic-tests
-            (lambda _
-              ;; The file 'test_arm_probnat.sh' doesn't seem to exist,
-              ;; or have a creation method specified anywhere in the source.
-              (substitute* "src/service/arm/Makefile.in"
-                (("check_SCRIPTS = \\\\")
-                 "DISABLED_check_SCRIPTS = \\"))
-              ;; The 'test_communicator_bidirect-tcp' fails
-              ;; non-deterministically (see:
-              ;; https://bugs.gnunet.org/view.php?id=8689).
-              (substitute* "src/service/transport/Makefile.in"
-                (("test_communicator_bidirect-tcp\\$\\(EXEEXT) ")
-                 ""))
-              ;; The 'test_fs_search_with_and' fails non-deterministically
-              ;; (see: https://bugs.gnunet.org/view.php?id=8692).
-              (substitute* "src/service/fs/Makefile.in"
-                (("test_fs_search_with_and\\$\\(EXEEXT) ")
-                 ""))))
           (add-before 'check 'set-env-var-for-tests
             (lambda _
               (setenv "LANG" "en_US.UTF-8")))