[packages/ghostscript] - up to 9.06

[arekm]

commit e2edb5ec42bb828af30746bb381c519a4208b4af
Author: Arkadiusz Miśkiewicz <arekm at maven.pl>
Date:   Sat Sep 8 21:19:42 2012 +0200

    - up to 9.06

 ghostscript-iccprofiles-initdir.patch | 35 +++++++++++++++++------------------
 ghostscript-time_h.patch              | 12 ------------
 ghostscript.spec                      |  9 ++++-----
 3 files changed, 21 insertions(+), 35 deletions(-)
---
diff --git a/ghostscript.spec b/ghostscript.spec
index 454717a..0b9ad37 100644
--- a/ghostscript.spec
+++ b/ghostscript.spec
@@ -17,17 +17,17 @@ Summary(ja.UTF-8):	PostScript インタープリタ・レンダラー
 Summary(pl.UTF-8):	Bezpłatny interpreter i renderer PostScriptu i PDF
 Summary(tr.UTF-8):	PostScript & PDF yorumlayıcı ve gösterici
 Name:		ghostscript
-Version:	9.05
+Version:	9.06
 Release:	1
 License:	GPL v3+
 Group:		Applications/Graphics
 Source0:	http://downloads.sourceforge.net/ghostscript/%{name}-%{version}.tar.bz2
-# Source0-md5:	8bcef1f33ddf8a4d12b2cf8da385c191
+# Source0-md5:	46f9ebe40dc52755287b30704270db11
 Source1:	http://www.mif.pg.gda.pl/homepages/ankry/man-PLD/%{name}-non-english-man-pages.tar.bz2
 # Source1-md5:	9b5953aa0cc155f4364f20036b848585
 Patch0:		%{name}-missquotes.patch
 Patch1:		%{name}-setuid.patch
-Patch2:		%{name}-time_h.patch
+
 Patch3:		%{name}-svga-shared.patch
 Patch5:		%{name}-cups-sh.patch
 Patch6:		%{name}-gdevcd8-fixes.patch
@@ -210,7 +210,7 @@ Statyczna wersja biblioteki IJS.
 %setup -q
 %patch0 -p1
 %patch1 -p1
-%patch2 -p1
+
 %patch3 -p1
 
 %patch5 -p1
@@ -325,7 +325,6 @@ rm -rf $RPM_BUILD_ROOT
 %files
 %defattr(644,root,root,755)
 %doc %{_docdir}/%{name}-%{version}
-%attr(755,root,root) %{_bindir}/dumphint
 %attr(755,root,root) %{_bindir}/dvipdf
 %attr(755,root,root) %{_bindir}/eps2eps
 %attr(755,root,root) %{_bindir}/font2c
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-time_h.patch b/ghostscript-time_h.patch
deleted file mode 100644
index de47066..0000000
--- a/ghostscript-time_h.patch
+++ /dev/null
@@ -1,12 +0,0 @@
---- gs6.50/base/time_.h.wiget	Tue Feb 20 13:20:40 2001
-+++ gs6.50/base/time_.h	Tue Feb 20 13:21:30 2001
-@@ -37,6 +37,9 @@
-  * The HAVE_SYS_TIME_H switch in gconfig_.h reflects this.
-  */
- #ifdef HAVE_SYS_TIME_H
-+#  ifdef __linux__
-+#    include <time.h>
-+#  endif
- #  include <sys/time.h>
- #  if defined(Plan9) || defined(M_UNIX) || defined(_IBMR2) || defined(_SEQUENT_)	/* Plan 9, SCO, AIX and Sequent's DYNIX/ptx need both time.h and sys/time.h! */
- #    include <time.h>
================================================================

---- gitweb:

http://git.pld-linux.org/gitweb.cgi/packages/ghostscript.git/commitdiff/e2edb5ec42bb828af30746bb381c519a4208b4af