diff --git a/.gitignore b/.gitignore index c422ce6..eb79c64 100644 --- a/.gitignore +++ b/.gitignore @@ -37,3 +37,6 @@ ft2demos-2.4.2.tar.bz2 /freetype-2.5.0.tar.bz2 /freetype-doc-2.5.0.tar.bz2 /ft2demos-2.5.0.tar.bz2 +/freetype-2.5.2.tar.bz2 +/freetype-doc-2.5.2.tar.bz2 +/ft2demos-2.5.2.tar.bz2 diff --git a/0001-Fix-vertical-size-of-emboldened-glyphs.patch b/0001-Fix-vertical-size-of-emboldened-glyphs.patch deleted file mode 100644 index 330d1ce..0000000 --- a/0001-Fix-vertical-size-of-emboldened-glyphs.patch +++ /dev/null @@ -1,45 +0,0 @@ -From 31e726d939e7b79506d11164d259c9789e429761 Mon Sep 17 00:00:00 2001 -From: Behdad Esfahbod -Date: Fri, 20 Sep 2013 07:20:53 +0200 -Subject: [PATCH] Fix vertical size of emboldened glyphs. - -Cf. https://bugzilla.gnome.org/show_bug.cgi?id=686709 - -* src/base/ftsynth.c (FT_GlyphSlot_Embolden): Adjust `horiBearingY' -also. ---- - src/base/ftsynth.c | 11 ++++++----- - 1 files changed, 6 insertions(+), 5 deletions(-) - -diff --git a/src/base/ftsynth.c b/src/base/ftsynth.c -index 241d37f..3098a60 100644 ---- a/src/base/ftsynth.c -+++ b/src/base/ftsynth.c -@@ -4,7 +4,7 @@ - /* */ - /* FreeType synthesizing code for emboldening and slanting (body). */ - /* */ --/* Copyright 2000-2006, 2010, 2012 by */ -+/* Copyright 2000-2006, 2010, 2012, 2013 by */ - /* David Turner, Robert Wilhelm, and Werner Lemberg. */ - /* */ - /* This file is part of the FreeType project, and may only be used, */ -@@ -139,10 +139,11 @@ - if ( slot->advance.y ) - slot->advance.y += ystr; - -- slot->metrics.width += xstr; -- slot->metrics.height += ystr; -- slot->metrics.horiAdvance += xstr; -- slot->metrics.vertAdvance += ystr; -+ slot->metrics.width += xstr; -+ slot->metrics.height += ystr; -+ slot->metrics.horiAdvance += xstr; -+ slot->metrics.vertAdvance += ystr; -+ slot->metrics.horiBearingY += ystr; - - /* XXX: 16-bit overflow case must be excluded before here */ - if ( slot->format == FT_GLYPH_FORMAT_BITMAP ) --- -1.8.3.1 - diff --git a/freetype-2.3.11-more-demos.patch b/freetype-2.3.11-more-demos.patch deleted file mode 100644 index 181eafe..0000000 --- a/freetype-2.3.11-more-demos.patch +++ /dev/null @@ -1,18 +0,0 @@ -diff -up ft2demos-2.3.11/Makefile.more-demos freetype-2.3.11/ft2demos-2.3.11/Makefile ---- ft2demos-2.3.11/Makefile.more-demos 2009-10-22 16:02:26.000000000 -0400 -+++ ft2demos-2.3.11/Makefile 2009-10-22 16:02:32.000000000 -0400 -@@ -288,10 +288,10 @@ else - # Note that ttdebug only works if the FreeType's `truetype' driver has - # been compiled with TT_CONFIG_OPTION_BYTECODE_INTERPRETER defined. - # -- # EXES += ftchkwd -- # EXES += ftmemchk -- # EXES += ftpatchk -- # EXES += fttimer -+ EXES += ftchkwd -+ EXES += ftmemchk -+ EXES += ftpatchk -+ EXES += fttimer - # EXES += testname - # EXES += ttdebug - diff --git a/freetype-2.4.12-enable-adobe-cff-engine.patch b/freetype-2.4.12-enable-adobe-cff-engine.patch deleted file mode 100644 index db11a44..0000000 --- a/freetype-2.4.12-enable-adobe-cff-engine.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- freetype-2.4.12/src/cff/cffobjs.c -+++ freetype-2.4.12/src/cff/cffobjs.c -@@ -1056,7 +1056,7 @@ - - - /* set default property values */ -- driver->hinting_engine = FT_CFF_HINTING_FREETYPE; -+ driver->hinting_engine = FT_CFF_HINTING_ADOBE; - driver->no_stem_darkening = FALSE; - - return FT_Err_Ok; diff --git a/freetype-2.4.12-pkgconfig.patch b/freetype-2.4.12-pkgconfig.patch index 397a003..28ffcbc 100644 --- a/freetype-2.4.12-pkgconfig.patch +++ b/freetype-2.4.12-pkgconfig.patch @@ -1,14 +1,14 @@ ---- freetype-2.4.12/builds/unix/freetype2.in -+++ freetype-2.4.12/builds/unix/freetype2.in +--- freetype-2.5.2/builds/unix/freetype2.in ++++ freetype-2.5.2/builds/unix/freetype2.in @@ -1,7 +1,7 @@ -prefix="%prefix%" -exec_prefix="%exec_prefix%" -libdir="%libdir%" --includedir="%includedir%" +-includedir="%includedir%/freetype2" +prefix=%prefix% +exec_prefix=%exec_prefix% +libdir=%libdir% -+includedir=%includedir% ++includedir=%includedir%/freetype2 Name: FreeType 2 Description: A free, high-quality, and portable font engine. diff --git a/freetype-2.5.0.1.patch b/freetype-2.5.0.1.patch deleted file mode 100644 index 4c59599..0000000 --- a/freetype-2.5.0.1.patch +++ /dev/null @@ -1,41 +0,0 @@ ---- 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-2.5.2-more-demos.patch b/freetype-2.5.2-more-demos.patch new file mode 100644 index 0000000..e737cb7 --- /dev/null +++ b/freetype-2.5.2-more-demos.patch @@ -0,0 +1,17 @@ +--- ft2demos-2.5.2/Makefile ++++ ft2demos-2.5.2/Makefile +@@ -296,10 +296,10 @@ else + # The following programs are not compiled automatically; either comment + # out the affected line or use the program name as a Makefile target. + # +- # EXES += ftchkwd +- # EXES += ftmemchk +- # EXES += ftpatchk +- # EXES += fttimer ++ EXES += ftchkwd ++ EXES += ftmemchk ++ EXES += ftpatchk ++ EXES += fttimer + # EXES += testname + + exes: $(EXES:%=$(BIN_DIR_2)/%$E) diff --git a/freetype.spec b/freetype.spec index 8087bfb..7c0d8c8 100644 --- a/freetype.spec +++ b/freetype.spec @@ -6,8 +6,8 @@ Summary: A free and portable font rendering engine Name: freetype -Version: 2.5.0 -Release: 5%{?dist} +Version: 2.5.2 +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 @@ -21,7 +21,7 @@ Patch21: freetype-2.3.0-enable-spr.patch # Enable otvalid and gxvalid modules Patch46: freetype-2.2.1-enable-valid.patch # Enable additional demos -Patch47: freetype-2.3.11-more-demos.patch +Patch47: freetype-2.5.2-more-demos.patch # Fix multilib conflicts Patch88: freetype-multilib.patch @@ -29,12 +29,6 @@ Patch88: freetype-multilib.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 - -# https://bugzilla.gnome.org/show_bug.cgi?id=686709 -Patch92: 0001-Fix-vertical-size-of-emboldened-glyphs.patch - Buildroot: %{_tmppath}/%{name}-%{version}-root-%(%{__id_u} -n) BuildRequires: libX11-devel @@ -98,10 +92,6 @@ popd %patch90 -p1 -b .pkgconfig -%patch91 -p1 -b .2.5.0.1 - -%patch92 -p1 -b .emboldened-glyphs - %build %configure --disable-static @@ -154,9 +144,9 @@ rm -rf $RPM_BUILD_ROOT %define wordsize 32 %endif -mv $RPM_BUILD_ROOT%{_includedir}/freetype2/freetype/config/ftconfig.h \ - $RPM_BUILD_ROOT%{_includedir}/freetype2/freetype/config/ftconfig-%{wordsize}.h -install -p -m 644 %{SOURCE3} $RPM_BUILD_ROOT%{_includedir}/freetype2/freetype/config/ftconfig.h +mv $RPM_BUILD_ROOT%{_includedir}/freetype2/config/ftconfig.h \ + $RPM_BUILD_ROOT%{_includedir}/freetype2/config/ftconfig-%{wordsize}.h +install -p -m 644 %{SOURCE3} $RPM_BUILD_ROOT%{_includedir}/freetype2/config/ftconfig.h # Don't package static a or .la files rm -f $RPM_BUILD_ROOT%{_libdir}/*.{a,la} @@ -212,7 +202,6 @@ rm -rf $RPM_BUILD_ROOT %dir %{_includedir}/freetype2 %{_datadir}/aclocal/freetype2.m4 %{_includedir}/freetype2/* -%{_includedir}/*.h %{_libdir}/libfreetype.so %{_bindir}/freetype-config %{_libdir}/pkgconfig/freetype2.pc @@ -222,6 +211,11 @@ rm -rf $RPM_BUILD_ROOT %doc docs/tutorial %changelog +* Fri Jan 17 2014 Marek Kasik - 2.5.2-1 +- Update to 2.5.2 +- Modify spec file to respect the new header file layout +- Resolves: #1034065 + * Fri Jan 10 2014 Marek Kasik - 2.5.0-5 - Enable ppc64le architecture - Resolves: #1051202 diff --git a/sources b/sources index 174372e..93fd124 100644 --- a/sources +++ b/sources @@ -1,3 +1,3 @@ -07b7f54bc32d3a0f8a44ec4586c73d81 freetype-2.5.0.tar.bz2 -40f3d5cc0b16396b3fb6b98eeaa053b2 freetype-doc-2.5.0.tar.bz2 -9bbea1989116715d3544d8439c8d2972 ft2demos-2.5.0.tar.bz2 +10e8f4d6a019b124088d18bc26123a25 freetype-2.5.2.tar.bz2 +cb858209b8d84860345f3f62fcae2af2 freetype-doc-2.5.2.tar.bz2 +399d98441c6c67b5bf29c7733db27438 ft2demos-2.5.2.tar.bz2