[packages/pstoedit] - don't try to pull plugins from random places - rel 2

[baggins]

commit 0118347ebfa96f60f59748316a8e1af68e7bbfdd
Author: Jan Rękorajski <baggins at pld-linux.org>
Date:   Sun Dec 6 12:09:10 2015 +0100

    - don't try to pull plugins from random places
    - rel 2

 pluginsdir.patch | 29 +++++++++++++++++++++++++++++
 pstoedit.spec    |  5 ++++-
 2 files changed, 33 insertions(+), 1 deletion(-)
---
diff --git a/pstoedit.spec b/pstoedit.spec
index 54c3057..82ec11d 100644
--- a/pstoedit.spec
+++ b/pstoedit.spec
@@ -2,11 +2,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.70
-Release:	1
+Release:	2
 License:	GPL v2+
 Group:		Applications/Graphics
 Source0:	http://downloads.sourceforge.net/pstoedit/%{name}-%{version}.tar.gz
 # Source0-md5:	d3ad4657b4944a8400f7ca76f78cb943
+Patch0:		pluginsdir.patch
 URL:		http://www.helga-glunz.homepage.t-online.de/pstoedit/
 BuildRequires:	ImageMagick-c++-devel
 BuildRequires:	autoconf >= 2.50
@@ -14,6 +15,7 @@ BuildRequires:	automake
 BuildRequires:	gd-devel
 BuildRequires:	ghostscript
 BuildRequires:	libEMF-devel
+BuildRequires:	libplot-devel >= 2.3
 BuildRequires:	libplotter-devel >= 2.3
 BuildRequires:	libstdc++-devel >= 5:3.0
 BuildRequires:	libtool >= 2:1.4d-3
@@ -130,6 +132,7 @@ Wtyczka wmf dla biblioteki pstoedit. Używa biblioteki libEMF.
 
 %prep
 %setup -q
+%patch0 -p1
 
 %build
 %{__libtoolize}
diff --git a/pluginsdir.patch b/pluginsdir.patch
new file mode 100644
index 0000000..38b5222
--- /dev/null
+++ b/pluginsdir.patch
@@ -0,0 +1,29 @@
+--- pstoedit-3.70/src/pstoedit.cpp~	2014-09-04 20:21:45.000000000 +0200
++++ pstoedit-3.70/src/pstoedit.cpp	2015-12-06 11:50:17.944605841 +0100
+@@ -261,26 +261,6 @@
+ 		loadPlugInDrivers(plugindir.c_str(), errstream, verbose);	// load the driver plugins
+ 		pluginsloaded = true;
+ 	}
+-	// also look in the directory where the pstoedit .exe/dll was found
+-	char szExePath[1000];
+-	szExePath[0] = '\0';
+-	const unsigned long r = P_GetPathToMyself(progname, szExePath, sizeof(szExePath));
+-	if (verbose)  errstream << "pstoedit : path to myself:" << progname << " " << r << " " << szExePath<< endl;
+-	char *p = 0;
+-	if (r && (p = strrchr(szExePath, directoryDelimiter)) != 0) {
+-		*p = '\0';
+-		if (!strequal(szExePath, plugindir.c_str())) {
+-			loadPlugInDrivers(szExePath, errstream,verbose);
+-			pluginsloaded = true;
+-		}
+-	}
+-	// now try also $exepath/../lib/pstoedit
+-	strcat_s(szExePath,1000,"/../lib/pstoedit");
+-	if (!strequal(szExePath, plugindir.c_str())) {
+-    	loadPlugInDrivers(szExePath, errstream,verbose);
+-		pluginsloaded = true;
+-	}
+-
+ #ifdef PSTOEDITLIBDIR
+ 	if (!pluginsloaded) {
+   	  // also try to load drivers from the PSTOEDITLIBDIR
================================================================

---- gitweb:

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