diff options
author | Patrick J Volkerding <volkerdi@slackware.com> | 2021-12-03 20:07:20 +0000 |
---|---|---|
committer | Eric Hameleers <alien@slackware.com> | 2021-12-04 08:59:57 +0100 |
commit | c29dcfa2dd2e7467ea3b6b757880348884d8790d (patch) | |
tree | d3353da7e281a39e6edb2bde414c1bc228be5d6e /source/l/freetype | |
parent | 66ba810196d8ce6f6da7df7931ce31e7303b8cf8 (diff) | |
download | current-c29dcfa2dd2e7467ea3b6b757880348884d8790d.tar.gz |
Fri Dec 3 20:07:20 UTC 202120211203200720
ap/rpm-4.16.1.3-x86_64-4.txz: Rebuilt.
Patched to handle non-compliant RPMs created by install4j. Thanks to alienBOB.
d/poke-1.4-x86_64-1.txz: Upgraded.
l/enchant-2.3.2-x86_64-1.txz: Upgraded.
l/freetype-2.11.1-x86_64-1.txz: Upgraded.
l/glib2-2.70.2-x86_64-1.txz: Upgraded.
n/lynx-2.9.0dev.10-x86_64-1.txz: Upgraded.
extra/php8/php8-8.1.0-x86_64-1.txz: Removed.
extra/php80/php80-8.0.13-x86_64-1.txz: Added.
extra/php81/php81-8.1.0-x86_64-1.txz: Added.
Diffstat (limited to 'source/l/freetype')
-rw-r--r-- | source/l/freetype/6e9d8d314ff6ab23177b9162c0b96616460bb84e.patch | 42 | ||||
-rwxr-xr-x | source/l/freetype/freetype.SlackBuild | 7 |
2 files changed, 2 insertions, 47 deletions
diff --git a/source/l/freetype/6e9d8d314ff6ab23177b9162c0b96616460bb84e.patch b/source/l/freetype/6e9d8d314ff6ab23177b9162c0b96616460bb84e.patch deleted file mode 100644 index b91780f1..00000000 --- a/source/l/freetype/6e9d8d314ff6ab23177b9162c0b96616460bb84e.patch +++ /dev/null @@ -1,42 +0,0 @@ -From 6e9d8d314ff6ab23177b9162c0b96616460bb84e Mon Sep 17 00:00:00 2001 -From: Alexei Podtelezhnikov <apodtele@gmail.com> -Date: Fri, 20 Aug 2021 16:01:32 -0400 -Subject: [PATCH] [base] Restore quiet no-op rendering of bitmap glyphs. - -Fixes #1076. - -* src/base/ftobjs.c (FT_Render_Glyph_Internal): Discard an error when -rendering a bitmap glyph. ---- - src/base/ftobjs.c | 7 ++++++- - 1 file changed, 6 insertions(+), 1 deletion(-) - -diff --git a/src/base/ftobjs.c b/src/base/ftobjs.c -index 342ac4a27..7b40c6421 100644 ---- a/src/base/ftobjs.c -+++ b/src/base/ftobjs.c -@@ -4703,7 +4703,7 @@ - else - renderer = FT_Lookup_Renderer( library, slot->format, &node ); - -- error = FT_ERR( Unimplemented_Feature ); -+ error = FT_ERR( Cannot_Render_Glyph ); - while ( renderer ) - { - error = renderer->render( renderer, slot, render_mode, NULL ); -@@ -4719,6 +4719,11 @@ - /* format. */ - renderer = FT_Lookup_Renderer( library, slot->format, &node ); - } -+ -+ /* it is not an error if we cannot render a bitmat glyph */ -+ if ( FT_ERR_EQ( error, Cannot_Render_Glyph ) && -+ slot->format == FT_GLYPH_FORMAT_BITMAP ) -+ error = FT_Err_Ok; - } - } - --- -GitLab - - diff --git a/source/l/freetype/freetype.SlackBuild b/source/l/freetype/freetype.SlackBuild index 4c9fdb9c..298d4797 100755 --- a/source/l/freetype/freetype.SlackBuild +++ b/source/l/freetype/freetype.SlackBuild @@ -24,7 +24,7 @@ cd $(dirname $0) ; CWD=$(pwd) PKGNAM=freetype VERSION=${VERSION:-$(echo $PKGNAM-*.tar.?z | cut -d - -f 2 | rev | cut -f 3- -d . | rev)} -BUILD=${BUILD:-2} +BUILD=${BUILD:-1} NUMJOBS=${NUMJOBS:-" -j$(expr $(nproc) + 1) "} @@ -91,9 +91,6 @@ find . \ # scripts in /etc/profile.d/. zcat $CWD/freetype.compile.both.subpixel.hinting.methods.diff.gz | patch -p1 --verbose || exit 1 -# Fix bitmap font rendering: -zcat $CWD/6e9d8d314ff6ab23177b9162c0b96616460bb84e.patch.gz | patch -p1 --verbose || exit 1 - CFLAGS="$SLKCFLAGS" \ CXXFLAGS="$SLKCFLAGS" \ ./configure \ @@ -151,7 +148,7 @@ cp -a \ ChangeLog LICENSE* README* \ $PKG/usr/doc/freetype-$VERSION # too much -rm -rf $PKG/usr/doc/freetype-$VERSION/docs/reference $PKG/usr/doc/freetype-2.11.0/docs/oldlogs +rm -rf $PKG/usr/doc/freetype-$VERSION/docs/reference $PKG/usr/doc/freetype-$VERSION/docs/oldlogs # If there's a ChangeLog file, installing at least part of the recent history # is useful, but don't let it get totally out of control: |