rpm/freetype2
SHA256
1
0
Fork 0
forked from pool/freetype2
Code Pull Requests Activity

- Add psaux-flex.patch to fix a regression in Type1 rendering

Browse Source 
OBS-URL: https://build.opensuse.org/package/show/M17N/freetype2?expand=0&rev=130
This commit is contained in:
Ismail Dönmez 2018-01-10 10:35:08 +00:00 committed by Git OBS Bridge
parent 44ebe63372
commit ccf0d326b0
5 changed files with 64 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
bugzilla-308961-cmex-workaround.patch
View File

@ -2,11 +2,11 @@
src/base/ftobjs.c | 5 +++++
1 file changed, 5 insertions(+)
Index: freetype-2.6.1/src/base/ftobjs.c
Index: freetype-2.9/src/base/ftobjs.c
===================================================================
--- freetype-2.6.1.orig/src/base/ftobjs.c
+++ freetype-2.6.1/src/base/ftobjs.c
@@ -2267,6 +2267,11 @@
--- freetype-2.9.orig/src/base/ftobjs.c
+++ freetype-2.9/src/base/ftobjs.c
@@ -2540,6 +2540,11 @@
if ( FT_IS_SCALABLE( face ) )
{

24
don-t-mark-libpng-as-required-library.patch
View File

@ -1,8 +1,8 @@
Index: freetype-2.6.1/builds/unix/configure
Index: freetype-2.9/builds/unix/configure
===================================================================
--- freetype-2.6.1.orig/builds/unix/configure
+++ freetype-2.6.1/builds/unix/configure
@@ -14096,7 +14096,6 @@ esac
--- freetype-2.9.orig/builds/unix/configure
+++ freetype-2.9/builds/unix/configure
@@ -14487,7 +14487,6 @@ esac
# entries in Requires.private are separated by commas;
REQUIRES_PRIVATE="$zlib_reqpriv, \
$bzip2_reqpriv, \
@ -10,7 +10,7 @@ Index: freetype-2.6.1/builds/unix/configure
$harfbuzz_reqpriv"
# beautify
REQUIRES_PRIVATE=`echo "$REQUIRES_PRIVATE" \
@@ -14110,7 +14109,6 @@ REQUIRES_PRIVATE=`echo "$REQUIRES_PRIVAT
@@ -14501,7 +14500,6 @@ REQUIRES_PRIVATE=`echo "$REQUIRES_PRIVAT
LIBS_PRIVATE="$zlib_libspriv \
$bzip2_libspriv \
@ -18,7 +18,7 @@ Index: freetype-2.6.1/builds/unix/configure
$harfbuzz_libspriv \
$ft2_extra_libs"
# beautify
@@ -14122,7 +14120,6 @@ LIBS_PRIVATE=`echo "$LIBS_PRIVATE" \
@@ -14513,7 +14511,6 @@ LIBS_PRIVATE=`echo "$LIBS_PRIVATE" \
LIBSSTATIC_CONFIG="-lfreetype \
$zlib_libsstaticconf \
$bzip2_libsstaticconf \
@ -26,11 +26,11 @@ Index: freetype-2.6.1/builds/unix/configure
$harfbuzz_libsstaticconf \
$ft2_extra_libs"
# remove -L/usr/lib and -L/usr/lib64 since `freetype-config' adds them later
Index: freetype-2.6.1/builds/unix/configure.raw
Index: freetype-2.9/builds/unix/configure.raw
===================================================================
--- freetype-2.6.1.orig/builds/unix/configure.raw
+++ freetype-2.6.1/builds/unix/configure.raw
@@ -918,7 +918,6 @@ esac
--- freetype-2.9.orig/builds/unix/configure.raw
+++ freetype-2.9/builds/unix/configure.raw
@@ -938,7 +938,6 @@ esac
# entries in Requires.private are separated by commas;
REQUIRES_PRIVATE="$zlib_reqpriv, \
$bzip2_reqpriv, \
@ -38,7 +38,7 @@ Index: freetype-2.6.1/builds/unix/configure.raw
$harfbuzz_reqpriv"
# beautify
REQUIRES_PRIVATE=`echo "$REQUIRES_PRIVATE" \
@@ -932,7 +931,6 @@ REQUIRES_PRIVATE=`echo "$REQUIRES_PRIVAT
@@ -952,7 +951,6 @@ REQUIRES_PRIVATE=`echo "$REQUIRES_PRIVAT
LIBS_PRIVATE="$zlib_libspriv \
$bzip2_libspriv \
@ -46,7 +46,7 @@ Index: freetype-2.6.1/builds/unix/configure.raw
$harfbuzz_libspriv \
$ft2_extra_libs"
# beautify
@@ -944,7 +942,6 @@ LIBS_PRIVATE=`echo "$LIBS_PRIVATE" \
@@ -964,7 +962,6 @@ LIBS_PRIVATE=`echo "$LIBS_PRIVATE" \
LIBSSTATIC_CONFIG="-lfreetype \
$zlib_libsstaticconf \
$bzip2_libsstaticconf \

5
freetype2.changes
View File

@ -1,3 +1,8 @@
-------------------------------------------------------------------
Wed Jan 10 10:32:25 UTC 2018 - idonmez@suse.com
- Add psaux-flex.patch to fix a regression in Type1 rendering
-------------------------------------------------------------------
Tue Jan 9 11:34:51 UTC 2018 - idonmez@suse.com

11
freetype2.spec
View File

@ -28,9 +28,11 @@ Url: https://www.freetype.org
Source0: https://download.savannah.gnu.org/releases/freetype/freetype-%{version}.tar.bz2
Source1: https://download.savannah.gnu.org/releases/freetype/freetype-doc-%{doc_version}.tar.bz2
Source3: baselibs.conf
Patch0: bugzilla-308961-cmex-workaround.patch
# PATCH-FIX-OPENSUSE don-t-mark-libpng-as-required-library.patch -- it is private in .pc
Patch202: don-t-mark-libpng-as-required-library.patch
Patch308961: bugzilla-308961-cmex-workaround.patch
Patch1: don-t-mark-libpng-as-required-library.patch
# PATCH-FIX-UPSTREAM psaux-flex.patch -- Upstream commit cc2f3cdecff5a351e7e8961b9f2e389ab740231a
Patch2: psaux-flex.patch
BuildRequires: gawk
BuildRequires: libbz2-devel
BuildRequires: libpng-devel
@ -80,8 +82,9 @@ It also contains a small tutorial for using that library.
%prep
%setup -q -n freetype-%{version} -a 1
%patch308961 -p 1
%patch202 -p1
%patch0 -p1
%patch1 -p1
%patch2 -p1
%build
export CFLAGS="%{optflags} -std=gnu99 -D_GNU_SOURCE $(getconf LFS_CFLAGS)"

36
psaux-flex.patch Normal file
View File

@ -0,0 +1,36 @@
From cc2f3cdecff5a351e7e8961b9f2e389ab740231a Mon Sep 17 00:00:00 2001
From: Ewald Hew <ewaldhew@gmail.com>
Date: Wed, 10 Jan 2018 13:24:56 +0800
Subject: [psaux] Correctly handle Flex features (#52846).
* src/psaux/psintrp.c (cf2_interpT2CharString) <cf2_cmdVMOVETO,
cf2_cmdHMOVETO>: Do not move if doing Flex.
---
ChangeLog | 7 +++++++
src/psaux/psintrp.c | 6 ++++--
2 files changed, 11 insertions(+), 2 deletions(-)
Index: freetype-2.9/src/psaux/psintrp.c
===================================================================
--- freetype-2.9.orig/src/psaux/psintrp.c
+++ freetype-2.9/src/psaux/psintrp.c
@@ -852,7 +852,8 @@
curY = ADD_INT32( curY, cf2_stack_popFixed( opStack ) );
- cf2_glyphpath_moveTo( &glyphPath, curX, curY );
+ if ( !decoder->flex_state )
+ cf2_glyphpath_moveTo( &glyphPath, curX, curY );
break;
@@ -2674,7 +2675,8 @@
curX = ADD_INT32( curX, cf2_stack_popFixed( opStack ) );
- cf2_glyphpath_moveTo( &glyphPath, curX, curY );
+ if ( !decoder->flex_state )
+ cf2_glyphpath_moveTo( &glyphPath, curX, curY );
break;