rpms/ghostscript/F-8 ghostscript-system-jasper.patch, NONE, 1.1 ghostscript.spec, 1.153, 1.154

[Tim Waugh (twaugh)]

Author: twaugh

Update of /cvs/pkgs/rpms/ghostscript/F-8
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv17909

Modified Files:
	ghostscript.spec 
Added Files:
	ghostscript-system-jasper.patch 
Log Message:
* Fri Feb 22 2008 Tim Waugh <twaugh at redhat.com> 8.61-7
- Build with jasper again (bug #433897).  Build requires jasper-devel, and
  a patch to remove jas_set_error_cb reference.


ghostscript-system-jasper.patch:

--- NEW FILE ghostscript-system-jasper.patch ---
diff -up ghostscript-8.61/src/sjpx.c.system-jasper ghostscript-8.61/src/sjpx.c
--- ghostscript-8.61/src/sjpx.c.system-jasper	2008-02-22 14:10:00.000000000 +0000
+++ ghostscript-8.61/src/sjpx.c	2008-02-22 14:10:15.000000000 +0000
@@ -34,14 +34,6 @@ static void s_jpxd_set_defaults(stream_s
 private_st_jpxd_state(); /* creates a gc object for our state,
 			    defined in sjpx.h */
 
-/* error reporting callback for the jpx library */
-static void
-s_jpx_jas_error_cb(jas_error_t err, char *msg)
-{
-  dprintf2("jasper (code %d) %s", (int)err, msg);
-}
-
-
 /* initialize the steam.
    this involves allocating the stream and image structures, and
    initializing the decoder.
@@ -59,7 +51,6 @@ s_jpxd_init(stream_state * ss)
     }
 
     status = jas_init();
-    jas_set_error_cb(s_jpx_jas_error_cb);
 #ifdef JPX_DEBUG
     /* raise the error reporting threshold from the default (0) */
     jas_setdbglevel(1);


Index: ghostscript.spec
===================================================================
RCS file: /cvs/pkgs/rpms/ghostscript/F-8/ghostscript.spec,v
retrieving revision 1.153
retrieving revision 1.154
diff -u -r1.153 -r1.154
--- ghostscript.spec	28 Jan 2008 15:31:08 -0000	1.153
+++ ghostscript.spec	22 Feb 2008 14:32:48 -0000	1.154
@@ -5,7 +5,7 @@
 Name: ghostscript
 Version: %{gs_ver}
 
-Release: 6%{?dist}
+Release: 7%{?dist}
 
 License: GPLv2
 URL: http://www.ghostscript.com/
@@ -21,6 +21,7 @@
 Patch5: http://www.openprinting.org/download/printing/esp-gpl-ghostscript-merge/ghostscript-8.57-ijs-krgb.patch
 Patch6: ghostscript-runlibfileifexists.patch
 Patch7: ghostscript-gsbug689577.patch
+Patch8: ghostscript-system-jasper.patch
 
 Requires: urw-fonts >= 1.1, ghostscript-fonts
 BuildRequires: libjpeg-devel, libXt-devel
@@ -31,6 +32,7 @@
 BuildRequires: libtiff-devel
 BuildRequires: cups-devel >= 1.1.13
 BuildRequires: libtool
+BuildRequires: jasper-devel
 %{?_with_freetype:BuildRequires: freetype-devel}
 BuildRoot: %{_tmppath}/%{name}-%{gs_ver}-root
 
@@ -96,6 +98,8 @@
 # Upstream patch for bug #416321.
 %patch7 -p1 -b .gsbug689577
 
+%patch8 -p1 -b .system-jasper
+
 # Convert manual pages to UTF-8
 from8859_1() {
 	iconv -f iso-8859-1 -t utf-8 < "$1" > "${1}_"
@@ -267,6 +271,10 @@
 %{_libdir}/libgs.so
 
 %changelog
+* Fri Feb 22 2008 Tim Waugh <twaugh at redhat.com> 8.61-7
+- Build with jasper again (bug #433897).  Build requires jasper-devel, and
+  a patch to remove jas_set_error_cb reference.
+
 * Mon Jan 28 2008 Tim Waugh <twaugh at redhat.com> 8.61-6
 - Don't build with jasper support.
 - Remove bundled libraries.