From b6969d8d934cb401401ccff3d23ae8f0e950903ae7f17cf865c473119cb00934 Mon Sep 17 00:00:00 2001 From: OBS User unknown Date: Tue, 2 Oct 2007 22:52:44 +0000 Subject: [PATCH] OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/freetype2?expand=0&rev=2 --- bugzilla-308961-cmex-workaround.patch | 15 +++++++++++++++ freetype2.changes | 6 ++++++ freetype2.spec | 14 +++++++++----- ft2demos.changes | 6 ++++++ ft2demos.spec | 12 ++++++++---- 5 files changed, 44 insertions(+), 9 deletions(-) create mode 100644 bugzilla-308961-cmex-workaround.patch diff --git a/bugzilla-308961-cmex-workaround.patch b/bugzilla-308961-cmex-workaround.patch new file mode 100644 index 0000000..74eaad3 --- /dev/null +++ b/bugzilla-308961-cmex-workaround.patch @@ -0,0 +1,15 @@ +--- freetype-2.3.5.orig/src/base/ftobjs.c ++++ freetype-2.3.5/src/base/ftobjs.c +@@ -1820,6 +1820,12 @@ + + if ( FT_IS_SCALABLE( face ) ) + { ++ if ( strncmp("CMEX", face->family_name, 4 ) == 0){ ++ face->height = (FT_Short)( face->ascender - face->descender ); ++ face->underline_position = (FT_Short)( -face->units_per_EM / 10 ); ++ face->underline_thickness = (FT_Short)( face->units_per_EM / 30 ); ++ } ++ + if ( face->height < 0 ) + face->height = (FT_Short)-face->height; + diff --git a/freetype2.changes b/freetype2.changes index 2b4222c..b63e622 100644 --- a/freetype2.changes +++ b/freetype2.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Tue Oct 02 16:38:08 CEST 2007 - mfabian@suse.de + +- Bugzilla #308961: add workaround for broken underlining + when using the CMEX fonts (by Peng Wu ). + ------------------------------------------------------------------- Tue Jul 03 16:19:11 CEST 2007 - mfabian@suse.de diff --git a/freetype2.spec b/freetype2.spec index b0efec6..48f6817 100644 --- a/freetype2.spec +++ b/freetype2.spec @@ -12,12 +12,12 @@ Name: freetype2 BuildRequires: zlib-devel -License: Other uncritical OpenSource License, Freetype License: http://freetype.sourceforge.net/FTL.TXT +License: Other uncritical OpenSource License Group: System/Libraries -Autoreqprov: on +AutoReqProv: on Version: 2.3.5 -Release: 12 -URL: http://www.freetype.org +Release: 19 +Url: http://www.freetype.org Summary: A TrueType Font Library # CVS repository: # cvs -d :pserver:anonymous@cvs.savannah.nongnu.org:/sources/freetype login @@ -31,6 +31,7 @@ Patch3: freetype2-bitmap-foundry.patch Patch4: ft2-stream-compat.diff Patch5: revert-fix-bytecode.patch Patch8: bugzilla-159166-reduce-embolden-distance.patch +Patch308961: bugzilla-308961-cmex-workaround.patch Patch100: freetype2-bc.patch Patch200: freetype2-subpixel.patch BuildRoot: %{_tmppath}/%{name}-%{version}-build @@ -83,6 +84,7 @@ Authors: %patch4 -p 1 -b .ft2-stream-compat #%patch5 -p 1 #%patch8 -p 1 +%patch308961 -p 1 %if %{enable_bytecode_interpreter} %patch100 -p 1 -b .bytecode %endif @@ -136,8 +138,10 @@ rm -rf $RPM_BUILD_ROOT; %{_libdir}/pkgconfig/freetype2.pc /usr/bin/* /usr/share/aclocal/* - %changelog +* Tue Oct 02 2007 - mfabian@suse.de +- Bugzilla #308961: add workaround for broken underlining + when using the CMEX fonts (by Peng Wu ). * Tue Jul 03 2007 - mfabian@suse.de - update to 2.3.5. Extract from the doc/CHANGES file: • Some subglyphs in TrueType fonts were handled incorrectly due diff --git a/ft2demos.changes b/ft2demos.changes index af3ab5a..fbd2e61 100644 --- a/ft2demos.changes +++ b/ft2demos.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Tue Oct 02 16:38:08 CEST 2007 - mfabian@suse.de + +- Bugzilla #308961: add workaround for broken underlining + when using the CMEX fonts (by Peng Wu ). + ------------------------------------------------------------------- Mon Aug 20 15:56:55 CEST 2007 - sbrabec@suse.cz diff --git a/ft2demos.spec b/ft2demos.spec index ea9d179..2daf57b 100644 --- a/ft2demos.spec +++ b/ft2demos.spec @@ -14,14 +14,14 @@ Name: ft2demos BuildRequires: xorg-x11-devel License: GPL v2 or later Group: Productivity/Publishing/Other -Autoreqprov: on +AutoReqProv: on %if %suse_version > 1000 Supplements: fonts-config %endif Version: 2.3.5 -Release: 12 +Release: 23 %define freetype_version %{version} -URL: http://www.freetype.org +Url: http://www.freetype.org Summary: Freetype2 Utilities and Demo Programs # CVS repository: # cvs -d :pserver:anonymous@cvs.savannah.nongnu.org:/sources/freetype login @@ -37,6 +37,7 @@ Patch3: freetype2-bitmap-foundry.patch Patch4: ft2-stream-compat.diff Patch5: revert-fix-bytecode.patch Patch8: bugzilla-159166-reduce-embolden-distance.patch +Patch308961: bugzilla-308961-cmex-workaround.patch Patch50: ft2demos-build-testname.patch Patch100: freetype2-bc.patch Patch101: ft2demos-bc.patch @@ -70,6 +71,7 @@ Authors: %patch4 -p 1 -b .ft2-stream-compat #%patch5 -p 1 #%patch8 -p 1 +%patch308961 -p 1 pushd ../ft2demos-%{version} %patch50 -p 1 popd @@ -123,8 +125,10 @@ rm -rf $RPM_BUILD_ROOT; %defattr(-,root,root) %{_bindir}/ft* %{_bindir}/testname - %changelog +* Tue Oct 02 2007 - mfabian@suse.de +- Bugzilla #308961: add workaround for broken underlining + when using the CMEX fonts (by Peng Wu ). * Mon Aug 20 2007 - sbrabec@suse.cz - Commented out NoSource to provide comfortable rebuild. * Tue Jul 03 2007 - mfabian@suse.de