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

Jan Steffens heftig at archlinux.org
Tue Jul 5 19:19:57 UTC 2016


    Date: Tuesday, July 5, 2016 @ 19:19:57
  Author: heftig
Revision: 271060

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

Added:
  freetype2/repos/testing-i686/0001-Enable-table-validation-modules.patch
    (from rev 271059, freetype2/trunk/0001-Enable-table-validation-modules.patch)
  freetype2/repos/testing-i686/0002-Enable-subpixel-rendering.patch
    (from rev 271059, freetype2/trunk/0002-Enable-subpixel-rendering.patch)
  freetype2/repos/testing-i686/0003-Make-subpixel-hinting-mode-configurable.patch
    (from rev 271059, freetype2/trunk/0003-Make-subpixel-hinting-mode-configurable.patch)
  freetype2/repos/testing-i686/PKGBUILD
    (from rev 271059, freetype2/trunk/PKGBUILD)
  freetype2/repos/testing-i686/freetype2.install
    (from rev 271059, freetype2/trunk/freetype2.install)
  freetype2/repos/testing-x86_64/0001-Enable-table-validation-modules.patch
    (from rev 271059, freetype2/trunk/0001-Enable-table-validation-modules.patch)
  freetype2/repos/testing-x86_64/0002-Enable-subpixel-rendering.patch
    (from rev 271059, freetype2/trunk/0002-Enable-subpixel-rendering.patch)
  freetype2/repos/testing-x86_64/0003-Make-subpixel-hinting-mode-configurable.patch
    (from rev 271059, freetype2/trunk/0003-Make-subpixel-hinting-mode-configurable.patch)
  freetype2/repos/testing-x86_64/PKGBUILD
    (from rev 271059, freetype2/trunk/PKGBUILD)
  freetype2/repos/testing-x86_64/freetype2.install
    (from rev 271059, freetype2/trunk/freetype2.install)
Deleted:
  freetype2/repos/testing-i686/0001-Enable-table-validation-modules.patch
  freetype2/repos/testing-i686/0002-Enable-subpixel-rendering.patch
  freetype2/repos/testing-i686/0003-Make-subpixel-hinting-mode-configurable.patch
  freetype2/repos/testing-i686/PKGBUILD
  freetype2/repos/testing-i686/freetype2.install
  freetype2/repos/testing-x86_64/0001-Enable-table-validation-modules.patch
  freetype2/repos/testing-x86_64/0002-Enable-subpixel-rendering.patch
  freetype2/repos/testing-x86_64/0003-Make-subpixel-hinting-mode-configurable.patch
  freetype2/repos/testing-x86_64/PKGBUILD
  freetype2/repos/testing-x86_64/freetype2.install

-------------------------------------------------------------------+
 /0001-Enable-table-validation-modules.patch                       |   68 +++
 /0002-Enable-subpixel-rendering.patch                             |   50 ++
 /0003-Make-subpixel-hinting-mode-configurable.patch               |  180 ++++++++++
 /PKGBUILD                                                         |  102 +++++
 /freetype2.install                                                |   34 +
 testing-i686/0001-Enable-table-validation-modules.patch           |   34 -
 testing-i686/0002-Enable-subpixel-rendering.patch                 |   25 -
 testing-i686/0003-Make-subpixel-hinting-mode-configurable.patch   |   90 -----
 testing-i686/PKGBUILD                                             |   51 --
 testing-i686/freetype2.install                                    |   13 
 testing-x86_64/0001-Enable-table-validation-modules.patch         |   34 -
 testing-x86_64/0002-Enable-subpixel-rendering.patch               |   25 -
 testing-x86_64/0003-Make-subpixel-hinting-mode-configurable.patch |   90 -----
 testing-x86_64/PKGBUILD                                           |   51 --
 testing-x86_64/freetype2.install                                  |   13 
 15 files changed, 434 insertions(+), 426 deletions(-)

Deleted: testing-i686/0001-Enable-table-validation-modules.patch
===================================================================
--- testing-i686/0001-Enable-table-validation-modules.patch	2016-07-05 19:19:04 UTC (rev 271059)
+++ testing-i686/0001-Enable-table-validation-modules.patch	2016-07-05 19:19:57 UTC (rev 271060)
@@ -1,34 +0,0 @@
-From 38732f60a5dc2a619dac5605d6c2fa90fc58d606 Mon Sep 17 00:00:00 2001
-From: "Jan Alexander Steffens (heftig)" <jan.steffens at gmail.com>
-Date: Tue, 23 Jun 2015 08:40:29 +0200
-Subject: [PATCH 1/3] Enable table validation modules
-
----
- modules.cfg | 4 ++--
- 1 file changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/modules.cfg b/modules.cfg
-index d677565a2bc2b5a2..f19cbec33384a86f 100644
---- a/modules.cfg
-+++ b/modules.cfg
-@@ -110,7 +110,7 @@ RASTER_MODULES += smooth
- 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).
- #
-@@ -129,7 +129,7 @@ AUX_MODULES += bzip2
- 
- # OpenType table validation.  Needs ftotval.c below.
- #
--# AUX_MODULES += otvalid
-+AUX_MODULES += otvalid
- 
- # Auxiliary PostScript driver component to share common code.
- #
--- 
-2.8.3
-

Copied: freetype2/repos/testing-i686/0001-Enable-table-validation-modules.patch (from rev 271059, freetype2/trunk/0001-Enable-table-validation-modules.patch)
===================================================================
--- testing-i686/0001-Enable-table-validation-modules.patch	                        (rev 0)
+++ testing-i686/0001-Enable-table-validation-modules.patch	2016-07-05 19:19:57 UTC (rev 271060)
@@ -0,0 +1,34 @@
+From 38732f60a5dc2a619dac5605d6c2fa90fc58d606 Mon Sep 17 00:00:00 2001
+From: "Jan Alexander Steffens (heftig)" <jan.steffens at gmail.com>
+Date: Tue, 23 Jun 2015 08:40:29 +0200
+Subject: [PATCH 1/3] Enable table validation modules
+
+---
+ modules.cfg | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/modules.cfg b/modules.cfg
+index d677565a2bc2b5a2..f19cbec33384a86f 100644
+--- a/modules.cfg
++++ b/modules.cfg
+@@ -110,7 +110,7 @@ RASTER_MODULES += smooth
+ 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).
+ #
+@@ -129,7 +129,7 @@ AUX_MODULES += bzip2
+ 
+ # OpenType table validation.  Needs ftotval.c below.
+ #
+-# AUX_MODULES += otvalid
++AUX_MODULES += otvalid
+ 
+ # Auxiliary PostScript driver component to share common code.
+ #
+-- 
+2.8.3
+

Deleted: testing-i686/0002-Enable-subpixel-rendering.patch
===================================================================
--- testing-i686/0002-Enable-subpixel-rendering.patch	2016-07-05 19:19:04 UTC (rev 271059)
+++ testing-i686/0002-Enable-subpixel-rendering.patch	2016-07-05 19:19:57 UTC (rev 271060)
@@ -1,25 +0,0 @@
-From 340fa8551faed5a105d0e1cbe4e81ade1f750a04 Mon Sep 17 00:00:00 2001
-From: "Jan Alexander Steffens (heftig)" <jan.steffens at gmail.com>
-Date: Tue, 23 Jun 2015 08:43:07 +0200
-Subject: [PATCH 2/3] Enable subpixel rendering
-
----
- include/freetype/config/ftoption.h | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/include/freetype/config/ftoption.h b/include/freetype/config/ftoption.h
-index 7dd3f55e572a23b9..33d563c4e1e47228 100644
---- a/include/freetype/config/ftoption.h
-+++ b/include/freetype/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
- 
- 
-   /*************************************************************************/
--- 
-2.8.3
-

Copied: freetype2/repos/testing-i686/0002-Enable-subpixel-rendering.patch (from rev 271059, freetype2/trunk/0002-Enable-subpixel-rendering.patch)
===================================================================
--- testing-i686/0002-Enable-subpixel-rendering.patch	                        (rev 0)
+++ testing-i686/0002-Enable-subpixel-rendering.patch	2016-07-05 19:19:57 UTC (rev 271060)
@@ -0,0 +1,25 @@
+From 340fa8551faed5a105d0e1cbe4e81ade1f750a04 Mon Sep 17 00:00:00 2001
+From: "Jan Alexander Steffens (heftig)" <jan.steffens at gmail.com>
+Date: Tue, 23 Jun 2015 08:43:07 +0200
+Subject: [PATCH 2/3] Enable subpixel rendering
+
+---
+ include/freetype/config/ftoption.h | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/include/freetype/config/ftoption.h b/include/freetype/config/ftoption.h
+index 7dd3f55e572a23b9..33d563c4e1e47228 100644
+--- a/include/freetype/config/ftoption.h
++++ b/include/freetype/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
+ 
+ 
+   /*************************************************************************/
+-- 
+2.8.3
+

Deleted: testing-i686/0003-Make-subpixel-hinting-mode-configurable.patch
===================================================================
--- testing-i686/0003-Make-subpixel-hinting-mode-configurable.patch	2016-07-05 19:19:04 UTC (rev 271059)
+++ testing-i686/0003-Make-subpixel-hinting-mode-configurable.patch	2016-07-05 19:19:57 UTC (rev 271060)
@@ -1,90 +0,0 @@
-From d0d93c2496175aa42b4c4bb3a45e4f0a6d264112 Mon Sep 17 00:00:00 2001
-From: "Jan Alexander Steffens (heftig)" <jan.steffens at gmail.com>
-Date: Wed, 15 Jun 2016 14:10:20 +0200
-Subject: [PATCH 3/3] Make subpixel hinting mode configurable
-
----
- include/freetype/config/ftoption.h |  4 ++--
- src/truetype/ttobjs.c              | 37 +++++++++++++++++++++++++++++++++++++
- 2 files changed, 39 insertions(+), 2 deletions(-)
-
-diff --git a/include/freetype/config/ftoption.h b/include/freetype/config/ftoption.h
-index 33d563c4e1e47228..a401fc8e9efbbd79 100644
---- a/include/freetype/config/ftoption.h
-+++ b/include/freetype/config/ftoption.h
-@@ -631,8 +631,8 @@ FT_BEGIN_HEADER
-   /* [1] http://www.microsoft.com/typography/cleartype/truetypecleartype.aspx */
-   /*                                                                       */
- /* #define TT_CONFIG_OPTION_SUBPIXEL_HINTING  1     */
--#define TT_CONFIG_OPTION_SUBPIXEL_HINTING     2
--/* #define TT_CONFIG_OPTION_SUBPIXEL_HINTING  ( 1 | 2 ) */
-+/* #define TT_CONFIG_OPTION_SUBPIXEL_HINTING  2     */
-+#define TT_CONFIG_OPTION_SUBPIXEL_HINTING     ( 1 | 2 )
- 
- 
-   /*************************************************************************/
-diff --git a/src/truetype/ttobjs.c b/src/truetype/ttobjs.c
-index ed3be2dbee79427c..d89f92e94d0e816b 100644
---- a/src/truetype/ttobjs.c
-+++ b/src/truetype/ttobjs.c
-@@ -36,6 +36,9 @@
- #include "ttgxvar.h"
- #endif
- 
-+#include <stdlib.h>
-+#include <errno.h>
-+
-   /*************************************************************************/
-   /*                                                                       */
-   /* The macro FT_COMPONENT is used in trace mode.  It is an implicit      */
-@@ -1286,6 +1289,7 @@
- #ifdef TT_USE_BYTECODE_INTERPRETER
- 
-     TT_Driver  driver = (TT_Driver)ttdriver;
-+    const char *envval;
- 
-     driver->interpreter_version = TT_INTERPRETER_VERSION_35;
- #ifdef TT_SUPPORT_SUBPIXEL_HINTING_INFINALITY
-@@ -1295,6 +1299,39 @@
-     driver->interpreter_version = TT_INTERPRETER_VERSION_40;
- #endif
- 
-+    errno = 0;
-+    envval = getenv( "FT2_SUBPIXEL_HINTING" );
-+    if ( envval )
-+    {
-+      char *endptr = NULL;
-+      unsigned long value = strtoul( envval, &endptr, 10 );
-+
-+      if ( !errno && endptr && !*endptr )
-+      {
-+        switch( value )
-+        {
-+        case 0:
-+          driver->interpreter_version = TT_INTERPRETER_VERSION_35;
-+          break;
-+
-+#ifdef TT_SUPPORT_SUBPIXEL_HINTING_INFINALITY
-+        case 1:
-+          driver->interpreter_version = TT_INTERPRETER_VERSION_38;
-+          break;
-+#endif
-+
-+#ifdef TT_SUPPORT_SUBPIXEL_HINTING_MINIMAL
-+        case 2:
-+          driver->interpreter_version = TT_INTERPRETER_VERSION_40;
-+          break;
-+#endif
-+
-+        default:
-+          break;
-+        }
-+      }
-+    }
-+
- #else /* !TT_USE_BYTECODE_INTERPRETER */
- 
-     FT_UNUSED( ttdriver );
--- 
-2.8.3
-

Copied: freetype2/repos/testing-i686/0003-Make-subpixel-hinting-mode-configurable.patch (from rev 271059, freetype2/trunk/0003-Make-subpixel-hinting-mode-configurable.patch)
===================================================================
--- testing-i686/0003-Make-subpixel-hinting-mode-configurable.patch	                        (rev 0)
+++ testing-i686/0003-Make-subpixel-hinting-mode-configurable.patch	2016-07-05 19:19:57 UTC (rev 271060)
@@ -0,0 +1,90 @@
+From d0d93c2496175aa42b4c4bb3a45e4f0a6d264112 Mon Sep 17 00:00:00 2001
+From: "Jan Alexander Steffens (heftig)" <jan.steffens at gmail.com>
+Date: Wed, 15 Jun 2016 14:10:20 +0200
+Subject: [PATCH 3/3] Make subpixel hinting mode configurable
+
+---
+ include/freetype/config/ftoption.h |  4 ++--
+ src/truetype/ttobjs.c              | 37 +++++++++++++++++++++++++++++++++++++
+ 2 files changed, 39 insertions(+), 2 deletions(-)
+
+diff --git a/include/freetype/config/ftoption.h b/include/freetype/config/ftoption.h
+index 33d563c4e1e47228..a401fc8e9efbbd79 100644
+--- a/include/freetype/config/ftoption.h
++++ b/include/freetype/config/ftoption.h
+@@ -631,8 +631,8 @@ FT_BEGIN_HEADER
+   /* [1] http://www.microsoft.com/typography/cleartype/truetypecleartype.aspx */
+   /*                                                                       */
+ /* #define TT_CONFIG_OPTION_SUBPIXEL_HINTING  1     */
+-#define TT_CONFIG_OPTION_SUBPIXEL_HINTING     2
+-/* #define TT_CONFIG_OPTION_SUBPIXEL_HINTING  ( 1 | 2 ) */
++/* #define TT_CONFIG_OPTION_SUBPIXEL_HINTING  2     */
++#define TT_CONFIG_OPTION_SUBPIXEL_HINTING     ( 1 | 2 )
+ 
+ 
+   /*************************************************************************/
+diff --git a/src/truetype/ttobjs.c b/src/truetype/ttobjs.c
+index ed3be2dbee79427c..d89f92e94d0e816b 100644
+--- a/src/truetype/ttobjs.c
++++ b/src/truetype/ttobjs.c
+@@ -36,6 +36,9 @@
+ #include "ttgxvar.h"
+ #endif
+ 
++#include <stdlib.h>
++#include <errno.h>
++
+   /*************************************************************************/
+   /*                                                                       */
+   /* The macro FT_COMPONENT is used in trace mode.  It is an implicit      */
+@@ -1286,6 +1289,7 @@
+ #ifdef TT_USE_BYTECODE_INTERPRETER
+ 
+     TT_Driver  driver = (TT_Driver)ttdriver;
++    const char *envval;
+ 
+     driver->interpreter_version = TT_INTERPRETER_VERSION_35;
+ #ifdef TT_SUPPORT_SUBPIXEL_HINTING_INFINALITY
+@@ -1295,6 +1299,39 @@
+     driver->interpreter_version = TT_INTERPRETER_VERSION_40;
+ #endif
+ 
++    errno = 0;
++    envval = getenv( "FT2_SUBPIXEL_HINTING" );
++    if ( envval )
++    {
++      char *endptr = NULL;
++      unsigned long value = strtoul( envval, &endptr, 10 );
++
++      if ( !errno && endptr && !*endptr )
++      {
++        switch( value )
++        {
++        case 0:
++          driver->interpreter_version = TT_INTERPRETER_VERSION_35;
++          break;
++
++#ifdef TT_SUPPORT_SUBPIXEL_HINTING_INFINALITY
++        case 1:
++          driver->interpreter_version = TT_INTERPRETER_VERSION_38;
++          break;
++#endif
++
++#ifdef TT_SUPPORT_SUBPIXEL_HINTING_MINIMAL
++        case 2:
++          driver->interpreter_version = TT_INTERPRETER_VERSION_40;
++          break;
++#endif
++
++        default:
++          break;
++        }
++      }
++    }
++
+ #else /* !TT_USE_BYTECODE_INTERPRETER */
+ 
+     FT_UNUSED( ttdriver );
+-- 
+2.8.3
+

Deleted: testing-i686/PKGBUILD
===================================================================
--- testing-i686/PKGBUILD	2016-07-05 19:19:04 UTC (rev 271059)
+++ testing-i686/PKGBUILD	2016-07-05 19:19:57 UTC (rev 271060)
@@ -1,51 +0,0 @@
-# $Id$
-# Maintainer: Jan de Groot <jgc at archlinux.org>
-
-pkgname=freetype2
-pkgver=2.6.4
-pkgrel=1
-pkgdesc="TrueType font rendering library"
-arch=(i686 x86_64)
-license=('GPL')
-url="http://www.freetype.org/"
-# 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')
-provides=('libfreetype.so')
-install=freetype2.install
-source=(http://download.savannah.gnu.org/releases/freetype/freetype-${pkgver}.tar.bz2{,.sig}
-        0001-Enable-table-validation-modules.patch
-        0002-Enable-subpixel-rendering.patch
-        0003-Make-subpixel-hinting-mode-configurable.patch)
-sha1sums=('5eaa8c949b4841eeabba44d2c582ff6859e5c4b9'
-          'SKIP'
-          '045b1b6a56151ab46a8300e6fd09f24294258e97'
-          'afd6f9504516fa02e57890dde820f488e0df36bb'
-          '2a1d6e734001e196c7a7790c78165d9b9fe49f7f')
-validpgpkeys=('58E0C111E39F5408C5D3EC76C1A60EACE707FDA5')
-
-prepare() {
-  cd "${srcdir}/freetype-${pkgver}"
-  patch -Np1 -i "${srcdir}/0001-Enable-table-validation-modules.patch"
-  patch -Np1 -i "${srcdir}/0002-Enable-subpixel-rendering.patch"
-
-  # Provide a way to set the default subpixel hinting mode
-  # at runtime, without depending on the application to do so.
-  patch -Np1 -i "${srcdir}/0003-Make-subpixel-hinting-mode-configurable.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/PKGBUILD (from rev 271059, freetype2/trunk/PKGBUILD)
===================================================================
--- testing-i686/PKGBUILD	                        (rev 0)
+++ testing-i686/PKGBUILD	2016-07-05 19:19:57 UTC (rev 271060)
@@ -0,0 +1,51 @@
+# $Id$
+# Maintainer: Jan de Groot <jgc at archlinux.org>
+
+pkgname=freetype2
+pkgver=2.6.4
+pkgrel=2
+pkgdesc="TrueType font rendering library"
+arch=(i686 x86_64)
+license=('GPL')
+url="http://www.freetype.org/"
+# 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')
+provides=('libfreetype.so')
+install=freetype2.install
+source=(http://download.savannah.gnu.org/releases/freetype/freetype-${pkgver}.tar.bz2{,.sig}
+        0001-Enable-table-validation-modules.patch
+        0002-Enable-subpixel-rendering.patch
+        0003-Make-subpixel-hinting-mode-configurable.patch)
+sha1sums=('5eaa8c949b4841eeabba44d2c582ff6859e5c4b9'
+          'SKIP'
+          '045b1b6a56151ab46a8300e6fd09f24294258e97'
+          'afd6f9504516fa02e57890dde820f488e0df36bb'
+          '2a1d6e734001e196c7a7790c78165d9b9fe49f7f')
+validpgpkeys=('58E0C111E39F5408C5D3EC76C1A60EACE707FDA5')
+
+prepare() {
+  cd "${srcdir}/freetype-${pkgver}"
+  patch -Np1 -i "${srcdir}/0001-Enable-table-validation-modules.patch"
+  patch -Np1 -i "${srcdir}/0002-Enable-subpixel-rendering.patch"
+
+  # Provide a way to set the default subpixel hinting mode
+  # at runtime, without depending on the application to do so.
+  patch -Np1 -i "${srcdir}/0003-Make-subpixel-hinting-mode-configurable.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
+}

Deleted: testing-i686/freetype2.install
===================================================================
--- testing-i686/freetype2.install	2016-07-05 19:19:04 UTC (rev 271059)
+++ testing-i686/freetype2.install	2016-07-05 19:19:57 UTC (rev 271060)
@@ -1,13 +0,0 @@
-post_upgrade() {
-  if (( $(vercmp $2 2.6.4-1) < 0 )); then
-    cat <<MSG
-  Subpixel hinting mode can be chosen by setting the right value in
-  your environment, for example /etc/environment or ~/.pam_environment .
-
-  Available settings:
-      FT2_SUBPIXEL_HINTING=0  # Classic mode
-      FT2_SUBPIXEL_HINTING=1  # Infinality mode
-      FT2_SUBPIXEL_HINTING=2  # Default mode
-MSG
-  fi
-}

Copied: freetype2/repos/testing-i686/freetype2.install (from rev 271059, freetype2/trunk/freetype2.install)
===================================================================
--- testing-i686/freetype2.install	                        (rev 0)
+++ testing-i686/freetype2.install	2016-07-05 19:19:57 UTC (rev 271060)
@@ -0,0 +1,17 @@
+post_install() {
+  post_upgrade $1 0
+}
+
+post_upgrade() {
+  if (( $(vercmp $2 2.6.4-2) < 0 )); then
+    cat <<MSG
+  Subpixel hinting mode can be chosen by setting the right value in
+  your environment, for example /etc/environment or ~/.pam_environment .
+
+  Available settings:
+      FT2_SUBPIXEL_HINTING=0  # Classic mode
+      FT2_SUBPIXEL_HINTING=1  # Infinality mode
+      FT2_SUBPIXEL_HINTING=2  # Default mode
+MSG
+  fi
+}

Deleted: testing-x86_64/0001-Enable-table-validation-modules.patch
===================================================================
--- testing-x86_64/0001-Enable-table-validation-modules.patch	2016-07-05 19:19:04 UTC (rev 271059)
+++ testing-x86_64/0001-Enable-table-validation-modules.patch	2016-07-05 19:19:57 UTC (rev 271060)
@@ -1,34 +0,0 @@
-From 38732f60a5dc2a619dac5605d6c2fa90fc58d606 Mon Sep 17 00:00:00 2001
-From: "Jan Alexander Steffens (heftig)" <jan.steffens at gmail.com>
-Date: Tue, 23 Jun 2015 08:40:29 +0200
-Subject: [PATCH 1/3] Enable table validation modules
-
----
- modules.cfg | 4 ++--
- 1 file changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/modules.cfg b/modules.cfg
-index d677565a2bc2b5a2..f19cbec33384a86f 100644
---- a/modules.cfg
-+++ b/modules.cfg
-@@ -110,7 +110,7 @@ RASTER_MODULES += smooth
- 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).
- #
-@@ -129,7 +129,7 @@ AUX_MODULES += bzip2
- 
- # OpenType table validation.  Needs ftotval.c below.
- #
--# AUX_MODULES += otvalid
-+AUX_MODULES += otvalid
- 
- # Auxiliary PostScript driver component to share common code.
- #
--- 
-2.8.3
-

Copied: freetype2/repos/testing-x86_64/0001-Enable-table-validation-modules.patch (from rev 271059, freetype2/trunk/0001-Enable-table-validation-modules.patch)
===================================================================
--- testing-x86_64/0001-Enable-table-validation-modules.patch	                        (rev 0)
+++ testing-x86_64/0001-Enable-table-validation-modules.patch	2016-07-05 19:19:57 UTC (rev 271060)
@@ -0,0 +1,34 @@
+From 38732f60a5dc2a619dac5605d6c2fa90fc58d606 Mon Sep 17 00:00:00 2001
+From: "Jan Alexander Steffens (heftig)" <jan.steffens at gmail.com>
+Date: Tue, 23 Jun 2015 08:40:29 +0200
+Subject: [PATCH 1/3] Enable table validation modules
+
+---
+ modules.cfg | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/modules.cfg b/modules.cfg
+index d677565a2bc2b5a2..f19cbec33384a86f 100644
+--- a/modules.cfg
++++ b/modules.cfg
+@@ -110,7 +110,7 @@ RASTER_MODULES += smooth
+ 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).
+ #
+@@ -129,7 +129,7 @@ AUX_MODULES += bzip2
+ 
+ # OpenType table validation.  Needs ftotval.c below.
+ #
+-# AUX_MODULES += otvalid
++AUX_MODULES += otvalid
+ 
+ # Auxiliary PostScript driver component to share common code.
+ #
+-- 
+2.8.3
+

Deleted: testing-x86_64/0002-Enable-subpixel-rendering.patch
===================================================================
--- testing-x86_64/0002-Enable-subpixel-rendering.patch	2016-07-05 19:19:04 UTC (rev 271059)
+++ testing-x86_64/0002-Enable-subpixel-rendering.patch	2016-07-05 19:19:57 UTC (rev 271060)
@@ -1,25 +0,0 @@
-From 340fa8551faed5a105d0e1cbe4e81ade1f750a04 Mon Sep 17 00:00:00 2001
-From: "Jan Alexander Steffens (heftig)" <jan.steffens at gmail.com>
-Date: Tue, 23 Jun 2015 08:43:07 +0200
-Subject: [PATCH 2/3] Enable subpixel rendering
-
----
- include/freetype/config/ftoption.h | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/include/freetype/config/ftoption.h b/include/freetype/config/ftoption.h
-index 7dd3f55e572a23b9..33d563c4e1e47228 100644
---- a/include/freetype/config/ftoption.h
-+++ b/include/freetype/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
- 
- 
-   /*************************************************************************/
--- 
-2.8.3
-

Copied: freetype2/repos/testing-x86_64/0002-Enable-subpixel-rendering.patch (from rev 271059, freetype2/trunk/0002-Enable-subpixel-rendering.patch)
===================================================================
--- testing-x86_64/0002-Enable-subpixel-rendering.patch	                        (rev 0)
+++ testing-x86_64/0002-Enable-subpixel-rendering.patch	2016-07-05 19:19:57 UTC (rev 271060)
@@ -0,0 +1,25 @@
+From 340fa8551faed5a105d0e1cbe4e81ade1f750a04 Mon Sep 17 00:00:00 2001
+From: "Jan Alexander Steffens (heftig)" <jan.steffens at gmail.com>
+Date: Tue, 23 Jun 2015 08:43:07 +0200
+Subject: [PATCH 2/3] Enable subpixel rendering
+
+---
+ include/freetype/config/ftoption.h | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/include/freetype/config/ftoption.h b/include/freetype/config/ftoption.h
+index 7dd3f55e572a23b9..33d563c4e1e47228 100644
+--- a/include/freetype/config/ftoption.h
++++ b/include/freetype/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
+ 
+ 
+   /*************************************************************************/
+-- 
+2.8.3
+

Deleted: testing-x86_64/0003-Make-subpixel-hinting-mode-configurable.patch
===================================================================
--- testing-x86_64/0003-Make-subpixel-hinting-mode-configurable.patch	2016-07-05 19:19:04 UTC (rev 271059)
+++ testing-x86_64/0003-Make-subpixel-hinting-mode-configurable.patch	2016-07-05 19:19:57 UTC (rev 271060)
@@ -1,90 +0,0 @@
-From d0d93c2496175aa42b4c4bb3a45e4f0a6d264112 Mon Sep 17 00:00:00 2001
-From: "Jan Alexander Steffens (heftig)" <jan.steffens at gmail.com>
-Date: Wed, 15 Jun 2016 14:10:20 +0200
-Subject: [PATCH 3/3] Make subpixel hinting mode configurable
-
----
- include/freetype/config/ftoption.h |  4 ++--
- src/truetype/ttobjs.c              | 37 +++++++++++++++++++++++++++++++++++++
- 2 files changed, 39 insertions(+), 2 deletions(-)
-
-diff --git a/include/freetype/config/ftoption.h b/include/freetype/config/ftoption.h
-index 33d563c4e1e47228..a401fc8e9efbbd79 100644
---- a/include/freetype/config/ftoption.h
-+++ b/include/freetype/config/ftoption.h
-@@ -631,8 +631,8 @@ FT_BEGIN_HEADER
-   /* [1] http://www.microsoft.com/typography/cleartype/truetypecleartype.aspx */
-   /*                                                                       */
- /* #define TT_CONFIG_OPTION_SUBPIXEL_HINTING  1     */
--#define TT_CONFIG_OPTION_SUBPIXEL_HINTING     2
--/* #define TT_CONFIG_OPTION_SUBPIXEL_HINTING  ( 1 | 2 ) */
-+/* #define TT_CONFIG_OPTION_SUBPIXEL_HINTING  2     */
-+#define TT_CONFIG_OPTION_SUBPIXEL_HINTING     ( 1 | 2 )
- 
- 
-   /*************************************************************************/
-diff --git a/src/truetype/ttobjs.c b/src/truetype/ttobjs.c
-index ed3be2dbee79427c..d89f92e94d0e816b 100644
---- a/src/truetype/ttobjs.c
-+++ b/src/truetype/ttobjs.c
-@@ -36,6 +36,9 @@
- #include "ttgxvar.h"
- #endif
- 
-+#include <stdlib.h>
-+#include <errno.h>
-+
-   /*************************************************************************/
-   /*                                                                       */
-   /* The macro FT_COMPONENT is used in trace mode.  It is an implicit      */
-@@ -1286,6 +1289,7 @@
- #ifdef TT_USE_BYTECODE_INTERPRETER
- 
-     TT_Driver  driver = (TT_Driver)ttdriver;
-+    const char *envval;
- 
-     driver->interpreter_version = TT_INTERPRETER_VERSION_35;
- #ifdef TT_SUPPORT_SUBPIXEL_HINTING_INFINALITY
-@@ -1295,6 +1299,39 @@
-     driver->interpreter_version = TT_INTERPRETER_VERSION_40;
- #endif
- 
-+    errno = 0;
-+    envval = getenv( "FT2_SUBPIXEL_HINTING" );
-+    if ( envval )
-+    {
-+      char *endptr = NULL;
-+      unsigned long value = strtoul( envval, &endptr, 10 );
-+
-+      if ( !errno && endptr && !*endptr )
-+      {
-+        switch( value )
-+        {
-+        case 0:
-+          driver->interpreter_version = TT_INTERPRETER_VERSION_35;
-+          break;
-+
-+#ifdef TT_SUPPORT_SUBPIXEL_HINTING_INFINALITY
-+        case 1:
-+          driver->interpreter_version = TT_INTERPRETER_VERSION_38;
-+          break;
-+#endif
-+
-+#ifdef TT_SUPPORT_SUBPIXEL_HINTING_MINIMAL
-+        case 2:
-+          driver->interpreter_version = TT_INTERPRETER_VERSION_40;
-+          break;
-+#endif
-+
-+        default:
-+          break;
-+        }
-+      }
-+    }
-+
- #else /* !TT_USE_BYTECODE_INTERPRETER */
- 
-     FT_UNUSED( ttdriver );
--- 
-2.8.3
-

Copied: freetype2/repos/testing-x86_64/0003-Make-subpixel-hinting-mode-configurable.patch (from rev 271059, freetype2/trunk/0003-Make-subpixel-hinting-mode-configurable.patch)
===================================================================
--- testing-x86_64/0003-Make-subpixel-hinting-mode-configurable.patch	                        (rev 0)
+++ testing-x86_64/0003-Make-subpixel-hinting-mode-configurable.patch	2016-07-05 19:19:57 UTC (rev 271060)
@@ -0,0 +1,90 @@
+From d0d93c2496175aa42b4c4bb3a45e4f0a6d264112 Mon Sep 17 00:00:00 2001
+From: "Jan Alexander Steffens (heftig)" <jan.steffens at gmail.com>
+Date: Wed, 15 Jun 2016 14:10:20 +0200
+Subject: [PATCH 3/3] Make subpixel hinting mode configurable
+
+---
+ include/freetype/config/ftoption.h |  4 ++--
+ src/truetype/ttobjs.c              | 37 +++++++++++++++++++++++++++++++++++++
+ 2 files changed, 39 insertions(+), 2 deletions(-)
+
+diff --git a/include/freetype/config/ftoption.h b/include/freetype/config/ftoption.h
+index 33d563c4e1e47228..a401fc8e9efbbd79 100644
+--- a/include/freetype/config/ftoption.h
++++ b/include/freetype/config/ftoption.h
+@@ -631,8 +631,8 @@ FT_BEGIN_HEADER
+   /* [1] http://www.microsoft.com/typography/cleartype/truetypecleartype.aspx */
+   /*                                                                       */
+ /* #define TT_CONFIG_OPTION_SUBPIXEL_HINTING  1     */
+-#define TT_CONFIG_OPTION_SUBPIXEL_HINTING     2
+-/* #define TT_CONFIG_OPTION_SUBPIXEL_HINTING  ( 1 | 2 ) */
++/* #define TT_CONFIG_OPTION_SUBPIXEL_HINTING  2     */
++#define TT_CONFIG_OPTION_SUBPIXEL_HINTING     ( 1 | 2 )
+ 
+ 
+   /*************************************************************************/
+diff --git a/src/truetype/ttobjs.c b/src/truetype/ttobjs.c
+index ed3be2dbee79427c..d89f92e94d0e816b 100644
+--- a/src/truetype/ttobjs.c
++++ b/src/truetype/ttobjs.c
+@@ -36,6 +36,9 @@
+ #include "ttgxvar.h"
+ #endif
+ 
++#include <stdlib.h>
++#include <errno.h>
++
+   /*************************************************************************/
+   /*                                                                       */
+   /* The macro FT_COMPONENT is used in trace mode.  It is an implicit      */
+@@ -1286,6 +1289,7 @@
+ #ifdef TT_USE_BYTECODE_INTERPRETER
+ 
+     TT_Driver  driver = (TT_Driver)ttdriver;
++    const char *envval;
+ 
+     driver->interpreter_version = TT_INTERPRETER_VERSION_35;
+ #ifdef TT_SUPPORT_SUBPIXEL_HINTING_INFINALITY
+@@ -1295,6 +1299,39 @@
+     driver->interpreter_version = TT_INTERPRETER_VERSION_40;
+ #endif
+ 
++    errno = 0;
++    envval = getenv( "FT2_SUBPIXEL_HINTING" );
++    if ( envval )
++    {
++      char *endptr = NULL;
++      unsigned long value = strtoul( envval, &endptr, 10 );
++
++      if ( !errno && endptr && !*endptr )
++      {
++        switch( value )
++        {
++        case 0:
++          driver->interpreter_version = TT_INTERPRETER_VERSION_35;
++          break;
++
++#ifdef TT_SUPPORT_SUBPIXEL_HINTING_INFINALITY
++        case 1:
++          driver->interpreter_version = TT_INTERPRETER_VERSION_38;
++          break;
++#endif
++
++#ifdef TT_SUPPORT_SUBPIXEL_HINTING_MINIMAL
++        case 2:
++          driver->interpreter_version = TT_INTERPRETER_VERSION_40;
++          break;
++#endif
++
++        default:
++          break;
++        }
++      }
++    }
++
+ #else /* !TT_USE_BYTECODE_INTERPRETER */
+ 
+     FT_UNUSED( ttdriver );
+-- 
+2.8.3
+

Deleted: testing-x86_64/PKGBUILD
===================================================================
--- testing-x86_64/PKGBUILD	2016-07-05 19:19:04 UTC (rev 271059)
+++ testing-x86_64/PKGBUILD	2016-07-05 19:19:57 UTC (rev 271060)
@@ -1,51 +0,0 @@
-# $Id$
-# Maintainer: Jan de Groot <jgc at archlinux.org>
-
-pkgname=freetype2
-pkgver=2.6.4
-pkgrel=1
-pkgdesc="TrueType font rendering library"
-arch=(i686 x86_64)
-license=('GPL')
-url="http://www.freetype.org/"
-# 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')
-provides=('libfreetype.so')
-install=freetype2.install
-source=(http://download.savannah.gnu.org/releases/freetype/freetype-${pkgver}.tar.bz2{,.sig}
-        0001-Enable-table-validation-modules.patch
-        0002-Enable-subpixel-rendering.patch
-        0003-Make-subpixel-hinting-mode-configurable.patch)
-sha1sums=('5eaa8c949b4841eeabba44d2c582ff6859e5c4b9'
-          'SKIP'
-          '045b1b6a56151ab46a8300e6fd09f24294258e97'
-          'afd6f9504516fa02e57890dde820f488e0df36bb'
-          '2a1d6e734001e196c7a7790c78165d9b9fe49f7f')
-validpgpkeys=('58E0C111E39F5408C5D3EC76C1A60EACE707FDA5')
-
-prepare() {
-  cd "${srcdir}/freetype-${pkgver}"
-  patch -Np1 -i "${srcdir}/0001-Enable-table-validation-modules.patch"
-  patch -Np1 -i "${srcdir}/0002-Enable-subpixel-rendering.patch"
-
-  # Provide a way to set the default subpixel hinting mode
-  # at runtime, without depending on the application to do so.
-  patch -Np1 -i "${srcdir}/0003-Make-subpixel-hinting-mode-configurable.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/PKGBUILD (from rev 271059, freetype2/trunk/PKGBUILD)
===================================================================
--- testing-x86_64/PKGBUILD	                        (rev 0)
+++ testing-x86_64/PKGBUILD	2016-07-05 19:19:57 UTC (rev 271060)
@@ -0,0 +1,51 @@
+# $Id$
+# Maintainer: Jan de Groot <jgc at archlinux.org>
+
+pkgname=freetype2
+pkgver=2.6.4
+pkgrel=2
+pkgdesc="TrueType font rendering library"
+arch=(i686 x86_64)
+license=('GPL')
+url="http://www.freetype.org/"
+# 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')
+provides=('libfreetype.so')
+install=freetype2.install
+source=(http://download.savannah.gnu.org/releases/freetype/freetype-${pkgver}.tar.bz2{,.sig}
+        0001-Enable-table-validation-modules.patch
+        0002-Enable-subpixel-rendering.patch
+        0003-Make-subpixel-hinting-mode-configurable.patch)
+sha1sums=('5eaa8c949b4841eeabba44d2c582ff6859e5c4b9'
+          'SKIP'
+          '045b1b6a56151ab46a8300e6fd09f24294258e97'
+          'afd6f9504516fa02e57890dde820f488e0df36bb'
+          '2a1d6e734001e196c7a7790c78165d9b9fe49f7f')
+validpgpkeys=('58E0C111E39F5408C5D3EC76C1A60EACE707FDA5')
+
+prepare() {
+  cd "${srcdir}/freetype-${pkgver}"
+  patch -Np1 -i "${srcdir}/0001-Enable-table-validation-modules.patch"
+  patch -Np1 -i "${srcdir}/0002-Enable-subpixel-rendering.patch"
+
+  # Provide a way to set the default subpixel hinting mode
+  # at runtime, without depending on the application to do so.
+  patch -Np1 -i "${srcdir}/0003-Make-subpixel-hinting-mode-configurable.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
+}

Deleted: testing-x86_64/freetype2.install
===================================================================
--- testing-x86_64/freetype2.install	2016-07-05 19:19:04 UTC (rev 271059)
+++ testing-x86_64/freetype2.install	2016-07-05 19:19:57 UTC (rev 271060)
@@ -1,13 +0,0 @@
-post_upgrade() {
-  if (( $(vercmp $2 2.6.4-1) < 0 )); then
-    cat <<MSG
-  Subpixel hinting mode can be chosen by setting the right value in
-  your environment, for example /etc/environment or ~/.pam_environment .
-
-  Available settings:
-      FT2_SUBPIXEL_HINTING=0  # Classic mode
-      FT2_SUBPIXEL_HINTING=1  # Infinality mode
-      FT2_SUBPIXEL_HINTING=2  # Default mode
-MSG
-  fi
-}

Copied: freetype2/repos/testing-x86_64/freetype2.install (from rev 271059, freetype2/trunk/freetype2.install)
===================================================================
--- testing-x86_64/freetype2.install	                        (rev 0)
+++ testing-x86_64/freetype2.install	2016-07-05 19:19:57 UTC (rev 271060)
@@ -0,0 +1,17 @@
+post_install() {
+  post_upgrade $1 0
+}
+
+post_upgrade() {
+  if (( $(vercmp $2 2.6.4-2) < 0 )); then
+    cat <<MSG
+  Subpixel hinting mode can be chosen by setting the right value in
+  your environment, for example /etc/environment or ~/.pam_environment .
+
+  Available settings:
+      FT2_SUBPIXEL_HINTING=0  # Classic mode
+      FT2_SUBPIXEL_HINTING=1  # Infinality mode
+      FT2_SUBPIXEL_HINTING=2  # Default mode
+MSG
+  fi
+}



More information about the arch-commits mailing list