From 8721ad3554525a44dedf2aec4a76766cf7fd4c1b4bee5758f85636ae31c93cd4 Mon Sep 17 00:00:00 2001 From: OBS User unknown Date: Tue, 9 Oct 2007 15:08:08 +0000 Subject: [PATCH] OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/freetype2?expand=0&rev=3 --- bugzilla-308961-cmex-workaround.patch | 13 +++++++------ freetype2.changes | 7 +++++++ freetype2.spec | 7 +++++-- ft2demos.changes | 7 +++++++ ft2demos.spec | 8 +++++--- 5 files changed, 31 insertions(+), 11 deletions(-) diff --git a/bugzilla-308961-cmex-workaround.patch b/bugzilla-308961-cmex-workaround.patch index 74eaad3..2cbd075 100644 --- a/bugzilla-308961-cmex-workaround.patch +++ b/bugzilla-308961-cmex-workaround.patch @@ -1,15 +1,16 @@ +Index: freetype-2.3.5/src/base/ftobjs.c +=================================================================== --- freetype-2.3.5.orig/src/base/ftobjs.c +++ freetype-2.3.5/src/base/ftobjs.c -@@ -1820,6 +1820,12 @@ - +@@ -1820,6 +1820,11 @@ + 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 ); ++ 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 b63e622..4c9e7ad 100644 --- a/freetype2.changes +++ b/freetype2.changes @@ -1,3 +1,10 @@ +------------------------------------------------------------------- +Mon Oct 08 11:43:58 CEST 2007 - mfabian@suse.de + +- Bugzilla #308961: improve workaround patch for the broken + underlining in the CMEX fonts + (again by Peng Wu ). + ------------------------------------------------------------------- Tue Oct 02 16:38:08 CEST 2007 - mfabian@suse.de diff --git a/freetype2.spec b/freetype2.spec index 48f6817..015b57e 100644 --- a/freetype2.spec +++ b/freetype2.spec @@ -16,7 +16,7 @@ License: Other uncritical OpenSource License Group: System/Libraries AutoReqProv: on Version: 2.3.5 -Release: 19 +Release: 21 Url: http://www.freetype.org Summary: A TrueType Font Library # CVS repository: @@ -111,7 +111,6 @@ make prefix=/usr libdir=%{_libdir} %{?jobs:-j %jobs} #make refdoc %install -rm -rf $RPM_BUILD_ROOT; # these development documents should go into the freetype2-devel package: mv docs/reference freetype-%{version}/docs make prefix=$RPM_BUILD_ROOT/usr libdir=$RPM_BUILD_ROOT/%{_libdir} install @@ -139,6 +138,10 @@ rm -rf $RPM_BUILD_ROOT; /usr/bin/* /usr/share/aclocal/* %changelog +* Mon Oct 08 2007 - mfabian@suse.de +- Bugzilla #308961: improve workaround patch for the broken + underlining in the CMEX fonts + (again by Peng Wu ). * Tue Oct 02 2007 - mfabian@suse.de - Bugzilla #308961: add workaround for broken underlining when using the CMEX fonts (by Peng Wu ). diff --git a/ft2demos.changes b/ft2demos.changes index fbd2e61..ff2f0c1 100644 --- a/ft2demos.changes +++ b/ft2demos.changes @@ -1,3 +1,10 @@ +------------------------------------------------------------------- +Mon Oct 08 11:43:58 CEST 2007 - mfabian@suse.de + +- Bugzilla #308961: improve workaround patch for the broken + underlining in the CMEX fonts + (again by Peng Wu ). + ------------------------------------------------------------------- Tue Oct 02 16:38:08 CEST 2007 - mfabian@suse.de diff --git a/ft2demos.spec b/ft2demos.spec index 2daf57b..86da88e 100644 --- a/ft2demos.spec +++ b/ft2demos.spec @@ -19,7 +19,7 @@ AutoReqProv: on Supplements: fonts-config %endif Version: 2.3.5 -Release: 23 +Release: 25 %define freetype_version %{version} Url: http://www.freetype.org Summary: Freetype2 Utilities and Demo Programs @@ -111,7 +111,6 @@ pushd .. popd %install -rm -rf $RPM_BUILD_ROOT; #make prefix=$RPM_BUILD_ROOT/usr libdir=$RPM_BUILD_ROOT/%{_libdir} install mkdir -p $RPM_BUILD_ROOT%{_bindir} pushd ../ft2demos-%{version}/bin/.libs @@ -119,13 +118,16 @@ pushd ../ft2demos-%{version}/bin/.libs popd %clean -rm -rf $RPM_BUILD_ROOT; %files %defattr(-,root,root) %{_bindir}/ft* %{_bindir}/testname %changelog +* Mon Oct 08 2007 - mfabian@suse.de +- Bugzilla #308961: improve workaround patch for the broken + underlining in the CMEX fonts + (again by Peng Wu ). * Tue Oct 02 2007 - mfabian@suse.de - Bugzilla #308961: add workaround for broken underlining when using the CMEX fonts (by Peng Wu ).