view 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 source

diff -uNr e/othersrc/gsdllinc/wgsver.c f/othersrc/gsdllinc/wgsver.c
--- e/othersrc/gsdllinc/wgsver.c	2010-12-27 10:09:35.000000000 -0500
+++ f/othersrc/gsdllinc/wgsver.c	2013-01-08 22:23:09.775545031 -0500
@@ -39,6 +39,10 @@
 #include <stdlib.h>
 #include "wgsver.h"
 
+#ifndef KEY_WOW64_64KEY
+#define KEY_WOW64_64KEY 0x0100
+#endif
+
 /* Ghostscript may be known in the Windows Registry by
  * the following names.
  */
diff -uNr e/src/cbstream.cpp f/src/cbstream.cpp
--- e/src/cbstream.cpp	2012-08-28 09:52:28.000000000 -0400
+++ f/src/cbstream.cpp	2013-01-08 22:15:04.575971765 -0500
@@ -33,6 +33,8 @@
 // this code is only needed under WIN32
 // ...and under OS/2
 
+#include <cstdio>
+
 #include "cppcomp.h"
 
 #include "cbstream.h"
diff -uNr e/src/Makefile.am f/src/Makefile.am
--- e/src/Makefile.am	2010-08-22 09:54:28.000000000 -0400
+++ f/src/Makefile.am	2013-01-08 22:28:40.596345408 -0500
@@ -133,7 +133,8 @@
 	genericints.h 				\
 	version.h
 
-libpstoedit_la_LIBADD = ${CXX_STD_LIB} ${CXX_RUNTIME_LIB} -ldl -lm
+libpstoedit_la_LIBADD = ${CXX_STD_LIB} ${CXX_RUNTIME_LIB} -lm
+libpstoedit_la_CPPFLAGS = -I$(top_srcdir)/othersrc/gsdllinc
 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");