From a2bf7bda4cade6e6b035ab7ad06acdfbf377c7a2 Mon Sep 17 00:00:00 2001 From: Maxim Cournoyer Date: Sat, 9 Mar 2024 20:36:20 -0500 Subject: [PATCH] gnu: libextractor: Update to 1.13. * gnu/packages/gnunet.scm (libextractor): Update to 1.13. [inputs]: Remove ffmpeg-4, no longer supported. Replace gtk+ with gdk-pixbuf. [argumens]: Reinstate parallel tests. Remove fix-exiv2-tests phase. Change-Id: Ic299c31a2d40512116c9876e0fbb4f9ded0ccc3b --- gnu/packages/gnunet.scm | 16 +++------------- 1 file changed, 3 insertions(+), 13 deletions(-) diff --git a/gnu/packages/gnunet.scm b/gnu/packages/gnunet.scm index fd101a8acf..a28419213b 100644 --- a/gnu/packages/gnunet.scm +++ b/gnu/packages/gnunet.scm @@ -84,14 +84,14 @@ (define-module (gnu packages gnunet) (define-public libextractor (package (name "libextractor") - (version "1.11") + (version "1.13") (source (origin (method url-fetch) (uri (string-append "mirror://gnu/libextractor/libextractor-" version ".tar.gz")) (sha256 (base32 - "13xxv11mif3m0mpk7i43mljhhaqrj52kznm1qi3qb8s6hymk7xhn")))) + "0mgprmwdhdwq9xhfxfhcncd304425nvcc4zi8ci5f0nja4n333xv")))) (build-system gnu-build-system) ;; WARNING: Checks require /dev/shm to be in the build chroot, especially ;; not to be a symbolic link to /run/shm. @@ -104,13 +104,12 @@ (define-public libextractor `(("exiv2" ,exiv2) ("bzip2" ,bzip2) ("flac" ,flac) - ("ffmpeg" ,ffmpeg-4) ("file" ,file) ;libmagic, for the MIME plug-in ("glib" ,glib) ("giflib" ,giflib) ("gstreamer" ,gstreamer) ("gst-plugins-base" ,gst-plugins-base) - ("gtk+" ,gtk+) + ("gdk-pixbuf" ,gdk-pixbuf) ("libarchive" ,libarchive) ("libgsf" ,libgsf) ("libjpeg" ,libjpeg-turbo) @@ -130,17 +129,8 @@ (define-public libextractor `(#:configure-flags (list (string-append "--with-ltdl=" (assoc-ref %build-inputs "libltdl"))) - #:parallel-tests? #f #:phases (modify-phases %standard-phases - (add-after 'configure 'fix-exiv2-tests - ;; exiv2>=0.27.3 rounds geolocation - ;; https://github.com/Exiv2/exiv2/pull/1107/commits/db1be4ae8e1077949fcb6a960e93069d6a41b395#diff-f3f55183ccbe956c720c86e61f708d9f - (lambda _ - (substitute* "src/plugins/test_exiv2.c" - (("17.585\\\\\" ") "18\\\"") - (("21.713\\\\\" ") "22\\\"")) - #t)) (add-after 'install 'move-static-libraries (lambda* (#:key outputs #:allow-other-keys) ;; Move static libraries to the "static" output.