[arch-commits] Commit in freetype2/repos (12 files)
Andreas Radke
andyrtr at nymeria.archlinux.org
Mon Mar 17 17:30:31 UTC 2014
Date: Monday, March 17, 2014 @ 18:30:31
Author: andyrtr
Revision: 208085
archrelease: copy trunk to testing-i686, testing-x86_64
Added:
freetype2/repos/testing-i686/
freetype2/repos/testing-i686/PKGBUILD
(from rev 208084, freetype2/trunk/PKGBUILD)
freetype2/repos/testing-i686/fix_segfault_with_harfbuzz.diff
(from rev 208084, freetype2/trunk/fix_segfault_with_harfbuzz.diff)
freetype2/repos/testing-i686/freetype-2.2.1-enable-valid.patch
(from rev 208084, freetype2/trunk/freetype-2.2.1-enable-valid.patch)
freetype2/repos/testing-i686/freetype-2.5.1-enable-sph.patch
(from rev 208084, freetype2/trunk/freetype-2.5.1-enable-sph.patch)
freetype2/repos/testing-i686/freetype-2.5.1-enable-spr.patch
(from rev 208084, freetype2/trunk/freetype-2.5.1-enable-spr.patch)
freetype2/repos/testing-x86_64/
freetype2/repos/testing-x86_64/PKGBUILD
(from rev 208084, freetype2/trunk/PKGBUILD)
freetype2/repos/testing-x86_64/fix_segfault_with_harfbuzz.diff
(from rev 208084, freetype2/trunk/fix_segfault_with_harfbuzz.diff)
freetype2/repos/testing-x86_64/freetype-2.2.1-enable-valid.patch
(from rev 208084, freetype2/trunk/freetype-2.2.1-enable-valid.patch)
freetype2/repos/testing-x86_64/freetype-2.5.1-enable-sph.patch
(from rev 208084, freetype2/trunk/freetype-2.5.1-enable-sph.patch)
freetype2/repos/testing-x86_64/freetype-2.5.1-enable-spr.patch
(from rev 208084, freetype2/trunk/freetype-2.5.1-enable-spr.patch)
--------------------------------------------------+
testing-i686/PKGBUILD | 55 +++++++++++++++++++++
testing-i686/fix_segfault_with_harfbuzz.diff | 32 ++++++++++++
testing-i686/freetype-2.2.1-enable-valid.patch | 20 +++++++
testing-i686/freetype-2.5.1-enable-sph.patch | 13 ++++
testing-i686/freetype-2.5.1-enable-spr.patch | 13 ++++
testing-x86_64/PKGBUILD | 55 +++++++++++++++++++++
testing-x86_64/fix_segfault_with_harfbuzz.diff | 32 ++++++++++++
testing-x86_64/freetype-2.2.1-enable-valid.patch | 20 +++++++
testing-x86_64/freetype-2.5.1-enable-sph.patch | 13 ++++
testing-x86_64/freetype-2.5.1-enable-spr.patch | 13 ++++
10 files changed, 266 insertions(+)
Copied: freetype2/repos/testing-i686/PKGBUILD (from rev 208084, freetype2/trunk/PKGBUILD)
===================================================================
--- testing-i686/PKGBUILD (rev 0)
+++ testing-i686/PKGBUILD 2014-03-17 17:30:31 UTC (rev 208085)
@@ -0,0 +1,55 @@
+# $Id$
+# Maintainer: Jan de Groot <jgc at archlinux.org>
+
+pkgname=freetype2
+pkgver=2.5.3
+pkgrel=2
+pkgdesc="TrueType font rendering library"
+arch=(i686 x86_64)
+license=('GPL')
+url="http://freetype.sourceforge.net"
+# adding harfbuzz for improved OpenType features auto-hinting
+# introduces a cycle dep to harfbuzz depending on freetype wanted by upstream
+depends=('zlib' 'bzip2' 'sh' 'libpng' 'harfbuzz')
+source=(http://downloads.sourceforge.net/sourceforge/freetype/freetype-${pkgver}.tar.bz2{,.sig}
+ freetype-2.2.1-enable-valid.patch
+ freetype-2.5.1-enable-spr.patch
+ freetype-2.5.1-enable-sph.patch
+ fix_segfault_with_harfbuzz.diff)
+sha1sums=('d3c26cc17ec7fe6c36f4efc02ef92ab6aa3f4b46'
+ 'SKIP'
+ 'f279d922a873d62a8af50bfc873051839d194dca'
+ '13ee8d558593db991ad29fa090b461f914536104'
+ 'c31fa3d342ead56f3acfa1f267b474a7686d0014'
+ 'c99013b4c19494cd26031878368191cd2b4459b0')
+
+prepare() {
+ cd "${srcdir}/freetype-${pkgver}"
+ patch -Np1 -i "${srcdir}/freetype-2.2.1-enable-valid.patch"
+ patch -Np1 -i "${srcdir}/freetype-2.5.1-enable-spr.patch"
+
+ # fix segfaults # https://bugs.archlinux.org/task/39365
+ # http://git.savannah.gnu.org/cgit/freetype/freetype2.git/commit/?id=23367ff97f33ef6a2b7e1fced1157c87a46d9596
+ patch -Np1 -i "${srcdir}/fix_segfault_with_harfbuzz.diff"
+
+ # Disabled for now due to resistance
+ # Kept here for easier rebuilds via ABS
+ # https://bugs.archlinux.org/task/35274
+ #patch -Np1 -i "${srcdir}/freetype-2.5.1-enable-sph.patch"
+}
+
+build() {
+ cd "${srcdir}/freetype-${pkgver}"
+ ./configure --prefix=/usr --disable-static
+ make
+}
+
+check() {
+ cd "${srcdir}/freetype-${pkgver}"
+ make -k check
+}
+
+package() {
+ cd "${srcdir}/freetype-${pkgver}"
+ make DESTDIR="${pkgdir}" install
+}
Copied: freetype2/repos/testing-i686/fix_segfault_with_harfbuzz.diff (from rev 208084, freetype2/trunk/fix_segfault_with_harfbuzz.diff)
===================================================================
--- testing-i686/fix_segfault_with_harfbuzz.diff (rev 0)
+++ testing-i686/fix_segfault_with_harfbuzz.diff 2014-03-17 17:30:31 UTC (rev 208085)
@@ -0,0 +1,32 @@
+From 23367ff97f33ef6a2b7e1fced1157c87a46d9596 Mon Sep 17 00:00:00 2001
+From: Werner Lemberg <wl at gnu.org>
+Date: Mon, 17 Mar 2014 06:33:14 +0000
+Subject: Fix Savannah bug #41869.
+
+This works around a problem with HarfBuzz (<= 0.9.26), which doesn't
+validate glyph indices returned by
+`hb_ot_layout_lookup_collect_glyphs'.
+
+* src/autofit/hbshim.c (af_get_coverage): Guard `idx'.
+
+* docs/CHANGES: Updated.
+---
+diff --git a/src/autofit/hbshim.c b/src/autofit/hbshim.c
+index 11fb743..2eda8d7 100644
+--- a/src/autofit/hbshim.c
++++ b/src/autofit/hbshim.c
+@@ -347,6 +347,11 @@
+ count++;
+ #endif
+
++ /* HarfBuzz 0.9.26 and older doesn't validate glyph indices */
++ /* returned by `hb_ot_layout_lookup_collect_glyphs'... */
++ if ( idx >= (hb_codepoint_t)globals->glyph_count )
++ continue;
++
+ if ( gstyles[idx] == AF_STYLE_UNASSIGNED )
+ gstyles[idx] = (FT_Byte)style_class->style;
+ #ifdef FT_DEBUG_LEVEL_TRACE
+--
+cgit v0.9.0.2
+
Copied: freetype2/repos/testing-i686/freetype-2.2.1-enable-valid.patch (from rev 208084, freetype2/trunk/freetype-2.2.1-enable-valid.patch)
===================================================================
--- testing-i686/freetype-2.2.1-enable-valid.patch (rev 0)
+++ testing-i686/freetype-2.2.1-enable-valid.patch 2014-03-17 17:30:31 UTC (rev 208085)
@@ -0,0 +1,20 @@
+--- freetype-2.2.1/modules.cfg.orig 2006-07-07 21:01:09.000000000 -0400
++++ freetype-2.2.1/modules.cfg 2006-07-07 21:01:54.000000000 -0400
+@@ -110,7 +110,7 @@
+ AUX_MODULES += cache
+
+ # TrueType GX/AAT table validation. Needs ftgxval.c below.
+-# AUX_MODULES += gxvalid
++AUX_MODULES += gxvalid
+
+ # Support for streams compressed with gzip (files with suffix .gz).
+ #
+@@ -124,7 +124,7 @@
+
+ # OpenType table validation. Needs ftotval.c below.
+ #
+-# AUX_MODULES += otvalid
++AUX_MODULES += otvalid
+
+ # Auxiliary PostScript driver component to share common code.
+ #
Copied: freetype2/repos/testing-i686/freetype-2.5.1-enable-sph.patch (from rev 208084, freetype2/trunk/freetype-2.5.1-enable-sph.patch)
===================================================================
--- testing-i686/freetype-2.5.1-enable-sph.patch (rev 0)
+++ testing-i686/freetype-2.5.1-enable-sph.patch 2014-03-17 17:30:31 UTC (rev 208085)
@@ -0,0 +1,13 @@
+diff --git i/include/config/ftoption.h w/include/config/ftoption.h
+index fe2ba15..1ab4226 100644
+--- i/include/config/ftoption.h
++++ w/include/config/ftoption.h
+@@ -591,7 +591,7 @@ FT_BEGIN_HEADER
+ /* This option requires TT_CONFIG_OPTION_BYTECODE_INTERPRETER to be */
+ /* defined. */
+ /* */
+-/* #define TT_CONFIG_OPTION_SUBPIXEL_HINTING */
++#define TT_CONFIG_OPTION_SUBPIXEL_HINTING
+
+
+ /*************************************************************************/
Copied: freetype2/repos/testing-i686/freetype-2.5.1-enable-spr.patch (from rev 208084, freetype2/trunk/freetype-2.5.1-enable-spr.patch)
===================================================================
--- testing-i686/freetype-2.5.1-enable-spr.patch (rev 0)
+++ testing-i686/freetype-2.5.1-enable-spr.patch 2014-03-17 17:30:31 UTC (rev 208085)
@@ -0,0 +1,13 @@
+diff --git i/include/config/ftoption.h w/include/config/ftoption.h
+index fe2ba15..22ce1a3 100644
+--- i/include/config/ftoption.h
++++ w/include/config/ftoption.h
+@@ -92,7 +92,7 @@ FT_BEGIN_HEADER
+ /* This is done to allow FreeType clients to run unmodified, forcing */
+ /* them to display normal gray-level anti-aliased glyphs. */
+ /* */
+-/* #define FT_CONFIG_OPTION_SUBPIXEL_RENDERING */
++#define FT_CONFIG_OPTION_SUBPIXEL_RENDERING
+
+
+ /*************************************************************************/
Copied: freetype2/repos/testing-x86_64/PKGBUILD (from rev 208084, freetype2/trunk/PKGBUILD)
===================================================================
--- testing-x86_64/PKGBUILD (rev 0)
+++ testing-x86_64/PKGBUILD 2014-03-17 17:30:31 UTC (rev 208085)
@@ -0,0 +1,55 @@
+# $Id$
+# Maintainer: Jan de Groot <jgc at archlinux.org>
+
+pkgname=freetype2
+pkgver=2.5.3
+pkgrel=2
+pkgdesc="TrueType font rendering library"
+arch=(i686 x86_64)
+license=('GPL')
+url="http://freetype.sourceforge.net"
+# adding harfbuzz for improved OpenType features auto-hinting
+# introduces a cycle dep to harfbuzz depending on freetype wanted by upstream
+depends=('zlib' 'bzip2' 'sh' 'libpng' 'harfbuzz')
+source=(http://downloads.sourceforge.net/sourceforge/freetype/freetype-${pkgver}.tar.bz2{,.sig}
+ freetype-2.2.1-enable-valid.patch
+ freetype-2.5.1-enable-spr.patch
+ freetype-2.5.1-enable-sph.patch
+ fix_segfault_with_harfbuzz.diff)
+sha1sums=('d3c26cc17ec7fe6c36f4efc02ef92ab6aa3f4b46'
+ 'SKIP'
+ 'f279d922a873d62a8af50bfc873051839d194dca'
+ '13ee8d558593db991ad29fa090b461f914536104'
+ 'c31fa3d342ead56f3acfa1f267b474a7686d0014'
+ 'c99013b4c19494cd26031878368191cd2b4459b0')
+
+prepare() {
+ cd "${srcdir}/freetype-${pkgver}"
+ patch -Np1 -i "${srcdir}/freetype-2.2.1-enable-valid.patch"
+ patch -Np1 -i "${srcdir}/freetype-2.5.1-enable-spr.patch"
+
+ # fix segfaults # https://bugs.archlinux.org/task/39365
+ # http://git.savannah.gnu.org/cgit/freetype/freetype2.git/commit/?id=23367ff97f33ef6a2b7e1fced1157c87a46d9596
+ patch -Np1 -i "${srcdir}/fix_segfault_with_harfbuzz.diff"
+
+ # Disabled for now due to resistance
+ # Kept here for easier rebuilds via ABS
+ # https://bugs.archlinux.org/task/35274
+ #patch -Np1 -i "${srcdir}/freetype-2.5.1-enable-sph.patch"
+}
+
+build() {
+ cd "${srcdir}/freetype-${pkgver}"
+ ./configure --prefix=/usr --disable-static
+ make
+}
+
+check() {
+ cd "${srcdir}/freetype-${pkgver}"
+ make -k check
+}
+
+package() {
+ cd "${srcdir}/freetype-${pkgver}"
+ make DESTDIR="${pkgdir}" install
+}
Copied: freetype2/repos/testing-x86_64/fix_segfault_with_harfbuzz.diff (from rev 208084, freetype2/trunk/fix_segfault_with_harfbuzz.diff)
===================================================================
--- testing-x86_64/fix_segfault_with_harfbuzz.diff (rev 0)
+++ testing-x86_64/fix_segfault_with_harfbuzz.diff 2014-03-17 17:30:31 UTC (rev 208085)
@@ -0,0 +1,32 @@
+From 23367ff97f33ef6a2b7e1fced1157c87a46d9596 Mon Sep 17 00:00:00 2001
+From: Werner Lemberg <wl at gnu.org>
+Date: Mon, 17 Mar 2014 06:33:14 +0000
+Subject: Fix Savannah bug #41869.
+
+This works around a problem with HarfBuzz (<= 0.9.26), which doesn't
+validate glyph indices returned by
+`hb_ot_layout_lookup_collect_glyphs'.
+
+* src/autofit/hbshim.c (af_get_coverage): Guard `idx'.
+
+* docs/CHANGES: Updated.
+---
+diff --git a/src/autofit/hbshim.c b/src/autofit/hbshim.c
+index 11fb743..2eda8d7 100644
+--- a/src/autofit/hbshim.c
++++ b/src/autofit/hbshim.c
+@@ -347,6 +347,11 @@
+ count++;
+ #endif
+
++ /* HarfBuzz 0.9.26 and older doesn't validate glyph indices */
++ /* returned by `hb_ot_layout_lookup_collect_glyphs'... */
++ if ( idx >= (hb_codepoint_t)globals->glyph_count )
++ continue;
++
+ if ( gstyles[idx] == AF_STYLE_UNASSIGNED )
+ gstyles[idx] = (FT_Byte)style_class->style;
+ #ifdef FT_DEBUG_LEVEL_TRACE
+--
+cgit v0.9.0.2
+
Copied: freetype2/repos/testing-x86_64/freetype-2.2.1-enable-valid.patch (from rev 208084, freetype2/trunk/freetype-2.2.1-enable-valid.patch)
===================================================================
--- testing-x86_64/freetype-2.2.1-enable-valid.patch (rev 0)
+++ testing-x86_64/freetype-2.2.1-enable-valid.patch 2014-03-17 17:30:31 UTC (rev 208085)
@@ -0,0 +1,20 @@
+--- freetype-2.2.1/modules.cfg.orig 2006-07-07 21:01:09.000000000 -0400
++++ freetype-2.2.1/modules.cfg 2006-07-07 21:01:54.000000000 -0400
+@@ -110,7 +110,7 @@
+ AUX_MODULES += cache
+
+ # TrueType GX/AAT table validation. Needs ftgxval.c below.
+-# AUX_MODULES += gxvalid
++AUX_MODULES += gxvalid
+
+ # Support for streams compressed with gzip (files with suffix .gz).
+ #
+@@ -124,7 +124,7 @@
+
+ # OpenType table validation. Needs ftotval.c below.
+ #
+-# AUX_MODULES += otvalid
++AUX_MODULES += otvalid
+
+ # Auxiliary PostScript driver component to share common code.
+ #
Copied: freetype2/repos/testing-x86_64/freetype-2.5.1-enable-sph.patch (from rev 208084, freetype2/trunk/freetype-2.5.1-enable-sph.patch)
===================================================================
--- testing-x86_64/freetype-2.5.1-enable-sph.patch (rev 0)
+++ testing-x86_64/freetype-2.5.1-enable-sph.patch 2014-03-17 17:30:31 UTC (rev 208085)
@@ -0,0 +1,13 @@
+diff --git i/include/config/ftoption.h w/include/config/ftoption.h
+index fe2ba15..1ab4226 100644
+--- i/include/config/ftoption.h
++++ w/include/config/ftoption.h
+@@ -591,7 +591,7 @@ FT_BEGIN_HEADER
+ /* This option requires TT_CONFIG_OPTION_BYTECODE_INTERPRETER to be */
+ /* defined. */
+ /* */
+-/* #define TT_CONFIG_OPTION_SUBPIXEL_HINTING */
++#define TT_CONFIG_OPTION_SUBPIXEL_HINTING
+
+
+ /*************************************************************************/
Copied: freetype2/repos/testing-x86_64/freetype-2.5.1-enable-spr.patch (from rev 208084, freetype2/trunk/freetype-2.5.1-enable-spr.patch)
===================================================================
--- testing-x86_64/freetype-2.5.1-enable-spr.patch (rev 0)
+++ testing-x86_64/freetype-2.5.1-enable-spr.patch 2014-03-17 17:30:31 UTC (rev 208085)
@@ -0,0 +1,13 @@
+diff --git i/include/config/ftoption.h w/include/config/ftoption.h
+index fe2ba15..22ce1a3 100644
+--- i/include/config/ftoption.h
++++ w/include/config/ftoption.h
+@@ -92,7 +92,7 @@ FT_BEGIN_HEADER
+ /* This is done to allow FreeType clients to run unmodified, forcing */
+ /* them to display normal gray-level anti-aliased glyphs. */
+ /* */
+-/* #define FT_CONFIG_OPTION_SUBPIXEL_RENDERING */
++#define FT_CONFIG_OPTION_SUBPIXEL_RENDERING
+
+
+ /*************************************************************************/
More information about the arch-commits
mailing list