diff options
| author |   Sam James <sam@gentoo.org> | 2020-10-20 08:09:31 +0000 |
|---|---|---|
| committer | Sam James <sam@gentoo.org> | 2020-10-20 08:09:31 +0000 |
| commit | ef7d73bef37f8b7cb76484574e4d316fdb06984b (patch) | |
| tree | cb7776b42f1e971e2ee13758454d6d6920d59998 /app-text/ghostscript-gpl | |
| parent | media-libs/faad2: Bump to version 2.10.0 (diff) | |
| download | gentoo-ef7d73bef37f8b7cb76484574e4d316fdb06984b.tar.gz gentoo-ef7d73bef37f8b7cb76484574e4d316fdb06984b.tar.bz2 gentoo-ef7d73bef37f8b7cb76484574e4d316fdb06984b.zip | |
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 <sam@gentoo.org>
Diffstat (limited to 'app-text/ghostscript-gpl')
| -rw-r--r-- | app-text/ghostscript-gpl/files/ghostscript-gpl-9.53.3-freetype-2.10.3.patch | 20 | ||||
| -rw-r--r-- | app-text/ghostscript-gpl/ghostscript-gpl-9.52-r1.ebuild | 5 | ||||
| -rw-r--r-- | app-text/ghostscript-gpl/ghostscript-gpl-9.53.3-r2.ebuild (renamed from app-text/ghostscript-gpl/ghostscript-gpl-9.53.3-r1.ebuild) | 6 |
3 files changed, 30 insertions, 1 deletions
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 000000000000..59d9ae0095f7 --- /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 b22f3b060f42..362f03559a7c 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 index 9e5d5486db8c..47929e088e2b 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/freetype-2.10.3 >=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 |