From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 9AE93158012 for ; Tue, 21 Sep 2021 19:02:34 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id D7251E07EE; Tue, 21 Sep 2021 19:02:33 +0000 (UTC) Received: from smtp.gentoo.org (woodpecker.gentoo.org [140.211.166.183]) (using TLSv1.2 with cipher ECDHE-RSA-CHACHA20-POLY1305 (256/256 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 7CA22E07EE for ; Tue, 21 Sep 2021 19:02:33 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.2 with cipher ECDHE-RSA-CHACHA20-POLY1305 (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 53B93342FA2 for ; Tue, 21 Sep 2021 19:02:32 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id BE95D55 for ; Tue, 21 Sep 2021 19:02:30 +0000 (UTC) From: "Sam James" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Sam James" Message-ID: <1632250934.b7805f02f359138edf4384f2b7df317bfc27e3cb.sam@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: app-text/ghostscript-gpl/, app-text/ghostscript-gpl/files/ X-VCS-Repository: repo/gentoo X-VCS-Files: app-text/ghostscript-gpl/files/ghostscript-gpl-9.54.0-makefile-deps.patch app-text/ghostscript-gpl/ghostscript-gpl-9.54.0-r1.ebuild X-VCS-Directories: app-text/ghostscript-gpl/files/ app-text/ghostscript-gpl/ X-VCS-Committer: sam X-VCS-Committer-Name: Sam James X-VCS-Revision: b7805f02f359138edf4384f2b7df317bfc27e3cb X-VCS-Branch: master Date: Tue, 21 Sep 2021 19:02:30 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: 435fe03f-7769-45fc-8b01-a4af1d2e80ca X-Archives-Hash: a36d48d081574577294a85f3ad15c007 commit: b7805f02f359138edf4384f2b7df317bfc27e3cb Author: Sam James gentoo org> AuthorDate: Tue Sep 21 19:01:50 2021 +0000 Commit: Sam James gentoo org> CommitDate: Tue Sep 21 19:02:14 2021 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b7805f02 app-text/ghostscript-gpl: add parallel build patch to 9.54.0-r1 Bug: https://bugs.gentoo.org/800125 Signed-off-by: Sam James gentoo.org> .../ghostscript-gpl-9.54.0-makefile-deps.patch | 110 +++++++++++++++++++++ .../ghostscript-gpl-9.54.0-r1.ebuild | 2 + 2 files changed, 112 insertions(+) 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 00000000000..33858f763db --- /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 710ac1d7f7a..8c45437e8ef 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 @@ -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