summaryrefslogtreecommitdiff
path: root/app-text/ghostscript-gpl
diff options
context:
space:
mode:
authorV3n3RiX <venerix@redcorelinux.org>2021-10-01 20:54:53 +0100
committerV3n3RiX <venerix@redcorelinux.org>2021-10-01 20:54:53 +0100
commit391b5b359a346aff490103da7dddc85047f83830 (patch)
tree29eea460a0bd7e1ff21d43b9d6df9af4d8a175e1 /app-text/ghostscript-gpl
parentc719fdcee603a5a706a45d10cb598762d56a727d (diff)
gentoo resync : 01.10.2021
Diffstat (limited to 'app-text/ghostscript-gpl')
-rw-r--r--app-text/ghostscript-gpl/Manifest5
-rw-r--r--app-text/ghostscript-gpl/files/ghostscript-gpl-9.54.0-makefile-deps-2.patch96
-rw-r--r--app-text/ghostscript-gpl/files/ghostscript-gpl-9.54.0-makefile-deps.patch2
-rw-r--r--app-text/ghostscript-gpl/ghostscript-gpl-9.54.0-r1.ebuild9
4 files changed, 105 insertions, 7 deletions
diff --git a/app-text/ghostscript-gpl/Manifest b/app-text/ghostscript-gpl/Manifest
index ac2c47f21ca8..4248ab0007fc 100644
--- a/app-text/ghostscript-gpl/Manifest
+++ b/app-text/ghostscript-gpl/Manifest
@@ -1,7 +1,8 @@
AUX ghostscript-gpl-9.53.3-fix-ps2epsi.patch 537 BLAKE2B fe6bf851c52751e3653e8e7cfac4b5e5e85ec3b9c9a125e5c7e0ca3aeca5cbe0b1ffe068633dd091755bfba410476b1328abbd94af7c90637541215f484e2413 SHA512 901a8a3b2ef645cd1e61f7596aa0f71921d480ebd48249b3d4e0e07dcfc33bb92ba484a28e952575c33062b3f429d8d60b43aeba8ea59a0623b18405dc27515a
AUX ghostscript-gpl-9.53.3-freetype-2.10.3.patch 508 BLAKE2B 8819f3be84b556adde4808509a1199d08b059a77abeafb6d95076194093a3223cc8c8b7032124eaeaa98dedb237dd94632cb374cb854f7d1594a80b82df79173 SHA512 43bb10cbf6b316d59a616f986fe8bea87af1313ca71138ecdeb531ea2a689c64718c44d0a81f69bdf30e3814fec3b36866c2249d26c6d45c58bd121accc7f8d4
AUX ghostscript-gpl-9.54.0-CVE-2021-3781.patch 7824 BLAKE2B 3e02e0085175054bb11dd392489ccd52cfe2d9b8b63430db55f54f95e13c1965f685eed2ccea367335565a0cfe2b35884a6da6d7465eeaf32442ec7680839917 SHA512 d00fccab57efbf2256d1c87f18e915a4c4dfc9a2c2a7bbaf9206c0a1fa72479402ded34b6b669ab2979cc637ac18181cbc3fe81ad18c2a3a4e5611f7d34da554
-AUX ghostscript-gpl-9.54.0-makefile-deps.patch 4532 BLAKE2B 555602c6f2fa1ea04e90ee4c68cca1965f8d31e6e9931c676dbe34e772931cf531042707e7f735081e8a5c5f0452ce9bb098add7dce661c8191ed29fa7a4db8f SHA512 96dd46ddaa9253886dc01dc093ea404d1c74ca9ca355b5dad0f2ef452c50927c114c4d27c961b688813eee713ec6565ab4ea1d1fb3ff47aca9c0194a04e2c6d9
+AUX ghostscript-gpl-9.54.0-makefile-deps-2.patch 5003 BLAKE2B 623f78c43bc5563f9a1feb4e5249c2235e655d22a6731d1002fc0c62ad553c60590d1e6a00e9046d5441d780c7547f6305c572f45fc047bdf449ad7ec6023691 SHA512 ea9ab533e046c65fadc639e50677ce7879e7bb741dcc45fc5a7c9772ff272868916cee56288e2a6f808240e945c745c5037a38f591e6a58a63e347b64121e9a1
+AUX ghostscript-gpl-9.54.0-makefile-deps.patch 4723 BLAKE2B 75abee2ee6b803889cada79c41bf32d8f9914d63e0ca404e7b779599c0b196ae64d639738ae9938defb8e83f01fac0e69dbd49b418e1d46da93bca75737c30db SHA512 0e5c499fd01526aedf52d28d7026dd18aa18d7298334187c73363ced7431c6bb34e7d2dcdde1e1448a10adf79dfe86c6de2d68aa7061ee478f7b49d61d173a70
DIST ghostscript-9.52.tar.xz 39711040 BLAKE2B 317042ae7e2bfdeded2ae9d9a1bd1521422d1ce1dd6b9b2cdedf4c503cce1285684d5329663dc8ee7263591761c33254827d16b1a93f8c10aad4baab1d859f93 SHA512 4c4a33884e1138bad553eee61fac1a72158297ad5c2ce46a4b36150848dea8158affaf2b902f4ff03e4f72ebc8154c198b618112624f409230a610b7648faa67
DIST ghostscript-9.53.3.tar.xz 41368160 BLAKE2B 6b5840a420d7527c7155bfb707fe19b3412bdd3a6707f44d058c20f607e6695cfc878cf5df4c4528686c1c1f488b2dbdb81ef5fdf38b950eb15751d2ebafb0a9 SHA512 eb832c27eecd30f15e346408c592d7096fd23ef0a6fa59bd50ca327578915434530a4868e69249c2594def0910c527302e99d54f0877f726a8ca8bea6f0f17b7
DIST ghostscript-9.54.0.tar.xz 56001768 BLAKE2B 4a98b1af74c4b4caf8d263cd5529059304a76884418c90401b0fc9a89e0f5de5417a439f6e08b95374e62158eec65528ef5f949497d5050a6408fb7c87e54aa9 SHA512 a3c96925f4dbf5e276fc543b88df185a0435c68166db15ac532094329ba8db314d739a292da18be7954daaafeeb290e641ea03edf888854d7e752998ec6062cc
@@ -10,6 +11,6 @@ DIST ghostscript-gpl-9.53-patchset-01.tar.xz 2340 BLAKE2B 55d82c88f1b57c08431883
DIST ghostscript-gpl-9.54-patchset-01.tar.xz 2600 BLAKE2B e89f16f149ba3c46b1e81d774a3dca8345dfb60ec959249292cc0f3d8bc811ac169e232e3fb85de9d0ce65dd41453f90461798007b8b9fdd2c6e44d55e7a9d10 SHA512 0c49fbe6ece86b0c7729421cf06a6a210341fbe676efd89c0f97c96a426d3156e6a8ee596e050b8ee6a1af7a94ea8d1d54a6166f020a7d40fec95949cd7f3b12
EBUILD ghostscript-gpl-9.52-r1.ebuild 5176 BLAKE2B db5d5ca4785c48ca75d55c980f9e1aae1132f3e68dd52e2443fe8bf0202b7c82367893167a8cc8a700c7ef12ff9d8743eb41732b8ba450b9fd9606a274210a36 SHA512 44a43ed682065164dafcfe7eb62918fb9906197569be216bfcc800d232d2ffc33702090844ad8b10f65492c60cb90a5b162560ad26b828973ca46ea85f993a8c
EBUILD ghostscript-gpl-9.53.3-r5.ebuild 5297 BLAKE2B 2e113f1d62339e4f09612787a016bcb67fa12cb93e40480a536d621fe4530005dd5827cd6141bd9cbab739fdf5870522ff7082faef73ef3fa955c98b50e6603c SHA512 0ed8f0571efe2853937ec4fe79c6f875728721a1b66d29df5f2e99de329e54354243c148a64493d969ac64b82bf56ba4333fe43cc93f3f1e27dea9fe955ec33b
-EBUILD ghostscript-gpl-9.54.0-r1.ebuild 5312 BLAKE2B 4f9d51fb65e131057d763290d2fa17cb6705c2a53d5c4181c73527cd130666fae9f0af24c0578c5cb217e812a82da6b2a0b9036a4ffd37ce38e22d3c7d5d2910 SHA512 38829cd1457cc2bb6eca7e38c2b0e42477520c5c93abf0d3563117a2bd34d7ac2859045672cb65f14a40b64d02b2b46923c8c1821e204291feb46884a9700278
+EBUILD ghostscript-gpl-9.54.0-r1.ebuild 5290 BLAKE2B 68bed51c9e011285e6c11ddc29ca85ac589dc900d41be3c6f61f34df9e097168e604c3e3b251eded5589e1bc4b69f84ac60bb483dc61a4cf0a858bde7a489483 SHA512 29cdd0de17180962172f6efb92e18483765899ec0815f4a43b5f27ec49824fe0b0c5a68e4172e761995a6418fabccc3bc9647dffb521cb57bf99614c3459f828
EBUILD ghostscript-gpl-9.54.0.ebuild 5143 BLAKE2B d9f1444bc320b4c7747722ffafdf5b8d47edc9ec60abc682d0ce91c53d8ff3e047b51a06af5d3acf2d09603b775bce0a199c9647f3ba2a61b3a249891327b29e SHA512 a6a5623daad8e504a8afe6e18a1fc9783ce9eb6dc2b8504eaa161d4d51dfedda2a45c85802eb72519ddb47fa2278c104946fc66dd9feafd763fc999d54e90be6
MISC metadata.xml 765 BLAKE2B dc8466ca08f1fa1891cc60e886bfdd4cccc517c4b355ba6d7697acdece16657982adbfbd4f5709b3850dfba1293ce269b17f9c05bb92f5e5531f3c7debd13613 SHA512 7f4dba7c256642b532cb7418507169a2554e0c4058011ff8dba802f93d677a824b8ae7896840369f06c801ca4a7d27fda86f8c6a344127f65f61ca6e3a02c0ee
diff --git a/app-text/ghostscript-gpl/files/ghostscript-gpl-9.54.0-makefile-deps-2.patch b/app-text/ghostscript-gpl/files/ghostscript-gpl-9.54.0-makefile-deps-2.patch
new file mode 100644
index 000000000000..38f0eaa1516f
--- /dev/null
+++ b/app-text/ghostscript-gpl/files/ghostscript-gpl-9.54.0-makefile-deps-2.patch
@@ -0,0 +1,96 @@
+From: Sam James <sam@gentoo.org>
+Date: Tue, 28 Sep 2021 03:40:19 +0100
+Subject: [PATCH] Rebased versions of upstream Makefile patches
+
+https://git.ghostscript.com/?p=ghostpdl.git;a=commit;h=cf868c13c03a781243c1d8764cbeba3a49ffb92e
+https://git.ghostscript.com/?p=ghostpdl.git;a=commitdiff;h=c8285e6e9cd42277ae298475ad0c96da009b0e98
+https://bugs.gentoo.org/800125
+--- a/devices/devs.mak
++++ b/devices/devs.mak
+@@ -669,7 +669,7 @@ $(DD)txtwrite.dev : $(ECHOGS_XE) $(txtwrite_) $(GDEV)\
+ $(DEVOBJ)gdevtxtw.$(OBJ) : $(DEVVECSRC)gdevtxtw.c $(GDEV) $(gdevkrnlsclass_h) \
+ $(memory__h) $(string__h) $(gp_h) $(gsparam_h) $(gsutil_h) \
+ $(gsdevice_h) $(gxfont_h) $(gxfont0_h) $(gstext_h) $(gxfcid_h)\
+- $(gxgstate_h) $(gxpath_h) $(gdevagl_h) $(DEVS_MAK) $(MAKEDIRS) $(DEVVECSRC)doc_common.h
++ $(gxgstate_h) $(gxpath_h) $(gdevagl_h) $(DEVS_MAK) $(DEVVECSRC)doc_common.h $(MAKEDIRS)
+ $(DEVCC) $(DEVO_)gdevtxtw.$(OBJ) $(C_) $(DEVVECSRC)gdevtxtw.c
+
+ $(DEVOBJ)gdevagl.$(OBJ) : $(DEVVECSRC)gdevagl.c $(GDEV)\
+@@ -684,14 +684,14 @@ gdevagl_h=$(DEVVECSRC)gdevagl.h
+ docxwrite_=$(DEVOBJ)gdevdocxw.$(OBJ) $(DEVOBJ)gdevagl.$(OBJ) $(DEVOBJ)doc_common.$(OBJ)
+
+ $(DD)docxwrite.dev : $(ECHOGS_XE) $(docxwrite_) $(GDEV)\
+- $(gdevagl_h) $(DEVS_MAK) $(MAKEDIRS) $(EXTRACT_OBJS)
++ $(gdevagl_h) $(DEVS_MAK) $(EXTRACT_OBJS) $(MAKEDIRS)
+ $(SETDEV2) $(DD)docxwrite $(docxwrite_) $(EXTRACT_OBJS)
+
+ $(DEVOBJ)gdevdocxw.$(OBJ) : $(DEVVECSRC)gdevdocxw.c $(GDEV) $(gdevkrnlsclass_h) \
+ $(memory__h) $(string__h) $(gp_h) $(gsparam_h) $(gsutil_h) \
+ $(gsdevice_h) $(gxfont_h) $(gxfont0_h) $(gstext_h) $(gxfcid_h)\
+- $(gxgstate_h) $(gxpath_h) $(gdevagl_h) $(DEVS_MAK) $(MAKEDIRS) \
+- $(DEVVECSRC)doc_common.h
++ $(gxgstate_h) $(gxpath_h) $(gdevagl_h) $(DEVS_MAK) $(DEVVECSRC)doc_common.h \
++ $(MAKEDIRS)
+ $(DEVCC) $(DEVO_)gdevdocxw.$(OBJ) $(C_) $(DEVVECSRC)gdevdocxw.c
+
+ # Shared code used by txtwrite and docxwrite.
+@@ -699,7 +699,7 @@ $(DEVOBJ)gdevdocxw.$(OBJ) : $(DEVVECSRC)gdevdocxw.c $(GDEV) $(gdevkrnlsclass_h)
+ $(DEVOBJ)doc_common.$(OBJ) : $(DEVVECSRC)doc_common.c $(GDEV) $(gdevkrnlsclass_h) \
+ $(memory__h) $(string__h) $(gp_h) $(gsparam_h) $(gsutil_h) \
+ $(gsdevice_h) $(gxfont_h) $(gxfont0_h) $(gstext_h) $(gxfcid_h)\
+- $(gxgstate_h) $(gxpath_h) $(gdevagl_h) $(DEVS_MAK) $(MAKEDIRS) $(DEVVECSRC)doc_common.h
++ $(gxgstate_h) $(gxpath_h) $(gdevagl_h) $(DEVS_MAK) $(DEVVECSRC)doc_common.h $(MAKEDIRS)
+ $(DEVCC) $(DEVO_)doc_common.$(OBJ) $(C_) $(DEVVECSRC)doc_common.c
+
+
+--- a/devices/extract.mak
++++ b/devices/extract.mak
+@@ -1,37 +1,37 @@
+ extract_cc = $(CC) $(CCFLAGS) $(I_)$(EXTRACT_DIR)/include$(_I) $(I_)$(ZSRCDIR)$(_I) $(O_)
+ extract_out_prefix = $(GLOBJDIR)$(D)extract_
+
+-$(extract_out_prefix)alloc.$(OBJ): $(EXTRACT_DIR)/src/alloc.c
++$(extract_out_prefix)alloc.$(OBJ): $(EXTRACT_DIR)/src/alloc.c $(MAKEDIRS)
+ $(extract_cc)$@ $(C_) $(EXTRACT_DIR)/src/alloc.c
+
+-$(extract_out_prefix)astring.$(OBJ): $(EXTRACT_DIR)/src/astring.c
++$(extract_out_prefix)astring.$(OBJ): $(EXTRACT_DIR)/src/astring.c $(MAKEDIRS)
+ $(extract_cc)$@ $(C_) $(EXTRACT_DIR)/src/astring.c
+
+-$(extract_out_prefix)buffer.$(OBJ): $(EXTRACT_DIR)/src/buffer.c
++$(extract_out_prefix)buffer.$(OBJ): $(EXTRACT_DIR)/src/buffer.c $(MAKEDIRS)
+ $(extract_cc)$@ $(C_) $(EXTRACT_DIR)/src/buffer.c
+
+-$(extract_out_prefix)docx.$(OBJ): $(EXTRACT_DIR)/src/docx.c
++$(extract_out_prefix)docx.$(OBJ): $(EXTRACT_DIR)/src/docx.c $(MAKEDIRS)
+ $(extract_cc)$@ $(C_) $(EXTRACT_DIR)/src/docx.c
+
+-$(extract_out_prefix)docx_template.$(OBJ): $(EXTRACT_DIR)/src/docx_template.c
++$(extract_out_prefix)docx_template.$(OBJ): $(EXTRACT_DIR)/src/docx_template.c $(MAKEDIRS)
+ $(extract_cc)$@ $(C_) $(EXTRACT_DIR)/src/docx_template.c
+
+-$(extract_out_prefix)extract.$(OBJ): $(EXTRACT_DIR)/src/extract.c
++$(extract_out_prefix)extract.$(OBJ): $(EXTRACT_DIR)/src/extract.c $(MAKEDIRS)
+ $(extract_cc)$@ $(C_) $(EXTRACT_DIR)/src/extract.c
+
+-$(extract_out_prefix)join.$(OBJ): $(EXTRACT_DIR)/src/join.c
++$(extract_out_prefix)join.$(OBJ): $(EXTRACT_DIR)/src/join.c $(MAKEDIRS)
+ $(extract_cc)$@ $(C_) $(EXTRACT_DIR)/src/join.c
+
+-$(extract_out_prefix)mem.$(OBJ): $(EXTRACT_DIR)/src/mem.c
++$(extract_out_prefix)mem.$(OBJ): $(EXTRACT_DIR)/src/mem.c $(MAKEDIRS)
+ $(extract_cc)$@ $(C_) $(EXTRACT_DIR)/src/mem.c
+
+-$(extract_out_prefix)outf.$(OBJ): $(EXTRACT_DIR)/src/outf.c
++$(extract_out_prefix)outf.$(OBJ): $(EXTRACT_DIR)/src/outf.c $(MAKEDIRS)
+ $(extract_cc)$@ $(C_) $(EXTRACT_DIR)/src/outf.c
+
+-$(extract_out_prefix)xml.$(OBJ): $(EXTRACT_DIR)/src/xml.c
++$(extract_out_prefix)xml.$(OBJ): $(EXTRACT_DIR)/src/xml.c $(MAKEDIRS)
+ $(extract_cc)$@ $(C_) $(EXTRACT_DIR)/src/xml.c
+
+-$(extract_out_prefix)zip.$(OBJ): $(EXTRACT_DIR)/src/zip.c
++$(extract_out_prefix)zip.$(OBJ): $(EXTRACT_DIR)/src/zip.c $(MAKEDIRS)
+ $(extract_cc)$@ $(C_) $(EXTRACT_DIR)/src/zip.c
+
+ EXTRACT_OBJS = \
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
index 33858f763db0..51ce95958ba1 100644
--- 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
@@ -1,4 +1,6 @@
https://git.ghostscript.com/?p=ghostpdl.git;a=commitdiff;h=4874418fd031617212336b8b55f8fcba3b9cfb68#patch1
+https://git.ghostscript.com/?p=ghostpdl.git;a=commit;h=cf868c13c03a781243c1d8764cbeba3a49ffb92e
+https://git.ghostscript.com/?p=ghostpdl.git;a=patch;h=c8285e6e9cd42277ae298475ad0c96da009b0e98
https://bugs.gentoo.org/800125
From: Chris Liddell <chris.liddell@artifex.com>
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
index fd72246a2b01..94be6c18b807 100644
--- a/app-text/ghostscript-gpl/ghostscript-gpl-9.54.0-r1.ebuild
+++ b/app-text/ghostscript-gpl/ghostscript-gpl-9.54.0-r1.ebuild
@@ -23,7 +23,7 @@ fi
LICENSE="AGPL-3 CPL-1.0"
SLOT="0/$(ver_cut 1-2)"
-KEYWORDS="~alpha amd64 ~arm ~arm64 hppa ~ia64 ~m68k ~mips ~ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm ~arm64 hppa ~ia64 ~m68k ~mips ~ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
IUSE="cups dbus gtk +jpeg2k l10n_de static-libs unicode X"
LANGS="ja ko zh-CN zh-TW"
@@ -72,6 +72,7 @@ src_prepare() {
# Upstream patches
eapply "${FILESDIR}"/${P}-CVE-2021-3781.patch
eapply "${FILESDIR}"/${P}-makefile-deps.patch
+ eapply "${FILESDIR}"/${P}-makefile-deps-2.patch
default
@@ -164,12 +165,10 @@ src_configure() {
}
src_compile() {
- # Forcing j1 for both emake calls for now
- # See bug #800125
- emake -j1 so all
+ emake so all
cd ijs || die
- emake -j1
+ emake
}
src_install() {