[packages/ghostscript] - use system freetype - adjusted BRs to require versions no older than bundled libraries - updated s
qboosh
qboosh at pld-linux.org
Thu Jan 7 17:23:55 CET 2016
commit 4690f9443c10e63fee56e234d69b1d028091d767
Author: Jakub Bogusz <qboosh at pld-linux.org>
Date: Thu Jan 7 17:25:53 2016 +0100
- use system freetype
- adjusted BRs to require versions no older than bundled libraries
- updated svga patch
ghostscript-svga-shared.patch | 46 +++++++++++++++++++++++++++----------------
ghostscript.spec | 34 +++++++++++++++++---------------
2 files changed, 47 insertions(+), 33 deletions(-)
---
diff --git a/ghostscript.spec b/ghostscript.spec
index 16a4ba5..a83a3b7 100644
--- a/ghostscript.spec
+++ b/ghostscript.spec
@@ -4,6 +4,7 @@
#
# Conditional build:
%bcond_without cairo # disable cairo support (for cairo bootstrap)
+%bcond_without system_freetype # build with included freetype
%bcond_without system_jbig2dec # build with included jbig2dec
%bcond_without system_lcms2 # build with included lcms2
%bcond_with svga # svgalib display support (vgalib,lvga256 devices) [broken in sources]
@@ -46,15 +47,15 @@ BuildRequires: automake >= 1.6
BuildRequires: dbus-devel
BuildRequires: docbook-style-dsssl
BuildRequires: fontconfig-devel
-BuildRequires: freetype-devel >= 2.0
+%{?with_system_freetype:BuildRequires: freetype-devel >= 1:2.6}
%{?with_gtk:BuildRequires: gtk+3-devel >= 3.0}
-%{?with_system_jbig2dec:BuildRequires: jbig2dec-devel}
-%{?with_system_lcms2:BuildRequires: lcms2-devel >= 2.3}
+%{?with_system_jbig2dec:BuildRequires: jbig2dec-devel >= 0.12}
+%{?with_system_lcms2:BuildRequires: lcms2-devel >= 2.6}
BuildRequires: libidn-devel
BuildRequires: libpaper-devel
-BuildRequires: libpng-devel >= 1.2.42
+BuildRequires: libpng-devel >= 2:1.6.17
BuildRequires: libstdc++-devel
-BuildRequires: libtiff-devel >= 3.9.2
+BuildRequires: libtiff-devel >= 4.0.1
BuildRequires: libtool
BuildRequires: pkgconfig
# Required by 'gdevvglb' device.
@@ -67,8 +68,8 @@ BuildRequires: tetex-dvips
%endif
BuildRequires: xorg-lib-libXext-devel
BuildRequires: xorg-lib-libXt-devel
-BuildRequires: zlib-devel >= 1.2.3
-%{?with_system_lcms2:Requires: lcms2 >= 2.3}
+BuildRequires: zlib-devel >= 1.2.8
+%{?with_system_lcms2:Requires: lcms2 >= 2.6}
Obsoletes: ghostscript-afpl
Obsoletes: ghostscript-esp
Obsoletes: ghostscript-gpl
@@ -208,9 +209,7 @@ Statyczna wersja biblioteki IJS.
%patch0 -p1
%patch1 -p1
-%if %{with svga}
%patch3 -p1
-%endif
%patch6 -p1
%patch7 -p1
@@ -223,14 +222,16 @@ Statyczna wersja biblioteki IJS.
%patch28 -p1
%build
-%if %{with system_jbig2dec}
-%{__rm} -r jbig2dec
-%endif
-# use system libs (sources contain unmodified zlib 1.2.3 and libpng 1.2.42)
+# use system libs:
+# freetype 2.5.5 + few pre-2.6 fixes from git
+%{?with_system_freetype:%{__rm} -r freetype}
+# jbig2dec 0.12 + minor updates
+%{?with_system_jbig2dec:%{__rm} -r jbig2dec}
+# (unmodified) libpng 1.6.17 and zlib 1.2.8
%{__rm} -r libpng zlib
-# jpeg is built with different configuration (D_MAX_BLOCKS_IN_MCU=64)
-# openjpeg is post-1.4 or modified
-# lcms is modified, but lcms2 is used by default
+# (unmodified) libjpeg 9a is built with different configuration (D_MAX_BLOCKS_IN_MCU=64)
+# openjpeg is 2.1.0 + fixes; stick to bundled for now
+# lcms2 is 2.6 with some minor future changes (one already in 2.7, two post-2.7, extra_xform.h ???)
%{?with_system_lcms2:%{__rm} -r lcms2}
%{__aclocal}
%{__autoconf}
@@ -297,6 +298,7 @@ echo ".so ps2pdf.1" > $RPM_BUILD_ROOT%{_mandir}/de/man1/ps2pdf12.1
echo ".so ps2pdf.1" > $RPM_BUILD_ROOT%{_mandir}/de/man1/ps2pdf13.1
bzip2 -dc %{SOURCE1} | tar xf - -C $RPM_BUILD_ROOT%{_mandir}
+%{__rm} $RPM_BUILD_ROOT%{_mandir}/README.ghostscript-non-english-man-pages
#mv -f $RPM_BUILD_ROOT%{_bindir}/{gsc,gs}
ln -sf gs $RPM_BUILD_ROOT%{_bindir}/gsc
diff --git a/ghostscript-svga-shared.patch b/ghostscript-svga-shared.patch
index 33d5e06..a600428 100644
--- a/ghostscript-svga-shared.patch
+++ b/ghostscript-svga-shared.patch
@@ -1,14 +1,14 @@
---- ghostscript-9.05/base/configure.ac.orig 2012-02-11 13:01:13.934739538 +0100
-+++ ghostscript-9.05/base/configure.ac 2012-02-11 14:41:09.408273622 +0100
-@@ -1389,6 +1389,7 @@
- PS_DEVS='psdf psdcmyk psdrgb pdfwrite pswrite ps2write epswrite psgray psmono psrgb bbox txtwrite inkcov'
- MISC_FDEVS='ccr cif inferno mag16 mag256 mgr4 mgr8 mgrgray2 mgrgray4 mgrgray8 mgrmono miff24 plan9bm sgirgb sunhmono bit bitrgb bitrgbtags bitcmyk devicen spotcmyk xcf'
- SVGDEV='svgwrite'
+--- ghostscript-9.18/configure.ac.orig 2016-01-06 21:16:43.016302214 +0100
++++ ghostscript-9.18/configure.ac 2016-01-06 21:35:06.882922225 +0100
+@@ -1811,6 +1811,7 @@
+ PS_DEVS='psdf psdcmyk psdrgb pdfwrite ps2write eps2write bbox txtwrite inkcov ink_cov psdcmykog fpng'
+ MISC_FDEVS='ccr cif inferno mag16 mag256 mgr4 mgr8 mgrgray2 mgrgray4 mgrgray8 mgrmono miff24 plan9bm sgirgb sunhmono bit bitrgb bitrgbtags bitcmyk devicen spotcmyk xcf plib plibg plibm plibc plibk gprf'
+ XPSDEV=$XPSWRITEDEVICE
+SVGA_DEVS=
while test -n "$drivers"; do
if echo $drivers |grep "," >/dev/null; then
-@@ -1527,6 +1528,9 @@
+@@ -1950,6 +1951,9 @@
AC_MSG_WARN(Unable to include opvp/oprp driver due to missing or disabled prerequisites...)
fi
;;
@@ -18,7 +18,7 @@
*)
# It's a driver name (or a user messup)
P_DEVS0="$P_DEVS0 `echo $THIS |sed -e 's,\.dev$,,'`"
-@@ -1578,6 +1582,7 @@
+@@ -2047,6 +2051,7 @@
AC_SUBST(JBIG2_DEVS)
AC_SUBST(IJS_DEVS)
AC_SUBST(PNG_DEVS)
@@ -26,7 +26,7 @@
# This now gets done after handling --enable-dynamic
# AC_SUBST(X11_DEVS)
-@@ -1633,6 +1638,10 @@
+@@ -2129,6 +2134,10 @@
else
DYNAMIC_DEVS=""
fi
@@ -37,14 +37,26 @@
DYNAMIC_FLAGS="-DGS_DEVS_SHARED -DGS_DEVS_SHARED_DIR=\\\"\$(gssharedir)\\\""
X11_DEVS=""
OPT_CFLAGS="$DYNAMIC_CFLAGS $OPT_CFLAGS"
---- ghostscript-9.05/base/Makefile.in.orig 2012-02-08 09:48:48.000000000 +0100
-+++ ghostscript-9.05/base/Makefile.in 2012-02-11 14:41:19.274940617 +0100
-@@ -521,7 +521,7 @@
- DEVICE_DEVS6=@PNG_DEVS@
+--- ghostscript-9.18/Makefile.in.orig 2016-01-06 21:16:43.029635544 +0100
++++ ghostscript-9.18/Makefile.in 2016-01-06 21:36:00.216253925 +0100
+@@ -594,7 +594,7 @@
DEVICE_DEVS7=@JBIG2_DEVS@
- DEVICE_DEVS8=@SVG_DEVS@
--DEVICE_DEVS9=
-+DEVICE_DEVS9=@SVGA_DEVS@
- DEVICE_DEVS10=
+ DEVICE_DEVS8=
+ DEVICE_DEVS9=@XPS_DEVS@
+-DEVICE_DEVS10=
++DEVICE_DEVS10=@SVGA_DEVS@
DEVICE_DEVS11=
DEVICE_DEVS12=
+ DEVICE_DEVS13=
+--- ghostscript-9.18/devices/gdevl256.c.orig 2016-01-06 21:36:44.772918446 +0100
++++ ghostscript-9.18/devices/gdevl256.c 2016-01-07 16:17:39.900096231 +0100
+@@ -169,8 +169,7 @@
+ gx_color_index
+ lvga256_map_rgb_color(gx_device * dev, const gx_color_value cv[])
+ {
+- gx_color_value r, g, b;
+- r = cv[0]; g = cv[1]; b = cv[2];
++ gx_color_value r = cv[0], g = cv[1], b = cv[2];
+ #define cv_bits(v,n) (v >> (gx_color_value_bits - n))
+ ushort r5 = cv_bits(r, 5), g5 = cv_bits(g, 5), b5 = cv_bits(b, 5);
+ static const byte cube_bits[32] =
================================================================
---- gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/ghostscript.git/commitdiff/4690f9443c10e63fee56e234d69b1d028091d767
More information about the pld-cvs-commit
mailing list