Author: qboosh Date: Sun Sep 12 19:23:49 2010 GMT
Module: packages Tag: HEAD
---- Log message:
- dropped outdated am patch
- added libpng14,system-zlib patches, force system zlib and libpng
---- Files affected:
packages/ghostscript:
ghostscript.spec (1.189 -> 1.190) , ghostscript-libpng14.patch (NONE -> 1.1)
(NEW), ghostscript-system-zlib.patch (NONE -> 1.1) (NEW),
ghostscript-am.patch (1.5 -> NONE) (REMOVED)
---- Diffs:
================================================================
Index: packages/ghostscript/ghostscript.spec
diff -u packages/ghostscript/ghostscript.spec:1.189
packages/ghostscript/ghostscript.spec:1.190
--- packages/ghostscript/ghostscript.spec:1.189 Sun Sep 12 06:59:22 2010
+++ packages/ghostscript/ghostscript.spec Sun Sep 12 21:23:44 2010
@@ -33,7 +33,8 @@
Patch0: %{name}-missquotes.patch
Patch1: %{name}-setuid.patch
Patch2: %{name}-time_h.patch
-Patch3: %{name}-am.patch
+Patch3: %{name}-libpng14.patch
+Patch4: %{name}-system-zlib.patch
# no device for cdj850 in non-espgs ghostscript
# look for patch in old spec for GNU ghostscript
#Patch4: %{name}-gdevcd8-fixes.patch
@@ -48,9 +49,9 @@
# for gsx
%{?with_gtk:BuildRequires: gtk+-devel}
BuildRequires: libpaper-devel
-BuildRequires: libpng-devel >= 1.0.8
+BuildRequires: libpng-devel >= 1.2.42
BuildRequires: libstdc++-devel
-BuildRequires: libtiff-devel
+BuildRequires: libtiff-devel >= 3.9.2
BuildRequires: libtool
BuildRequires: pkgconfig
# Required by 'gdevvglb' device.
@@ -61,6 +62,7 @@
BuildRequires: tetex-dvips
BuildRequires: xorg-lib-libXext-devel
BuildRequires: xorg-lib-libXt-devel
+BuildRequires: zlib-devel >= 1.2.3
Obsoletes: ghostscript-afpl
Obsoletes: ghostscript-gpl
Obsoletes: ghostscript-esp
@@ -176,17 +178,16 @@
%patch0 -p1
%patch1 -p1
%patch2 -p1
-#%patch3 -p1
-#%%patch4 -p1
-#%%patch5 -p1
+%patch3 -p1
+%patch4 -p1
%build
-# workarounds
%if %{with system_jbig2dec}
-if [ -d jbig2dec ]; then
- rm -rf jbig2dec
-fi
+%{__rm} -r jbig2dec
%endif
+# use system libs (sources contain unmodified zlib 1.2.3 and libpng 1.2.42)
+%{__rm} -r libpng zlib
+# jpeg is built with different configuration (D_MAX_BLOCKS_IN_MCU=64), jasper
is modified
cd jasper
%{__libtoolize}
%{__aclocal}
@@ -393,6 +394,10 @@
All persons listed below can be reached at <cvs_login>@pld-linux.org
$Log$
+Revision 1.190 2010/09/12 19:23:44 qboosh
+- dropped outdated am patch
+- added libpng14,system-zlib patches, force system zlib and libpng
+
Revision 1.189 2010/09/12 04:59:22 qboosh
- glib patch is outdated
================================================================
Index: packages/ghostscript/ghostscript-libpng14.patch
diff -u /dev/null packages/ghostscript/ghostscript-libpng14.patch:1.1
--- /dev/null Sun Sep 12 21:23:49 2010
+++ packages/ghostscript/ghostscript-libpng14.patch Sun Sep 12 21:23:44 2010
@@ -0,0 +1,11 @@
+--- ghostscript-8.71/configure.ac.orig 2010-09-12 10:34:12.879128431 +0200
++++ ghostscript-8.71/configure.ac 2010-09-12 19:34:10.199128431 +0200
+@@ -402,7 +402,7 @@
+ PNGDEVS="$PNGDEVS_ALL"
+ else
+ AC_MSG_RESULT([no])
+- AC_CHECK_LIB(png, png_check_sig, [
++ AC_CHECK_LIB(png, png_sig_cmp, [
+ AC_CHECK_HEADERS(png.h, [
+ SHARE_LIBPNG=1
+ PNGDEVS="$PNGDEVS_ALL"
================================================================
Index: packages/ghostscript/ghostscript-system-zlib.patch
diff -u /dev/null packages/ghostscript/ghostscript-system-zlib.patch:1.1
--- /dev/null Sun Sep 12 21:23:49 2010
+++ packages/ghostscript/ghostscript-system-zlib.patch Sun Sep 12 21:23:44 2010
@@ -0,0 +1,27 @@
+--- ghostscript-8.71/base/unix-aux.mak.orig 2009-01-08 10:17:18.000000000
+0100
++++ ghostscript-8.71/base/unix-aux.mak 2010-09-12 20:04:42.987128431 +0200
+@@ -77,13 +77,24 @@
+ $(GENINIT_XE): $(GLSRC)geninit.c $(AK) $(GENINIT_DEPS)
+ $(CCAUX) $(I_)$(GLSRCDIR)$(_I) $(O_)$(GENINIT_XE) $(GLSRC)geninit.c
+
++ifeq ($(SHARE_ZLIB),1)
++MKROMFS_OBJS= $(GLOBJ)gscdefs.$(OBJ) $(GLOBJ)gsmisc.$(OBJ) \
++ $(GLOBJ)gpmisc.$(OBJ) $(GLOBJ)gslibctx.$(OBJ) $(GLOBJ)gp_getnv.$(OBJ) \
++ $(GLOBJ)gp_unix.$(OBJ) $(GLOBJ)gp_unifs.$(OBJ) $(GLOBJ)gp_unifn.$(OBJ) \
++ $(GLOBJ)gp_stdia.$(OBJ) $(GLOBJ)gsutil.$(OBJ)
++else
+ MKROMFS_OBJS=$(MKROMFS_ZLIB_OBJS) $(GLOBJ)gscdefs.$(OBJ)
$(GLOBJ)gsmisc.$(OBJ) \
+ $(GLOBJ)gpmisc.$(OBJ) $(GLOBJ)gslibctx.$(OBJ) $(GLOBJ)gp_getnv.$(OBJ) \
+ $(GLOBJ)gp_unix.$(OBJ) $(GLOBJ)gp_unifs.$(OBJ) $(GLOBJ)gp_unifn.$(OBJ) \
+ $(GLOBJ)gp_stdia.$(OBJ) $(GLOBJ)gsutil.$(OBJ)
++endif
+
+ $(MKROMFS_XE): $(GLSRC)mkromfs.c $(MKROMFS_COMMON_DEPS) $(MKROMFS_OBJS)
++ifeq ($(SHARE_ZLIB),1)
++ $(CCAUX) $(GENOPT) $(CFLAGS) $(I_)$(GLSRCDIR)$(_I) $(I_)$(GLOBJ)$(_I)
$(I_)$(ZSRCDIR)$(_I) $(GLSRC)mkromfs.c $(O_)$(MKROMFS_XE) $(MKROMFS_OBJS) -lm
-lz $(EXTRALIBS)
++else
+ $(CCAUX) $(GENOPT) $(CFLAGS) $(I_)$(GLSRCDIR)$(_I) $(I_)$(GLOBJ)$(_I)
$(I_)$(ZSRCDIR)$(_I) $(GLSRC)mkromfs.c $(O_)$(MKROMFS_XE) $(MKROMFS_OBJS) -lm
$(EXTRALIBS)
++endif
+
+ # Query the environment to construct gconfig_.h.
+ # The "else true;" is required because Ultrix's implementation of sh -e
================================================================
---- CVS-web:
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/ghostscript/ghostscript.spec?r1=1.189&r2=1.190&f=u
_______________________________________________
pld-cvs-commit mailing list
[email protected]
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
