mirror of
https://git.in.rschanz.org/ryan77627/guix.git
synced 2024-12-24 05:18:07 -05:00
gnu: pstoedit: Update to 4.00.
* gnu/packages/graphics.scm (pstoedit): Update to 4.00. [source]: Apply patches. [arguments]: New field. [inputs]: Remove labels. Add glib and pango. * gnu/packages/patches/pstoedit-fix-gcc12.patch: New file. * gnu/packages/patches/pstoedit-fix-plainC.patch: Likewise. * gnu/packages/patches/pstoedit-pkglibdir.patch: Likewise. * gnu/local.mk (dist_patch_DATA): Register them. Change-Id: Ia17dae0ebc3e08b573b02431b10cc689a72a07dd
This commit is contained in:
Maxim Cournoyer
Ludovic Courtès
parent
506b910e7b
commit
43395dd244
5 changed files with 104 additions and 8 deletions
|
|
@ -1968,6 +1968,9 @@ dist_patch_DATA = \
|
|||
%D%/packages/patches/psm-disable-memory-stats.patch \
|
||||
%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 \
|
||||
%D%/packages/patches/pulseview-qt515-compat.patch \
|
||||
|
|
|
|||
|
|
@ -21,7 +21,7 @@
|
|||
;;; Copyright © 2020 Jakub Kądziołka <kuba@kadziolka.net>
|
||||
;;; Copyright © 2020, 2021 Nicolas Goaziou <mail@nicolasgoaziou.fr>
|
||||
;;; Copyright © 2020 Raghav Gururajan <raghavgururajan@disroot.org>
|
||||
;;; Copyright © 2020, 2021, 2022, 2023 Maxim Cournoyer <maxim.cournoyer@gmail.com>
|
||||
;;; Copyright © 2020, 2021, 2022, 2023, 2024 Maxim Cournoyer <maxim.cournoyer@gmail.com>
|
||||
;;; Copyright © 2020 Gabriel Arazas <foo.dogsquared@gmail.com>
|
||||
;;; Copyright © 2021 Antoine Côté <antoine.cote@posteo.net>
|
||||
;;; Copyright © 2021 Andy Tai <atai@atai.org>
|
||||
|
|
@ -978,23 +978,38 @@ (define-public python-booleanoperations
|
|||
(define-public pstoedit
|
||||
(package
|
||||
(name "pstoedit")
|
||||
(version "3.77")
|
||||
;; 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")
|
||||
(source (origin
|
||||
(method url-fetch)
|
||||
(uri (string-append "mirror://sourceforge/pstoedit/pstoedit/"
|
||||
version "/pstoedit-" version ".tar.gz"))
|
||||
(sha256
|
||||
(base32
|
||||
"02av76j75g5sq3bg353yl6dlllda9ihmmk4c8hvgiscix816nv4s"))))
|
||||
"1sk2mhrjgnlz4a1650p3qxrv6av6qc66ibmy48ckspx7mfp7snh7"))
|
||||
(patches
|
||||
(search-patches "pstoedit-fix-gcc12.patch"
|
||||
"pstoedit-fix-plainC.patch"
|
||||
"pstoedit-pkglibdir.patch"))))
|
||||
(build-system gnu-build-system)
|
||||
(arguments
|
||||
;; Avoid keeping extraneous references to libtool exhaustively listed
|
||||
;; dependencies.
|
||||
(list #:configure-flags #~(list "LDFLAGS=-Wl,--as-needed")))
|
||||
(native-inputs
|
||||
(list pkg-config))
|
||||
(inputs
|
||||
`(("ghostscript" ,ghostscript)
|
||||
("imagemagick" ,imagemagick)
|
||||
("libplot" ,plotutils)
|
||||
("libjpeg" ,libjpeg-turbo)
|
||||
("zlib" ,zlib))) ;else libp2edrvmagick++.so fails to link
|
||||
(list ghostscript
|
||||
imagemagick
|
||||
plotutils
|
||||
libjpeg-turbo
|
||||
libzip
|
||||
;; The following inputs are pulled in by libtool, from the
|
||||
;; imagemagick library files (.la), which records all its
|
||||
;; transitive dependencies.
|
||||
glib
|
||||
pango))
|
||||
(home-page "http://www.pstoedit.net/")
|
||||
(synopsis "Converter for PostScript and PDF graphics")
|
||||
(description "The @code{pstoedit} utility allows translating graphics
|
||||
|
|
|
|||
12
gnu/packages/patches/pstoedit-fix-gcc12.patch
Normal file
12
gnu/packages/patches/pstoedit-fix-gcc12.patch
Normal file
|
|
@ -0,0 +1,12 @@
|
|||
Retrieved from Fedora: https://src.fedoraproject.org/rpms/pstoedit/tree
|
||||
|
||||
--- a/src/drvpptx.orig.cpp 2021-08-29 16:25:45.000000000 +0200
|
||||
+++ b/src/drvpptx.cpp 2022-01-28 11:57:44.765756339 +0100
|
||||
@@ -65,6 +65,7 @@
|
||||
#define ZIP_EXTERN extern
|
||||
|
||||
#include <zip.h>
|
||||
+#include <memory>
|
||||
|
||||
#ifdef _MSC_VER
|
||||
// MS VC++ Windows
|
||||
47
gnu/packages/patches/pstoedit-fix-plainC.patch
Normal file
47
gnu/packages/patches/pstoedit-fix-plainC.patch
Normal file
|
|
@ -0,0 +1,47 @@
|
|||
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[]);
|
||||
|
||||
19
gnu/packages/patches/pstoedit-pkglibdir.patch
Normal file
19
gnu/packages/patches/pstoedit-pkglibdir.patch
Normal file
|
|
@ -0,0 +1,19 @@
|
|||
Retrieved from Fedora: https://src.fedoraproject.org/rpms/pstoedit/tree
|
||||
|
||||
--- a/config/pstoedit.pc.orig.in 2018-04-16 14:26:28.000000000 +0200
|
||||
+++ b/config/pstoedit.pc.in 2020-10-05 14:37:16.750980762 +0200
|
||||
@@ -1,7 +1,7 @@
|
||||
prefix=@prefix@
|
||||
exec_prefix=@exec_prefix@
|
||||
libdir=@libdir@
|
||||
-includedir=@includedir@
|
||||
+includedir=@includedir@/pstoedit
|
||||
|
||||
Name: pstoedit
|
||||
Description: converts PostScript(TM) and PDF files to other vector graphic formats
|
||||
@@ -8,4 +8,4 @@
|
||||
Version: @VERSION@.0
|
||||
Requires:
|
||||
Libs: -L@libdir@ -lpstoedit @CXX_STD_LIB@ @CXX_RUNTIME_LIB@ @LIBLD_LDFLAGS@
|
||||
-Cflags: -I@includedir@
|
||||
+Cflags: -I@includedir@/pstoedit
|
||||
Loading…
Reference in a new issue