From b4ed15bc8b24b3625f1769eb33208b2c86bd0929 Mon Sep 17 00:00:00 2001 From: Tim Waugh Date: Mar 08 2013 12:42:35 +0000 Subject: 9.07. Resolves: rhbz#911517 --- diff --git a/ghostscript-gdevcups-debug-uninit.patch b/ghostscript-gdevcups-debug-uninit.patch index 321f8fa..9122d1f 100644 --- a/ghostscript-gdevcups-debug-uninit.patch +++ b/ghostscript-gdevcups-debug-uninit.patch @@ -1,11 +1,11 @@ -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]); +diff -up ghostscript-9.07/cups/gdevcups.c.gdevcups-debug-uninit ghostscript-9.07/cups/gdevcups.c +--- ghostscript-9.07/cups/gdevcups.c.gdevcups-debug-uninit 2013-02-14 07:58:16.000000000 +0000 ++++ ghostscript-9.07/cups/gdevcups.c 2013-02-14 17:16:59.677951232 +0000 +@@ -830,6 +830,7 @@ cups_get_matrix(gx_device *pdev, /* I - + dmprintf4(pdev->memory, "DEBUG2: PageSize = [ %d %d ], HWResolution = [ %d %d ]\n", + cups->header.PageSize[0], cups->header.PageSize[1], + cups->header.HWResolution[0], cups->header.HWResolution[1]); + if (size_set) - dprintf4("DEBUG2: HWMargins = [ %.3f %.3f %.3f %.3f ]\n", - pdev->HWMargins[0], pdev->HWMargins[1], pdev->HWMargins[2], - pdev->HWMargins[3]); + dmprintf4(pdev->memory, "DEBUG2: HWMargins = [ %.3f %.3f %.3f %.3f ]\n", + pdev->HWMargins[0], pdev->HWMargins[1], pdev->HWMargins[2], + pdev->HWMargins[3]); diff --git a/ghostscript-icc-missing-check.patch b/ghostscript-icc-missing-check.patch index 0bf2f1f..702d966 100644 --- a/ghostscript-icc-missing-check.patch +++ b/ghostscript-icc-missing-check.patch @@ -1,7 +1,7 @@ -diff -up ghostscript-9.05/base/gsicc_manage.c.icc-missing-check ghostscript-9.05/base/gsicc_manage.c ---- ghostscript-9.05/base/gsicc_manage.c.icc-missing-check 2012-02-08 08:48:48.000000000 +0000 -+++ ghostscript-9.05/base/gsicc_manage.c 2012-04-04 12:39:29.151888287 +0100 -@@ -140,6 +140,8 @@ gsicc_set_iccsmaskprofile(const char *pn +diff -up ghostscript-9.07/base/gsicc_manage.c.icc-missing-check ghostscript-9.07/base/gsicc_manage.c +--- ghostscript-9.07/base/gsicc_manage.c.icc-missing-check 2013-02-14 07:58:13.000000000 +0000 ++++ ghostscript-9.07/base/gsicc_manage.c 2013-02-14 17:15:48.974654828 +0000 +@@ -144,6 +144,8 @@ gsicc_set_iccsmaskprofile(const char *pn if (str != NULL) { icc_profile = gsicc_profile_new(str, mem, pname, namelen); code = sfclose(str); @@ -10,21 +10,21 @@ diff -up ghostscript-9.05/base/gsicc_manage.c.icc-missing-check ghostscript-9.05 /* Get the profile handle */ icc_profile->profile_handle = gsicc_get_profile_handle_buffer(icc_profile->buffer, -@@ -517,6 +519,8 @@ gsicc_set_srcgtag_struct(gsicc_manager_t - icc_profile = - gsicc_profile_new(str, mem, curr_ptr, strlen(curr_ptr)); - code = sfclose(str); -+ } -+ if (str != NULL && icc_profile != NULL) { - gsicc_init_profile_info(icc_profile); - break; - } else { -@@ -1127,6 +1131,8 @@ gsicc_set_device_profile(gx_device * pde +@@ -593,6 +595,8 @@ gsicc_set_srcgtag_struct(gsicc_manager_t + icc_profile = + gsicc_profile_new(str, mem, curr_ptr, strlen(curr_ptr)); + code = sfclose(str); ++ } ++ if (str != NULL && icc_profile != NULL) { + gsicc_init_profile_info(icc_profile); + cmm = gsCMM_DEFAULT; + /* Check if this object is a devicelink profile. +@@ -1516,6 +1520,8 @@ gsicc_set_device_profile(gx_device * pde icc_profile = gsicc_profile_new(str, mem, file_name, strlen(file_name)); code = sfclose(str); + } + if (str != NULL && icc_profile != NULL) { if (pro_enum < gsPROOFPROFILE) { - if_debug1(gs_debug_flag_icc, "[icc] Setting device profile %d\n", pro_enum); - pdev->icc_struct->device_profile[pro_enum] = icc_profile; + if_debug1m(gs_debug_flag_icc, mem, + "[icc] Setting device profile %d\n", pro_enum); diff --git a/ghostscript-ijs-automake-ver.patch b/ghostscript-ijs-automake-ver.patch deleted file mode 100644 index b27e277..0000000 --- a/ghostscript-ijs-automake-ver.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff -urNp ghostscript-9.01.old/ijs/Makefile.am ghostscript-9.01/ijs/Makefile.am ---- ghostscript-9.01.old/ijs/Makefile.am 2011-03-08 10:09:33.055722164 +0000 -+++ ghostscript-9.01/ijs/Makefile.am 2011-03-08 10:09:37.390722163 +0000 -@@ -24,7 +24,7 @@ - - ## Process this file with automake to produce Makefile.in. - --AUTOMAKE_OPTIONS = 1.6 foreign dist-bzip2 no-dependencies -+AUTOMAKE_OPTIONS = 1.8 foreign dist-bzip2 no-dependencies - - @SET_MAKE@ - diff --git a/ghostscript.spec b/ghostscript.spec index ea482e8..d618f9a 100644 --- a/ghostscript.spec +++ b/ghostscript.spec @@ -1,11 +1,11 @@ -%define gs_ver 9.06 -%define gs_dot_ver 9.06 +%define gs_ver 9.07 +%define gs_dot_ver 9.07 %{expand: %%define build_with_freetype %{?_with_freetype:1}%{!?_with_freetype:0}} Summary: A PostScript interpreter and renderer Name: ghostscript Version: %{gs_ver} -Release: 7%{?dist} +Release: 1%{?dist} # Included CMap data is Redistributable, no modification permitted, # see http://bugzilla.redhat.com/487510 @@ -19,7 +19,6 @@ Source4: cidfmap Patch1: ghostscript-multilib.patch Patch2: ghostscript-scripts.patch Patch3: ghostscript-noopt.patch -Patch4: ghostscript-ijs-automake-ver.patch Patch5: ghostscript-runlibfileifexists.patch Patch6: ghostscript-icc-missing-check.patch Patch10: ghostscript-cups-filters.patch @@ -41,7 +40,7 @@ BuildRequires: libtool BuildRequires: jasper-devel BuildRequires: dbus-devel BuildRequires: poppler-data -BuildRequires: lcms2-devel +BuildRequires: lcms2-devel >= 2.4-5 BuildRequires: openjpeg-devel %{?_with_freetype:BuildRequires: freetype-devel} BuildRoot: %{_tmppath}/%{name}-%{gs_ver}-root @@ -114,10 +113,6 @@ rm -rf expat freetype icclib jasper jpeg lcms2 libpng openjpeg zlib cups/libs # Build igcref.c with -O0 to work around bug #150771. %patch3 -p1 -b .noopt -# Fix ./autgen.sh in ijs sub-project -# See http://bugs.ghostscript.com/show_bug.cgi?id=692040 for details. -%patch4 -p1 -b .ijs-automake-ver - # Define .runlibfileifexists. %patch5 -p1 @@ -333,6 +328,9 @@ rm -rf $RPM_BUILD_ROOT %{_libdir}/libgs.so %changelog +* Fri Mar 8 2013 Tim Waugh - 9.07-1 +- 9.07. + * Wed Feb 13 2013 Fedora Release Engineering - 9.06-7 - Rebuilt for https://fedoraproject.org/wiki/Fedora_19_Mass_Rebuild @@ -1261,7 +1259,7 @@ rm -rf $RPM_BUILD_ROOT * Thu Aug 9 2001 Yukihiro Nakai 6.51-5 - Add cjk resources -* Thu Aug 1 2001 Crutcher Dunnavant 6.51-4 +* Wed Aug 1 2001 Crutcher Dunnavant 6.51-4 - applied drepper@redhat.com's patch for #50300 - fixed build deps on zlib-devel and libpng-devel, #49853 - made gs_init.ps a config file; #25096