From c719fdcee603a5a706a45d10cb598762d56a727d Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Sat, 25 Sep 2021 20:21:45 +0100 Subject: gentoo resync : 25.09.2021 --- app-text/ghostscript-gpl/Manifest | 3 +- .../ghostscript-gpl-9.54.0-makefile-deps.patch | 110 +++++++++++++++++++++ .../ghostscript-gpl-9.54.0-r1.ebuild | 10 +- 3 files changed, 119 insertions(+), 4 deletions(-) create mode 100644 app-text/ghostscript-gpl/files/ghostscript-gpl-9.54.0-makefile-deps.patch (limited to 'app-text/ghostscript-gpl') diff --git a/app-text/ghostscript-gpl/Manifest b/app-text/ghostscript-gpl/Manifest index ced4056f8dc9..ac2c47f21ca8 100644 --- a/app-text/ghostscript-gpl/Manifest +++ b/app-text/ghostscript-gpl/Manifest @@ -1,6 +1,7 @@ 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 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 @@ -9,6 +10,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 5180 BLAKE2B 761fee44bfa6108187c3ff7c533ea9d7e08adedecd947924a0d01737c4603d5fd9c7504b5450db576b23b3c4ba315fea03ca9ba0148f2bdfd6638d86f05206f7 SHA512 a08aa7301628c345a95c684bc21ed54ffb5caf191997b4ff6977f9c23e324a9b58c62cbd75083ce7d8748f7a867b3c734db93ff091929aad5eb6e5ac3e8cd030 +EBUILD ghostscript-gpl-9.54.0-r1.ebuild 5312 BLAKE2B 4f9d51fb65e131057d763290d2fa17cb6705c2a53d5c4181c73527cd130666fae9f0af24c0578c5cb217e812a82da6b2a0b9036a4ffd37ce38e22d3c7d5d2910 SHA512 38829cd1457cc2bb6eca7e38c2b0e42477520c5c93abf0d3563117a2bd34d7ac2859045672cb65f14a40b64d02b2b46923c8c1821e204291feb46884a9700278 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.patch b/app-text/ghostscript-gpl/files/ghostscript-gpl-9.54.0-makefile-deps.patch new file mode 100644 index 000000000000..33858f763db0 --- /dev/null +++ b/app-text/ghostscript-gpl/files/ghostscript-gpl-9.54.0-makefile-deps.patch @@ -0,0 +1,110 @@ +https://git.ghostscript.com/?p=ghostpdl.git;a=commitdiff;h=4874418fd031617212336b8b55f8fcba3b9cfb68#patch1 +https://bugs.gentoo.org/800125 + +From: Chris Liddell +Date: Thu, 6 May 2021 12:23:59 +0100 +Subject: [PATCH] Remove makefile reference to non-existent header file + +Fixes (spurious) parallel make failure on the cluster +--- a/base/lib.mak ++++ b/base/lib.mak +@@ -488,7 +488,6 @@ gxcoord_h=$(GLSRC)gxcoord.h + gxcpath_h=$(GLSRC)gxcpath.h + gxdda_h=$(GLSRC)gxdda.h + gxdevbuf_h=$(GLSRC)gxdevbuf.h +-gxdevrop_h=$(GLSRC)gxdevrop.h + gxdevmem_h=$(GLSRC)gxdevmem.h + gxdhtres_h=$(GLSRC)gxdhtres.h + gxfont0_h=$(GLSRC)gxfont0.h +@@ -2407,13 +2406,13 @@ $(GLD)roplib.dev : $(LIB_MAK) $(ECHOGS_XE) $(roplib_) $(LIB_MAK) $(MAKEDIRS) + + $(GLOBJ)gdevdrop_1.$(OBJ) : $(GLSRC)gdevdrop.c $(AK) $(gx_h) $(gserrors_h) \ + $(memory__h) $(gxdevsop_h) $(gsbittab_h) $(gsropt_h) $(gxcindex_h) \ +- $(gxdcolor_h) $(gxdevice_h) $(gxdevmem_h) $(gxdevrop_h) $(gxgetbit_h) \ ++ $(gxdcolor_h) $(gxdevice_h) $(gxdevmem_h) $(gxgetbit_h) \ + $(gdevmem_h) $(gdevmrop_h) $(gdevmpla_h) $(stdint__h) $(LIB_MAK) $(MAKEDIRS) + $(GLCC) $(D_)WITH_CAL$(_D) $(I_)$(CALSRCDIR)$(_I) $(GLO_)gdevdrop_1.$(OBJ) $(C_) $(GLSRC)gdevdrop.c + + $(GLOBJ)gdevdrop_0.$(OBJ) : $(GLSRC)gdevdrop.c $(AK) $(gx_h) $(gserrors_h) \ + $(memory__h) $(gxdevsop_h) $(gsbittab_h) $(gsropt_h) $(gxcindex_h) \ +- $(gxdcolor_h) $(gxdevice_h) $(gxdevmem_h) $(gxdevrop_h) $(gxgetbit_h) \ ++ $(gxdcolor_h) $(gxdevice_h) $(gxdevmem_h) $(gxgetbit_h) \ + $(gdevmem_h) $(gdevmrop_h) $(gdevmpla_h) $(stdint__h) $(LIB_MAK) $(MAKEDIRS) + $(GLCC) $(GLO_)gdevdrop_0.$(OBJ) $(C_) $(GLSRC)gdevdrop.c + +@@ -5585,75 +5584,6 @@ $(GLSRC)gxdevbuf.h:$(GLSRC)std.h + $(GLSRC)gxdevbuf.h:$(GLSRC)stdpre.h + $(GLSRC)gxdevbuf.h:$(GLGEN)arch.h + $(GLSRC)gxdevbuf.h:$(GLSRC)gs_dll_call.h +-$(GLSRC)gxdevrop.h:$(GLSRC)gxdevcli.h +-$(GLSRC)gxdevrop.h:$(GLSRC)gxcmap.h +-$(GLSRC)gxdevrop.h:$(GLSRC)gxtext.h +-$(GLSRC)gxdevrop.h:$(GLSRC)gstext.h +-$(GLSRC)gxdevrop.h:$(GLSRC)gsnamecl.h +-$(GLSRC)gxdevrop.h:$(GLSRC)gstparam.h +-$(GLSRC)gxdevrop.h:$(GLSRC)gxfmap.h +-$(GLSRC)gxdevrop.h:$(GLSRC)gsfunc.h +-$(GLSRC)gxdevrop.h:$(GLSRC)gxcspace.h +-$(GLSRC)gxdevrop.h:$(GLSRC)gxrplane.h +-$(GLSRC)gxdevrop.h:$(GLSRC)gscsel.h +-$(GLSRC)gxdevrop.h:$(GLSRC)gxfcache.h +-$(GLSRC)gxdevrop.h:$(GLSRC)gsfont.h +-$(GLSRC)gxdevrop.h:$(GLSRC)gsimage.h +-$(GLSRC)gxdevrop.h:$(GLSRC)gsdcolor.h +-$(GLSRC)gxdevrop.h:$(GLSRC)gxcvalue.h +-$(GLSRC)gxdevrop.h:$(GLSRC)gxbcache.h +-$(GLSRC)gxdevrop.h:$(GLSRC)gsropt.h +-$(GLSRC)gxdevrop.h:$(GLSRC)gxdda.h +-$(GLSRC)gxdevrop.h:$(GLSRC)gxpath.h +-$(GLSRC)gxdevrop.h:$(GLSRC)gxfrac.h +-$(GLSRC)gxdevrop.h:$(GLSRC)gxtmap.h +-$(GLSRC)gxdevrop.h:$(GLSRC)gxftype.h +-$(GLSRC)gxdevrop.h:$(GLSRC)gscms.h +-$(GLSRC)gxdevrop.h:$(GLSRC)gsrect.h +-$(GLSRC)gxdevrop.h:$(GLSRC)gslparam.h +-$(GLSRC)gxdevrop.h:$(GLSRC)gsdevice.h +-$(GLSRC)gxdevrop.h:$(GLSRC)gscpm.h +-$(GLSRC)gxdevrop.h:$(GLSRC)gscspace.h +-$(GLSRC)gxdevrop.h:$(GLSRC)gsgstate.h +-$(GLSRC)gxdevrop.h:$(GLSRC)gsxfont.h +-$(GLSRC)gxdevrop.h:$(GLSRC)gsdsrc.h +-$(GLSRC)gxdevrop.h:$(GLSRC)gsiparam.h +-$(GLSRC)gxdevrop.h:$(GLSRC)gxfixed.h +-$(GLSRC)gxdevrop.h:$(GLSRC)gscompt.h +-$(GLSRC)gxdevrop.h:$(GLSRC)gsmatrix.h +-$(GLSRC)gxdevrop.h:$(GLSRC)gspenum.h +-$(GLSRC)gxdevrop.h:$(GLSRC)gxhttile.h +-$(GLSRC)gxdevrop.h:$(GLSRC)gsparam.h +-$(GLSRC)gxdevrop.h:$(GLSRC)gsrefct.h +-$(GLSRC)gxdevrop.h:$(GLSRC)gp.h +-$(GLSRC)gxdevrop.h:$(GLSRC)memento.h +-$(GLSRC)gxdevrop.h:$(GLSRC)memory_.h +-$(GLSRC)gxdevrop.h:$(GLSRC)gsuid.h +-$(GLSRC)gxdevrop.h:$(GLSRC)gsstruct.h +-$(GLSRC)gxdevrop.h:$(GLSRC)gxsync.h +-$(GLSRC)gxdevrop.h:$(GLSRC)gxbitmap.h +-$(GLSRC)gxdevrop.h:$(GLSRC)srdline.h +-$(GLSRC)gxdevrop.h:$(GLSRC)scommon.h +-$(GLSRC)gxdevrop.h:$(GLSRC)gsbitmap.h +-$(GLSRC)gxdevrop.h:$(GLSRC)gsccolor.h +-$(GLSRC)gxdevrop.h:$(GLSRC)gxarith.h +-$(GLSRC)gxdevrop.h:$(GLSRC)stat_.h +-$(GLSRC)gxdevrop.h:$(GLSRC)gpsync.h +-$(GLSRC)gxdevrop.h:$(GLSRC)gsstype.h +-$(GLSRC)gxdevrop.h:$(GLSRC)gsmemory.h +-$(GLSRC)gxdevrop.h:$(GLSRC)gpgetenv.h +-$(GLSRC)gxdevrop.h:$(GLSRC)gscdefs.h +-$(GLSRC)gxdevrop.h:$(GLSRC)gslibctx.h +-$(GLSRC)gxdevrop.h:$(GLSRC)gxcindex.h +-$(GLSRC)gxdevrop.h:$(GLSRC)stdio_.h +-$(GLSRC)gxdevrop.h:$(GLSRC)gsccode.h +-$(GLSRC)gxdevrop.h:$(GLSRC)stdint_.h +-$(GLSRC)gxdevrop.h:$(GLSRC)gssprintf.h +-$(GLSRC)gxdevrop.h:$(GLSRC)gstypes.h +-$(GLSRC)gxdevrop.h:$(GLSRC)std.h +-$(GLSRC)gxdevrop.h:$(GLSRC)stdpre.h +-$(GLSRC)gxdevrop.h:$(GLGEN)arch.h +-$(GLSRC)gxdevrop.h:$(GLSRC)gs_dll_call.h + $(GLSRC)gxdevmem.h:$(GLSRC)gxdevcli.h + $(GLSRC)gxdevmem.h:$(GLSRC)gxcmap.h + $(GLSRC)gxdevmem.h:$(GLSRC)gxtext.h 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 26de70cf7a7c..fd72246a2b01 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" @@ -69,7 +69,9 @@ src_prepare() { eapply "${WORKDIR}/patches/"*.patch fi + # Upstream patches eapply "${FILESDIR}"/${P}-CVE-2021-3781.patch + eapply "${FILESDIR}"/${P}-makefile-deps.patch default @@ -162,10 +164,12 @@ src_configure() { } src_compile() { - emake so all + # Forcing j1 for both emake calls for now + # See bug #800125 + emake -j1 so all cd ijs || die - emake + emake -j1 } src_install() { -- cgit v1.2.3