summaryrefslogtreecommitdiff
path: root/print/ghostscript-gpl/patches
diff options
context:
space:
mode:
Diffstat (limited to 'print/ghostscript-gpl/patches')
-rw-r--r--print/ghostscript-gpl/patches/patch-CVE-2012-44052
-rw-r--r--print/ghostscript-gpl/patches/patch-af14
-rw-r--r--print/ghostscript-gpl/patches/patch-ah31
-rw-r--r--print/ghostscript-gpl/patches/patch-ai2
-rw-r--r--print/ghostscript-gpl/patches/patch-aj2
-rw-r--r--print/ghostscript-gpl/patches/patch-al10
-rw-r--r--print/ghostscript-gpl/patches/patch-an2
-rw-r--r--print/ghostscript-gpl/patches/patch-base_configure_ac31
-rw-r--r--print/ghostscript-gpl/patches/patch-base_gdevpng.c2
-rw-r--r--print/ghostscript-gpl/patches/patch-base_gserrors_h2
-rw-r--r--print/ghostscript-gpl/patches/patch-configure.ac15
-rw-r--r--print/ghostscript-gpl/patches/patch-openjpeg_libopenjpeg_opj_malloc_h10
12 files changed, 66 insertions, 57 deletions
diff --git a/print/ghostscript-gpl/patches/patch-CVE-2012-4405 b/print/ghostscript-gpl/patches/patch-CVE-2012-4405
index ea22152319a..033234ff50f 100644
--- a/print/ghostscript-gpl/patches/patch-CVE-2012-4405
+++ b/print/ghostscript-gpl/patches/patch-CVE-2012-4405
@@ -1,4 +1,4 @@
-$NetBSD: patch-CVE-2012-4405,v 1.1 2013/03/16 21:32:01 dholland Exp $
+$NetBSD: patch-CVE-2012-4405,v 1.2 2014/04/26 13:51:40 wiz Exp $
from RedHat bug #854227
diff --git a/print/ghostscript-gpl/patches/patch-af b/print/ghostscript-gpl/patches/patch-af
index e0d6da205c8..58c6de89a48 100644
--- a/print/ghostscript-gpl/patches/patch-af
+++ b/print/ghostscript-gpl/patches/patch-af
@@ -1,4 +1,4 @@
-$NetBSD: patch-af,v 1.2 2013/10/05 05:13:07 ryoon Exp $
+$NetBSD: patch-af,v 1.3 2014/04/26 13:51:40 wiz Exp $
(From the log for revision 1.4 of print/ghostscript/patches/patch-af)
date: 2008/11/13 17:36:54; author: chuck; state: Exp; lines: +22 -4
@@ -14,9 +14,9 @@ XXX: this still leaves the issue of libgs.so (et al.) being hardwired
in PLIST, instead of using libgs.dylib (et al.). i'm not sure of
the best way to fix that. at least it compiles now....
---- base/unix-dll.mak.orig 2012-02-08 08:48:48.000000000 +0000
-+++ base/unix-dll.mak
-@@ -58,13 +58,12 @@ LDFLAGS_SO=-shared -Wl,$(LD_SET_DT_SONAM
+--- base/unix-dll.mak.orig 2012-08-08 17:01:36.000000000 +0900
++++ base/unix-dll.mak 2012-10-10 10:03:50.000000000 +0900
+@@ -59,13 +59,12 @@
# MacOS X
@@ -35,17 +35,17 @@ the best way to fix that. at least it compiles now....
GS_SO=$(BINDIR)/$(GS_SONAME)
GS_SO_MAJOR=$(BINDIR)/$(GS_SONAME_MAJOR)
-@@ -85,11 +84,11 @@ $(GS_SO_MAJOR): $(GS_SO_MAJOR_MINOR)
+@@ -86,11 +85,11 @@
# Build the small Ghostscript loaders, with Gtk+ and without
$(GSSOC_XE): $(GS_SO) $(PSSRC)$(SOC_LOADER)
$(GLCC) -g -o $(GSSOC_XE) $(PSSRC)dxmainc.c \
- -L$(BINDIR) -l$(GS)
-+ -L$(BINDIR) -Wl,-R$(PREFIX)/lib -l$(GS) ${LDFLAGS}
++ -L$(BINDIR) -Wl,-R$(PREFIX)/lib -l$(GS)
$(GSSOX_XE): $(GS_SO) $(PSSRC)$(SOC_LOADER)
$(GLCC) -g $(SOC_CFLAGS) -o $(GSSOX_XE) $(PSSRC)$(SOC_LOADER) \
- -L$(BINDIR) -l$(GS) $(SOC_LIBS)
-+ -L$(BINDIR) -l$(GS) -Wl,-R$(PREFIX)/lib -l$(GS) $(SOC_LIBS) ${LDFLAGS}
++ -L$(BINDIR) -l$(GS) -Wl,-R$(PREFIX)/lib -l$(GS) $(SOC_LIBS)
# ------------------------- Recursive make targets ------------------------- #
diff --git a/print/ghostscript-gpl/patches/patch-ah b/print/ghostscript-gpl/patches/patch-ah
index aadd003a3a4..9476425057e 100644
--- a/print/ghostscript-gpl/patches/patch-ah
+++ b/print/ghostscript-gpl/patches/patch-ah
@@ -1,23 +1,17 @@
-$NetBSD: patch-ah,v 1.2 2014/04/07 07:36:20 richard Exp $
+$NetBSD: patch-ah,v 1.3 2014/04/26 13:51:40 wiz Exp $
(1) First chunk to fix the X11_TYPE=native problem, which
freetype2 in /usr/X11R7/ is way old, and work around to
use ghostscript-provided freetype2.
+ This part is not necessary for NetBSD 6.0, 6.1.
-(2) Second chunk existed from old days, and no idea, sorry (mef@).
+(2) Second chunk for X11_TYPE=native, will have following problem without
+ this patch:
+ | Shared object "libpaper.so.1" not found
---- configure.orig 2012-02-08 08:50:31.000000000 +0000
+--- configure.orig 2012-08-08 17:04:57.000000000 +0900
+++ configure
-@@ -3747,7 +3747,7 @@ CONTRIBINCLUDE="include contrib/contrib.
- INSTALL_CONTRIB="install-contrib-extras"
-
- # This is just an arbitrary file in contrib to check
--if !(test -f contrib/gdevbjc_.c); then
-+if ! (test -f contrib/gdevbjc_.c); then
- enable_contrib=no
- fi
-
-@@ -3775,13 +3775,13 @@ case `uname` in
+@@ -3786,13 +3786,13 @@
;;
*BSD)
if test $ac_cv_c_compiler_gnu = yes; then
@@ -33,7 +27,7 @@ $NetBSD: patch-ah,v 1.2 2014/04/07 07:36:20 richard Exp $
CC_DBG_FLAGS_TO_TRY="-g -O0"
fi
SET_DT_SONAME=""
-@@ -5290,7 +5290,7 @@ fi
+@@ -5331,7 +5331,7 @@
fi
if test x$with_libpaper != xno; then
@@ -42,12 +36,3 @@ $NetBSD: patch-ah,v 1.2 2014/04/07 07:36:20 richard Exp $
$as_echo "#define USE_LIBPAPER 1" >>confdefs.h
-@@ -6426,7 +6426,7 @@ done
- LCUPSINCLUDE="include \$(GLSRCDIR)/lcups.mak"
- LCUPSIINCLUDE="include \$(GLSRCDIR)/lcupsi.mak"
- if ( test x$with_pdftoraster != xno ); then
-- if test "$CUPSVERSION" ">" "1.2"; then
-+ if echo "$CUPSVERSION" | grep -q '^1\.[2-9]'; then
- CUPSPDFTORASTER="1"
- fi
- fi
diff --git a/print/ghostscript-gpl/patches/patch-ai b/print/ghostscript-gpl/patches/patch-ai
index 7e2edfd5f30..0e335ee85ce 100644
--- a/print/ghostscript-gpl/patches/patch-ai
+++ b/print/ghostscript-gpl/patches/patch-ai
@@ -1,4 +1,4 @@
-$NetBSD: patch-ai,v 1.1 2013/03/16 21:32:01 dholland Exp $
+$NetBSD: patch-ai,v 1.2 2014/04/26 13:51:40 wiz Exp $
replace BSD/Linux specific "qd" printf format specifier by "lld",
should fix build problem on Solaris reported by Joern Clausen
diff --git a/print/ghostscript-gpl/patches/patch-aj b/print/ghostscript-gpl/patches/patch-aj
index f264ca04e04..a51a194950a 100644
--- a/print/ghostscript-gpl/patches/patch-aj
+++ b/print/ghostscript-gpl/patches/patch-aj
@@ -1,4 +1,4 @@
-$NetBSD: patch-aj,v 1.1 2013/03/16 21:32:01 dholland Exp $
+$NetBSD: patch-aj,v 1.2 2014/04/26 13:51:40 wiz Exp $
http://bugs.ghostscript.com/show_bug.cgi?id=690883
diff --git a/print/ghostscript-gpl/patches/patch-al b/print/ghostscript-gpl/patches/patch-al
index 253c984e023..26702b8255f 100644
--- a/print/ghostscript-gpl/patches/patch-al
+++ b/print/ghostscript-gpl/patches/patch-al
@@ -1,4 +1,12 @@
-$NetBSD: patch-al,v 1.1 2013/03/16 21:32:01 dholland Exp $
+$NetBSD: patch-al,v 1.2 2014/04/26 13:51:40 wiz Exp $
+
+Echogs is almost strings command and accepts some glue to output
+from its command line. The output, in this case ldt.tr, will be really
+shell script for ld command. The adding words with this patch,
+$(LDFLAGS_SO), will be included in the argument of ld command.
+
+$(LDFLAGS_SO) is defined in patch-af, for Mac OS X, Darwin.
+ -- added by mef@ --
--- base/unixlink.mak.orig 2010-02-18 12:08:31.000000000 +0000
+++ base/unixlink.mak
diff --git a/print/ghostscript-gpl/patches/patch-an b/print/ghostscript-gpl/patches/patch-an
index be397f18fc1..9a3f12c2656 100644
--- a/print/ghostscript-gpl/patches/patch-an
+++ b/print/ghostscript-gpl/patches/patch-an
@@ -1,4 +1,4 @@
-$NetBSD: patch-an,v 1.1 2013/03/16 21:32:01 dholland Exp $
+$NetBSD: patch-an,v 1.2 2014/04/26 13:51:40 wiz Exp $
Do some initialization of global stuff earlier, in particular before
"@file" args get processed, fixes PR pkg/42984 from T. M. Pederson.
diff --git a/print/ghostscript-gpl/patches/patch-base_configure_ac b/print/ghostscript-gpl/patches/patch-base_configure_ac
new file mode 100644
index 00000000000..3942bcb7155
--- /dev/null
+++ b/print/ghostscript-gpl/patches/patch-base_configure_ac
@@ -0,0 +1,31 @@
+$NetBSD: patch-base_configure_ac,v 1.1 2014/04/26 13:51:40 wiz Exp $
+
+The source for configure, see patch-ah
+
+--- base/configure.ac.orig 2012-08-08 17:01:36.000000000 +0900
++++ base/configure.ac 2013-04-08 10:51:50.000000000 +0900
+@@ -142,13 +142,13 @@
+ ;;
+ *BSD)
+ if test $ac_cv_prog_gcc = yes; then
+- CC_OPT_FLAGS_TO_TRY="-O2"
++ CC_OPT_FLAGS_TO_TRY="-O2 -I./freetype/include"
+ CC_DBG_FLAGS_TO_TRY="-g -O0"
+ fi
+ ;;
+ Darwin*)
+ if test $ac_cv_prog_gcc = yes; then
+- CC_OPT_FLAGS_TO_TRY="-O2"
++ CC_OPT_FLAGS_TO_TRY="-O2 -I./freetype/include"
+ CC_DBG_FLAGS_TO_TRY="-g -O0"
+ fi
+ SET_DT_SONAME=""
+@@ -457,7 +457,7 @@
+ fi
+
+ if test x$with_libpaper != xno; then
+- LIBS="$LIBS -lpaper"
++ LIBS="$LIBS -L${LPLIBDIR} -Wl,-R${LPLIBDIR} -lpaper"
+ AC_DEFINE(USE_LIBPAPER, 1, [Using libpaper])
+ CFLAGS="$CFLAGS -DUSE_LIBPAPER"
+ fi
diff --git a/print/ghostscript-gpl/patches/patch-base_gdevpng.c b/print/ghostscript-gpl/patches/patch-base_gdevpng.c
index 6dc9148809f..4ad2ed5944f 100644
--- a/print/ghostscript-gpl/patches/patch-base_gdevpng.c
+++ b/print/ghostscript-gpl/patches/patch-base_gdevpng.c
@@ -1,4 +1,4 @@
-$NetBSD: patch-base_gdevpng.c,v 1.1 2013/03/16 21:32:01 dholland Exp $
+$NetBSD: patch-base_gdevpng.c,v 1.2 2014/04/26 13:51:40 wiz Exp $
The patch was included in patches/patch-ak:
revision 1.5
diff --git a/print/ghostscript-gpl/patches/patch-base_gserrors_h b/print/ghostscript-gpl/patches/patch-base_gserrors_h
index 9c28a432d29..a8786e6f994 100644
--- a/print/ghostscript-gpl/patches/patch-base_gserrors_h
+++ b/print/ghostscript-gpl/patches/patch-base_gserrors_h
@@ -1,4 +1,4 @@
-$NetBSD: patch-base_gserrors_h,v 1.1 2013/03/16 21:32:01 dholland Exp $
+$NetBSD: patch-base_gserrors_h,v 1.2 2014/04/26 13:51:40 wiz Exp $
# This suppresses the noisy warning that __func__ redefined
--- base/gserrors.h.orig 2012-02-08 17:48:48.000000000 +0900
diff --git a/print/ghostscript-gpl/patches/patch-configure.ac b/print/ghostscript-gpl/patches/patch-configure.ac
deleted file mode 100644
index 6d241bb9f3c..00000000000
--- a/print/ghostscript-gpl/patches/patch-configure.ac
+++ /dev/null
@@ -1,15 +0,0 @@
-$NetBSD: patch-configure.ac,v 1.1 2013/03/16 21:32:01 dholland Exp $
-
-See patch-ah (configure)
-
---- base/configure.ac.orig 2011-08-05 20:12:20.000000000 +0900
-+++ base/configure.ac 2011-08-22 19:10:30.000000000 +0900
-@@ -404,7 +404,7 @@
- fi
-
- if test x$with_libpaper != xno; then
-- LIBS="$LIBS -lpaper"
-+ LIBS="$LIBS -L${LPLIBDIR} -Wl,-R${LPLIBDIR} -lpaper"
- AC_DEFINE(USE_LIBPAPER, 1, [Using libpaper])
- CFLAGS="$CFLAGS -DUSE_LIBPAPER"
- fi
diff --git a/print/ghostscript-gpl/patches/patch-openjpeg_libopenjpeg_opj_malloc_h b/print/ghostscript-gpl/patches/patch-openjpeg_libopenjpeg_opj_malloc_h
index 4106c689b12..a03021f124e 100644
--- a/print/ghostscript-gpl/patches/patch-openjpeg_libopenjpeg_opj_malloc_h
+++ b/print/ghostscript-gpl/patches/patch-openjpeg_libopenjpeg_opj_malloc_h
@@ -1,4 +1,4 @@
-$NetBSD: patch-openjpeg_libopenjpeg_opj_malloc_h,v 1.1 2013/03/16 21:32:01 dholland Exp $
+$NetBSD: patch-openjpeg_libopenjpeg_opj_malloc_h,v 1.2 2014/04/26 13:51:40 wiz Exp $
To avoid following problem:
| gcc .. (omitted).. g -o ./sobin/gsc ./psi/dxmainc.c \
@@ -6,14 +6,14 @@ To avoid following problem:
| ./sobin/libgs.so: undefined reference to `memalign'
| gmake[2]: *** [sobin/gsc] Error 1
---- openjpeg/libopenjpeg/opj_malloc.h.orig 2012-04-18 22:36:57.000000000 +0900
-+++ openjpeg/libopenjpeg/opj_malloc.h 2012-04-18 22:54:13.000000000 +0900
+--- openjpeg/libopenjpeg/opj_malloc.h.orig 2012-08-08 17:01:36.000000000 +0900
++++ openjpeg/libopenjpeg/opj_malloc.h 2012-10-08 09:17:03.000000000 +0900
@@ -84,7 +84,7 @@
#if defined(__sun)
#define HAVE_MEMALIGN
/* Linux x86_64 and OSX always align allocations to 16 bytes */
-- #elif !defined(__amd64__) && !defined(__APPLE__)
-+ #elif !defined(__amd64__) && !defined(__APPLE__) && !defined(__NetBSD__) && !defined(__DragonFly__) && !defined(__OpenBSD__)
+- #elif !defined(__amd64__) && !defined(__APPLE__) && !defined(_AIX) && !defined(__FreeBSD__)
++ #elif !defined(__amd64__) && !defined(__APPLE__) && !defined(_AIX) && !defined(__FreeBSD__) && !defined(__NetBSD__) && !defined(__DragonFly__)
#define HAVE_MEMALIGN
#include <malloc.h>
#endif
generated by cgit v1.2.3 (git 2.39.1) at 2025-01-22 11:13:57 +0000