diff options
| author | Zach van Rijn <me@zv.io> | 2022-02-05 02:08:48 +0000 |
|---|---|---|
| committer | Zach van Rijn <me@zv.io> | 2022-10-21 18:33:57 -0500 |
| commit | 375e8cd42602eedf028f5421cf39020af9822131 (patch) | |
| tree | cbaaceb9eacc2db6e10a8dd4302e547a1670776f | |
| parent | aa4aebe0fe4183260aab1a9a4c439a420a9650a4 (diff) | |
| download | packages-375e8cd42602eedf028f5421cf39020af9822131.tar.gz packages-375e8cd42602eedf028f5421cf39020af9822131.tar.bz2 packages-375e8cd42602eedf028f5421cf39020af9822131.tar.xz packages-375e8cd42602eedf028f5421cf39020af9822131.zip | |
user/gnu-ghostscript: patch freetype macro assumption. fixes #493.
| -rw-r--r-- | user/gnu-ghostscript/APKBUILD | 6 | ||||
| -rw-r--r-- | user/gnu-ghostscript/ft-callback-def.patch | 19 |
2 files changed, 23 insertions, 2 deletions
diff --git a/user/gnu-ghostscript/APKBUILD b/user/gnu-ghostscript/APKBUILD index 583194c4b..ca146ecb8 100644 --- a/user/gnu-ghostscript/APKBUILD +++ b/user/gnu-ghostscript/APKBUILD @@ -2,7 +2,7 @@ # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=gnu-ghostscript pkgver=9.14.1 -pkgrel=3 +pkgrel=4 pkgdesc="PostScript utilities" url="https://www.gnu.org/software/ghostscript/" arch="all" @@ -15,6 +15,7 @@ subpackages="$pkgname-dev $pkgname-doc $pkgname-libs" source="ftp://ftp.gnu.org/gnu/ghostscript/gnu-ghostscript-$pkgver.tar.xz do-not-use-sprintf.patch locksafe.patch + ft-callback-def.patch " build() { @@ -43,4 +44,5 @@ package() { sha512sums="658f6ae14b29965c7959b9bd1463760d7fb03b35251446fc37101dbe7ee2866c74a0803e22b2f4488be3221d026578be1d6be7b562ff240036134fbf83edabf9 gnu-ghostscript-9.14.1.tar.xz 1c4d79633ecece9f4de7a672f2888939be7d1e0ba24f3a66500fdfbb37e081e0f323a5efa0d1547fed51206e5a95d3b0659c0ea845d0bc333f281dfb88fcc040 do-not-use-sprintf.patch -ee06c1753147bcce85e3cdc6c254ef2c75b7f1dfdc0a9bce82bc24bb8d814470ba81be5372fb4bec3a999190f53c4615226fd3dbf05969c436b480eb2ec14f37 locksafe.patch" +ee06c1753147bcce85e3cdc6c254ef2c75b7f1dfdc0a9bce82bc24bb8d814470ba81be5372fb4bec3a999190f53c4615226fd3dbf05969c436b480eb2ec14f37 locksafe.patch +c404dacba3e1739933b296c9ecd305f8df48e586c1d593750c5e1ca490232c8897eb20596e96262d5ae59683a5f70717ad99f4a7f5537a7b3ae9bb24f6013385 ft-callback-def.patch" diff --git a/user/gnu-ghostscript/ft-callback-def.patch b/user/gnu-ghostscript/ft-callback-def.patch new file mode 100644 index 000000000..0bec225c9 --- /dev/null +++ b/user/gnu-ghostscript/ft-callback-def.patch @@ -0,0 +1,19 @@ +https://gitlab.kitware.com/vtk/vtk/-/issues/18033 + +diff -ur a/base/fapi_ft.c b/base/fapi_ft.c +--- a/base/fapi_ft.c 2022-02-05 02:01:29.370000000 +0000 ++++ b/base/fapi_ft.c 2022-02-05 02:03:31.520000000 +0000 +@@ -1,3 +1,13 @@ ++/* FT_CALLBACK_DEF no longer exported since freetype-2.10.3 */ ++/* has been moved to <freetype/internal/compiler-macros.h> */ ++# 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 */ ++ + /* Copyright (C) 2001-2012 Artifex Software, Inc. + All Rights Reserved. + |