[arch-commits] Commit in lib32-freetype2/repos/multilib-x86_64 (10 files)

Florian Pritz bluewind at archlinux.org
Thu Jul 2 17:28:18 UTC 2015


    Date: Thursday, July 2, 2015 @ 19:28:18
  Author: bluewind
Revision: 136282

archrelease: copy trunk to multilib-x86_64

Added:
  lib32-freetype2/repos/multilib-x86_64/PKGBUILD
    (from rev 136281, lib32-freetype2/trunk/PKGBUILD)
  lib32-freetype2/repos/multilib-x86_64/env_FT2_SUBPIXEL_HINTING.diff
    (from rev 136281, lib32-freetype2/trunk/env_FT2_SUBPIXEL_HINTING.diff)
  lib32-freetype2/repos/multilib-x86_64/freetype-2.2.1-enable-valid.patch
    (from rev 136281, lib32-freetype2/trunk/freetype-2.2.1-enable-valid.patch)
  lib32-freetype2/repos/multilib-x86_64/freetype-2.5.1-enable-sph.patch
    (from rev 136281, lib32-freetype2/trunk/freetype-2.5.1-enable-sph.patch)
  lib32-freetype2/repos/multilib-x86_64/freetype-2.5.1-enable-spr.patch
    (from rev 136281, lib32-freetype2/trunk/freetype-2.5.1-enable-spr.patch)
Deleted:
  lib32-freetype2/repos/multilib-x86_64/PKGBUILD
  lib32-freetype2/repos/multilib-x86_64/env_FT2_SUBPIXEL_HINTING.diff
  lib32-freetype2/repos/multilib-x86_64/freetype-2.2.1-enable-valid.patch
  lib32-freetype2/repos/multilib-x86_64/freetype-2.5.1-enable-sph.patch
  lib32-freetype2/repos/multilib-x86_64/freetype-2.5.1-enable-spr.patch

-----------------------------------+
 PKGBUILD                          |  124 ++++++++++++++++++------------------
 env_FT2_SUBPIXEL_HINTING.diff     |   36 +++++-----
 freetype-2.2.1-enable-valid.patch |   40 +++++------
 freetype-2.5.1-enable-sph.patch   |   26 +++----
 freetype-2.5.1-enable-spr.patch   |   26 +++----
 5 files changed, 126 insertions(+), 126 deletions(-)

Deleted: PKGBUILD
===================================================================
--- PKGBUILD	2015-07-02 17:28:13 UTC (rev 136281)
+++ PKGBUILD	2015-07-02 17:28:18 UTC (rev 136282)
@@ -1,62 +0,0 @@
-# $Id$
-# Maintainer: Ionut Biru <ibiru at archlinux.org>
-# Contributor: Jan de Groot <jgc at archlinux.org>
-
-_pkgbasename=freetype2
-pkgname=lib32-$_pkgbasename
-pkgver=2.5.5
-pkgrel=1
-pkgdesc="TrueType font rendering library (32-bit)"
-arch=(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=('lib32-zlib' 'lib32-bzip2' 'lib32-libpng' 'lib32-harfbuzz' $_pkgbasename)
-makedepends=(gcc-multilib)
-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_SUBPIXEL_HINTING.diff)
-sha1sums=('7b7460ef51a8fdb17baae53c6658fc1ad000a1c2'
-          'SKIP'
-          'f279d922a873d62a8af50bfc873051839d194dca'
-          '13ee8d558593db991ad29fa090b461f914536104'
-          'c31fa3d342ead56f3acfa1f267b474a7686d0014'
-          '78322bee05f013cd76487439ddac0cae50596db4')
-validpgpkeys=('58E0C111E39F5408C5D3EC76C1A60EACE707FDA5')
-
-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 enable the above patch at runtime.
-  # Hopefully just a temporary measure until fontconfig picks up
-  # the necessary configurables.
-  patch -Np1 -i "${srcdir}/env_FT2_SUBPIXEL_HINTING.diff"
-}
-
-build() {
-  export CC="gcc -m32"
-  export CXX="g++ -m32"
-  export PKG_CONFIG_PATH="/usr/lib32/pkgconfig"
-
-  cd "${srcdir}/freetype-${pkgver}"
-  ./configure --prefix=/usr --libdir=/usr/lib32
-  make
-}
-
-check() {
-  cd "${srcdir}/freetype-${pkgver}"
-  make -k check
-}
-
-package() {
-  cd "${srcdir}/freetype-${pkgver}"
-  make DESTDIR="${pkgdir}" install
-  rm -r "${pkgdir}"/usr/{include,share,bin}
-}

Copied: lib32-freetype2/repos/multilib-x86_64/PKGBUILD (from rev 136281, lib32-freetype2/trunk/PKGBUILD)
===================================================================
--- PKGBUILD	                        (rev 0)
+++ PKGBUILD	2015-07-02 17:28:18 UTC (rev 136282)
@@ -0,0 +1,62 @@
+# $Id$
+# Maintainer: Ionut Biru <ibiru at archlinux.org>
+# Contributor: Jan de Groot <jgc at archlinux.org>
+
+_pkgbasename=freetype2
+pkgname=lib32-$_pkgbasename
+pkgver=2.6
+pkgrel=1
+pkgdesc="TrueType font rendering library (32-bit)"
+arch=(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=('lib32-zlib' 'lib32-bzip2' 'lib32-libpng' 'lib32-harfbuzz' $_pkgbasename)
+makedepends=(gcc-multilib)
+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_SUBPIXEL_HINTING.diff)
+sha1sums=('cd2b144205dd2c61693e2d861069367aa3dde1bc'
+          'SKIP'
+          'f279d922a873d62a8af50bfc873051839d194dca'
+          '13ee8d558593db991ad29fa090b461f914536104'
+          'c31fa3d342ead56f3acfa1f267b474a7686d0014'
+          '78322bee05f013cd76487439ddac0cae50596db4')
+validpgpkeys=('58E0C111E39F5408C5D3EC76C1A60EACE707FDA5')
+
+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 enable the above patch at runtime.
+  # Hopefully just a temporary measure until fontconfig picks up
+  # the necessary configurables.
+  patch -Np1 -i "${srcdir}/env_FT2_SUBPIXEL_HINTING.diff"
+}
+
+build() {
+  export CC="gcc -m32"
+  export CXX="g++ -m32"
+  export PKG_CONFIG_PATH="/usr/lib32/pkgconfig"
+
+  cd "${srcdir}/freetype-${pkgver}"
+  ./configure --prefix=/usr --libdir=/usr/lib32
+  make
+}
+
+check() {
+  cd "${srcdir}/freetype-${pkgver}"
+  make -k check
+}
+
+package() {
+  cd "${srcdir}/freetype-${pkgver}"
+  make DESTDIR="${pkgdir}" install
+  rm -r "${pkgdir}"/usr/{include,share,bin}
+}

Deleted: env_FT2_SUBPIXEL_HINTING.diff
===================================================================
--- env_FT2_SUBPIXEL_HINTING.diff	2015-07-02 17:28:13 UTC (rev 136281)
+++ env_FT2_SUBPIXEL_HINTING.diff	2015-07-02 17:28:18 UTC (rev 136282)
@@ -1,18 +0,0 @@
-diff -u -r freetype-2.5.4/src/truetype/ttobjs.c freetype-2.5.4-env/src/truetype/ttobjs.c
---- freetype-2.5.4/src/truetype/ttobjs.c	2014-12-06 18:52:13.098214719 +0100
-+++ freetype-2.5.4-env/src/truetype/ttobjs.c	2014-12-10 09:13:04.418886699 +0100
-@@ -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_SUBPIXEL_HINTING" ) )
-+      driver->interpreter_version = TT_INTERPRETER_VERSION_38;
-+    else
- #endif
-+      driver->interpreter_version = TT_INTERPRETER_VERSION_35;
- 
- #else /* !TT_USE_BYTECODE_INTERPRETER */
- 

Copied: lib32-freetype2/repos/multilib-x86_64/env_FT2_SUBPIXEL_HINTING.diff (from rev 136281, lib32-freetype2/trunk/env_FT2_SUBPIXEL_HINTING.diff)
===================================================================
--- env_FT2_SUBPIXEL_HINTING.diff	                        (rev 0)
+++ env_FT2_SUBPIXEL_HINTING.diff	2015-07-02 17:28:18 UTC (rev 136282)
@@ -0,0 +1,18 @@
+diff -u -r freetype-2.5.4/src/truetype/ttobjs.c freetype-2.5.4-env/src/truetype/ttobjs.c
+--- freetype-2.5.4/src/truetype/ttobjs.c	2014-12-06 18:52:13.098214719 +0100
++++ freetype-2.5.4-env/src/truetype/ttobjs.c	2014-12-10 09:13:04.418886699 +0100
+@@ -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_SUBPIXEL_HINTING" ) )
++      driver->interpreter_version = TT_INTERPRETER_VERSION_38;
++    else
+ #endif
++      driver->interpreter_version = TT_INTERPRETER_VERSION_35;
+ 
+ #else /* !TT_USE_BYTECODE_INTERPRETER */
+ 

Deleted: freetype-2.2.1-enable-valid.patch
===================================================================
--- freetype-2.2.1-enable-valid.patch	2015-07-02 17:28:13 UTC (rev 136281)
+++ freetype-2.2.1-enable-valid.patch	2015-07-02 17:28:18 UTC (rev 136282)
@@ -1,20 +0,0 @@
---- 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: lib32-freetype2/repos/multilib-x86_64/freetype-2.2.1-enable-valid.patch (from rev 136281, lib32-freetype2/trunk/freetype-2.2.1-enable-valid.patch)
===================================================================
--- freetype-2.2.1-enable-valid.patch	                        (rev 0)
+++ freetype-2.2.1-enable-valid.patch	2015-07-02 17:28:18 UTC (rev 136282)
@@ -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.
+ #

Deleted: freetype-2.5.1-enable-sph.patch
===================================================================
--- freetype-2.5.1-enable-sph.patch	2015-07-02 17:28:13 UTC (rev 136281)
+++ freetype-2.5.1-enable-sph.patch	2015-07-02 17:28:18 UTC (rev 136282)
@@ -1,13 +0,0 @@
-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: lib32-freetype2/repos/multilib-x86_64/freetype-2.5.1-enable-sph.patch (from rev 136281, lib32-freetype2/trunk/freetype-2.5.1-enable-sph.patch)
===================================================================
--- freetype-2.5.1-enable-sph.patch	                        (rev 0)
+++ freetype-2.5.1-enable-sph.patch	2015-07-02 17:28:18 UTC (rev 136282)
@@ -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
+ 
+ 
+   /*************************************************************************/

Deleted: freetype-2.5.1-enable-spr.patch
===================================================================
--- freetype-2.5.1-enable-spr.patch	2015-07-02 17:28:13 UTC (rev 136281)
+++ freetype-2.5.1-enable-spr.patch	2015-07-02 17:28:18 UTC (rev 136282)
@@ -1,13 +0,0 @@
-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: lib32-freetype2/repos/multilib-x86_64/freetype-2.5.1-enable-spr.patch (from rev 136281, lib32-freetype2/trunk/freetype-2.5.1-enable-spr.patch)
===================================================================
--- freetype-2.5.1-enable-spr.patch	                        (rev 0)
+++ freetype-2.5.1-enable-spr.patch	2015-07-02 17:28:18 UTC (rev 136282)
@@ -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