Mercurial > gub

changeset 6366:68a58dcb49ed

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Update ghostscript patches
author Masamichi Hosoda <trueroad@users.noreply.github.com>
date Wed, 11 Mar 2015 21:32:21 +0900
parents af6ab6f5b77a
children 394498f6e345
files gub/specs/ghostscript.py patches/ghostscript-9.15-cygwin.patch patches/ghostscript-9.15-make.patch patches/ghostscript-9.15-share-libtiff-init.patch patches/ghostscript-9.15-windows-snprintf.patch
diffstat 5 files changed, 237 insertions(+), 4 deletions(-) [+]
line wrap: on
line diff
--- a/gub/specs/ghostscript.py	Wed Mar 11 21:30:02 2015 +0900
+++ b/gub/specs/ghostscript.py	Wed Mar 11 21:32:21 2015 +0900
@@ -25,10 +25,10 @@
     #source = 'git://git.infradead.org/ghostscript.git?branch=refs/remotes/git-svn&revision=' + revision
     source = 'http://downloads.ghostscript.com/public/ghostscript-9.15.tar.gz'
     patches = [
-        'ghostscript-9.00-make.patch',
-        'ghostscript-9.00-cygwin.patch',
-        'ghostscript-9.00-share-libtiff-init.patch',
-        'ghostscript-9.00-windows-snprintf.patch',
+        'ghostscript-9.15-make.patch',
+        'ghostscript-9.15-cygwin.patch',
+        'ghostscript-9.15-share-libtiff-init.patch',
+        'ghostscript-9.15-windows-snprintf.patch',
         'ghostscript-8.70-windows-make.patch',
        ]
     parallel_build_broken = True
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/patches/ghostscript-9.15-cygwin.patch	Wed Mar 11 21:32:21 2015 +0900
@@ -0,0 +1,87 @@
+--- a/base/unix-gcc.mak	2014-09-22 19:17:33.000000000 +0900
++++ b/base/unix-gcc.mak	2015-03-11 20:58:56.434601000 +0900
+@@ -57,13 +57,13 @@
+ INSTALL_PROGRAM = $(INSTALL) -m 755
+ INSTALL_DATA = $(INSTALL) -m 644
+ 
+-prefix = /usr/local
++prefix = /usr
+ exec_prefix = $(prefix)
+ bindir = $(exec_prefix)/bin
+ scriptdir = $(bindir)
+ includedir = $(prefix)/include
+ libdir = $(exec_prefix)/lib
+-mandir = $(prefix)/man
++mandir = $(prefix)/share/man
+ man1ext = 1
+ datadir = $(prefix)/share
+ gsdir = $(datadir)/ghostscript
+@@ -71,7 +71,7 @@
+ gssharedir = $(libdir)/ghostscript/$(GS_DOT_VERSION)
+ gsincludedir = $(includedir)/ghostscript/
+ 
+-docdir=$(gsdatadir)/doc
++docdir=$(gsdatadir)/doc/ghostscript-$(GS_DOT_VERSION)
+ exdir=$(gsdatadir)/examples
+ GS_DOCDIR=$(docdir)
+ 
+@@ -156,7 +156,7 @@
+ # what its name is.
+ # See gs.mak and Make.htm for more information.
+ 
+-SHARE_LIBPNG=0
++SHARE_LIBPNG=1
+ LIBPNG_NAME=png
+ 
+ # Define whether to use a shared version of libtiff and where
+@@ -180,7 +180,7 @@
+ # what its name is (usually libz, but sometimes libgz).
+ # See gs.mak and Make.htm for more information.
+ 
+-SHARE_ZLIB=0
++SHARE_ZLIB=1
+ #ZLIB_NAME=gz
+ ZLIB_NAME=z
+ 
+@@ -245,7 +245,7 @@
+ CFLAGS_STANDARD=-O2
+ CFLAGS_DEBUG=-g -O0
+ CFLAGS_PROFILE=-pg -O2
+-CFLAGS_SO=-fPIC
++#CFLAGS_SO=-fPIC
+ 
+ # Define the other compilation flags.  Add at most one of the following:
+ #	-DBSD4_2 for 4.2bsd systems.
+@@ -302,7 +302,7 @@
+ # Note that x_.h expects to find the header files in $(XINCLUDE)/X11,
+ # not in $(XINCLUDE).
+ 
+-XINCLUDE=-I/usr/X11R6/include
++#XINCLUDE=-I/usr/X11R6/include
+ 
+ # Define the directory/ies and library names for the X11 library files.
+ # XLIBDIRS is for ld and should include -L; XLIBDIR is for LD_RUN_PATH
+@@ -317,9 +317,11 @@
+ #XLIBS=Xt SM ICE Xext X11
+ 
+ #XLIBDIRS=-L/usr/local/X/lib
+-XLIBDIRS=-L/usr/X11R6/lib
++#XLIBDIRS=-L/usr/X11R6/lib
++XLIBDIRS=
+ XLIBDIR=
+-XLIBS=Xt Xext X11
++#XLIBS=Xt Xext X11
++XLIBS=
+ 
+ # Define the .dev module that implements thread and synchronization
+ # primitives for this platform.
+@@ -377,7 +379,8 @@
+ # Choose the device(s) to include.  See devs.mak for details,
+ # devs.mak and contrib.mak for the list of available devices.
+ 
+-DEVICE_DEVS=$(DISPLAY_DEV) $(DD)x11.dev $(DD)x11alpha.dev $(DD)x11cmyk.dev $(DD)x11gray2.dev $(DD)x11gray4.dev $(DD)x11mono.dev
++#DEVICE_DEVS=$(DISPLAY_DEV) $(DD)x11.dev $(DD)x11alpha.dev $(DD)x11cmyk.dev $(DD)x11gray2.dev $(DD)x11gray4.dev $(DD)x11mono.dev
++DEVICE_DEVS=
+ 
+ #DEVICE_DEVS1=
+ #DEVICE_DEVS2=
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/patches/ghostscript-9.15-make.patch	Wed Mar 11 21:32:21 2015 +0900
@@ -0,0 +1,105 @@
+--- a/base/unix-dll.mak	2014-09-22 19:17:33.000000000 +0900
++++ b/base/unix-dll.mak	2015-03-11 20:06:35.095445000 +0900
+@@ -28,6 +28,11 @@
+ SODIRPREFIX=so
+ SODEBUGDIRPREFIX=sodebug
+ 
++ifeq ($(TARGET),mingw)
++GS=gs
++XE=.exe
++endif
++
+ # ------------------- Ghostscript shared object --------------------------- #
+ 
+ # Shared object names
+@@ -63,14 +68,27 @@
+ # LDFLAGS_SO=-shared -Wl,$(LD_SET_DT_SONAME)$(LDFLAGS_SO_PREFIX)$(GS_SONAME_MAJOR)
+ 
+ 
++ifeq ($(TARGET),darwin)
+ # MacOS X
+-#GS_SOEXT=dylib
+-#GS_SONAME=$(GS_SONAME_BASE).$(GS_SOEXT)
+-#GS_SONAME_MAJOR=$(GS_SONAME_BASE).$(GS_VERSION_MAJOR).$(GS_SOEXT)
+-#GS_SONAME_MAJOR_MINOR=$(GS_SONAME_BASE).$(GS_VERSION_MAJOR).$(GS_VERSION_MINOR).$(GS_SOEXT)
++GS_SOEXT=dylib
++GS_SONAME=$(GS_SONAME_BASE).$(GS_SOEXT)
++GS_SONAME_MAJOR=$(GS_SONAME_BASE).$(GS_VERSION_MAJOR).$(GS_SOEXT)
++GS_SONAME_MAJOR_MINOR=$(GS_SONAME_BASE).$(GS_VERSION_MAJOR).$(GS_VERSION_MINOR).$(GS_SOEXT)
+ #LDFLAGS_SO=-dynamiclib -flat_namespace
+ #LDFLAGS_SO_MAC=-dynamiclib -install_name $(GS_SONAME_MAJOR_MINOR)
+ #LDFLAGS_SO=-dynamiclib -install_name $(FRAMEWORK_NAME)
++LDFLAGS_SO=-dynamiclib
++endif
++
++ifeq ($(TARGET),mingw)
++# Mingw
++GS_SONAME_BASE=gs
++GS_SOEXT=dll
++GS_SONAME=$(GS_SONAME_BASE).$(GS_SOEXT)
++GS_SONAME_MAJOR=$(GS_SONAME_BASE)-$(GS_VERSION_MAJOR).$(GS_SOEXT)
++GS_SONAME_MAJOR_MINOR=$(GS_SONAME_BASE)-$(GS_VERSION_MAJOR).$(GS_VERSION_MINOR).$(GS_SOEXT)
++LDFLAGS_SO=-shared -Wl,-soname=$(GS_SONAME_MAJOR_MINOR)
++endif
+ 
+ GS_SO=$(BINDIR)/$(GS_SONAME)
+ GS_SO_MAJOR=$(BINDIR)/$(GS_SONAME_MAJOR) 
+@@ -99,6 +117,8 @@
+ 
+ # ------------------------- Recursive make targets ------------------------- #
+ 
++# Help -rpath $ORIGIN survive the $(MAKE) command line expansion
++MAKE_LDFLAGS=$(subst $$,\$$$$,$(LDFLAGS))
+ SODEFS=\
+  GS_XE=$(BINDIR)/$(GS_SONAME_MAJOR_MINOR)\
+  DISPLAY_DEV=$(DD)display.dev\
+@@ -129,16 +149,16 @@
+ 	$(MAKE) so-subtarget GENOPT='-DDEBUG' BUILDDIRPREFIX=$(SODEBUGDIRPREFIX)
+ 
+ so-subtarget:
+-	$(MAKE) $(SODEFS) GENOPT='$(GENOPT)' LDFLAGS='$(LDFLAGS)'\
++	$(MAKE) $(SODEFS) GENOPT='$(GENOPT)' LDFLAGS='$(MAKE_LDFLAGS)'\
+ 	 CFLAGS='$(CFLAGS_STANDARD) $(GCFLAGS) $(AC_CFLAGS) $(XCFLAGS)' prefix=$(prefix)\
+ 	 directories
+-	$(MAKE) $(SODEFS) GENOPT='$(GENOPT)' LDFLAGS='$(LDFLAGS)'\
++	$(MAKE) $(SODEFS) GENOPT='$(GENOPT)' LDFLAGS='$(MAKE_LDFLAGS)'\
+ 	 CFLAGS='$(CFLAGS_STANDARD) $(GCFLAGS) $(AC_CFLAGS) $(XCFLAGS)' prefix=$(prefix)\
+ 	 $(AUXDIR)/echogs$(XEAUX) $(AUXDIR)/genarch$(XEAUX)
+-	$(MAKE) $(SODEFS) GENOPT='$(GENOPT)' LDFLAGS='$(LDFLAGS) $(LDFLAGS_SO)'\
++	$(MAKE) $(SODEFS) GENOPT='$(GENOPT)' LDFLAGS='$(MAKE_LDFLAGS) $(LDFLAGS_SO)'\
+ 	 CFLAGS='$(CFLAGS_STANDARD) $(CFLAGS_SO) $(GCFLAGS) $(AC_CFLAGS) $(XCFLAGS)'\
+ 	 prefix=$(prefix)
+-	$(MAKE) $(SODEFS_FINAL) GENOPT='$(GENOPT)' LDFLAGS='$(LDFLAGS)'\
++	$(MAKE) $(SODEFS_FINAL) GENOPT='$(GENOPT)' LDFLAGS='$(MAKE_LDFLAGS)'\
+ 	 CFLAGS='$(CFLAGS_STANDARD) $(GCFLAGS) $(AC_CFLAGS) $(XCFLAGS)' prefix=$(prefix)\
+ 	 $(GSSOC_XE) $(GSSOX_XE)
+ 
+--- a/base/unixlink.mak	2014-09-22 19:17:33.000000000 +0900
++++ b/base/unixlink.mak	2015-03-11 20:53:01.152652900 +0900
+@@ -45,13 +45,16 @@
+ 	$(SH) <$(liar_tr)
+ 	$(RANLIB) $(GS_A)
+ 
++# Help -rpath $ORIGIN survive the ECHOGS_XE sh command line expansion
++SHELL_LDFLAGS=$(subst $$,\$$,$(LDFLAGS))
++
+ # Here is the final link step.  The stuff with LD_RUN_PATH is for SVR4
+ # systems with dynamic library loading; I believe it's harmless elsewhere.
+ # The resetting of the environment variables to empty strings is for SCO Unix,
+ # which has limited environment space.
+ ldt_tr=$(PSOBJ)ldt.tr
+ $(GS_XE): $(ld_tr) $(ECHOGS_XE) $(XE_ALL) $(PSOBJ)gsromfs$(COMPILE_INITS).$(OBJ)
+-	$(ECHOGS_XE) -w $(ldt_tr) -n - $(CCLD) $(LDFLAGS) -o $(GS_XE)
++	$(ECHOGS_XE) -w $(ldt_tr) -n - $(CCLD) $(SHELL_LDFLAGS) -o $(GS_XE)
+ 	$(ECHOGS_XE) -a $(ldt_tr) -n -s $(PSOBJ)gsromfs$(COMPILE_INITS).$(OBJ) $(PSOBJ)gs.$(OBJ) -s
+ 	cat $(ld_tr) >>$(ldt_tr)
+ 	$(ECHOGS_XE) -a $(ldt_tr) -s - $(EXTRALIBS) $(STDLIBS)
+@@ -70,7 +73,7 @@
+ apitest: $(APITEST_XE)
+ 
+ $(APITEST_XE): $(ld_tr) $(ECHOGS_XE) $(XE_ALL) $(PSOBJ)gsromfs$(COMPILE_INITS).$(OBJ) $(PSOBJ)apitest.$(OBJ)
+-	$(ECHOGS_XE) -w $(ldt_tr) -n - $(CCLD) $(LDFLAGS) -o $(APITEST_XE)
++	$(ECHOGS_XE) -w $(ldt_tr) -n - $(CCLD) $(SHELL_LDFLAGS) -o $(APITEST_XE)
+ 	$(ECHOGS_XE) -a $(ldt_tr) -n -s $(PSOBJ)gsromfs$(COMPILE_INITS).$(OBJ) $(PSOBJ)apitest.$(OBJ) -s
+ 	cat $(ld_tr) >>$(ldt_tr)
+ 	$(ECHOGS_XE) -a $(ldt_tr) -s - $(EXTRALIBS) $(STDLIBS)
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/patches/ghostscript-9.15-share-libtiff-init.patch	Wed Mar 11 21:32:21 2015 +0900
@@ -0,0 +1,26 @@
+--- a/configure.ac	2014-09-22 19:17:33.000000000 +0900
++++ b/configure.ac	2015-03-11 21:03:53.941625800 +0900
+@@ -998,6 +998,7 @@
+ AC_ARG_WITH([system-libtiff], AC_HELP_STRING([--with-system-libtiff],
+                                              [Force using the systems libtiff]),
+             [], [with_system_libtiff=check])
++SHARE_LIBTIFF=1
+ TIFFDEVS=''
+ FAX_DEVS=''
+ 
+@@ -1012,7 +1013,6 @@
+             LIBTIFFDIR=$srcdir/tiff
+             LIBTIFFCONFDIR=tiff-config
+             HAVE_LOCAL_LIBTIFF=1
+-            SHARE_LIBTIFF=0
+         else
+             # We MUST NOT use PKG_CHECK_MODULES since it is a) not a standard
+             # autoconf macro and b) requires pkg-config on the system, which is
+@@ -1073,7 +1073,6 @@
+             AC_MSG_RESULT([yes])
+             LIBTIFFDIR=$srcdir/tiff
+             LIBTIFFCONFDIR=tiff-config
+-            SHARE_LIBTIFF=0
+             TIFFDEVS="$TIFFDEVS_ALL"
+             FAX_DEVS="$FAX_DEVS_ALL"
+         else
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/patches/ghostscript-9.15-windows-snprintf.patch	Wed Mar 11 21:32:21 2015 +0900
@@ -0,0 +1,15 @@
+--- a/base/gp_mswin.c	2014-09-22 19:17:33.000000000 +0900
++++ b/base/gp_mswin.c	2015-03-11 21:10:32.833047100 +0900
+@@ -900,6 +900,7 @@
+ /* Microsoft Visual C++ 2005  doesn't properly define snprintf,
+    which is defined in the C standard ISO/IEC 9899:1999 (E) */
+ 
++#if !defined(__CYGWIN__) && !defined(__MINGW32__)
+ int snprintf(char *buffer, size_t count, const char *format, ...)
+ {
+     if (count > 0) {
+@@ -914,3 +915,4 @@
+     } else
+         return 0;
+ }
++#endif