[freetype-freeworld] Update to 2.6.3 (matches Fedora freetype) (TODO: new-sources needed)

Kevin Kofler kkofler at rpmfusion.org
Thu Jun 23 03:57:16 CEST 2016


commit b201eae7ceacd1b886957e5ddff4ecc0b07a56b5
Author: Kevin Kofler <kevin.kofler at chello.at>
Date:   Thu Jun 23 03:56:47 2016 +0200

    Update to 2.6.3 (matches Fedora freetype) (TODO: new-sources needed)
    
    * Thu Jun 23 2016 Kevin Kofler <Kevin at tigcc.ticalc.org> 2.6.3-1
    - Update to 2.6.3 (matches Fedora freetype)
    - Drop obsolete 0001-cff-Don-t-use-hmtx-table-for-LSB-45520.patch backport
    - Restore old (pre-2.5.2) enable-spr patch, ftoption.h moved back
    
    TODO: Someone needs to run rfpkg-free new-sources freetype-2.6.3.tar.bz2,
          I did not get rfpkg to run in the hurry.

 0001-cff-Don-t-use-hmtx-table-for-LSB-45520.patch  | 26 ----------------------
 ...le-spr.patch => freetype-2.3.0-enable-spr.patch |  5 ++---
 freetype-freeworld.spec                            | 13 ++++++-----
 3 files changed, 9 insertions(+), 35 deletions(-)
---
diff --git a/freetype-2.5.2-enable-spr.patch b/freetype-2.3.0-enable-spr.patch
similarity index 61%
rename from freetype-2.5.2-enable-spr.patch
rename to freetype-2.3.0-enable-spr.patch
index b893914..8432e28 100644
--- a/freetype-2.5.2-enable-spr.patch
+++ b/freetype-2.3.0-enable-spr.patch
@@ -1,6 +1,5 @@
-diff -ur freetype-2.5.2/include/config/ftoption.h freetype-2.5.2-enable-spr/include/config/ftoption.h
---- freetype-2.5.2/include/config/ftoption.h	2013-12-08 19:40:19.000000000 +0100
-+++ freetype-2.5.2-enable-spr/include/config/ftoption.h	2014-01-17 19:17:34.000000000 +0100
+--- freetype-2.3.0/include/freetype/config/ftoption.h.spf	2007-01-18 14:27:34.000000000 -0500
++++ freetype-2.3.0/include/freetype/config/ftoption.h	2007-01-18 14:27:48.000000000 -0500
 @@ -92,7 +92,7 @@
    /* This is done to allow FreeType clients to run unmodified, forcing     */
    /* them to display normal gray-level anti-aliased glyphs.                */
diff --git a/freetype-freeworld.spec b/freetype-freeworld.spec
index acd669c..517f8cc 100644
--- a/freetype-freeworld.spec
+++ b/freetype-freeworld.spec
@@ -1,14 +1,12 @@
 Summary: A free and portable font rendering engine
 Name: freetype-freeworld
-Version: 2.6
+Version: 2.6.3
 Release: 1%{?dist}
 License: (FTL or GPLv2+) and BSD and MIT and Public Domain and zlib with acknowledgement
 URL: http://www.freetype.org
 Source:  http://download.savannah.gnu.org/releases/freetype/freetype-%{version}.tar.bz2
 
-Patch0:   0001-cff-Don-t-use-hmtx-table-for-LSB-45520.patch
-
-Patch21:  freetype-2.5.2-enable-spr.patch
+Patch21:  freetype-2.3.0-enable-spr.patch
 
 # Enable otvalid and gxvalid modules
 Patch46:  freetype-2.2.1-enable-valid.patch
@@ -40,8 +38,6 @@ It transparently overrides the system library using ld.so.conf.d.
 %prep
 %setup -q -n freetype-%{version}
 
-%patch0  -p1 -b .hmtx-table
-
 %patch21 -p1 -b .enable-spr
 
 %patch46 -p1 -b .enable-valid
@@ -89,6 +85,11 @@ echo "%{_libdir}/%{name}" \
 %config(noreplace) %{_sysconfdir}/ld.so.conf.d/%{name}-%{_arch}.conf
 
 %changelog
+* Thu Jun 23 2016 Kevin Kofler <Kevin at tigcc.ticalc.org> 2.6.3-1
+- Update to 2.6.3 (matches Fedora freetype)
+- Drop obsolete 0001-cff-Don-t-use-hmtx-table-for-LSB-45520.patch backport
+- Restore old (pre-2.5.2) enable-spr patch, ftoption.h moved back
+
 * Thu Oct 29 2015 Kevin Kofler <Kevin at tigcc.ticalc.org> 2.6-1
 - Update to 2.6 (matches Fedora freetype, rh#1229688)
 - Drop obsolete freetype-2.5.5-thread-safety.patch backport


More information about the rpmfusion-commits mailing list