~ruther/guix-local

ae7e80d8edb24f9dbeee3a34134596d59ca1c02d — Janneke Nieuwenhuizen 1 year, 10 months ago e8da942
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
4 files changed, 19 insertions(+), 3 deletions(-)

M gnu/local.mk
M gnu/packages/check.scm
A gnu/packages/patches/podofo-gcc-14.patch
M gnu/packages/pdf.scm
M gnu/local.mk => gnu/local.mk +1 -0
@@ 2032,6 2032,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		\

M gnu/packages/check.scm => gnu/packages/check.scm +3 -3
@@ 549,9 549,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

A gnu/packages/patches/podofo-gcc-14.patch => gnu/packages/patches/podofo-gcc-14.patch +13 -0
@@ 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__
 

M gnu/packages/pdf.scm => gnu/packages/pdf.scm +2 -0
@@ 30,6 30,7 @@
;;; Copyright © 2024 Artyom V. Poptsov <poptsov.artyom@gmail.com>
;;; Copyright © 2024 Aaron Covrig <aaron.covrig.us@ieee.org>
;;; Copyright © 2025 Jussi Timperi <jussi.timperi@iki.fi>
;;; Copyright © 2024 Janneke Nieuwenhuizen <janneke@gnu.org>
;;;
;;; 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"))))