diff --git a/.gitignore b/.gitignore index 00913b4..3a0897c 100644 --- a/.gitignore +++ b/.gitignore @@ -10,3 +10,4 @@ pstoedit-3.45.tar.gz /pstoedit-3.77.tar.gz /pstoedit-3.78.tar.gz /pstoedit-4.00.tar.gz +/pstoedit-4.01.tar.gz diff --git a/pstoedit-fix-plainC.patch b/pstoedit-fix-plainC.patch deleted file mode 100644 index d6abdfb..0000000 --- a/pstoedit-fix-plainC.patch +++ /dev/null @@ -1,45 +0,0 @@ -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 - - typedef int (*execute_interpreter_function)(int argc, const char * const argv[]); - diff --git a/pstoedit.spec b/pstoedit.spec index 94d3faa..6d2ce66 100644 --- a/pstoedit.spec +++ b/pstoedit.spec @@ -1,8 +1,8 @@ Name: pstoedit -Version: 4.00 -Release: 5%{?dist} +Version: 4.01 +Release: 1%{?dist} Summary: Translates PostScript and PDF graphics into other vector formats -License: GPLv2+ +License: GPL-2.0-or-later URL: http://www.pstoedit.net Source0: https://sourceforge.net/projects/pstoedit/files/pstoedit/%{version}/pstoedit-%{version}.tar.gz @@ -12,10 +12,6 @@ Patch0: pstoedit-pkglibdir.patch # drvpptx.cpp:68:1: note: 'std::unique_ptr' is defined in header ''; did you forget to '#include '? Patch1: pstoedit-fix-gcc12.patch -# C++ loadpstoeditplugins declaration breaks C compilation (e.g. autotrace) -# https://sourceforge.net/p/pstoedit/patches/5/ -Patch2: pstoedit-fix-plainC.patch - BuildRequires: make BuildRequires: gd-devel BuildRequires: dos2unix @@ -52,7 +48,6 @@ applications %if 0%{?fedora} || 0%{?rhel} > 9 %patch -P 1 -p1 %endif -%patch -P 2 -p1 dos2unix doc/*.htm doc/readme.txt @@ -86,6 +81,9 @@ find $RPM_BUILD_ROOT -type f -name "*.la" -exec rm -f {} ';' %changelog +* Thu Mar 28 2024 Antonio Trande - 4.01-1 +- Release 4.01 + * Fri Jan 26 2024 Fedora Release Engineering - 4.00-5 - Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild diff --git a/sources b/sources index 46c2a8f..40f56e2 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (pstoedit-4.00.tar.gz) = 82a8afd56bdefdc78fe7c39367480943a1639412e271f9469e3f9b77e3652cd6a291a828eeaba28ff0aeba58cb1bb052624650cdc4c8658b4e7e27f6d4a386f4 +SHA512 (pstoedit-4.01.tar.gz) = 33fb5da1ffd16788dfd902f29d14af7da112575cbc9cce7635598bcbe26094d56bfe0d97e64ee4d7b81248365c113786003c60f97c477216a8027cba91c61541