149/237: gnu: podofo: Fix build with gcc-14.

[guix-commits]

janneke pushed a commit to branch core-packages-team
in repository guix.

commit 4482459254ae3b5fe8e19f44092bbcdb23682467
Author: Janneke Nieuwenhuizen <janneke@gnu.org>
AuthorDate: Thu Jan 2 17:50:09 2025 +0100

    gnu: podofo: Fix build with gcc-14.
    
    * gnu/packages/patches/podofo-gcc-14.patch: New file.
    * gnu/local.mk (dist_patch_DATA): Register it.
    * gnu/packages/pdf.scm (podofo)[source]: Use it.
    
    Change-Id: I9a85c994f69587cc3ba463a3e647f0aeebd53d04
---
 gnu/local.mk                             |  1 +
 gnu/packages/check.scm                   |  6 +++---
 gnu/packages/patches/podofo-gcc-14.patch | 13 +++++++++++++
 gnu/packages/pdf.scm                     |  2 ++
 4 files changed, 19 insertions(+), 3 deletions(-)

diff --git a/gnu/local.mk b/gnu/local.mk
index 78573c5057..660119e14c 100644
--- a/gnu/local.mk
+++ b/gnu/local.mk
@@ -1981,6 +1981,7 @@ dist_patch_DATA =                                         
\
   %D%/packages/patches/plasp-fix-normalization.patch \
   %D%/packages/patches/plasp-include-iostream.patch \
   %D%/packages/patches/pocketfft-cpp-prefer-preprocessor-if.patch              
        \
+  %D%/packages/patches/podofo-gcc-14.patch                     \
   %D%/packages/patches/pokerth-boost.patch                     \
   %D%/packages/patches/ppsspp-disable-upgrade-and-gold.patch           \
   %D%/packages/patches/procps-strtod-test.patch                 \
diff --git a/gnu/packages/check.scm b/gnu/packages/check.scm
index 47047de59e..f037185d90 100644
--- a/gnu/packages/check.scm
+++ b/gnu/packages/check.scm
@@ -490,9 +490,9 @@ with a flexible variety of user interfaces.")
              (method url-fetch)
               (uri (string-append "http://dev-www.libreoffice.org/src/";
                                   name "-" version ".tar.gz"))
-             (sha256
-              (base32
-               "19qpqzy66bq76wcyadmi3zahk5v1ll2kig1nvg96zx9padkcdic9"))))
+              (sha256
+               (base32
+                "19qpqzy66bq76wcyadmi3zahk5v1ll2kig1nvg96zx9padkcdic9"))))
     ;; Explicitly link with libdl. This is expected to be done by packages
     ;; relying on cppunit for their tests. However, not all of them do.
     ;; If we added the linker flag to such packages, we would pollute all
diff --git a/gnu/packages/patches/podofo-gcc-14.patch 
b/gnu/packages/patches/podofo-gcc-14.patch
new file mode 100644
index 0000000000..5238bc7e2a
--- /dev/null
+++ b/gnu/packages/patches/podofo-gcc-14.patch
@@ -0,0 +1,13 @@
+Upstream-status: Not presented upstream.
+
+--- podofo-0.9.8/test/unit/StringTest.h.orig   2025-01-02 17:35:43.328872274 
+0100
++++ podofo-0.9.8/test/unit/StringTest.h        2025-01-02 17:36:17.384862445 
+0100
+@@ -22,6 +22,8 @@
+ #define _STRING_TEST_H_
+ 
+ #include <cppunit/extensions/HelperMacros.h>
++#include <podofo/base/PdfString.h>
++namespace PoDoFo {std::ostream& operator<<(std::ostream& o, const PdfString& 
s);}
+ 
+ #ifndef __clang__
+ 
diff --git a/gnu/packages/pdf.scm b/gnu/packages/pdf.scm
index f1e72ecc57..15c9fd6808 100644
--- a/gnu/packages/pdf.scm
+++ b/gnu/packages/pdf.scm
@@ -29,6 +29,7 @@
 ;;; Copyright © 2023 Benjamin Slade <slade@lambda-y.net>
 ;;; Copyright © 2024 Artyom V. Poptsov <poptsov.artyom@gmail.com>
 ;;; Copyright © 2024 Aaron Covrig <aaron.covrig.us@ieee.org>
+;;; Copyright © 2024 Janneke Nieuwenhuizen <janneke@gnu.org>
 ;;;
 ;;; This file is part of GNU Guix.
 ;;;
@@ -758,6 +759,7 @@ interaction.")
               (method url-fetch)
               (uri (string-append "mirror://sourceforge/podofo/podofo/" version
                                   "/podofo-" version ".tar.gz"))
+              (patches (search-patches "podofo-gcc-14.patch"))
               (sha256
                (base32
                 "0m2icjy35jd0900g0fyfrmf0zsldv1chfc1q0zcqlaqrbzhhgrjx"))))