diff src/pstoedit-1-fixes.patch @ 3813:ea3cab4018c5

pstoedit: update 4.70 * src/pstoedit-2-gs.patch: update patch * src/pstoedit.mk: update version, checksum * src/pstoedit-1-fixes.patc: updatepatch
author John Donoghue
date Fri, 27 Feb 2015 15:29:26 -0500
parents 09a58eb274f4
children 3c5634c6a422
line wrap: on
line diff
--- a/src/pstoedit-1-fixes.patch	Fri Feb 27 08:19:06 2015 -0500
+++ b/src/pstoedit-1-fixes.patch	Fri Feb 27 15:29:26 2015 -0500
@@ -37,3 +37,31 @@
  libpstoedit_la_LDFLAGS = -no-undefined
  
  pstoedit_SOURCES = cmdmain.cpp
+diff -ur pstoedit-3.70.orig/src/dynload.cpp pstoedit-3.70/src/dynload.cpp
+--- pstoedit-3.70.orig/src/dynload.cpp	2015-02-27 11:26:42.674665283 -0500
++++ pstoedit-3.70/src/dynload.cpp	2015-02-27 11:28:12.270406665 -0500
+@@ -229,7 +229,7 @@
+ #if defined(__linux) || defined(__linux__) || defined(__CYGWIN__) || defined(__FreeBSD__) || defined(__hpux) || defined(__sparc) || defined(__OS2__) || defined(_AIX) || (defined (HAVE_DLFCN_H) && (HAVE_DLFCN_H==1 ) )
+ 	DynLoader::fptr rfptr = ptr_to_fptr(dlsym(handle, name));	//lint !e611 //: Suspicious cast
+ #elif defined(_WIN32)
+-	DynLoader::fptr rfptr = ptr_to_fptr(GetProcAddress((HINSTANCE) handle, name));	//lint !e611 //: Suspicious cast
++	DynLoader::fptr rfptr = ptr_to_fptr((void*)GetProcAddress((HINSTANCE) handle, name));	//lint !e611 //: Suspicious cast
+ #else
+ #error "system unsupported so far"
+ #endif
+diff -ur pstoedit-3.70.orig/src/pstoedit.cpp pstoedit-3.70/src/pstoedit.cpp
+--- pstoedit-3.70.orig/src/pstoedit.cpp	2015-02-27 13:34:44.955166896 -0500
++++ pstoedit-3.70/src/pstoedit.cpp	2015-02-27 13:36:47.962690034 -0500
+@@ -269,10 +269,12 @@
+ 	char *p = 0;
+ 	if (r && (p = strrchr(szExePath, directoryDelimiter)) != 0) {
+ 		*p = '\0';
++/* disabled load in exe dir --
+ 		if (!strequal(szExePath, plugindir.c_str())) {
+ 			loadPlugInDrivers(szExePath, errstream,verbose);
+ 			pluginsloaded = true;
+ 		}
++*/
+ 	}
+ 	// now try also $exepath/../lib/pstoedit
+ 	strcat_s(szExePath,1000,"/../lib/pstoedit");