guix_mirror_bot pushed a commit to branch core-packages-team in repository guix.
commit 7a4bd2e1e7c46444548b41f2d7e0fdd16e07828d Author: Janneke Nieuwenhuizen <[email protected]> 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 e65dce5b56..aab67caf02 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -2018,6 +2018,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/pounce-readable-checks.patch \ %D%/packages/patches/ppsspp-disable-upgrade-and-gold.patch \ diff --git a/gnu/packages/check.scm b/gnu/packages/check.scm index 657969b759..22bf90504b 100644 --- a/gnu/packages/check.scm +++ b/gnu/packages/check.scm @@ -548,9 +548,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 90f1b54097..5acd09bb10 100644 --- a/gnu/packages/pdf.scm +++ b/gnu/packages/pdf.scm @@ -30,6 +30,7 @@ ;;; Copyright © 2024 Artyom V. Poptsov <[email protected]> ;;; Copyright © 2024 Aaron Covrig <[email protected]> ;;; Copyright © 2025 Jussi Timperi <[email protected]> +;;; Copyright © 2024 Janneke Nieuwenhuizen <[email protected]> ;;; ;;; This file is part of GNU Guix. ;;; @@ -847,6 +848,7 @@ interaction.") (url "https://github.com/podofo/podofo";) (commit version))) (file-name (git-file-name name version)) + (patches (search-patches "podofo-gcc-14.patch")) (sha256 (base32 "1fyv0zbl6zs93wy0qb3mjkfm99pgz5275nkzss115ww2w04h0ssl"))))
