diff --git a/ghostscript-gdevcups-debug-uninit.patch b/ghostscript-gdevcups-debug-uninit.patch deleted file mode 100644 index 9122d1f..0000000 --- a/ghostscript-gdevcups-debug-uninit.patch +++ /dev/null @@ -1,11 +0,0 @@ -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) - 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.spec b/ghostscript.spec index 668e40c..bff3b05 100644 --- a/ghostscript.spec +++ b/ghostscript.spec @@ -28,7 +28,6 @@ Patch4: ghostscript-runlibfileifexists.patch Patch5: ghostscript-icc-missing-check.patch Patch6: ghostscript-Fontmap.local.patch Patch7: ghostscript-iccprofiles-initdir.patch -Patch8: ghostscript-gdevcups-debug-uninit.patch Patch9: ghostscript-wrf-snprintf.patch Patch10: ghostscript-gs694154.patch Patch11: ghostscript-sys-zlib.patch @@ -128,9 +127,6 @@ rm -rf expat freetype icclib jasper jpeg jpegxr lcms lcms2 libpng openjpeg zlib # Don't assume %%rom%% device is available for initial ICC profile dir. %patch7 -p1 -b .iccprofiles-initdir -# gdevcups: don't use uninitialized variables in debugging output. -%patch8 -p1 -b .gdevcups-debug-uninit - # Use more caution when converting floats to strings (bug #980085). %patch9 -p1 -b .wrf-snprintf @@ -337,6 +333,9 @@ rm -rf $RPM_BUILD_ROOT %{_libdir}/libgs.so %changelog +* Tue Sep 9 2014 Tim Waugh +- No need to apply patch for already-applied gdevcups-debug-uninit. + * Sat Aug 16 2014 Fedora Release Engineering - 9.14-6 - Rebuilt for https://fedoraproject.org/wiki/Fedora_21_22_Mass_Rebuild