guix_mirror_bot pushed a commit to branch add-compress-debug-symbols-phase in repository guix.
commit b35111206458400fbdb6adead9c9fe1b532604ca Author: Maxim Cournoyer <[email protected]> AuthorDate: Mon Nov 10 10:50:20 2025 +0900 gnu: pstoedit: Update to 4.02. * gnu/packages/graphics.scm (pstoedit): Update to 4.0.2. [source]: Remove pstoedit-fix-plainC.patch. * gnu/packages/patches/pstoedit-fix-plainC.patch: Delete file. * gnu/local.mk (dist_patch_DATA): De-register it. Change-Id: I885722d147b40742feffd134eb9c17d9ea54a791 --- gnu/local.mk | 1 - gnu/packages/graphics.scm | 7 ++-- gnu/packages/patches/pstoedit-fix-plainC.patch | 47 -------------------------- 3 files changed, 2 insertions(+), 53 deletions(-) diff --git a/gnu/local.mk b/gnu/local.mk index dbc76f5bd4..546be21818 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -2143,7 +2143,6 @@ dist_patch_DATA = \ %D%/packages/patches/psm-ldflags.patch \ %D%/packages/patches/psm-repro.patch \ %D%/packages/patches/pstoedit-fix-gcc12.patch \ - %D%/packages/patches/pstoedit-fix-plainC.patch \ %D%/packages/patches/pstoedit-pkglibdir.patch \ %D%/packages/patches/pulseaudio-fix-mult-test.patch \ %D%/packages/patches/pulseaudio-longer-test-timeout.patch \ diff --git a/gnu/packages/graphics.scm b/gnu/packages/graphics.scm index 872008eb2a..5c94406aee 100644 --- a/gnu/packages/graphics.scm +++ b/gnu/packages/graphics.scm @@ -1318,19 +1318,16 @@ Angus Johnson}.") (define-public pstoedit (package (name "pstoedit") - ;; Do not yet upgrade to 4.0.0, as its include file fails to compile for C - ;; project (see: https://github.com/reviczky/pstoedit/issues/2). - (version "4.00") + (version "4.02") (source (origin (method url-fetch) (uri (string-append "mirror://sourceforge/pstoedit/pstoedit/" version "/pstoedit-" version ".tar.gz")) (sha256 (base32 - "1sk2mhrjgnlz4a1650p3qxrv6av6qc66ibmy48ckspx7mfp7snh7")) + "0bzpknndsf2cvsh1z90j6cx9mzqkb3m1ajdl52cavcn6s8rb922m")) (patches (search-patches "pstoedit-fix-gcc12.patch" - "pstoedit-fix-plainC.patch" "pstoedit-pkglibdir.patch")))) (build-system gnu-build-system) (arguments diff --git a/gnu/packages/patches/pstoedit-fix-plainC.patch b/gnu/packages/patches/pstoedit-fix-plainC.patch deleted file mode 100644 index 684c5043be..0000000000 --- a/gnu/packages/patches/pstoedit-fix-plainC.patch +++ /dev/null @@ -1,47 +0,0 @@ -Retrieved from Fedora: https://src.fedoraproject.org/rpms/pstoedit/tree - -diff --git a/src/pstoedit.cpp b/src/pstoedit.cpp -index a718f37..ac0df37 100755 ---- a/src/pstoedit.cpp -+++ b/src/pstoedit.cpp -@@ -327,6 +327,11 @@ extern FILE *yyin; // used by lexer - // otherwise we could declare it locally where it is used - - -+extern "C" DLLEXPORT void loadpstoeditplugins_plainC(const char *progname, int verbose) -+{ -+ return loadpstoeditplugins(progname, cerr, (bool) verbose); -+} -+ - static void usage(ostream & outstream, bool forTeX, bool withdetails, bool withcategories ) - { - if (withcategories) { -diff --git a/src/pstoedit.h b/src/pstoedit.h -index 294b3c2..74ebf2a 100755 ---- a/src/pstoedit.h -+++ b/src/pstoedit.h -@@ -100,8 +100,13 @@ void clearPstoeditDriverInfo_plainC(struct DriverDescription_S * ptr); - - #ifdef __cplusplus - extern "C" DLLEXPORT --#endif - void loadpstoeditplugins(const char* progname, std::ostream & errstream, bool verbose); -+#endif -+ -+#ifdef __cplusplus -+extern "C" DLLEXPORT -+#endif -+void loadpstoeditplugins_plainC(const char* progname, int verbose); - - #ifdef __cplusplus - extern "C" DLLEXPORT ---- a/src/pstoedit.orig.h 2023-07-22 19:27:43.691166652 +0200 -+++ b/src/pstoedit.h 2023-07-22 19:31:18.897952130 +0200 -@@ -37,6 +37,7 @@ - #endif - - #include "pstoedll.h" -+#include <stdbool.h> - - typedef int (*execute_interpreter_function)(int argc, const char * const argv[]); -
