diff options
| author | Patrick J Volkerding <volkerdi@slackware.com> | 2021-01-17 23:48:59 +0000 |
|---|---|---|
| committer | Eric Hameleers <alien@slackware.com> | 2021-01-18 08:59:51 +0100 |
| commit | 16c4108efdee84a002fc181f54191cc5a98e82fc (patch) | |
| tree | f0eb8d3e0657384d5f9c17c66f98d551607e85c4 /source/ap/ghostscript | |
| parent | cdbbea4bb74a0bfd04f1484609c725d222b40abd (diff) | |
| download | current-16c4108efdee84a002fc181f54191cc5a98e82fc.tar.gz | |
Sun Jan 17 23:48:59 UTC 202120210117234859
a/kernel-generic-5.10.8-x86_64-1.txz: Upgraded.
a/kernel-huge-5.10.8-x86_64-1.txz: Upgraded.
a/kernel-modules-5.10.8-x86_64-1.txz: Upgraded.
a/mkinitrd-1.4.11-x86_64-17.txz: Rebuilt.
Upgraded to busybox-1.32.1.
ap/sc-im-20200904_bdd936a-x86_64-1.txz: Upgraded.
d/kernel-headers-5.10.8-x86-1.txz: Upgraded.
d/python-setuptools-51.3.1-x86_64-1.txz: Upgraded.
k/kernel-source-5.10.8-noarch-1.txz: Upgraded.
l/libical-3.0.9-x86_64-1.txz: Upgraded.
l/pulseaudio-14.2-x86_64-1.txz: Upgraded.
n/ModemManager-1.14.10-x86_64-1.txz: Upgraded.
n/iptables-1.8.7-x86_64-1.txz: Upgraded.
n/libnftnl-1.1.9-x86_64-1.txz: Upgraded.
xfce/garcon-4.16.1-x86_64-1.txz: Upgraded.
xfce/xfce4-whiskermenu-plugin-2.5.2-x86_64-1.txz: Upgraded.
isolinux/initrd.img: Rebuilt.
kernels/*: Upgraded.
usb-and-pxe-installers/usbboot.img: Rebuilt.
Diffstat (limited to 'source/ap/ghostscript')
| -rw-r--r-- | source/ap/ghostscript/ghostscript-9.53.3-freetype_fix-1.patch | 39 | ||||
| -rwxr-xr-x | source/ap/ghostscript/ghostscript.SlackBuild | 3 |
2 files changed, 42 insertions, 0 deletions
diff --git a/source/ap/ghostscript/ghostscript-9.53.3-freetype_fix-1.patch b/source/ap/ghostscript/ghostscript-9.53.3-freetype_fix-1.patch new file mode 100644 index 00000000..66b5f655 --- /dev/null +++ b/source/ap/ghostscript/ghostscript-9.53.3-freetype_fix-1.patch @@ -0,0 +1,39 @@ +Submitted By: Ken Moffat <ken at linuxfromscratch dot org> +Date: 2020-10-20 +Initial Package Version: 9.53.3 +Upstream Status: Applied +Origin: https://git.ghostscript.com/?p=ghostpdl.git;a=commitdiff;h=41ef9a0bc36b#patch1 +Description: Fixes build failure with freetype-2.10.3 and later. + +diff --git a/base/fapi_ft.c b/base/fapi_ft.c +index 65fa6dc..21aef2f 100644 (file) +--- a/base/fapi_ft.c ++++ b/base/fapi_ft.c +@@ -125,7 +125,7 @@ static void + delete_inc_int_info(gs_fapi_server * a_server, + FT_IncrementalRec * a_inc_int_info); + +-FT_CALLBACK_DEF(void *) ++static void * + FF_alloc(FT_Memory memory, long size) + { + gs_memory_t *mem = (gs_memory_t *) memory->user; +@@ -133,7 +133,7 @@ FF_alloc(FT_Memory memory, long size) + return (gs_malloc(mem, size, 1, "FF_alloc")); + } + +-FT_CALLBACK_DEF(void *) ++static void * + FF_realloc(FT_Memory memory, long cur_size, long new_size, void *block) + { + gs_memory_t *mem = (gs_memory_t *) memory->user; +@@ -153,7 +153,7 @@ FT_CALLBACK_DEF(void *) + return (tmp); + } + +-FT_CALLBACK_DEF(void) ++static void + FF_free(FT_Memory memory, void *block) + { + gs_memory_t *mem = (gs_memory_t *) memory->user; + diff --git a/source/ap/ghostscript/ghostscript.SlackBuild b/source/ap/ghostscript/ghostscript.SlackBuild index 614896e0..8179ac61 100755 --- a/source/ap/ghostscript/ghostscript.SlackBuild +++ b/source/ap/ghostscript/ghostscript.SlackBuild @@ -76,6 +76,9 @@ cd ${SRCPREFIX}${PKGNAM}-$VERSION || exit 1 # Remove unmaintained garbage: rm -rf freetype jpeg lcms2 libpng libtiff png tiff zlib +# Fix build against freetype-2.10.3+: +zcat $CWD/ghostscript-9.53.3-freetype_fix-1.patch.gz | patch -p1 --verbose || exit 1 + # Regenerate ./configure. Needed if patched, or to prevent libtool mismatch. autoreconf --force --install ( cd jbig2dec ; autoreconf --force --install ) |