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 C2B04138359 for ; Tue, 20 Oct 2020 08:09:45 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 0DC4EE0819; Tue, 20 Oct 2020 08:09:45 +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-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id BD7A9E0819 for ; Tue, 20 Oct 2020 08:09:44 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 4BB433402FE for ; Tue, 20 Oct 2020 08:09:43 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id B4E28209 for ; Tue, 20 Oct 2020 08:09:41 +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: <1603181371.ef7d73bef37f8b7cb76484574e4d316fdb06984b.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.53.3-freetype-2.10.3.patch app-text/ghostscript-gpl/ghostscript-gpl-9.52-r1.ebuild app-text/ghostscript-gpl/ghostscript-gpl-9.53.3-r1.ebuild app-text/ghostscript-gpl/ghostscript-gpl-9.53.3-r2.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: ef7d73bef37f8b7cb76484574e4d316fdb06984b X-VCS-Branch: master Date: Tue, 20 Oct 2020 08:09:41 +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: 2319c9cc-7e69-4d62-8a7e-ad97ad437f0c X-Archives-Hash: 816474ae304cbe95d37c889179207cee commit: ef7d73bef37f8b7cb76484574e4d316fdb06984b Author: Sam James gentoo org> AuthorDate: Tue Oct 20 08:09:31 2020 +0000 Commit: Sam James gentoo org> CommitDate: Tue Oct 20 08:09:31 2020 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ef7d73be app-text/ghostscript-gpl: fix compat. with >=media-libs/freetype-2.10.3 Closes: https://bugs.gentoo.org/747808 Package-Manager: Portage-3.0.8, Repoman-3.0.1 Signed-off-by: Sam James gentoo.org> .../ghostscript-gpl-9.53.3-freetype-2.10.3.patch | 20 ++++++++++++++++++++ .../ghostscript-gpl/ghostscript-gpl-9.52-r1.ebuild | 5 +++++ ....3-r1.ebuild => ghostscript-gpl-9.53.3-r2.ebuild} | 6 +++++- 3 files changed, 30 insertions(+), 1 deletion(-) diff --git a/app-text/ghostscript-gpl/files/ghostscript-gpl-9.53.3-freetype-2.10.3.patch b/app-text/ghostscript-gpl/files/ghostscript-gpl-9.53.3-freetype-2.10.3.patch new file mode 100644 index 00000000000..59d9ae0095f --- /dev/null +++ b/app-text/ghostscript-gpl/files/ghostscript-gpl-9.53.3-freetype-2.10.3.patch @@ -0,0 +1,20 @@ +https://bugs.ghostscript.com/show_bug.cgi?id=702985 +https://bugs.gentoo.org/747808 + +--- ghostscript-9.53.3/base/fapi_ft.c ++++ ghostscript-9.53.3/base/fapi_ft.c +@@ -125,6 +125,14 @@ + delete_inc_int_info(gs_fapi_server * a_server, + FT_IncrementalRec * a_inc_int_info); + ++#ifndef FT_CALLBACK_DEF ++#ifdef __cplusplus ++#define FT_CALLBACK_DEF( x ) extern "C" x ++#else ++#define FT_CALLBACK_DEF( x ) static x ++#endif ++#endif ++ + FT_CALLBACK_DEF(void *) + FF_alloc(FT_Memory memory, long size) + { diff --git a/app-text/ghostscript-gpl/ghostscript-gpl-9.52-r1.ebuild b/app-text/ghostscript-gpl/ghostscript-gpl-9.52-r1.ebuild index b22f3b060f4..362f03559a7 100644 --- a/app-text/ghostscript-gpl/ghostscript-gpl-9.52-r1.ebuild +++ b/app-text/ghostscript-gpl/ghostscript-gpl-9.52-r1.ebuild @@ -60,6 +60,11 @@ RDEPEND="${DEPEND} S="${WORKDIR}/${MY_P}" +PATCHES=( + # bug #747808 + "${FILESDIR}/${PN}-9.53.3-freetype-2.10.3.patch" +) + src_prepare() { if [[ -n "${MY_PATCHSET}" ]] ; then # apply various patches, many borrowed from Fedora diff --git a/app-text/ghostscript-gpl/ghostscript-gpl-9.53.3-r1.ebuild b/app-text/ghostscript-gpl/ghostscript-gpl-9.53.3-r2.ebuild similarity index 98% rename from app-text/ghostscript-gpl/ghostscript-gpl-9.53.3-r1.ebuild rename to app-text/ghostscript-gpl/ghostscript-gpl-9.53.3-r2.ebuild index 9e5d5486db8..47929e088e2 100644 --- a/app-text/ghostscript-gpl/ghostscript-gpl-9.53.3-r1.ebuild +++ b/app-text/ghostscript-gpl/ghostscript-gpl-9.53.3-r2.ebuild @@ -35,7 +35,6 @@ DEPEND=" app-text/libpaper media-libs/fontconfig >=media-libs/freetype-2.4.9:2= - =media-libs/jbig2dec-0.19:= >=media-libs/lcms-2.6:2 >=media-libs/libpng-1.6.2:0= @@ -61,6 +60,11 @@ RDEPEND="${DEPEND} S="${WORKDIR}/${MY_P}" +PATCHES=( + # bug #747808 + "${FILESDIR}/${PN}-9.53.3-freetype-2.10.3.patch" +) + src_prepare() { if [[ -n "${MY_PATCHSET}" ]] ; then # apply various patches, many borrowed from Fedora