This commit is contained in:
Tim Waugh 2011-04-04 13:22:24 +01:00
parent 562801bfb7
commit 8ffc6df09a
6 changed files with 25 additions and 1309 deletions

1
.gitignore vendored
View File

@ -28,3 +28,4 @@ ghostscript-8.70.tar.xz
ghostscript-8.71.tar.xz
/ghostscript-9.00.tar.xz
/ghostscript-9.01.tar.bz2
/ghostscript-9.02.tar.bz2

File diff suppressed because it is too large Load Diff

View File

@ -1,17 +1,16 @@
diff -up ghostscript-8.70/cups/cups.mak.cups-filters ghostscript-8.70/cups/cups.mak
--- ghostscript-8.70/cups/cups.mak.cups-filters 2009-10-15 12:42:27.531402610 +0100
+++ ghostscript-8.70/cups/cups.mak 2009-10-15 12:44:14.835402533 +0100
@@ -63,10 +63,10 @@ install-cups: cups
$(INSTALL_PROGRAM) $(PDFTORASTER_XE) $(DESTDIR)$(CUPSSERVERBIN)/filter; \
diff -up ghostscript-9.02/cups/cups.mak.cups-filters ghostscript-9.02/cups/cups.mak
--- ghostscript-9.02/cups/cups.mak.cups-filters 2011-02-28 22:31:28.000000000 +0000
+++ ghostscript-9.02/cups/cups.mak 2011-04-04 12:39:23.691844891 +0100
@@ -56,10 +56,8 @@ install-cups: cups
$(INSTALL_PROGRAM) $(GSTORASTER_XE) $(DESTDIR)$(CUPSSERVERBIN)/filter; \
fi
$(INSTALL_PROGRAM) cups/pstopxl $(DESTDIR)$(CUPSSERVERBIN)/filter
- -mkdir -p $(DESTDIR)$(CUPSSERVERROOT)
- $(INSTALL_DATA) cups/pstoraster.convs $(DESTDIR)$(CUPSSERVERROOT)
- if [ "$(CUPSPDFTORASTER)" = "1" ]; then \
- $(INSTALL_DATA) cups/gstoraster.convs $(DESTDIR)$(CUPSSERVERROOT); \
- fi
+ -mkdir -p $(DESTDIR)$(CUPSDATA)/mime
+ $(INSTALL_DATA) cups/pstoraster.convs $(DESTDIR)$(CUPSDATA)/mime
if [ "$(CUPSPDFTORASTER)" = "1" ]; then \
- $(INSTALL_DATA) cups/pdftoraster.convs $(DESTDIR)$(CUPSSERVERROOT); \
+ $(INSTALL_DATA) cups/pdftoraster.convs $(DESTDIR)$(CUPSDATA)/mime; \
fi
+ $(INSTALL_DATA) cups/gstoraster.convs $(DESTDIR)$(CUPSDATA)/mime
-mkdir -p $(DESTDIR)$(CUPSDATA)/model
$(INSTALL_DATA) cups/pxlcolor.ppd $(DESTDIR)$(CUPSDATA)/model
$(INSTALL_DATA) cups/pxlmono.ppd $(DESTDIR)$(CUPSDATA)/model

View File

@ -1,17 +1,11 @@
diff -up ghostscript-9.00/cups/gdevcups.c.gdevcups-debug-uninit ghostscript-9.00/cups/gdevcups.c
--- ghostscript-9.00/cups/gdevcups.c.gdevcups-debug-uninit 2010-08-12 19:10:47.000000000 +0100
+++ ghostscript-9.00/cups/gdevcups.c 2010-10-14 17:39:39.834994296 +0100
@@ -807,9 +807,10 @@ cups_get_matrix(gx_device *pdev, /* I -
diff -up ghostscript-9.02/cups/gdevcups.c.gdevcups-debug-uninit ghostscript-9.02/cups/gdevcups.c
--- ghostscript-9.02/cups/gdevcups.c.gdevcups-debug-uninit 2011-03-07 15:40:13.000000000 +0000
+++ ghostscript-9.02/cups/gdevcups.c 2011-04-04 12:40:48.995443449 +0100
@@ -815,6 +815,7 @@ cups_get_matrix(gx_device *pdev, /* I -
dprintf4("DEBUG2: PageSize = [ %d %d ], HWResolution = [ %d %d ]\n",
cups->header.PageSize[0], cups->header.PageSize[1],
cups->header.HWResolution[0], cups->header.HWResolution[1]);
- dprintf4("DEBUG2: HWMargins = [ %.3f %.3f %.3f %.3f ]\n",
- pdev->HWMargins[0], pdev->HWMargins[1], pdev->HWMargins[2],
- pdev->HWMargins[3]);
+ if (size_set)
+ dprintf4("DEBUG2: HWMargins = [ %.3f %.3f %.3f %.3f ]\n",
+ pdev->HWMargins[0], pdev->HWMargins[1], pdev->HWMargins[2],
+ pdev->HWMargins[3]);
dprintf6("DEBUG2: matrix = [ %.3f %.3f %.3f %.3f %.3f %.3f ]\n",
pmat->xx, pmat->xy, pmat->yx, pmat->yy, pmat->tx, pmat->ty);
#endif /* DEBUG */
dprintf4("DEBUG2: HWMargins = [ %.3f %.3f %.3f %.3f ]\n",
pdev->HWMargins[0], pdev->HWMargins[1], pdev->HWMargins[2],
pdev->HWMargins[3]);

View File

@ -1,11 +1,11 @@
%define gs_ver 9.01
%define gs_dot_ver 9.01
%define gs_ver 9.02
%define gs_dot_ver 9.02
%{expand: %%define build_with_freetype %{?_with_freetype:1}%{!?_with_freetype:0}}
Summary: A PostScript interpreter and renderer
Name: ghostscript
Version: %{gs_ver}
Release: 3%{?dist}
Release: 1%{?dist}
# Included CMap data is Redistributable, no modification permitted,
# see http://bugzilla.redhat.com/487510
@ -29,7 +29,6 @@ Patch21: ghostscript-jbig2-image-refcount.patch
Patch27: ghostscript-Fontmap.local.patch
Patch28: ghostscript-iccprofiles-initdir.patch
Patch29: ghostscript-gdevcups-debug-uninit.patch
Patch30: ghostscript-colord.patch
Requires: urw-fonts >= 1.1, ghostscript-fonts
Requires: poppler-data
@ -151,9 +150,6 @@ rm -rf libpng zlib jpeg jasper
# gdevcups: don't use uninitialized variables in debugging output.
%patch29 -p1 -b .gdevcups-debug-uninit
# colord: use colord to get the correct device profile
%patch30 -p1 -b .colord
# Convert manual pages to UTF-8
from8859_1() {
iconv -f iso-8859-1 -t utf-8 < "$1" > "${1}_"
@ -346,6 +342,9 @@ rm -rf $RPM_BUILD_ROOT
%{_libdir}/libgs.so
%changelog
* Mon Apr 4 2011 Tim Waugh <twaugh@redhat.com> 9.02-1
- 9.02.
* Thu Mar 10 2011 Tim Waugh <twaugh@redhat.com> 9.01-3
- colord support: prefix printer name with "cups-" to get device ID.

View File

@ -1,3 +1,3 @@
2fbae60417d42779f6488ab897dcaaf6 acro5-cmaps-2001.tar.gz
dfc93dd2aaaf2b86d2fd55f654c13261 adobe-cmaps-200406.tar.gz
9824d6a21ad8b4a831f67601959f1181 ghostscript-9.01.tar.bz2
f67151444bd56a7904579fc75a083dd6 ghostscript-9.02.tar.bz2