packages: ghostscript/ghostscript-git.patch, ghostscript/ghostscript.spec, ...

arekm arekm at pld-linux.org
Tue Jul 12 23:09:22 CEST 2011


Author: arekm                        Date: Tue Jul 12 21:09:22 2011 GMT
Module: packages                      Tag: HEAD
---- Log message:
- rel 4; fix romfs linking with zlib

---- Files affected:
packages/ghostscript:
   ghostscript-git.patch (1.1 -> 1.2) , ghostscript.spec (1.207 -> 1.208) , ghostscript-zlib.patch (NONE -> 1.1)  (NEW)

---- Diffs:

================================================================
Index: packages/ghostscript/ghostscript-git.patch
diff -u packages/ghostscript/ghostscript-git.patch:1.1 packages/ghostscript/ghostscript-git.patch:1.2
--- packages/ghostscript/ghostscript-git.patch:1.1	Tue Jul 12 22:15:34 2011
+++ packages/ghostscript/ghostscript-git.patch	Tue Jul 12 23:09:17 2011
@@ -54,3 +54,40 @@
                  return index+1;
          }
      }
+commit 6f6e28de040e17580fa2a92ce65368cd13ca9964
+Author: Chris Liddell <chris.liddell at artifex.com>
+Date:   Tue Feb 22 16:10:08 2011 +0000
+
+    Tweak to allow compressed romfs to be built when we're configured
+    to use the system's zlib rather than our own.
+    
+    As a side effect of this, freetype is now configured to use the
+    same zlib instance as Ghostscript (instead of freetype's own
+    subset of zlib sources).
+    
+    Bug 691986
+    
+    No cluster differences expected.
+    
+    git-svn-id: http://svn.ghostscript.com/ghostscript/trunk@12184 a1074d23-0009-0410-80fe-cf8c14f379e6
+
+diff --git a/gs/base/lib.mak b/gs/base/lib.mak
+index d97c3d4..44275b4 100644
+--- a/gs/base/lib.mak
++++ b/gs/base/lib.mak
+@@ -2823,10 +2823,14 @@
+ 
+ # Define the ZLIB modules needed by mnkromfs here to factor it out of top makefiles
+ # Also put the .h dependencies here for the same reason
+-MKROMFS_ZLIB_OBJS=$(GLOBJ)compress.$(OBJ) $(GLOBJ)deflate.$(OBJ) \
++MKROMFS_ZLIB_OBJ_1=
++
++MKROMFS_ZLIB_OBJS_0=$(GLOBJ)compress.$(OBJ) $(GLOBJ)deflate.$(OBJ) \
+ 	$(GLOBJ)zutil.$(OBJ) $(GLOBJ)adler32.$(OBJ) $(GLOBJ)crc32.$(OBJ) \
+ 	$(GLOBJ)trees.$(OBJ)
+ 
++MKROMFS_ZLIB_OBJS=$(MKROMFS_ZLIB_OBJS_$(SHARE_ZLIB))
++
+ MKROMFS_COMMON_DEPS=$(stdpre_h) $(stdint__h) $(gsiorom_h) $(arch_h)\
+ 	$(gsmemret_h) $(gsmalloc_h) $(gsstype_h) $(gp_h) $(time__h)
+ 

================================================================
Index: packages/ghostscript/ghostscript.spec
diff -u packages/ghostscript/ghostscript.spec:1.207 packages/ghostscript/ghostscript.spec:1.208
--- packages/ghostscript/ghostscript.spec:1.207	Tue Jul 12 22:15:34 2011
+++ packages/ghostscript/ghostscript.spec	Tue Jul 12 23:09:17 2011
@@ -18,7 +18,7 @@
 Summary(tr.UTF-8):	PostScript & PDF yorumlayıcı ve gösterici
 Name:		ghostscript
 Version:	9.02
-Release:	3
+Release:	4
 License:	GPL v3+
 Group:		Applications/Graphics
 Source0:	http://downloads.sourceforge.net/ghostscript/%{name}-%{version}.tar.bz2
@@ -32,6 +32,7 @@
 Patch6:		%{name}-gdevcd8-fixes.patch
 Patch7:		%{name}-fPIC.patch
 Patch8:		%{name}-git.patch
+Patch9:		%{name}-zlib.patch
 URL:		http://www.ghostscript.com/
 BuildRequires:	autoconf >= 2.57
 BuildRequires:	automake >= 1.6
@@ -190,6 +191,7 @@
 %patch6 -p1
 %patch7 -p1
 %patch8 -p2
+%patch9 -p1
 
 %build
 %if %{with system_jbig2dec}
@@ -408,6 +410,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.208  2011/07/12 21:09:17  arekm
+- rel 4; fix romfs linking with zlib
+
 Revision 1.207  2011/07/12 20:15:34  arekm
 - rel 3; fix Error: Font Renderer Plugin ( FreeType ) return code = -1 from git
 

================================================================
Index: packages/ghostscript/ghostscript-zlib.patch
diff -u /dev/null packages/ghostscript/ghostscript-zlib.patch:1.1
--- /dev/null	Tue Jul 12 23:09:22 2011
+++ packages/ghostscript/ghostscript-zlib.patch	Tue Jul 12 23:09:17 2011
@@ -0,0 +1,11 @@
+--- ghostscript-9.02/configure.ac~	2011-07-12 22:52:14.000000000 +0200
++++ ghostscript-9.02/configure.ac	2011-07-12 23:01:05.464937334 +0200
+@@ -594,6 +594,8 @@
+   local directory named 'zlib'. See http://www.gzip.org/zlib/
+   for more information.
+   ])
++else
++  LIBS="$LIBS -lz"
+ fi
+ 
+ dnl if GS is to use the system zlib, freetype
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/ghostscript/ghostscript-git.patch?r1=1.1&r2=1.2&f=u
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/ghostscript/ghostscript.spec?r1=1.207&r2=1.208&f=u



More information about the pld-cvs-commit mailing list