Mercurial > mxe-octave
changeset 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 | 82bd7cd7d06d |
| children | a6140fcf5631 |
| files | src/pstoedit-1-fixes.patch src/pstoedit-2-gs.patch src/pstoedit.mk |
| diffstat | 3 files changed, 39 insertions(+), 11 deletions(-) [+] |
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");
--- a/src/pstoedit-2-gs.patch Fri Feb 27 08:19:06 2015 -0500 +++ b/src/pstoedit-2-gs.patch Fri Feb 27 15:29:26 2015 -0500 @@ -1,6 +1,6 @@ -diff -ur pstoedit-3.61-orig/configure.ac pstoedit-3.61/configure.ac ---- pstoedit-3.61-orig/configure.ac 2012-08-28 06:46:41 -0400 -+++ pstoedit-3.61/configure.ac 2013-07-05 23:29:38 -0400 +diff -ur pstoedit-3.70.orig/configure.ac pstoedit-3.70/configure.ac +--- pstoedit-3.70.orig/configure.ac 2015-02-27 13:34:44.538158342 -0500 ++++ pstoedit-3.70/configure.ac 2015-02-27 15:12:27.821126740 -0500 @@ -53,12 +53,12 @@ dnl Check Ghostscript GS="" @@ -15,18 +15,18 @@ +dnl AC_MSG_ERROR([** Cannot find ghostscript. If it is already installed, Check PATH.]) +dnl else +dnl dnl Strip off // to / that causes troubles. -+dnl GS=`echo $GS | sed -e 's/\/\//\//g'` ++dnl GS=`echo $GS | sed -e 's/\/\//\//g'` +dnl fi PKG_PROG_PKG_CONFIG -diff -ur pstoedit-3.62.orig/src/Makefile.am pstoedit-3.62/src/Makefile.am ---- pstoedit-3.62.orig/src/Makefile.am 2014-06-03 12:53:10 -0400 -+++ pstoedit-3.62/src/Makefile.am 2014-06-03 12:54:14 -0400 -@@ -31,7 +31,7 @@ - ${LIBMAGICK_CFLAGS} \ +diff -ur pstoedit-3.70.orig/src/Makefile.am pstoedit-3.70/src/Makefile.am +--- pstoedit-3.70.orig/src/Makefile.am 2015-02-27 13:34:45.004167901 -0500 ++++ pstoedit-3.70/src/Makefile.am 2015-02-27 15:13:10.916976944 -0500 +@@ -32,7 +32,7 @@ ${LIBEMF_CFLAGS} \ ${LIBPNG_CFLAGS} \ + ${LIBZIP_CFLAGS} \ - -DDEFAULTGS=$(GS) \ + -DDEFAULTGS="\"$(GS)\"" \ -DPSTOEDITDATADIR="\"$(pkgdatadir)\"" \
--- a/src/pstoedit.mk Fri Feb 27 08:19:06 2015 -0500 +++ b/src/pstoedit.mk Fri Feb 27 15:29:26 2015 -0500 @@ -3,8 +3,8 @@ PKG := pstoedit $(PKG)_IGNORE := -$(PKG)_VERSION := 3.62 -$(PKG)_CHECKSUM := 50d5a4e2fe0e0ff2f73cb094cb945b221083e742 +$(PKG)_VERSION := 3.70 +$(PKG)_CHECKSUM := 657f8f7070fde1432cd65a34b6b1c4b5b42f8b50 $(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