Mercurial > mxe-octave
changeset 5258:57dd959b3713
pstoedit: update to v3.75
* src/pstoedit-1-fixes.patch, src/pstoedit-2-gs.patch: update patch
* src/pstoedit.mk: update version, checksum
| author | John Donoghue |
|---|---|
| date | Mon, 06 Jan 2020 13:02:08 -0500 |
| parents | 1927e90b6f63 |
| children | 6d8f7b772e30 |
| files | src/pstoedit-1-fixes.patch src/pstoedit-2-gs.patch src/pstoedit.mk |
| diffstat | 3 files changed, 20 insertions(+), 35 deletions(-) [+] |
line wrap: on
line diff
--- a/src/pstoedit-1-fixes.patch Mon Jan 06 09:59:07 2020 -0500 +++ b/src/pstoedit-1-fixes.patch Mon Jan 06 13:02:08 2020 -0500 @@ -1,21 +1,19 @@ -diff -ur pstoedit-3.74.orig/othersrc/gsdllinc/wgsver.c pstoedit-3.74/othersrc/gsdllinc/wgsver.c ---- pstoedit-3.74.orig/othersrc/gsdllinc/wgsver.c 2019-08-12 16:51:30.466523053 -0400 -+++ pstoedit-3.74/othersrc/gsdllinc/wgsver.c 2019-08-12 16:57:43.384024846 -0400 -@@ -40,6 +40,10 @@ +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 +@@ -40,6 +40,9 @@ #include "wgsver.h" #include "cppcomp.h" +#ifndef KEY_WOW64_64KEY +#define KEY_WOW64_64KEY 0x0100 +#endif -+ /* Ghostscript may be known in the Windows Registry by * the following names. */ -Only in pstoedit-3.74/othersrc/gsdllinc: wgsver.c.orig -diff -ur pstoedit-3.74.orig/src/cbstream.cpp pstoedit-3.74/src/cbstream.cpp ---- pstoedit-3.74.orig/src/cbstream.cpp 2019-08-12 16:51:30.466523053 -0400 -+++ pstoedit-3.74/src/cbstream.cpp 2019-08-12 16:57:43.388024951 -0400 +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 @@ -33,6 +33,8 @@ // this code is only needed under WIN32 // ...and under OS/2 @@ -25,22 +23,9 @@ #include "cppcomp.h" #include "cbstream.h" -diff -ur pstoedit-3.74.orig/src/dynload.cpp pstoedit-3.74/src/dynload.cpp ---- pstoedit-3.74.orig/src/dynload.cpp 2019-08-12 16:51:30.470523154 -0400 -+++ pstoedit-3.74/src/dynload.cpp 2019-08-12 16:57:43.388024951 -0400 -@@ -240,7 +240,7 @@ - #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) -- 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 -Only in pstoedit-3.74/src: dynload.cpp.orig -diff -ur pstoedit-3.74.orig/src/Makefile.am pstoedit-3.74/src/Makefile.am ---- pstoedit-3.74.orig/src/Makefile.am 2019-08-12 16:51:30.470523154 -0400 -+++ pstoedit-3.74/src/Makefile.am 2019-08-12 16:57:43.388024951 -0400 +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 @@ psfront.h \ genericints.h
--- a/src/pstoedit-2-gs.patch Mon Jan 06 09:59:07 2020 -0500 +++ b/src/pstoedit-2-gs.patch Mon Jan 06 13:02:08 2020 -0500 @@ -1,7 +1,7 @@ -diff -ur pstoedit-3.74-1/configure.ac pstoedit-3.74/configure.ac ---- pstoedit-3.74-1/configure.ac 2019-08-12 17:00:05.383739915 -0400 -+++ pstoedit-3.74/configure.ac 2019-08-12 17:01:34.890067312 -0400 -@@ -44,8 +44,8 @@ +diff -ur pstoedit-3.75.1/configure.ac pstoedit-3.75/configure.ac +--- pstoedit-3.75.1/configure.ac 2020-01-06 12:54:05.031731787 -0500 ++++ pstoedit-3.75/configure.ac 2020-01-06 12:55:08.329343414 -0500 +@@ -50,8 +50,8 @@ dnl fi dnl Check Ghostscript @@ -12,15 +12,15 @@ PKG_PROG_PKG_CONFIG -diff -ur pstoedit-3.74-1/src/Makefile.am pstoedit-3.74/src/Makefile.am ---- pstoedit-3.74-1/src/Makefile.am 2019-08-12 17:00:05.395740228 -0400 -+++ pstoedit-3.74/src/Makefile.am 2019-08-12 17:02:29.107472650 -0400 +diff -ur pstoedit-3.75.1/src/Makefile.am pstoedit-3.75/src/Makefile.am +--- pstoedit-3.75.1/src/Makefile.am 2020-01-06 12:54:05.047732194 -0500 ++++ pstoedit-3.75/src/Makefile.am 2020-01-06 12:56:08.370870430 -0500 @@ -32,7 +32,7 @@ ${LIBEMF_CFLAGS} \ ${LIBPNG_CFLAGS} \ ${LIBZIP_CFLAGS} \ - -DDEFAULTGS=$(GS) \ -+ -DDEFAULTGS="\"$(GS)\"" \ ++ -DDEFAULTGS="\"$(GS)\"" \ -DPSTOEDITDATADIR="\"$(pkgdatadir)\"" \ -DPSTOEDITLIBDIR="\"$(pkglibdir)\"" \ ${SPECIAL_CXXFLAGS}
--- a/src/pstoedit.mk Mon Jan 06 09:59:07 2020 -0500 +++ b/src/pstoedit.mk Mon Jan 06 13:02:08 2020 -0500 @@ -3,8 +3,8 @@ PKG := pstoedit $(PKG)_IGNORE := -$(PKG)_VERSION := 3.74 -$(PKG)_CHECKSUM := 88aabbfc602856184419f212e439438c7229b9c0 +$(PKG)_VERSION := 3.75 +$(PKG)_CHECKSUM := b0fa3356efdca67bbc0c7c9145827c31384a6cc6 $(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