[arch-commits] Commit in freetype2/repos (14 files)

Jan Steffens heftig at archlinux.org
Sun Dec 7 20:11:11 UTC 2014


    Date: Sunday, December 7, 2014 @ 21:11:10
  Author: heftig
Revision: 227355

archrelease: copy trunk to testing-i686, testing-x86_64

Added:
  freetype2/repos/testing-i686/
  freetype2/repos/testing-i686/PKGBUILD
    (from rev 227354, freetype2/trunk/PKGBUILD)
  freetype2/repos/testing-i686/env_FT2_NO_SUBPIXEL_HINTING.diff
    (from rev 227354, freetype2/trunk/env_FT2_NO_SUBPIXEL_HINTING.diff)
  freetype2/repos/testing-i686/freetype-2.2.1-enable-valid.patch
    (from rev 227354, freetype2/trunk/freetype-2.2.1-enable-valid.patch)
  freetype2/repos/testing-i686/freetype-2.5.1-enable-sph.patch
    (from rev 227354, freetype2/trunk/freetype-2.5.1-enable-sph.patch)
  freetype2/repos/testing-i686/freetype-2.5.1-enable-spr.patch
    (from rev 227354, freetype2/trunk/freetype-2.5.1-enable-spr.patch)
  freetype2/repos/testing-i686/freetype2.install
    (from rev 227354, freetype2/trunk/freetype2.install)
  freetype2/repos/testing-x86_64/
  freetype2/repos/testing-x86_64/PKGBUILD
    (from rev 227354, freetype2/trunk/PKGBUILD)
  freetype2/repos/testing-x86_64/env_FT2_NO_SUBPIXEL_HINTING.diff
    (from rev 227354, freetype2/trunk/env_FT2_NO_SUBPIXEL_HINTING.diff)
  freetype2/repos/testing-x86_64/freetype-2.2.1-enable-valid.patch
    (from rev 227354, freetype2/trunk/freetype-2.2.1-enable-valid.patch)
  freetype2/repos/testing-x86_64/freetype-2.5.1-enable-sph.patch
    (from rev 227354, freetype2/trunk/freetype-2.5.1-enable-sph.patch)
  freetype2/repos/testing-x86_64/freetype-2.5.1-enable-spr.patch
    (from rev 227354, freetype2/trunk/freetype-2.5.1-enable-spr.patch)
  freetype2/repos/testing-x86_64/freetype2.install
    (from rev 227354, freetype2/trunk/freetype2.install)

--------------------------------------------------+
 testing-i686/PKGBUILD                            |   54 +++++++++++++++++++++
 testing-i686/env_FT2_NO_SUBPIXEL_HINTING.diff    |   19 +++++++
 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-i686/freetype2.install                   |    9 +++
 testing-x86_64/PKGBUILD                          |   54 +++++++++++++++++++++
 testing-x86_64/env_FT2_NO_SUBPIXEL_HINTING.diff  |   19 +++++++
 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 +++++
 testing-x86_64/freetype2.install                 |    9 +++
 12 files changed, 256 insertions(+)

Copied: freetype2/repos/testing-i686/PKGBUILD (from rev 227354, freetype2/trunk/PKGBUILD)
===================================================================
--- testing-i686/PKGBUILD	                        (rev 0)
+++ testing-i686/PKGBUILD	2014-12-07 20:11:10 UTC (rev 227355)
@@ -0,0 +1,54 @@
+# $Id$
+# Maintainer: Jan de Groot <jgc at archlinux.org>
+
+pkgname=freetype2
+pkgver=2.5.4
+pkgrel=1
+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')
+install=freetype2.install
+source=(http://download.savannah.gnu.org/releases/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
+        env_FT2_NO_SUBPIXEL_HINTING.diff)
+sha1sums=('f30b929e2edc5d7ca64c1ccc65f0c2068e84c5e2'
+          'SKIP'
+          'f279d922a873d62a8af50bfc873051839d194dca'
+          '13ee8d558593db991ad29fa090b461f914536104'
+          'c31fa3d342ead56f3acfa1f267b474a7686d0014'
+          'ddba70eef4270e5a89e098d6ee1e7ceb03ea98da')
+
+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"
+  
+  # https://bugs.archlinux.org/task/35274
+  patch -Np1 -i "${srcdir}/freetype-2.5.1-enable-sph.patch"
+  # Provide a way to disable the above patch at runtime.
+  # Expected to be a temporary measure until fontconfig picks up
+  # the necessary configurables.
+  patch -Np1 -i "${srcdir}/env_FT2_NO_SUBPIXEL_HINTING.diff"
+}
+
+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/env_FT2_NO_SUBPIXEL_HINTING.diff (from rev 227354, freetype2/trunk/env_FT2_NO_SUBPIXEL_HINTING.diff)
===================================================================
--- testing-i686/env_FT2_NO_SUBPIXEL_HINTING.diff	                        (rev 0)
+++ testing-i686/env_FT2_NO_SUBPIXEL_HINTING.diff	2014-12-07 20:11:10 UTC (rev 227355)
@@ -0,0 +1,19 @@
+diff --git i/src/truetype/ttobjs.c w/src/truetype/ttobjs.c
+index 46f1332..af50a1d 100644
+--- i/src/truetype/ttobjs.c
++++ w/src/truetype/ttobjs.c
+@@ -1264,10 +1264,11 @@
+       return FT_THROW( Could_Not_Find_Context );
+ 
+ #ifdef TT_CONFIG_OPTION_SUBPIXEL_HINTING
+-    driver->interpreter_version = TT_INTERPRETER_VERSION_38;
+-#else
+-    driver->interpreter_version = TT_INTERPRETER_VERSION_35;
++    if ( !getenv( "FT2_NO_SUBPIXEL_HINTING" ) )
++      driver->interpreter_version = TT_INTERPRETER_VERSION_38;
++    else
+ #endif
++      driver->interpreter_version = TT_INTERPRETER_VERSION_35;
+ 
+ #else /* !TT_USE_BYTECODE_INTERPRETER */
+ 

Copied: freetype2/repos/testing-i686/freetype-2.2.1-enable-valid.patch (from rev 227354, 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-12-07 20:11:10 UTC (rev 227355)
@@ -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 227354, 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-12-07 20:11:10 UTC (rev 227355)
@@ -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 227354, 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-12-07 20:11:10 UTC (rev 227355)
@@ -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-i686/freetype2.install (from rev 227354, freetype2/trunk/freetype2.install)
===================================================================
--- testing-i686/freetype2.install	                        (rev 0)
+++ testing-i686/freetype2.install	2014-12-07 20:11:10 UTC (rev 227355)
@@ -0,0 +1,9 @@
+post_upgrade() {
+  if (( $(vercmp $2 2.5.4-1) < 0 )); then
+    cat <<MSG
+  Subpixel hinting has been enabled by default. To get back the old look, add
+    FT2_NO_SUBPIXEL_HINTING=1
+  to your environment, for example /etc/environment or ~/.pam_environment .
+MSG
+  fi
+}

Copied: freetype2/repos/testing-x86_64/PKGBUILD (from rev 227354, freetype2/trunk/PKGBUILD)
===================================================================
--- testing-x86_64/PKGBUILD	                        (rev 0)
+++ testing-x86_64/PKGBUILD	2014-12-07 20:11:10 UTC (rev 227355)
@@ -0,0 +1,54 @@
+# $Id$
+# Maintainer: Jan de Groot <jgc at archlinux.org>
+
+pkgname=freetype2
+pkgver=2.5.4
+pkgrel=1
+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')
+install=freetype2.install
+source=(http://download.savannah.gnu.org/releases/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
+        env_FT2_NO_SUBPIXEL_HINTING.diff)
+sha1sums=('f30b929e2edc5d7ca64c1ccc65f0c2068e84c5e2'
+          'SKIP'
+          'f279d922a873d62a8af50bfc873051839d194dca'
+          '13ee8d558593db991ad29fa090b461f914536104'
+          'c31fa3d342ead56f3acfa1f267b474a7686d0014'
+          'ddba70eef4270e5a89e098d6ee1e7ceb03ea98da')
+
+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"
+  
+  # https://bugs.archlinux.org/task/35274
+  patch -Np1 -i "${srcdir}/freetype-2.5.1-enable-sph.patch"
+  # Provide a way to disable the above patch at runtime.
+  # Expected to be a temporary measure until fontconfig picks up
+  # the necessary configurables.
+  patch -Np1 -i "${srcdir}/env_FT2_NO_SUBPIXEL_HINTING.diff"
+}
+
+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/env_FT2_NO_SUBPIXEL_HINTING.diff (from rev 227354, freetype2/trunk/env_FT2_NO_SUBPIXEL_HINTING.diff)
===================================================================
--- testing-x86_64/env_FT2_NO_SUBPIXEL_HINTING.diff	                        (rev 0)
+++ testing-x86_64/env_FT2_NO_SUBPIXEL_HINTING.diff	2014-12-07 20:11:10 UTC (rev 227355)
@@ -0,0 +1,19 @@
+diff --git i/src/truetype/ttobjs.c w/src/truetype/ttobjs.c
+index 46f1332..af50a1d 100644
+--- i/src/truetype/ttobjs.c
++++ w/src/truetype/ttobjs.c
+@@ -1264,10 +1264,11 @@
+       return FT_THROW( Could_Not_Find_Context );
+ 
+ #ifdef TT_CONFIG_OPTION_SUBPIXEL_HINTING
+-    driver->interpreter_version = TT_INTERPRETER_VERSION_38;
+-#else
+-    driver->interpreter_version = TT_INTERPRETER_VERSION_35;
++    if ( !getenv( "FT2_NO_SUBPIXEL_HINTING" ) )
++      driver->interpreter_version = TT_INTERPRETER_VERSION_38;
++    else
+ #endif
++      driver->interpreter_version = TT_INTERPRETER_VERSION_35;
+ 
+ #else /* !TT_USE_BYTECODE_INTERPRETER */
+ 

Copied: freetype2/repos/testing-x86_64/freetype-2.2.1-enable-valid.patch (from rev 227354, 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-12-07 20:11:10 UTC (rev 227355)
@@ -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 227354, 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-12-07 20:11:10 UTC (rev 227355)
@@ -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 227354, 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-12-07 20:11:10 UTC (rev 227355)
@@ -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/freetype2.install (from rev 227354, freetype2/trunk/freetype2.install)
===================================================================
--- testing-x86_64/freetype2.install	                        (rev 0)
+++ testing-x86_64/freetype2.install	2014-12-07 20:11:10 UTC (rev 227355)
@@ -0,0 +1,9 @@
+post_upgrade() {
+  if (( $(vercmp $2 2.5.4-1) < 0 )); then
+    cat <<MSG
+  Subpixel hinting has been enabled by default. To get back the old look, add
+    FT2_NO_SUBPIXEL_HINTING=1
+  to your environment, for example /etc/environment or ~/.pam_environment .
+MSG
+  fi
+}



More information about the arch-commits mailing list