1 |
commit: b7805f02f359138edf4384f2b7df317bfc27e3cb |
2 |
Author: Sam James <sam <AT> gentoo <DOT> org> |
3 |
AuthorDate: Tue Sep 21 19:01:50 2021 +0000 |
4 |
Commit: Sam James <sam <AT> gentoo <DOT> org> |
5 |
CommitDate: Tue Sep 21 19:02:14 2021 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b7805f02 |
7 |
|
8 |
app-text/ghostscript-gpl: add parallel build patch to 9.54.0-r1 |
9 |
|
10 |
Bug: https://bugs.gentoo.org/800125 |
11 |
Signed-off-by: Sam James <sam <AT> gentoo.org> |
12 |
|
13 |
.../ghostscript-gpl-9.54.0-makefile-deps.patch | 110 +++++++++++++++++++++ |
14 |
.../ghostscript-gpl-9.54.0-r1.ebuild | 2 + |
15 |
2 files changed, 112 insertions(+) |
16 |
|
17 |
diff --git a/app-text/ghostscript-gpl/files/ghostscript-gpl-9.54.0-makefile-deps.patch b/app-text/ghostscript-gpl/files/ghostscript-gpl-9.54.0-makefile-deps.patch |
18 |
new file mode 100644 |
19 |
index 00000000000..33858f763db |
20 |
--- /dev/null |
21 |
+++ b/app-text/ghostscript-gpl/files/ghostscript-gpl-9.54.0-makefile-deps.patch |
22 |
@@ -0,0 +1,110 @@ |
23 |
+https://git.ghostscript.com/?p=ghostpdl.git;a=commitdiff;h=4874418fd031617212336b8b55f8fcba3b9cfb68#patch1 |
24 |
+https://bugs.gentoo.org/800125 |
25 |
+ |
26 |
+From: Chris Liddell <chris.liddell@×××××××.com> |
27 |
+Date: Thu, 6 May 2021 12:23:59 +0100 |
28 |
+Subject: [PATCH] Remove makefile reference to non-existent header file |
29 |
+ |
30 |
+Fixes (spurious) parallel make failure on the cluster |
31 |
+--- a/base/lib.mak |
32 |
++++ b/base/lib.mak |
33 |
+@@ -488,7 +488,6 @@ gxcoord_h=$(GLSRC)gxcoord.h |
34 |
+ gxcpath_h=$(GLSRC)gxcpath.h |
35 |
+ gxdda_h=$(GLSRC)gxdda.h |
36 |
+ gxdevbuf_h=$(GLSRC)gxdevbuf.h |
37 |
+-gxdevrop_h=$(GLSRC)gxdevrop.h |
38 |
+ gxdevmem_h=$(GLSRC)gxdevmem.h |
39 |
+ gxdhtres_h=$(GLSRC)gxdhtres.h |
40 |
+ gxfont0_h=$(GLSRC)gxfont0.h |
41 |
+@@ -2407,13 +2406,13 @@ $(GLD)roplib.dev : $(LIB_MAK) $(ECHOGS_XE) $(roplib_) $(LIB_MAK) $(MAKEDIRS) |
42 |
+ |
43 |
+ $(GLOBJ)gdevdrop_1.$(OBJ) : $(GLSRC)gdevdrop.c $(AK) $(gx_h) $(gserrors_h) \ |
44 |
+ $(memory__h) $(gxdevsop_h) $(gsbittab_h) $(gsropt_h) $(gxcindex_h) \ |
45 |
+- $(gxdcolor_h) $(gxdevice_h) $(gxdevmem_h) $(gxdevrop_h) $(gxgetbit_h) \ |
46 |
++ $(gxdcolor_h) $(gxdevice_h) $(gxdevmem_h) $(gxgetbit_h) \ |
47 |
+ $(gdevmem_h) $(gdevmrop_h) $(gdevmpla_h) $(stdint__h) $(LIB_MAK) $(MAKEDIRS) |
48 |
+ $(GLCC) $(D_)WITH_CAL$(_D) $(I_)$(CALSRCDIR)$(_I) $(GLO_)gdevdrop_1.$(OBJ) $(C_) $(GLSRC)gdevdrop.c |
49 |
+ |
50 |
+ $(GLOBJ)gdevdrop_0.$(OBJ) : $(GLSRC)gdevdrop.c $(AK) $(gx_h) $(gserrors_h) \ |
51 |
+ $(memory__h) $(gxdevsop_h) $(gsbittab_h) $(gsropt_h) $(gxcindex_h) \ |
52 |
+- $(gxdcolor_h) $(gxdevice_h) $(gxdevmem_h) $(gxdevrop_h) $(gxgetbit_h) \ |
53 |
++ $(gxdcolor_h) $(gxdevice_h) $(gxdevmem_h) $(gxgetbit_h) \ |
54 |
+ $(gdevmem_h) $(gdevmrop_h) $(gdevmpla_h) $(stdint__h) $(LIB_MAK) $(MAKEDIRS) |
55 |
+ $(GLCC) $(GLO_)gdevdrop_0.$(OBJ) $(C_) $(GLSRC)gdevdrop.c |
56 |
+ |
57 |
+@@ -5585,75 +5584,6 @@ $(GLSRC)gxdevbuf.h:$(GLSRC)std.h |
58 |
+ $(GLSRC)gxdevbuf.h:$(GLSRC)stdpre.h |
59 |
+ $(GLSRC)gxdevbuf.h:$(GLGEN)arch.h |
60 |
+ $(GLSRC)gxdevbuf.h:$(GLSRC)gs_dll_call.h |
61 |
+-$(GLSRC)gxdevrop.h:$(GLSRC)gxdevcli.h |
62 |
+-$(GLSRC)gxdevrop.h:$(GLSRC)gxcmap.h |
63 |
+-$(GLSRC)gxdevrop.h:$(GLSRC)gxtext.h |
64 |
+-$(GLSRC)gxdevrop.h:$(GLSRC)gstext.h |
65 |
+-$(GLSRC)gxdevrop.h:$(GLSRC)gsnamecl.h |
66 |
+-$(GLSRC)gxdevrop.h:$(GLSRC)gstparam.h |
67 |
+-$(GLSRC)gxdevrop.h:$(GLSRC)gxfmap.h |
68 |
+-$(GLSRC)gxdevrop.h:$(GLSRC)gsfunc.h |
69 |
+-$(GLSRC)gxdevrop.h:$(GLSRC)gxcspace.h |
70 |
+-$(GLSRC)gxdevrop.h:$(GLSRC)gxrplane.h |
71 |
+-$(GLSRC)gxdevrop.h:$(GLSRC)gscsel.h |
72 |
+-$(GLSRC)gxdevrop.h:$(GLSRC)gxfcache.h |
73 |
+-$(GLSRC)gxdevrop.h:$(GLSRC)gsfont.h |
74 |
+-$(GLSRC)gxdevrop.h:$(GLSRC)gsimage.h |
75 |
+-$(GLSRC)gxdevrop.h:$(GLSRC)gsdcolor.h |
76 |
+-$(GLSRC)gxdevrop.h:$(GLSRC)gxcvalue.h |
77 |
+-$(GLSRC)gxdevrop.h:$(GLSRC)gxbcache.h |
78 |
+-$(GLSRC)gxdevrop.h:$(GLSRC)gsropt.h |
79 |
+-$(GLSRC)gxdevrop.h:$(GLSRC)gxdda.h |
80 |
+-$(GLSRC)gxdevrop.h:$(GLSRC)gxpath.h |
81 |
+-$(GLSRC)gxdevrop.h:$(GLSRC)gxfrac.h |
82 |
+-$(GLSRC)gxdevrop.h:$(GLSRC)gxtmap.h |
83 |
+-$(GLSRC)gxdevrop.h:$(GLSRC)gxftype.h |
84 |
+-$(GLSRC)gxdevrop.h:$(GLSRC)gscms.h |
85 |
+-$(GLSRC)gxdevrop.h:$(GLSRC)gsrect.h |
86 |
+-$(GLSRC)gxdevrop.h:$(GLSRC)gslparam.h |
87 |
+-$(GLSRC)gxdevrop.h:$(GLSRC)gsdevice.h |
88 |
+-$(GLSRC)gxdevrop.h:$(GLSRC)gscpm.h |
89 |
+-$(GLSRC)gxdevrop.h:$(GLSRC)gscspace.h |
90 |
+-$(GLSRC)gxdevrop.h:$(GLSRC)gsgstate.h |
91 |
+-$(GLSRC)gxdevrop.h:$(GLSRC)gsxfont.h |
92 |
+-$(GLSRC)gxdevrop.h:$(GLSRC)gsdsrc.h |
93 |
+-$(GLSRC)gxdevrop.h:$(GLSRC)gsiparam.h |
94 |
+-$(GLSRC)gxdevrop.h:$(GLSRC)gxfixed.h |
95 |
+-$(GLSRC)gxdevrop.h:$(GLSRC)gscompt.h |
96 |
+-$(GLSRC)gxdevrop.h:$(GLSRC)gsmatrix.h |
97 |
+-$(GLSRC)gxdevrop.h:$(GLSRC)gspenum.h |
98 |
+-$(GLSRC)gxdevrop.h:$(GLSRC)gxhttile.h |
99 |
+-$(GLSRC)gxdevrop.h:$(GLSRC)gsparam.h |
100 |
+-$(GLSRC)gxdevrop.h:$(GLSRC)gsrefct.h |
101 |
+-$(GLSRC)gxdevrop.h:$(GLSRC)gp.h |
102 |
+-$(GLSRC)gxdevrop.h:$(GLSRC)memento.h |
103 |
+-$(GLSRC)gxdevrop.h:$(GLSRC)memory_.h |
104 |
+-$(GLSRC)gxdevrop.h:$(GLSRC)gsuid.h |
105 |
+-$(GLSRC)gxdevrop.h:$(GLSRC)gsstruct.h |
106 |
+-$(GLSRC)gxdevrop.h:$(GLSRC)gxsync.h |
107 |
+-$(GLSRC)gxdevrop.h:$(GLSRC)gxbitmap.h |
108 |
+-$(GLSRC)gxdevrop.h:$(GLSRC)srdline.h |
109 |
+-$(GLSRC)gxdevrop.h:$(GLSRC)scommon.h |
110 |
+-$(GLSRC)gxdevrop.h:$(GLSRC)gsbitmap.h |
111 |
+-$(GLSRC)gxdevrop.h:$(GLSRC)gsccolor.h |
112 |
+-$(GLSRC)gxdevrop.h:$(GLSRC)gxarith.h |
113 |
+-$(GLSRC)gxdevrop.h:$(GLSRC)stat_.h |
114 |
+-$(GLSRC)gxdevrop.h:$(GLSRC)gpsync.h |
115 |
+-$(GLSRC)gxdevrop.h:$(GLSRC)gsstype.h |
116 |
+-$(GLSRC)gxdevrop.h:$(GLSRC)gsmemory.h |
117 |
+-$(GLSRC)gxdevrop.h:$(GLSRC)gpgetenv.h |
118 |
+-$(GLSRC)gxdevrop.h:$(GLSRC)gscdefs.h |
119 |
+-$(GLSRC)gxdevrop.h:$(GLSRC)gslibctx.h |
120 |
+-$(GLSRC)gxdevrop.h:$(GLSRC)gxcindex.h |
121 |
+-$(GLSRC)gxdevrop.h:$(GLSRC)stdio_.h |
122 |
+-$(GLSRC)gxdevrop.h:$(GLSRC)gsccode.h |
123 |
+-$(GLSRC)gxdevrop.h:$(GLSRC)stdint_.h |
124 |
+-$(GLSRC)gxdevrop.h:$(GLSRC)gssprintf.h |
125 |
+-$(GLSRC)gxdevrop.h:$(GLSRC)gstypes.h |
126 |
+-$(GLSRC)gxdevrop.h:$(GLSRC)std.h |
127 |
+-$(GLSRC)gxdevrop.h:$(GLSRC)stdpre.h |
128 |
+-$(GLSRC)gxdevrop.h:$(GLGEN)arch.h |
129 |
+-$(GLSRC)gxdevrop.h:$(GLSRC)gs_dll_call.h |
130 |
+ $(GLSRC)gxdevmem.h:$(GLSRC)gxdevcli.h |
131 |
+ $(GLSRC)gxdevmem.h:$(GLSRC)gxcmap.h |
132 |
+ $(GLSRC)gxdevmem.h:$(GLSRC)gxtext.h |
133 |
|
134 |
diff --git a/app-text/ghostscript-gpl/ghostscript-gpl-9.54.0-r1.ebuild b/app-text/ghostscript-gpl/ghostscript-gpl-9.54.0-r1.ebuild |
135 |
index 710ac1d7f7a..8c45437e8ef 100644 |
136 |
--- a/app-text/ghostscript-gpl/ghostscript-gpl-9.54.0-r1.ebuild |
137 |
+++ b/app-text/ghostscript-gpl/ghostscript-gpl-9.54.0-r1.ebuild |
138 |
@@ -69,7 +69,9 @@ src_prepare() { |
139 |
eapply "${WORKDIR}/patches/"*.patch |
140 |
fi |
141 |
|
142 |
+ # Upstream patches |
143 |
eapply "${FILESDIR}"/${P}-CVE-2021-3781.patch |
144 |
+ eapply "${FILESDIR}"/${P}-makefile-deps.patch |
145 |
|
146 |
default |