From 1afc4d227ddc6c72c3b0b9c2f22c91b79b8368d9 Mon Sep 17 00:00:00 2001 From: Marek Kasik Date: Mon, 5 Aug 2013 17:55:37 +0200 Subject: [PATCH] Update to 2.5.0 Backport changes from freetype-2.5.0.1 (ft2demos-2.5.0.1 and freetype-doc-2.5.0.1 were not released) --- .gitignore | 3 +++ freetype-2.5.0.1.patch | 41 +++++++++++++++++++++++++++++++++++++++++ freetype.spec | 19 ++++++++++++------- sources | 6 +++--- 4 files changed, 59 insertions(+), 10 deletions(-) create mode 100644 freetype-2.5.0.1.patch diff --git a/.gitignore b/.gitignore index 0a652df..c422ce6 100644 --- a/.gitignore +++ b/.gitignore @@ -34,3 +34,6 @@ ft2demos-2.4.2.tar.bz2 /freetype-2.4.12.tar.bz2 /freetype-doc-2.4.12.tar.bz2 /ft2demos-2.4.12.tar.bz2 +/freetype-2.5.0.tar.bz2 +/freetype-doc-2.5.0.tar.bz2 +/ft2demos-2.5.0.tar.bz2 diff --git a/freetype-2.5.0.1.patch b/freetype-2.5.0.1.patch new file mode 100644 index 0000000..4c59599 --- /dev/null +++ b/freetype-2.5.0.1.patch @@ -0,0 +1,41 @@ +--- a/builds/unix/install.mk ++++ b/builds/unix/install.mk +@@ -3,7 +3,7 @@ + # + + +-# Copyright 1996-2000, 2002, 2003, 2006 by ++# Copyright 1996-2000, 2002, 2003, 2006, 2013 by + # David Turner, Robert Wilhelm, and Werner Lemberg. + # + # This file is part of the FreeType project, and may only be used, modified, +@@ -31,7 +31,6 @@ install: $(PROJECT_LIBRARY) + $(MKINSTALLDIRS) $(DESTDIR)$(libdir) \ + $(DESTDIR)$(libdir)/pkgconfig \ + $(DESTDIR)$(includedir)/freetype2/freetype/config \ +- $(DESTDIR)$(includedir)/freetype2/freetype/cache \ + $(DESTDIR)$(bindir) \ + $(DESTDIR)$(datadir)/aclocal + $(LIBTOOL) --mode=install $(INSTALL) \ +--- a/devel/ftoption.h ++++ b/devel/ftoption.h +@@ -765,7 +765,7 @@ FT_BEGIN_HEADER + /* switch between the two engines using the `hinting-engine' property of */ + /* the cff driver module. */ + /* */ +-/* #define CFF_CONFIG_OPTION_OLD_ENGINE */ ++#define CFF_CONFIG_OPTION_OLD_ENGINE + + + /*************************************************************************/ +--- a/include/freetype/config/ftoption.h ++++ b/include/freetype/config/ftoption.h +@@ -765,7 +765,7 @@ FT_BEGIN_HEADER + /* switch between the two engines using the `hinting-engine' property of */ + /* the cff driver module. */ + /* */ +-#define CFF_CONFIG_OPTION_OLD_ENGINE ++/* #define CFF_CONFIG_OPTION_OLD_ENGINE */ + + + /*************************************************************************/ diff --git a/freetype.spec b/freetype.spec index 4d5ef24..9be5e0c 100644 --- a/freetype.spec +++ b/freetype.spec @@ -6,8 +6,8 @@ Summary: A free and portable font rendering engine Name: freetype -Version: 2.4.12 -Release: 6%{?dist} +Version: 2.5.0 +Release: 1%{?dist} License: (FTL or GPLv2+) and BSD and MIT and Public Domain and zlib with acknowledgement Group: System Environment/Libraries URL: http://www.freetype.org @@ -26,12 +26,12 @@ Patch47: freetype-2.3.11-more-demos.patch # Fix multilib conflicts Patch88: freetype-multilib.patch -# https://bugzilla.redhat.com/show_bug.cgi?id=959771 -Patch89: freetype-2.4.12-enable-adobe-cff-engine.patch - # https://bugzilla.redhat.com/show_bug.cgi?id=961855 Patch90: freetype-2.4.12-pkgconfig.patch +# Backport of all (2) commits from 2.5.0.1 +Patch91: freetype-2.5.0.1.patch + Buildroot: %{_tmppath}/%{name}-%{version}-root-%(%{__id_u} -n) BuildRequires: libX11-devel @@ -92,10 +92,10 @@ popd %patch88 -p1 -b .multilib -%patch89 -p1 -b .adobe-cff - %patch90 -p1 -b .pkgconfig +%patch91 -p1 -b .2.5.0.1 + %build %configure --disable-static @@ -216,6 +216,11 @@ rm -rf $RPM_BUILD_ROOT %doc docs/tutorial %changelog +* Mon Aug 05 2013 Marek Kasik - 2.5.0-1 +- Update to 2.5.0 +- Backport changes from freetype-2.5.0.1 +- (ft2demos-2.5.0.1 and freetype-doc-2.5.0.1 were not released) + * Sat Aug 03 2013 Fedora Release Engineering - 2.4.12-6 - Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild diff --git a/sources b/sources index 55bb041..174372e 100644 --- a/sources +++ b/sources @@ -1,3 +1,3 @@ -3463102764315eb86c0d3c2e1f3ffb7d freetype-2.4.12.tar.bz2 -e3955ef324b2ceea74dc849e07fbfb7a freetype-doc-2.4.12.tar.bz2 -79d2329da1a118d559ec6bd77fddb210 ft2demos-2.4.12.tar.bz2 +07b7f54bc32d3a0f8a44ec4586c73d81 freetype-2.5.0.tar.bz2 +40f3d5cc0b16396b3fb6b98eeaa053b2 freetype-doc-2.5.0.tar.bz2 +9bbea1989116715d3544d8439c8d2972 ft2demos-2.5.0.tar.bz2