[packages/pstoedit] - updated to 3.78 - updated pluginsdir patch

[qboosh]

commit b6bb095443d66a4c336cd10bccb7450f08ac98ea
Author: Jakub Bogusz <qboosh at pld-linux.org>
Date:   Mon Apr 11 19:22:52 2022 +0200

    - updated to 3.78
    - updated pluginsdir patch

 pluginsdir.patch | 24 ++++++++++++------------
 pstoedit.spec    |  8 ++++----
 2 files changed, 16 insertions(+), 16 deletions(-)
---
diff --git a/pstoedit.spec b/pstoedit.spec
index 514544f..f9aca65 100644
--- a/pstoedit.spec
+++ b/pstoedit.spec
@@ -1,12 +1,12 @@
 Summary:	Convert PostScript and PDF files into various vector-graphic formats
 Summary(pl.UTF-8):	Konwerter PostScriptu i PDF do różnych formatów wektorowych
 Name:		pstoedit
-Version:	3.73
+Version:	3.78
 Release:	1
 License:	GPL v2+
 Group:		Applications/Graphics
 Source0:	http://downloads.sourceforge.net/pstoedit/%{name}-%{version}.tar.gz
-# Source0-md5:	aec93415ede08505e950ec7fee4289ff
+# Source0-md5:	5c748c4fb1e7d6187694a5bdbd9f27d8
 Patch0:		pluginsdir.patch
 Patch1:		imagemagick7.patch
 URL:		http://www.helga-glunz.homepage.t-online.de/pstoedit/
@@ -19,7 +19,7 @@ BuildRequires:	ghostscript
 BuildRequires:	latex2man
 BuildRequires:	libEMF-devel
 BuildRequires:	libplotter-devel >= 2.3
-BuildRequires:	libstdc++-devel >= 5:3.0
+BuildRequires:	libstdc++-devel >= 6:4.7
 BuildRequires:	libtool >= 2:2
 BuildRequires:	libzip-devel
 BuildRequires:	ming-devel
@@ -52,7 +52,7 @@ Summary(pl.UTF-8):	Pliki nagłówkowe biblioteki pstoedit
 Group:		Development/Libraries
 Requires:	%{name} = %{version}-%{release}
 Requires:	gd-devel
-Requires:	libstdc++-devel
+Requires:	libstdc++-devel >= 6:4.7
 
 %description devel
 pstoedit library header files.
diff --git a/pluginsdir.patch b/pluginsdir.patch
index 0af6e04..ad3b8d4 100644
--- a/pluginsdir.patch
+++ b/pluginsdir.patch
@@ -1,9 +1,9 @@
---- pstoedit-3.73/src/pstoedit.cpp.orig	2019-03-09 09:17:34.193450804 +0100
-+++ pstoedit-3.73/src/pstoedit.cpp	2019-03-09 09:19:23.226193457 +0100
-@@ -271,30 +271,6 @@
- 	  pluginsloaded = true;
+--- pstoedit-3.78/src/pstoedit.cpp.orig	2022-04-11 17:09:22.797484174 +0200
++++ pstoedit-3.78/src/pstoedit.cpp	2022-04-11 17:09:25.547439114 +0200
+@@ -267,30 +267,6 @@ static void loadpstoeditplugins(const ch
+ 		//pluginsloaded = true;
  	}
- #endif
+ 
 -	// If the above failed, also look in the directory where the pstoedit .exe/dll was found
 -	if (!pluginsloaded) {
 -	  char szExePath[1000];
@@ -13,21 +13,21 @@
 -	  char *p = nullptr;
 -	  if (r && (p = strrchr(szExePath, directoryDelimiter)) != nullptr) {
 -		*p = '\0';
--		loadPlugInDrivers(szExePath, errstream,verbose);
+-		pluginsloaded |= loadPlugInDrivers(szExePath, errstream,verbose);
 -	  }
 -	  // now try also $exepath/../lib/pstoedit
--          if (szExePath[0]) {
--            // it is not an empty string
+-      if (szExePath[0]) {
+-         // it is not an empty string
 -#if COMPILEDFOR64BIT 
 -	    strcat_s(szExePath,1000,"/../lib64/pstoedit");
 -#else
 -	    strcat_s(szExePath,1000,"/../lib/pstoedit");
 -#endif
 -	    if (!strequal(szExePath, plugindir.c_str())) {
--	      loadPlugInDrivers(szExePath, errstream,verbose);
+-	      pluginsloaded |= loadPlugInDrivers(szExePath, errstream,verbose);
 -	    }
 -	  }
 -	}
- 
- 	// delete[]plugindir;
- }
+ #ifdef PSTOEDITLIBDIR
+ 	if (!pluginsloaded) {
+ 		struct stat s;
================================================================

---- gitweb:

http://git.pld-linux.org/gitweb.cgi/packages/pstoedit.git/commitdiff/b6bb095443d66a4c336cd10bccb7450f08ac98ea