# HG changeset patch
# User John Donoghue <john.donoghue@ieee.org>
# Date 1631451107 14400
# Node ID 8d61de83cf9026682c02b44d78debfd3b0018055
# Parent  b96d29842043841146c599b57143d071346563c4
pstoedit: update to v3.77

* src/pstoedit.mk: update version, checksum

* src/pstoedit-1-fixes.patch,
  src/pstoedit-5-use_gs_env.patch: update patches

diff -r b96d29842043 -r 8d61de83cf90 src/pstoedit-1-fixes.patch
--- a/src/pstoedit-1-fixes.patch	Sun Sep 12 08:51:28 2021 -0400
+++ b/src/pstoedit-1-fixes.patch	Sun Sep 12 08:51:47 2021 -0400
@@ -1,6 +1,6 @@
-diff -ur pstoedit-3.75.orig/othersrc/gsdllinc/wgsver.c pstoedit-3.75/othersrc/gsdllinc/wgsver.c
---- pstoedit-3.75.orig/othersrc/gsdllinc/wgsver.c	2020-01-06 12:45:59.927286515 -0500
-+++ pstoedit-3.75/othersrc/gsdllinc/wgsver.c	2020-01-06 12:46:54.580699984 -0500
+diff -ur pstoedit-3.77.orig/othersrc/gsdllinc/wgsver.c pstoedit-3.77/othersrc/gsdllinc/wgsver.c
+--- pstoedit-3.77.orig/othersrc/gsdllinc/wgsver.c	2021-09-08 15:38:09.812856463 -0400
++++ pstoedit-3.77/othersrc/gsdllinc/wgsver.c	2021-09-08 15:39:08.695322622 -0400
 @@ -40,6 +40,9 @@
  #include "wgsver.h"
  #include "cppcomp.h"
@@ -11,9 +11,9 @@
  /* Ghostscript may be known in the Windows Registry by
   * the following names.
   */
-diff -ur pstoedit-3.75.orig/src/cbstream.cpp pstoedit-3.75/src/cbstream.cpp
---- pstoedit-3.75.orig/src/cbstream.cpp	2020-01-06 12:45:59.927286515 -0500
-+++ pstoedit-3.75/src/cbstream.cpp	2020-01-06 12:49:33.424788938 -0500
+diff -ur pstoedit-3.77.orig/src/cbstream.cpp pstoedit-3.77/src/cbstream.cpp
+--- pstoedit-3.77.orig/src/cbstream.cpp	2021-09-08 15:38:09.813856522 -0400
++++ pstoedit-3.77/src/cbstream.cpp	2021-09-08 15:39:08.696322681 -0400
 @@ -33,6 +33,8 @@
  // this code is only needed under WIN32
  // ...and under OS/2
@@ -23,10 +23,22 @@
  #include "cppcomp.h"
  
  #include "cbstream.h"
-diff -ur pstoedit-3.75.orig/src/Makefile.am pstoedit-3.75/src/Makefile.am
---- pstoedit-3.75.orig/src/Makefile.am	2020-01-06 12:45:59.931286619 -0500
-+++ pstoedit-3.75/src/Makefile.am	2020-01-06 12:52:56.149975594 -0500
-@@ -143,7 +143,8 @@
+diff -ur pstoedit-3.77.orig/src/dynload.cpp pstoedit-3.77/src/dynload.cpp
+--- pstoedit-3.77.orig/src/dynload.cpp	2021-09-08 15:38:09.817856757 -0400
++++ pstoedit-3.77/src/dynload.cpp	2021-09-08 15:42:20.225597212 -0400
+@@ -241,7 +241,7 @@
+ #ifdef _WIN64
+ 	DynLoader::fptr rfptr = /* ptr_to_fptr */(GetProcAddress((HINSTANCE) handle, name));	//lint !e611 //: Suspicious cast
+ #else
+-	DynLoader::fptr rfptr = ptr_to_fptr(GetProcAddress((HINSTANCE)handle, name));
++	DynLoader::fptr rfptr = ptr_to_fptr((void*)GetProcAddress((HINSTANCE)handle, name));
+ #endif
+ 
+ #else
+diff -ur pstoedit-3.77.orig/src/Makefile.am pstoedit-3.77/src/Makefile.am
+--- pstoedit-3.77.orig/src/Makefile.am	2021-09-08 15:38:09.817856757 -0400
++++ pstoedit-3.77/src/Makefile.am	2021-09-08 15:39:08.696322681 -0400
+@@ -144,7 +144,8 @@
  	psfront.h				\
  	genericints.h
  
@@ -36,18 +48,12 @@
  libpstoedit_la_LDFLAGS = -no-undefined
  
  pstoedit_SOURCES = cmdmain.cpp
-diff -ur pstoedit-3.75.orig/src/dynload.cpp pstoedit-3.75/src/dynload.cpp
---- pstoedit-3.75.orig/src/dynload.cpp	2020-01-09 13:50:03.610222335 -0500
-+++ pstoedit-3.75/src/dynload.cpp	2020-01-09 13:51:10.084019302 -0500
-@@ -239,8 +239,10 @@
- 	DynLoader::fptr rfptr = ptr_to_fptr(dlsym(handle, name));	//lint !e611 //: Suspicious cast
- #elif defined(OS_WIN32_WCE)
- 	DynLoader::fptr rfptr = ptr_to_fptr(GetProcAddress((HINSTANCE) handle, LPSTRtoLPWSTR(name).c_str()));	//lint !e611 //: Suspicious cast
--#elif defined(_WIN32)
-+#elif defined(_WIN64)
- 	DynLoader::fptr rfptr = /* ptr_to_fptr */(GetProcAddress((HINSTANCE) handle, name));	//lint !e611 //: Suspicious cast
-+#elif defined(_WIN32)
-+	DynLoader::fptr rfptr = ptr_to_fptr((void*)GetProcAddress((HINSTANCE) handle, name));	//lint !e611 //: Suspicious cast
- #else
- #error "system unsupported so far"
- #endif
+@@ -171,7 +172,7 @@
+ pstoedit.cpp : pstoedit.ph
+ 
+ pstoedit.ph : pstoedit.pro
+-	awk -f ps_pro_to_ph.awk < pstoedit.pro > pstoedit.ph
++	awk -f $(srcdir)/ps_pro_to_ph.awk < $(srcdir)/pstoedit.pro > pstoedit.ph
+ 
+ cppcheck:
+ 	cppcheck --inconclusive --enable=all `sh ./get_D_and_I_options.sh ${AM_CPPFLAGS}` ${SOURCES}
diff -r b96d29842043 -r 8d61de83cf90 src/pstoedit-5-use_gs_env.patch
--- a/src/pstoedit-5-use_gs_env.patch	Sun Sep 12 08:51:28 2021 -0400
+++ b/src/pstoedit-5-use_gs_env.patch	Sun Sep 12 08:51:47 2021 -0400
@@ -1,12 +1,11 @@
-diff -ur pstoedit-3.70.orig/src/callgs.cpp pstoedit-3.70/src/callgs.cpp
---- pstoedit-3.70.orig/src/callgs.cpp	2016-07-27 13:04:53.173499210 -0400
-+++ pstoedit-3.70/src/callgs.cpp	2016-07-27 13:56:54.686649091 -0400
-@@ -364,7 +364,15 @@
+diff -ur pstoedit-3.77.orig/src/callgs.cpp pstoedit-3.77/src/callgs.cpp
+--- pstoedit-3.77.orig/src/callgs.cpp	2021-09-06 16:18:29.786833687 -0400
++++ pstoedit-3.77/src/callgs.cpp	2021-09-06 16:23:10.927193819 -0400
+@@ -368,7 +368,14 @@
  		} else {
  		    if (verbose) errstream<< "nothing found in gsview32.ini file - using find_gs to lookup latest version of Ghostscript in registry " << endl;
  			static char buf[1000];
--			if (find_gs(buf, sizeof(buf), 550 /* min ver*/ , getPstoeditsetDLLUsage() , gsregbase)) { 
-+
+-			if (find_gs(buf, sizeof(buf), 550 /* min ver*/ , getPstoeditsetDLLUsage() , gsregbase, verbose)) { 
 +
 +	                gstocall = getenv("GS");
 +
@@ -14,7 +13,7 @@
 +		                if (verbose)
 +			                errstream << "GS is set to:" << gstocall << endl;
 +
-+                        } else if (find_gs(buf, sizeof(buf), 550 /* min ver*/ , getPstoeditsetDLLUsage() , gsregbase)) { 
++                        } else if (find_gs(buf, sizeof(buf), 550 /* min ver*/ , getPstoeditsetDLLUsage() , gsregbase, verbose)) { 
  				if (verbose) {
- 					(void)dumpgsvers(gsregbase);
+ 					(void)dumpgsvers(gsregbase, verbose);
  					if (getPstoeditsetDLLUsage()) errstream << "Latest GS DLL is " << buf << endl;
diff -r b96d29842043 -r 8d61de83cf90 src/pstoedit.mk
--- a/src/pstoedit.mk	Sun Sep 12 08:51:28 2021 -0400
+++ b/src/pstoedit.mk	Sun Sep 12 08:51:47 2021 -0400
@@ -3,8 +3,8 @@
 
 PKG             := pstoedit
 $(PKG)_IGNORE   :=
-$(PKG)_VERSION  := 3.75
-$(PKG)_CHECKSUM := b0fa3356efdca67bbc0c7c9145827c31384a6cc6
+$(PKG)_VERSION  := 3.77
+$(PKG)_CHECKSUM := 480a6004a47d06f8a506ccc542b2954329e2be97
 $(PKG)_SUBDIR   := $(PKG)-$($(PKG)_VERSION)
 $(PKG)_FILE     := $(PKG)-$($(PKG)_VERSION).tar.gz
 $(PKG)_URL      := https://sourceforge.net/projects/pstoedit/files/$(PKG)/$($(PKG)_VERSION)/$($(PKG)_FILE)/download