diff options
| author | Andrew Manison <amanison@anselsystems.com> | 2011-02-16 19:14:26 +0000 |
|---|---|---|
| committer | Andrew Manison <amanison@anselsystems.com> | 2011-02-16 19:14:26 +0000 |
| commit | 71e39ce025e46b17e9634cb8fdeec7af04f2f0fa (patch) | |
| tree | ab6569d59ab7f79ae8cb7c677658f9ba12854069 /main/ghostscript/ghostscript-system-jasper.patch | |
| parent | 01fd4f6611dd2b61cd8ceee01b4a454d74bbbc51 (diff) | |
| parent | 692f71db5a7621fe29b255de3ef9ae973b74eacb (diff) | |
| download | aports-71e39ce025e46b17e9634cb8fdeec7af04f2f0fa.tar.bz2 aports-71e39ce025e46b17e9634cb8fdeec7af04f2f0fa.tar.xz | |
Merge branch 'master' of ssh://git.alpinelinux.org/gitroot/aports-amanison
Conflicts:
main/iaxmodem/APKBUILD
Diffstat (limited to 'main/ghostscript/ghostscript-system-jasper.patch')
| -rw-r--r-- | main/ghostscript/ghostscript-system-jasper.patch | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/main/ghostscript/ghostscript-system-jasper.patch b/main/ghostscript/ghostscript-system-jasper.patch index 444b76029f..dc704468cb 100644 --- a/main/ghostscript/ghostscript-system-jasper.patch +++ b/main/ghostscript/ghostscript-system-jasper.patch @@ -1,9 +1,9 @@ -diff -up ghostscript-8.64/base/sjpx.c.system-jasper ghostscript-8.64/base/sjpx.c ---- ghostscript-8.64/base/sjpx.c.system-jasper 2008-08-21 00:22:49.000000000 +0100 -+++ ghostscript-8.64/base/sjpx.c 2009-02-04 11:35:56.000000000 +0000 -@@ -34,14 +34,6 @@ static void s_jpxd_set_defaults(stream_s +diff -up ghostscript-9.00/base/sjpx.c.system-jasper ghostscript-9.00/base/sjpx.c +--- ghostscript-9.00/base/sjpx.c.system-jasper 2010-08-17 15:31:58.000000000 +0100 ++++ ghostscript-9.00/base/sjpx.c 2010-09-23 09:59:46.747467642 +0100 +@@ -33,14 +33,6 @@ static void s_jpxd_set_defaults(stream_s private_st_jpxd_state(); /* creates a gc object for our state, - defined in sjpx.h */ + defined in sjpx.h */ -/* error reporting callback for the jpx library */ -static void @@ -16,7 +16,7 @@ diff -up ghostscript-8.64/base/sjpx.c.system-jasper ghostscript-8.64/base/sjpx.c /* 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) +@@ -56,7 +48,6 @@ s_jpxd_init(stream_state * ss) } status = jas_init(); |