Login
[x]
Log in using an account from:
Fedora Account System
Red Hat Associate
Red Hat Customer
Or login using a Red Hat Bugzilla account
Forgot Password
Login:
Hide Forgot
Create an Account
Red Hat Bugzilla – Attachment 845621 Details for
Bug 1034065
freetype-2.5.2 is available
[?]
New
Simple Search
Advanced Search
My Links
Browse
Requests
Reports
Current State
Search
Tabular reports
Graphical reports
Duplicates
Other Reports
User Changes
Plotly Reports
Bug Status
Bug Severity
Non-Defaults
|
Product Dashboard
Help
Page Help!
Bug Writing Guidelines
What's new
Browser Support Policy
5.0.4.rh83 Release notes
FAQ
Guides index
User guide
Web Services
Contact
Legal
This site requires JavaScript to be enabled to function correctly, please enable it.
[patch]
Update Freetype package to version 2.5.2.
0001-Update-to-2.5.2.patch (text/plain), 11.11 KB, created by
Michael Kuhn
on 2014-01-05 01:02:54 UTC
(
hide
)
Description:
Update Freetype package to version 2.5.2.
Filename:
MIME Type:
Creator:
Michael Kuhn
Created:
2014-01-05 01:02:54 UTC
Size:
11.11 KB
patch
obsolete
>From ed8ae20178fcbbf3473f4829f0dce6d08c4352f2 Mon Sep 17 00:00:00 2001 >From: Michael Kuhn <suraia@ikkoku.de> >Date: Sun, 29 Dec 2013 23:05:16 +0100 >Subject: [PATCH] Update to 2.5.2. > >--- > 0001-Fix-vertical-size-of-emboldened-glyphs.patch | 45 ----------------------- > freetype-2.3.0-enable-spr.patch | 14 ++++++- > freetype-2.3.11-more-demos.patch | 14 +++---- > freetype-2.4.12-enable-adobe-cff-engine.patch | 11 ------ > freetype-2.4.12-pkgconfig.patch | 9 +++-- > freetype-2.5.0.1.patch | 41 --------------------- > freetype.spec | 24 ++++-------- > 7 files changed, 32 insertions(+), 126 deletions(-) > delete mode 100644 0001-Fix-vertical-size-of-emboldened-glyphs.patch > delete mode 100644 freetype-2.4.12-enable-adobe-cff-engine.patch > delete mode 100644 freetype-2.5.0.1.patch > >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 <behdad@behdad.org> >-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.0-enable-spr.patch b/freetype-2.3.0-enable-spr.patch >index 8432e28..ec0acd4 100644 >--- a/freetype-2.3.0-enable-spr.patch >+++ b/freetype-2.3.0-enable-spr.patch >@@ -1,5 +1,6 @@ >---- 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 >+diff -ru freetype-2.5.2.orig/include/config/ftoption.h freetype-2.5.2/include/config/ftoption.h >+--- freetype-2.5.2.orig/include/config/ftoption.h 2013-12-29 21:55:23.370376233 +0100 >++++ freetype-2.5.2/include/config/ftoption.h 2013-12-29 21:56:24.286653883 +0100 > @@ -92,7 +92,7 @@ > /* This is done to allow FreeType clients to run unmodified, forcing */ > /* them to display normal gray-level anti-aliased glyphs. */ >@@ -9,3 +10,12 @@ > > > /*************************************************************************/ >+@@ -591,7 +591,7 @@ >+ /* This option requires TT_CONFIG_OPTION_BYTECODE_INTERPRETER to be */ >+ /* defined. */ >+ /* */ >+-/* #define TT_CONFIG_OPTION_SUBPIXEL_HINTING */ >++#define TT_CONFIG_OPTION_SUBPIXEL_HINTING >+ >+ >+ /*************************************************************************/ >diff --git a/freetype-2.3.11-more-demos.patch b/freetype-2.3.11-more-demos.patch >index 181eafe..6174e71 100644 >--- a/freetype-2.3.11-more-demos.patch >+++ b/freetype-2.3.11-more-demos.patch >@@ -1,9 +1,9 @@ >-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. >+diff -ru ft2demos-2.5.2.orig/Makefile ft2demos-2.5.2/Makefile >+--- ft2demos-2.5.2.orig/Makefile 2013-12-29 21:55:28.869491763 +0100 >++++ ft2demos-2.5.2/Makefile 2013-12-29 21:57:21.548851688 +0100 >+@@ -296,10 +296,10 @@ >+ # 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 >@@ -14,5 +14,5 @@ diff -up ft2demos-2.3.11/Makefile.more-demos freetype-2.3.11/ft2demos-2.3.11/Mak > + EXES += ftpatchk > + EXES += fttimer > # EXES += testname >- # EXES += ttdebug > >+ exes: $(EXES:%=$(BIN_DIR_2)/%$E) >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..7ead4e5 100644 >--- a/freetype-2.4.12-pkgconfig.patch >+++ b/freetype-2.4.12-pkgconfig.patch >@@ -1,14 +1,15 @@ >---- freetype-2.4.12/builds/unix/freetype2.in >-+++ freetype-2.4.12/builds/unix/freetype2.in >+diff -ru freetype-2.5.2.orig/builds/unix/freetype2.in freetype-2.5.2/builds/unix/freetype2.in >+--- freetype-2.5.2.orig/builds/unix/freetype2.in 2013-12-29 21:55:23.332375438 +0100 >++++ freetype-2.5.2/builds/unix/freetype2.in 2013-12-29 21:58:16.913007919 +0100 > @@ -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.spec b/freetype.spec >index 74cee3c..f8cdc5d 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: 4%{?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 >@@ -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,9 @@ rm -rf $RPM_BUILD_ROOT > %doc docs/tutorial > > %changelog >+* Sun Dec 29 2013 Michael Kuhn <suraia@ikkoku.de> - 2.5.2-1 >+- Update to 2.5.2. >+ > * Fri Sep 20 2013 Marek Kasik <mkasik@redhat.com> - 2.5.0-4 > - Fix vertical size of emboldened glyphs > >-- >1.8.5.2 >
<b>You cannot view the attachment while viewing its details because your browser does not support IFRAMEs. <a href="attachment.cgi?id=845621">View the attachment on a separate page</a>.</b>
View Attachment As Diff
View Attachment As Raw
Actions:
View
|
Diff
Attachments on
bug 1034065
: 845621