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 117CE158018 for ; Tue, 28 Sep 2021 02:50:23 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 11FC4E09B8; Tue, 28 Sep 2021 02:50:22 +0000 (UTC) Received: from smtp.gentoo.org (woodpecker.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (using TLSv1.2 with cipher ECDHE-RSA-CHACHA20-POLY1305 (256/256 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id D6D8FE09B8 for ; Tue, 28 Sep 2021 02:50:21 +0000 (UTC) Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84]) (using TLSv1.2 with cipher ECDHE-RSA-CHACHA20-POLY1305 (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id A131E342C35 for ; Tue, 28 Sep 2021 02:50:20 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id E025E10D for ; Tue, 28 Sep 2021 02:50:18 +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: <1632797396.655a62e570746ba83e8fbadd977d58ae608984ba.sam@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: app-text/ghostscript-gpl/files/, app-text/ghostscript-gpl/ X-VCS-Repository: repo/gentoo X-VCS-Files: app-text/ghostscript-gpl/files/ghostscript-gpl-9.54.0-makefile-deps-2.patch 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: 655a62e570746ba83e8fbadd977d58ae608984ba X-VCS-Branch: master Date: Tue, 28 Sep 2021 02:50:18 +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: b516235c-433f-4c04-b38c-55108f624cea X-Archives-Hash: d966ac4c9e7ea65dc794ad44bbce2ab7 commit: 655a62e570746ba83e8fbadd977d58ae608984ba Author: Sam James gentoo org> AuthorDate: Tue Sep 28 02:49:56 2021 +0000 Commit: Sam James gentoo org> CommitDate: Tue Sep 28 02:49:56 2021 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=655a62e5 app-text/ghostscript-gpl: add more upstream parallel build patches to 94.0-r1 Bug: https://bugs.gentoo.org/800125 Signed-off-by: Sam James gentoo.org> .../ghostscript-gpl-9.54.0-makefile-deps-2.patch | 96 ++++++++++++++++++++++ .../ghostscript-gpl-9.54.0-makefile-deps.patch | 2 + .../ghostscript-gpl-9.54.0-r1.ebuild | 7 +- 3 files changed, 101 insertions(+), 4 deletions(-) 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 00000000000..38f0eaa1516 --- /dev/null +++ b/app-text/ghostscript-gpl/files/ghostscript-gpl-9.54.0-makefile-deps-2.patch @@ -0,0 +1,96 @@ +From: Sam James +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 33858f763db..51ce95958ba 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 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 210f7eba636..94be6c18b80 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 @@ -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() {