diff options
| author | Patrick J Volkerding <volkerdi@slackware.com> | 2021-08-21 18:57:13 +0000 |
|---|---|---|
| committer | Eric Hameleers <alien@slackware.com> | 2021-08-22 08:59:54 +0200 |
| commit | cf1ce311aa18fe90657998c5f1ec9f9eec01831f (patch) | |
| tree | 24c5640cc02c5691310ae425301eaf5583c4b795 /source | |
| parent | 22c2e383b0af382c38db014d9155517c80281305 (diff) | |
| download | current-cf1ce311aa18fe90657998c5f1ec9f9eec01831f.tar.gz | |
Sat Aug 21 18:57:13 UTC 202120210821185713
a/upower-0.99.13-x86_64-1.txz: Upgraded.
a/xfsprogs-5.13.0-x86_64-1.txz: Upgraded.
l/freetype-2.11.0-x86_64-2.txz: Rebuilt.
Restore quiet no-op rendering of bitmap glyphs.
Diffstat (limited to 'source')
| -rw-r--r-- | source/l/freetype/6e9d8d314ff6ab23177b9162c0b96616460bb84e.patch | 42 | ||||
| -rwxr-xr-x | source/l/freetype/freetype.SlackBuild | 5 |
2 files changed, 45 insertions, 2 deletions
diff --git a/source/l/freetype/6e9d8d314ff6ab23177b9162c0b96616460bb84e.patch b/source/l/freetype/6e9d8d314ff6ab23177b9162c0b96616460bb84e.patch new file mode 100644 index 00000000..b91780f1 --- /dev/null +++ b/source/l/freetype/6e9d8d314ff6ab23177b9162c0b96616460bb84e.patch @@ -0,0 +1,42 @@ +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 605c1e9c..4c9fdb9c 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:-1} +BUILD=${BUILD:-2} NUMJOBS=${NUMJOBS:-" -j$(expr $(nproc) + 1) "} @@ -91,7 +91,8 @@ find . \ # scripts in /etc/profile.d/. zcat $CWD/freetype.compile.both.subpixel.hinting.methods.diff.gz | patch -p1 --verbose || exit 1 -chown -R root:root . +# Fix bitmap font rendering: +zcat $CWD/6e9d8d314ff6ab23177b9162c0b96616460bb84e.patch.gz | patch -p1 --verbose || exit 1 CFLAGS="$SLKCFLAGS" \ CXXFLAGS="$SLKCFLAGS" \ |