[ghostscript] 9.06.

Tim Waugh twaugh at fedoraproject.org
Thu Aug 9 13:30:35 UTC 2012


commit 068e7291ae1382c76b0faa998c39af9ea3082bae
Author: Tim Waugh <twaugh at redhat.com>
Date:   Thu Aug 9 14:30:22 2012 +0100

    9.06.

 .gitignore                            |    1 +
 ghostscript-iccprofiles-initdir.patch |   35 ++++++++++++++++-----------------
 ghostscript-runlibfileifexists.patch  |   18 ++++++++--------
 ghostscript.spec                      |    9 +++++--
 sources                               |    2 +-
 5 files changed, 34 insertions(+), 31 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index eb23678..db6db1d 100644
--- a/.gitignore
+++ b/.gitignore
@@ -31,3 +31,4 @@ ghostscript-8.71.tar.xz
 /ghostscript-9.02.tar.bz2
 /ghostscript-9.04.tar.bz2
 /ghostscript-9.05.tar.bz2
+/ghostscript-9.06.tar.bz2
diff --git a/ghostscript-iccprofiles-initdir.patch b/ghostscript-iccprofiles-initdir.patch
index 3c827e0..b47511c 100644
--- a/ghostscript-iccprofiles-initdir.patch
+++ b/ghostscript-iccprofiles-initdir.patch
@@ -1,17 +1,16 @@
-diff -up ghostscript-9.04rc1/psi/zusparam.c.iccprofiles-initdir ghostscript-9.04rc1/psi/zusparam.c
---- ghostscript-9.04rc1/psi/zusparam.c.iccprofiles-initdir	2011-07-29 10:42:52.000000000 +0100
-+++ ghostscript-9.04rc1/psi/zusparam.c	2011-08-01 12:32:41.203228412 +0100
-@@ -605,6 +605,8 @@ set_default_gray_icc(i_ctx_t *i_ctx_p, g
-     return code;
- }
+diff -up ghostscript-9.06/base/gsicc_manage.c.iccprofiles-initdir ghostscript-9.06/base/gsicc_manage.c
+--- ghostscript-9.06/base/gsicc_manage.c.iccprofiles-initdir	2012-08-09 13:58:22.102364807 +0100
++++ ghostscript-9.06/base/gsicc_manage.c	2012-08-09 14:09:24.495864641 +0100
+@@ -38,6 +38,7 @@
+ #include "gsicc_create.h"
+ #include "gpmisc.h"
+ #include "gxdevice.h"
++#include "gxiodev.h"
  
-+extern_gx_io_device_table();
-+
- static void
- current_icc_directory(i_ctx_t *i_ctx_p, gs_param_string * pval)
- {
-@@ -612,8 +614,21 @@ current_icc_directory(i_ctx_t *i_ctx_p, 
-     const gs_lib_ctx_t *lib_ctx = ((gs_imager_state *)igs)->memory->gs_lib_ctx;
+ #define ICC_HEADER_SIZE 128
+ 
+@@ -2176,8 +2177,21 @@ gs_currenticcdirectory(const gs_state *
+     const gs_lib_ctx_t *lib_ctx = pgs->memory->gs_lib_ctx;
  
      if (lib_ctx->profiledir == NULL) {
 -        pval->data = (const byte *)rfs;
@@ -20,17 +19,17 @@ diff -up ghostscript-9.04rc1/psi/zusparam.c.iccprofiles-initdir ghostscript-9.04
 +	int i;
 +
 +	for (i = 0; i < gx_io_device_table_count; i++) {
-+	    const gx_io_device *iodev = gx_io_device_table[i];
++	    const gx_io_device *iodev = lib_ctx->io_device_table[i];
 +	    const char *dname = iodev->dname;
 +
-+	    if (dname && strlen(dname) == 5 && !memcpy("%rom%", dname, 5)) {
++	    if (dname && strlen(dname) == 5 && !memcmp("%rom%", dname, 5)) {
 +		have_rom_device = 1;
 +		break;
 +	    }
 +	}
 +
-+        pval->data = (const byte *) (have_rom_device ? rfs : "");
-+        pval->size = strlen(pval->data);
++        pval->data = (const byte *)(have_rom_device ? rfs : "");
++        pval->size = strlen((const char *)pval->data);
+         pval->persistent = true;
      } else {
          pval->data = (const byte *)(lib_ctx->profiledir);
-         pval->size = lib_ctx->profiledir_len;
diff --git a/ghostscript-runlibfileifexists.patch b/ghostscript-runlibfileifexists.patch
index 423d6ef..53cd5ca 100644
--- a/ghostscript-runlibfileifexists.patch
+++ b/ghostscript-runlibfileifexists.patch
@@ -1,7 +1,7 @@
-diff -up ghostscript-9.05/Resource/Init/gs_fonts.ps.runlibfileifexists ghostscript-9.05/Resource/Init/gs_fonts.ps
---- ghostscript-9.05/Resource/Init/gs_fonts.ps.runlibfileifexists	2012-02-08 08:48:49.000000000 +0000
-+++ ghostscript-9.05/Resource/Init/gs_fonts.ps	2012-02-09 12:15:50.651367207 +0000
-@@ -96,10 +96,19 @@ userdict /Fontmap .FontDirectory maxleng
+diff -up ghostscript-9.06/Resource/Init/gs_fonts.ps.runlibfileifexists ghostscript-9.06/Resource/Init/gs_fonts.ps
+--- ghostscript-9.06/Resource/Init/gs_fonts.ps.runlibfileifexists	2012-08-08 09:01:36.000000000 +0100
++++ ghostscript-9.06/Resource/Init/gs_fonts.ps	2012-08-09 08:23:46.750732348 +0100
+@@ -95,10 +95,19 @@ userdict /Fontmap .FontDirectory maxleng
                  % stack: dict file fontname filename|aliasname
        1 index type /stringtype eq
        1 index type /nametype eq and 1 index xcheck and
@@ -24,10 +24,10 @@ diff -up ghostscript-9.05/Resource/Init/gs_fonts.ps.runlibfileifexists ghostscri
        } {
                  % This is a real entry.
                  % Read and pop tokens until a semicolon.
-diff -up ghostscript-9.05/Resource/Init/gs_init.ps.runlibfileifexists ghostscript-9.05/Resource/Init/gs_init.ps
---- ghostscript-9.05/Resource/Init/gs_init.ps.runlibfileifexists	2012-02-08 08:48:49.000000000 +0000
-+++ ghostscript-9.05/Resource/Init/gs_init.ps	2012-02-09 12:15:50.652367207 +0000
-@@ -679,6 +679,14 @@ systemdict /internaldict dup .makeintern
+diff -up ghostscript-9.06/Resource/Init/gs_init.ps.runlibfileifexists ghostscript-9.06/Resource/Init/gs_init.ps
+--- ghostscript-9.06/Resource/Init/gs_init.ps.runlibfileifexists	2012-08-08 09:01:36.000000000 +0100
++++ ghostscript-9.06/Resource/Init/gs_init.ps	2012-08-09 08:23:46.750732348 +0100
+@@ -678,6 +678,14 @@ systemdict /internaldict dup .makeintern
             { /undefinedfilename signalerror }
            ifelse
          } bind def
@@ -42,7 +42,7 @@ diff -up ghostscript-9.05/Resource/Init/gs_init.ps.runlibfileifexists ghostscrip
  /selectdevice
          { finddevice setdevice .setdefaultscreen } bind def
  /signalerror		% <object> <errorname> signalerror -
-@@ -847,6 +855,7 @@ userdict /.currentresourcefile //null pu
+@@ -846,6 +854,7 @@ userdict /.currentresourcefile //null pu
          } bind def
  % Temporarily substitute it for the real runlibfile.
  /.runlibfile /runlibfile load def
diff --git a/ghostscript.spec b/ghostscript.spec
index 4462181..7b522d6 100644
--- a/ghostscript.spec
+++ b/ghostscript.spec
@@ -1,11 +1,11 @@
-%define gs_ver 9.05
-%define gs_dot_ver 9.05
+%define gs_ver 9.06
+%define gs_dot_ver 9.06
 %{expand: %%define build_with_freetype %{?_with_freetype:1}%{!?_with_freetype:0}}
 Summary: A PostScript interpreter and renderer
 Name: ghostscript
 Version: %{gs_ver}
 
-Release: 5%{?dist}
+Release: 1%{?dist}
 
 # Included CMap data is Redistributable, no modification permitted,
 # see http://bugzilla.redhat.com/487510
@@ -329,6 +329,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_libdir}/libgs.so
 
 %changelog
+* Wed Aug  8 2012 Tim Waugh <twaugh at redhat.com> - 9.06-1
+- 9.06.
+
 * Thu Jul 19 2012 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 9.05-5
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild
 
diff --git a/sources b/sources
index 32a3456..4ce38f1 100644
--- a/sources
+++ b/sources
@@ -1,3 +1,3 @@
 2fbae60417d42779f6488ab897dcaaf6  acro5-cmaps-2001.tar.gz
 dfc93dd2aaaf2b86d2fd55f654c13261  adobe-cmaps-200406.tar.gz
-8bcef1f33ddf8a4d12b2cf8da385c191  ghostscript-9.05.tar.bz2
+46f9ebe40dc52755287b30704270db11  ghostscript-9.06.tar.bz2


More information about the scm-commits mailing list