summaryrefslogtreecommitdiffstats
path: root/meta/recipes-extended/ghostscript/ghostscript
diff options
context:
space:
mode:
Diffstat (limited to 'meta/recipes-extended/ghostscript/ghostscript')
-rw-r--r--meta/recipes-extended/ghostscript/ghostscript/avoid-host-contamination.patch14
-rw-r--r--meta/recipes-extended/ghostscript/ghostscript/base-genht.c-add-a-preprocessor-define-to-allow-fope.patch42
-rw-r--r--meta/recipes-extended/ghostscript/ghostscript/cups-no-gcrypt.patch37
-rw-r--r--meta/recipes-extended/ghostscript/ghostscript/ghostscript-9.15-parallel-make.patch28
-rw-r--r--meta/recipes-extended/ghostscript/ghostscript/ghostscript-9.21-native-fix-disable-system-libtiff.patch47
-rw-r--r--meta/recipes-extended/ghostscript/ghostscript/ghostscript-9.21-prevent_recompiling.patch78
-rw-r--r--meta/recipes-extended/ghostscript/ghostscript/mkdir-p.patch50
7 files changed, 5 insertions, 291 deletions
diff --git a/meta/recipes-extended/ghostscript/ghostscript/avoid-host-contamination.patch b/meta/recipes-extended/ghostscript/ghostscript/avoid-host-contamination.patch
index e8cb16c36b..67f14bd368 100644
--- a/meta/recipes-extended/ghostscript/ghostscript/avoid-host-contamination.patch
+++ b/meta/recipes-extended/ghostscript/ghostscript/avoid-host-contamination.patch
@@ -1,12 +1,11 @@
1From 0ccbaa134093bf6afc79f2d20d061bca5a8754ed Mon Sep 17 00:00:00 2001 1From b36713c8f1ba0e5755b78845a433354a63663b1a Mon Sep 17 00:00:00 2001
2From: Kai Kang <kai.kang@windriver.com> 2From: Kai Kang <kai.kang@windriver.com>
3Date: Thu, 29 Mar 2018 16:02:05 +0800 3Date: Thu, 29 Mar 2018 16:02:05 +0800
4Subject: [PATCH 04/10] avoid host contamination 4Subject: [PATCH] avoid host contamination
5 5
6Remove hardcode path refer to host to avoid host contamination. 6Remove hardcode path refer to host to avoid host contamination.
7 7
8Upstream-Status: Inappropriate [embedded specific] 8Upstream-Status: Pending
9
10Signed-off-by: Kai Kang <kai.kang@windriver.com> 9Signed-off-by: Kai Kang <kai.kang@windriver.com>
11 10
12Rebase to 9.23 11Rebase to 9.23
@@ -16,10 +15,10 @@ Signed-off-by: Hongxu Jia <hongxu.jia@windriver.com>
16 1 file changed, 1 insertion(+), 1 deletion(-) 15 1 file changed, 1 insertion(+), 1 deletion(-)
17 16
18diff --git a/devices/devs.mak b/devices/devs.mak 17diff --git a/devices/devs.mak b/devices/devs.mak
19index 846aa50..9570182 100644 18index 186f704..88ab8c9 100644
20--- a/devices/devs.mak 19--- a/devices/devs.mak
21+++ b/devices/devs.mak 20+++ b/devices/devs.mak
22@@ -393,7 +393,7 @@ $(DEVOBJ)gdevxalt.$(OBJ) : $(DEVSRC)gdevxalt.c $(GDEVX) $(math__h) $(memory__h)\ 21@@ -397,7 +397,7 @@ $(DEVOBJ)gdevxalt.$(OBJ) : $(DEVSRC)gdevxalt.c $(GDEVX) $(math__h) $(memory__h)\
23 ### NON PORTABLE, ONLY UNIX WITH GCC SUPPORT 22 ### NON PORTABLE, ONLY UNIX WITH GCC SUPPORT
24 23
25 $(DEVOBJ)X11.so : $(x11alt_) $(x11_) $(DEVS_MAK) $(MAKEDIRS) 24 $(DEVOBJ)X11.so : $(x11alt_) $(x11_) $(DEVS_MAK) $(MAKEDIRS)
@@ -28,6 +27,3 @@ index 846aa50..9570182 100644
28 27
29 ###### --------------- Memory-buffered printer devices --------------- ###### 28 ###### --------------- Memory-buffered printer devices --------------- ######
30 29
31--
321.8.3.1
33
diff --git a/meta/recipes-extended/ghostscript/ghostscript/base-genht.c-add-a-preprocessor-define-to-allow-fope.patch b/meta/recipes-extended/ghostscript/ghostscript/base-genht.c-add-a-preprocessor-define-to-allow-fope.patch
deleted file mode 100644
index 7d80066a80..0000000000
--- a/meta/recipes-extended/ghostscript/ghostscript/base-genht.c-add-a-preprocessor-define-to-allow-fope.patch
+++ /dev/null
@@ -1,42 +0,0 @@
1From 9ca6f795409b988d38dd98bc2a6ecb68a9392312 Mon Sep 17 00:00:00 2001
2From: Hongxu Jia <hongxu.jia@windriver.com>
3Date: Thu, 29 Mar 2018 16:37:40 +0800
4Subject: [PATCH 10/10] base/genht.c: add a preprocessor define to allow fopen
5 calling
6
7The commit in upstream:
8http://git.ghostscript.com/?p=ghostpdl.git;a=commitdiff;h=773c69e46e70bdd5482676437dafd2ca83397643
9
10Replace all fopen calls with gp_fopen and add a preprocessor define so
11that any unintential calls directly to fopen will cause an error.
12
13Only exceptions are those in the platform specific code, and mkromfs.c.
14This patch add a preprocessor define to allow fopen calling in
15base/genht.c.
16
17Upstream-Status: Pending
18
19Rebase to 9.23
20Signed-off-by: Hongxu Jia <hongxu.jia@windriver.com>
21---
22 base/genht.c | 4 ++++
23 1 file changed, 4 insertions(+)
24
25diff --git a/base/genht.c b/base/genht.c
26index e597e72..e96bfb5 100644
27--- a/base/genht.c
28+++ b/base/genht.c
29@@ -16,6 +16,10 @@
30
31 /* Generate C code for compiling halftones into ROM. */
32 #include "malloc_.h"
33+
34+/* prevent gp.h from defining fopen */
35+#define fopen fopen
36+
37 #include "stdio_.h"
38 #include "string_.h"
39 #include "gscdefs.h"
40--
411.8.3.1
42
diff --git a/meta/recipes-extended/ghostscript/ghostscript/cups-no-gcrypt.patch b/meta/recipes-extended/ghostscript/ghostscript/cups-no-gcrypt.patch
deleted file mode 100644
index 4c9bb22fa2..0000000000
--- a/meta/recipes-extended/ghostscript/ghostscript/cups-no-gcrypt.patch
+++ /dev/null
@@ -1,37 +0,0 @@
1From 9129eb7fa9dc160d64a7d9df9279a3b1dae4d793 Mon Sep 17 00:00:00 2001
2From: Jackie Huang <jackie.huang@windriver.com>
3Date: Thu, 29 Mar 2018 16:16:18 +0800
4Subject: [PATCH 08/10] cups no gcrypt
5
6Don't build-depend on libgcrypt, as nothing is used from it
7
8Backported from
9http://www.cups.org/strfiles.php/3308/cups-no-gcrypt.patch
10
11This addresses the cryto dependency seen during build.
12
13Upstream-Status: Backport
14
15Signed-off-by: Jackie Huang <jackie.huang@windriver.com>
16
17Rebase to 9.23
18Signed-off-by: Hongxu Jia <hongxu.jia@windriver.com>
19---
20 cups/libs/cups/http-private.h | 1 -
21 1 file changed, 1 deletion(-)
22
23diff --git a/cups/libs/cups/http-private.h b/cups/libs/cups/http-private.h
24index 99a85c3..a674852 100644
25--- a/cups/libs/cups/http-private.h
26+++ b/cups/libs/cups/http-private.h
27@@ -80,7 +80,6 @@ typedef int socklen_t;
28 # elif defined HAVE_GNUTLS
29 # include <gnutls/gnutls.h>
30 # include <gnutls/x509.h>
31-# include <gcrypt.h>
32 # elif defined(HAVE_CDSASSL)
33 # include <CoreFoundation/CoreFoundation.h>
34 # include <Security/Security.h>
35--
361.8.3.1
37
diff --git a/meta/recipes-extended/ghostscript/ghostscript/ghostscript-9.15-parallel-make.patch b/meta/recipes-extended/ghostscript/ghostscript/ghostscript-9.15-parallel-make.patch
deleted file mode 100644
index 5b57da2a97..0000000000
--- a/meta/recipes-extended/ghostscript/ghostscript/ghostscript-9.15-parallel-make.patch
+++ /dev/null
@@ -1,28 +0,0 @@
1From 04a86a613e0f9bfbbad99874f72217f75e8c53a3 Mon Sep 17 00:00:00 2001
2From: Robert Yang <liezhi.yang@windriver.com>
3Date: Thu, 29 Mar 2018 15:59:05 +0800
4Subject: [PATCH] contrib.mak: fix for parallel build
5
6Upstream-Status: Pending
7
8Signed-off-by: Robert Yang <liezhi.yang@windriver.com>
9
10Rebase to 9.23
11Signed-off-by: Hongxu Jia <hongxu.jia@windriver.com>
12
13---
14 contrib/contrib.mak | 1 +
15 1 file changed, 1 insertion(+)
16
17diff --git a/contrib/contrib.mak b/contrib/contrib.mak
18index 2edee7a..c9100e8 100644
19--- a/contrib/contrib.mak
20+++ b/contrib/contrib.mak
21@@ -1241,6 +1241,7 @@ $(DEVOBJ)gdevalps.$(OBJ) : $(JAPSRC)gdevalps.c $(PDEVH) \
22 ### ----------------- Additional .upp files ---------------- ###
23
24 extra-upp-install: install-libdata
25+ mkdir -p $(DESTDIR)$(gsdatadir)$(D)lib
26 for f in $(CONTRIBSRC)uniprint$(D)*.upp; do \
27 $(INSTALL_DATA) $$f $(DESTDIR)$(gsdatadir)$(D)lib || exit 1; \
28 done
diff --git a/meta/recipes-extended/ghostscript/ghostscript/ghostscript-9.21-native-fix-disable-system-libtiff.patch b/meta/recipes-extended/ghostscript/ghostscript/ghostscript-9.21-native-fix-disable-system-libtiff.patch
deleted file mode 100644
index a382c7f891..0000000000
--- a/meta/recipes-extended/ghostscript/ghostscript/ghostscript-9.21-native-fix-disable-system-libtiff.patch
+++ /dev/null
@@ -1,47 +0,0 @@
1From 0124b1c29b9cfe46d73ae82ce023dd7c5b055744 Mon Sep 17 00:00:00 2001
2From: Hongxu Jia <hongxu.jia@windriver.com>
3Date: Thu, 29 Mar 2018 16:36:12 +0800
4Subject: [PATCH 09/10] ghostscript-native:fix disable-system-libtiff
5
6Modify configure to add the check to make sure
7ghostscrip could work while system-libtiff is
8disabled.
9
10Upstream-Status: Pending
11
12Signed-off-by: Hongxu Jia <hongxu.jia@windriver.com>
13
14Rebase to ghostscript 9.25.
15
16Signed-off-by: Hongxu Jia <hongxu.jia@windriver.com>
17Signed-off-by: Jagadeesh Krishnanjanappa <jkrishnanjanappa@mvista.com>
18---
19 configure.ac | 5 +++++
20 1 file changed, 5 insertions(+)
21
22diff --git a/configure.ac b/configure.ac
23index 80a60b1..f3e9efb 100644
24--- a/configure.ac
25+++ b/configure.ac
26@@ -1319,6 +1319,7 @@ AC_TRY_COMPILE([], [return 0;],
27 CFLAGS=$CGLAGS_STORE
28
29 if test x"$SHARE_LIBTIFF" = x"0" ; then
30+ if test -e $LIBTIFFDIR/configure; then
31 echo "Running libtiff configure script..."
32 olddir=`pwd`
33 if ! test -d "$LIBTIFFCONFDIR" ; then
34@@ -1337,6 +1338,10 @@ if test x"$SHARE_LIBTIFF" = x"0" ; then
35
36 echo
37 echo "Continuing with Ghostscript configuration..."
38+ else
39+ AC_MSG_NOTICE([Could not find local copy of libtiff.
40+Disabling tiff output devices.])
41+ fi
42 fi
43
44 AC_SUBST(SHARE_LIBTIFF)
45--
461.8.3.1
47
diff --git a/meta/recipes-extended/ghostscript/ghostscript/ghostscript-9.21-prevent_recompiling.patch b/meta/recipes-extended/ghostscript/ghostscript/ghostscript-9.21-prevent_recompiling.patch
deleted file mode 100644
index c76915fb81..0000000000
--- a/meta/recipes-extended/ghostscript/ghostscript/ghostscript-9.21-prevent_recompiling.patch
+++ /dev/null
@@ -1,78 +0,0 @@
1From 239d681306a8d97ed10954788d32ba2f4b55f77c Mon Sep 17 00:00:00 2001
2From: Kang Kai <kai.kang@windriver.com>
3Date: Thu, 29 Mar 2018 16:10:16 +0800
4Subject: [PATCH 06/10] prevent recompiling
5
6Just use commands provided by ghostscript-native, preventing recompile
7them when compile ghostscript. Way to enable cross compile.
8
9Upstream-Status: Pending
10
11Signed-off-by: Kang Kai <kai.kang@windriver.com>
12Signed-off-by: Wenzong Fan <wenzong.fan@windriver.com>
13
14Rebase to 9.25
15Signed-off-by: Hongxu Jia <hongxu.jia@windriver.com>
16Signed-off-by: Jagadeesh Krishnanjanappa <jkrishnanjanappa@mvista.com>
17---
18 base/unix-aux.mak | 44 --------------------------------------------
19 1 file changed, 44 deletions(-)
20
21diff --git a/base/unix-aux.mak b/base/unix-aux.mak
22index 5bf72e9..9cb39d7 100644
23--- a/base/unix-aux.mak
24+++ b/base/unix-aux.mak
25@@ -54,50 +54,6 @@ $(AUX)gp_stdia.$(OBJ): $(GLSRC)gp_stdia.
26 $(stdio__h) $(time__h) $(unistd__h) $(gx_h) $(gp_h) $(UNIX_AUX_MAK) $(MAKEDIRS)
27 $(GLCCAUX) $(AUXO_)gp_stdia.$(OBJ) $(C_) $(GLSRC)gp_stdia.c
28
29-# -------------------------- Auxiliary programs --------------------------- #
30-
31-$(ECHOGS_XE): $(GLSRC)echogs.c $(AK) $(stdpre_h) $(UNIX_AUX_MAK) $(MAKEDIRS)
32- $(CCAUX_) $(I_)$(GLSRCDIR)$(_I) $(O_)$(ECHOGS_XE) $(GLSRC)echogs.c $(AUXEXTRALIBS)
33-
34-$(PACKPS_XE): $(GLSRC)pack_ps.c $(stdpre_h) $(UNIX_AUX_MAK) $(MAKEDIRS)
35- $(CCAUX_) $(I_)$(GLSRCDIR)$(_I) $(O_)$(PACKPS_XE) $(GLSRC)pack_ps.c $(AUXEXTRALIBS)
36-
37-# On the RS/6000 (at least), compiling genarch.c with gcc with -O
38-# produces a buggy executable.
39-$(GENARCH_XE): $(GLSRC)genarch.c $(AK) $(GENARCH_DEPS) $(UNIX_AUX_MAK) $(MAKEDIRS)
40- $(CCAUX_) $(I_)$(GLSRCDIR)$(_I) $(O_)$(GENARCH_XE) $(GLSRC)genarch.c $(AUXEXTRALIBS)
41-
42-$(GENCONF_XE): $(GLSRC)genconf.c $(AK) $(GENCONF_DEPS) $(UNIX_AUX_MAK) $(MAKEDIRS)
43- $(CCAUX_) $(I_)$(GLSRCDIR)$(_I) $(O_)$(GENCONF_XE) $(GLSRC)genconf.c $(AUXEXTRALIBS)
44-
45-$(GENDEV_XE): $(GLSRC)gendev.c $(AK) $(GENDEV_DEPS) $(UNIX_AUX_MAK) $(MAKEDIRS)
46- $(CCAUX_) $(I_)$(GLSRCDIR)$(_I) $(O_)$(GENDEV_XE) $(GLSRC)gendev.c $(AUXEXTRALIBS)
47-
48-$(GENHT_XE): $(GLSRC)genht.c $(AK) $(GENHT_DEPS) $(UNIX_AUX_MAK) $(MAKEDIRS)
49- $(CCAUX_) $(GENHT_CFLAGS) $(O_)$(GENHT_XE) $(GLSRC)genht.c $(AUXEXTRALIBS)
50-
51-# To get GS to use the system zlib, you remove/hide the gs/zlib directory
52-# which means that the mkromfs build can't find the zlib source it needs.
53-# So it's split into two targets, one using the zlib source directly.....
54-MKROMFS_OBJS_0=$(MKROMFS_ZLIB_OBJS) $(AUX)gpmisc.$(OBJ) $(AUX)gp_getnv.$(OBJ) \
55- $(AUX)gscdefs.$(OBJ) $(AUX)gp_unix.$(OBJ) $(AUX)gp_unifs.$(OBJ) $(AUX)gp_unifn.$(OBJ) \
56- $(AUX)gp_stdia.$(OBJ) $(AUX)gsutil.$(OBJ) $(AUX)memento.$(OBJ)
57-
58-$(MKROMFS_XE)_0: $(GLSRC)mkromfs.c $(MKROMFS_COMMON_DEPS) $(MKROMFS_OBJS_0) $(UNIX_AUX_MAK) $(MAKEDIRS)
59- $(CCAUX_) $(GENOPTAUX) $(I_)$(GLSRCDIR)$(_I) $(I_)$(GLOBJ)$(_I) $(I_)$(ZSRCDIR)$(_I) $(GLSRC)mkromfs.c $(O_)$(MKROMFS_XE)_0 $(MKROMFS_OBJS_0) $(AUXEXTRALIBS)
60-
61-# .... and one using the zlib library linked via the command line
62-MKROMFS_OBJS_1=$(AUX)gscdefs.$(OBJ) \
63- $(AUX)gpmisc.$(OBJ) $(AUX)gp_getnv.$(OBJ) \
64- $(AUX)gp_unix.$(OBJ) $(AUX)gp_unifs.$(OBJ) $(AUX)gp_unifn.$(OBJ) \
65- $(AUX)gp_stdia.$(OBJ) $(AUX)gsutil.$(OBJ)
66-
67-$(MKROMFS_XE)_1: $(GLSRC)mkromfs.c $(MKROMFS_COMMON_DEPS) $(MKROMFS_OBJS_1) $(UNIX_AUX_MAK) $(MAKEDIRS)
68- $(CCAUX_) $(GENOPTAUX) $(I_)$(GLSRCDIR)$(_I) $(I_)$(GLOBJ)$(_I) $(I_)$(ZSRCDIR)$(_I) $(GLSRC)mkromfs.c $(O_)$(MKROMFS_XE)_1 $(MKROMFS_OBJS_1) $(AUXEXTRALIBS)
69-
70-$(MKROMFS_XE): $(MKROMFS_XE)_$(SHARE_ZLIB) $(UNIX_AUX_MAK) $(MAKEDIRS)
71- $(CP_) $(MKROMFS_XE)_$(SHARE_ZLIB) $(MKROMFS_XE)
72-
73 # Query the environment to construct gconfig_.h.
74 # These are all defined conditionally (except the JasPER one), so that
75 # they can be overridden by settings from the configure script.
76--
771.8.3.1
78
diff --git a/meta/recipes-extended/ghostscript/ghostscript/mkdir-p.patch b/meta/recipes-extended/ghostscript/ghostscript/mkdir-p.patch
deleted file mode 100644
index 3e6d3e3c48..0000000000
--- a/meta/recipes-extended/ghostscript/ghostscript/mkdir-p.patch
+++ /dev/null
@@ -1,50 +0,0 @@
1From 2b23026f8e2a352417fb1c4da94bf69b19bef267 Mon Sep 17 00:00:00 2001
2From: Joe Slater <joe.slater@windriver.com>
3Date: Thu, 29 Mar 2018 16:04:32 +0800
4Subject: [PATCH 05/10] ghostscript: allow directories to be created more than
5 once
6
7When doing parallel builds, we might try to create directories
8more than once. This should not cause an error.
9
10Upstream-Status: Pending
11
12Signed-off-by: Joe Slater <joe.slater@windriver.com>
13
14Rebase to 9.23
15Signed-off-by: Hongxu Jia <hongxu.jia@windriver.com>
16---
17 base/unix-end.mak | 17 ++++++++---------
18 1 file changed, 8 insertions(+), 9 deletions(-)
19
20diff --git a/base/unix-end.mak b/base/unix-end.mak
21index 9ce599a..feff5a6 100644
22--- a/base/unix-end.mak
23+++ b/base/unix-end.mak
24@@ -17,15 +17,14 @@
25 UNIX_END_MAK=$(GLSRC)unix-end.mak $(TOP_MAKEFILES)
26 # Define the rule for building standard configurations.
27 directories: $(UNIX_END_MAK)
28- @if test "$(BINDIR)" != "" -a ! -d $(BINDIR); then mkdir $(BINDIR); fi
29- @if test "$(GLGENDIR)" != "" -a ! -d $(GLGENDIR); then mkdir $(GLGENDIR); fi
30- @if test "$(GLOBJDIR)" != "" -a ! -d $(GLOBJDIR); then mkdir $(GLOBJDIR); fi
31- @if test "$(DEVGENDIR)" != "" -a ! -d $(DEVGENDIR); then mkdir $(DEVGENDIR); fi
32- @if test "$(DEVOBJDIR)" != "" -a ! -d $(DEVOBJDIR); then mkdir $(DEVOBJDIR); fi
33- @if test "$(AUXDIR)" != "" -a ! -d $(AUXDIR); then mkdir $(AUXDIR); fi
34- @if test "$(PSGENDIR)" != "" -a ! -d $(PSGENDIR); then mkdir $(PSGENDIR); fi
35- @if test "$(PSGENDIR)" != "" -a ! -d $(PSGENDIR)/cups; then mkdir $(PSGENDIR)/cups; fi
36- @if test "$(PSOBJDIR)" != "" -a ! -d $(PSOBJDIR); then mkdir $(PSOBJDIR); fi
37+ @if test "$(BINDIR)" != "" -a ! -d $(BINDIR); then mkdir -p $(BINDIR); fi
38+ @if test "$(GLGENDIR)" != "" -a ! -d $(GLGENDIR); then mkdir -p $(GLGENDIR); fi
39+ @if test "$(GLOBJDIR)" != "" -a ! -d $(GLOBJDIR); then mkdir -p $(GLOBJDIR); fi
40+ @if test "$(DEVGENDIR)" != "" -a ! -d $(DEVGENDIR); then mkdir -p $(DEVGENDIR); fi
41+ @if test "$(DEVOBJDIR)" != "" -a ! -d $(DEVOBJDIR); then mkdir -p $(DEVOBJDIR); fi
42+ @if test "$(AUXDIR)" != "" -a ! -d $(AUXDIR); then mkdir -p $(AUXDIR); fi
43+ @if test "$(PSGENDIR)" != "" -a ! -d $(PSGENDIR)/cups; then mkdir -p $(PSGENDIR)/cups; fi
44+ @if test "$(PSOBJDIR)" != "" -a ! -d $(PSOBJDIR); then mkdir -p $(PSOBJDIR); fi
45
46
47 gs: .gssubtarget $(UNIX_END_MAK)
48--
491.8.3.1
50
generated by cgit v1.2.3-54-g00ecf (git 2.39.0) at 2024-05-24 03:21:14 +0000