rpms/ghostscript
3
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

- Build with jasper again (bug #433897). Build requires jasper-devel, and a

Browse Source 
patch to remote jas_set_error_cb reference.
This commit is contained in:
Tim Waugh 2008-02-22 14:25:28 +00:00
parent 2cf528ec0f
commit 1fa2af9aa9
2 changed files with 35 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
ghostscript-system-jasper.patch Normal file
View File

@ -0,0 +1,26 @@
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);

11
ghostscript.spec
View File

@ -5,7 +5,7 @@ Summary: A PostScript(TM) interpreter and renderer.
Name: ghostscript Name: ghostscript
Version: %{gs_ver} Version: %{gs_ver}
Release: 8%{?dist} Release: 9%{?dist}
License: GPLv2 License: GPLv2
URL: http://www.ghostscript.com/ URL: http://www.ghostscript.com/
@ -21,6 +21,7 @@ Patch4: ghostscript-fPIC.patch
Patch5: http://www.openprinting.org/download/printing/esp-gpl-ghostscript-merge/ghostscript-8.57-ijs-krgb.patch Patch5: http://www.openprinting.org/download/printing/esp-gpl-ghostscript-merge/ghostscript-8.57-ijs-krgb.patch
Patch6: ghostscript-runlibfileifexists.patch Patch6: ghostscript-runlibfileifexists.patch
Patch7: ghostscript-gsbug689577.patch Patch7: ghostscript-gsbug689577.patch
Patch8: ghostscript-system-jasper.patch
Requires: urw-fonts >= 1.1, ghostscript-fonts Requires: urw-fonts >= 1.1, ghostscript-fonts
BuildRequires: libjpeg-devel, libXt-devel BuildRequires: libjpeg-devel, libXt-devel
@ -31,6 +32,7 @@ BuildRequires: libxml2-devel
BuildRequires: libtiff-devel BuildRequires: libtiff-devel
BuildRequires: cups-devel >= 1.1.13 BuildRequires: cups-devel >= 1.1.13
BuildRequires: libtool BuildRequires: libtool
BuildRequires: jasper-devel
%{?_with_freetype:BuildRequires: freetype-devel} %{?_with_freetype:BuildRequires: freetype-devel}
BuildRoot: %{_tmppath}/%{name}-%{gs_ver}-root BuildRoot: %{_tmppath}/%{name}-%{gs_ver}-root
@ -96,6 +98,8 @@ rm -rf libpng zlib jpeg jasper
# Upstream patch for bug #416321. # Upstream patch for bug #416321.
%patch7 -p1 -b .gsbug689577 %patch7 -p1 -b .gsbug689577
%patch8 -p1 -b .system-jasper
# Convert manual pages to UTF-8 # Convert manual pages to UTF-8
from8859_1() { from8859_1() {
iconv -f iso-8859-1 -t utf-8 < "$1" > "${1}_" iconv -f iso-8859-1 -t utf-8 < "$1" > "${1}_"
@ -125,7 +129,6 @@ do
FONTPATH="$FONTPATH${FONTPATH:+:}$path" FONTPATH="$FONTPATH${FONTPATH:+:}$path"
done done
%configure --with-ijs --enable-dynamic --with-fontpath="$FONTPATH" \ %configure --with-ijs --enable-dynamic --with-fontpath="$FONTPATH" \
--without-jasper \
--with-drivers=ALL --disable-compile-inits --with-drivers=ALL --disable-compile-inits
# Build IJS # Build IJS
@ -267,6 +270,10 @@ rm -rf $RPM_BUILD_ROOT
%{_libdir}/libgs.so %{_libdir}/libgs.so
%changelog %changelog
* Fri Feb 22 2008 Tim Waugh <twaugh@redhat.com> 8.61-9
- Build with jasper again (bug #433897). Build requires jasper-devel, and
a patch to remote jas_set_error_cb reference.
* Wed Feb 13 2008 Tim Waugh <twaugh@redhat.com> 8.61-8 * Wed Feb 13 2008 Tim Waugh <twaugh@redhat.com> 8.61-8
- Rebuild for GCC 4.3. - Rebuild for GCC 4.3.