[arch-commits] Commit in lib32-freetype2/repos/multilib-x86_64 (9 files)
Jan Steffens
heftig at archlinux.org
Wed May 2 11:34:25 UTC 2018
Date: Wednesday, May 2, 2018 @ 11:34:24
Author: heftig
Revision: 318656
archrelease: copy trunk to multilib-x86_64
Added:
lib32-freetype2/repos/multilib-x86_64/0001-Enable-table-validation-modules.patch
(from rev 318655, lib32-freetype2/trunk/0001-Enable-table-validation-modules.patch)
lib32-freetype2/repos/multilib-x86_64/0002-Enable-infinality-subpixel-hinting.patch
(from rev 318655, lib32-freetype2/trunk/0002-Enable-infinality-subpixel-hinting.patch)
lib32-freetype2/repos/multilib-x86_64/0003-Enable-long-PCF-family-names.patch
(from rev 318655, lib32-freetype2/trunk/0003-Enable-long-PCF-family-names.patch)
lib32-freetype2/repos/multilib-x86_64/PKGBUILD
(from rev 318655, lib32-freetype2/trunk/PKGBUILD)
Deleted:
lib32-freetype2/repos/multilib-x86_64/0001-Enable-table-validation-modules.patch
lib32-freetype2/repos/multilib-x86_64/0001-psaux-Correctly-handle-Flex-features-52846.patch
lib32-freetype2/repos/multilib-x86_64/0002-Enable-infinality-subpixel-hinting.patch
lib32-freetype2/repos/multilib-x86_64/0003-Enable-long-PCF-family-names.patch
lib32-freetype2/repos/multilib-x86_64/PKGBUILD
-------------------------------------------------------+
0001-Enable-table-validation-modules.patch | 100 ++++++------
0001-psaux-Correctly-handle-Flex-features-52846.patch | 38 ----
0002-Enable-infinality-subpixel-hinting.patch | 60 +++----
0003-Enable-long-PCF-family-names.patch | 56 +++----
PKGBUILD | 128 +++++++---------
5 files changed, 169 insertions(+), 213 deletions(-)
Deleted: 0001-Enable-table-validation-modules.patch
===================================================================
--- 0001-Enable-table-validation-modules.patch 2018-05-02 11:33:15 UTC (rev 318655)
+++ 0001-Enable-table-validation-modules.patch 2018-05-02 11:34:24 UTC (rev 318656)
@@ -1,50 +0,0 @@
-From c7a6a2312313a971089fb592deb8c476be4dca0f Mon Sep 17 00:00:00 2001
-Message-Id: <c7a6a2312313a971089fb592deb8c476be4dca0f.1513462508.git.jan.steffens at gmail.com>
-From: "Jan Alexander Steffens (heftig)" <jan.steffens at gmail.com>
-Date: Tue, 23 Jun 2015 08:40:29 +0200
-Subject: [PATCH 1/4] Enable table validation modules
-
----
- modules.cfg | 4 ++--
- 1 file changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/modules.cfg b/modules.cfg
-index 56a2340e56d187aa..3a028329187275df 100644
---- a/modules.cfg
-+++ b/modules.cfg
-@@ -120,30 +120,30 @@ AUX_MODULES += cache
- # TrueType GX/AAT table validation. Needs ftgxval.c below.
- #
- # No FT_CONFIG_OPTION_PIC support.
--# AUX_MODULES += gxvalid
-+AUX_MODULES += gxvalid
-
- # Support for streams compressed with gzip (files with suffix .gz).
- #
- # See include/freetype/ftgzip.h for the API.
- # No FT_CONFIG_OPTION_PIC support.
- AUX_MODULES += gzip
-
- # Support for streams compressed with LZW (files with suffix .Z).
- #
- # See include/freetype/ftlzw.h for the API.
- # No FT_CONFIG_OPTION_PIC support.
- AUX_MODULES += lzw
-
- # Support for streams compressed with bzip2 (files with suffix .bz2).
- #
- # See include/freetype/ftbzip2.h for the API.
- # No FT_CONFIG_OPTION_PIC support.
- AUX_MODULES += bzip2
-
- # OpenType table validation. Needs ftotval.c below.
- #
- # No FT_CONFIG_OPTION_PIC support.
--# AUX_MODULES += otvalid
-+AUX_MODULES += otvalid
-
- # Auxiliary PostScript driver component to share common code.
- #
---
-2.15.1
-
Copied: lib32-freetype2/repos/multilib-x86_64/0001-Enable-table-validation-modules.patch (from rev 318655, lib32-freetype2/trunk/0001-Enable-table-validation-modules.patch)
===================================================================
--- 0001-Enable-table-validation-modules.patch (rev 0)
+++ 0001-Enable-table-validation-modules.patch 2018-05-02 11:34:24 UTC (rev 318656)
@@ -0,0 +1,50 @@
+From 7053fd3cef88991e2da6aac5f1dda2c30ce22b4c Mon Sep 17 00:00:00 2001
+Message-Id: <7053fd3cef88991e2da6aac5f1dda2c30ce22b4c.1525259379.git.jan.steffens at gmail.com>
+From: "Jan Alexander Steffens (heftig)" <jan.steffens at gmail.com>
+Date: Tue, 23 Jun 2015 08:40:29 +0200
+Subject: [PATCH 1/4] Enable table validation modules
+
+---
+ modules.cfg | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/modules.cfg b/modules.cfg
+index 4bf344524..f9aa44b2a 100644
+--- a/modules.cfg
++++ b/modules.cfg
+@@ -120,30 +120,30 @@ AUX_MODULES += cache
+ # TrueType GX/AAT table validation. Needs `ftgxval.c' below.
+ #
+ # No FT_CONFIG_OPTION_PIC support.
+-# AUX_MODULES += gxvalid
++AUX_MODULES += gxvalid
+
+ # Support for streams compressed with gzip (files with suffix .gz).
+ #
+ # See include/freetype/ftgzip.h for the API.
+ # No FT_CONFIG_OPTION_PIC support.
+ AUX_MODULES += gzip
+
+ # Support for streams compressed with LZW (files with suffix .Z).
+ #
+ # See include/freetype/ftlzw.h for the API.
+ # No FT_CONFIG_OPTION_PIC support.
+ AUX_MODULES += lzw
+
+ # Support for streams compressed with bzip2 (files with suffix .bz2).
+ #
+ # See include/freetype/ftbzip2.h for the API.
+ # No FT_CONFIG_OPTION_PIC support.
+ AUX_MODULES += bzip2
+
+ # OpenType table validation. Needs `ftotval.c' below.
+ #
+ # No FT_CONFIG_OPTION_PIC support.
+-# AUX_MODULES += otvalid
++AUX_MODULES += otvalid
+
+ # Auxiliary PostScript driver component to share common code.
+ #
+--
+2.17.0
+
Deleted: 0001-psaux-Correctly-handle-Flex-features-52846.patch
===================================================================
--- 0001-psaux-Correctly-handle-Flex-features-52846.patch 2018-05-02 11:33:15 UTC (rev 318655)
+++ 0001-psaux-Correctly-handle-Flex-features-52846.patch 2018-05-02 11:34:24 UTC (rev 318656)
@@ -1,38 +0,0 @@
-From cc2f3cdecff5a351e7e8961b9f2e389ab740231a Mon Sep 17 00:00:00 2001
-From: Ewald Hew <ewaldhew at gmail.com>
-Date: Wed, 10 Jan 2018 13:24:56 +0800
-Subject: [PATCH] [psaux] Correctly handle Flex features (#52846).
-
-* src/psaux/psintrp.c (cf2_interpT2CharString) <cf2_cmdVMOVETO,
-cf2_cmdHMOVETO>: Do not move if doing Flex.
----
- src/psaux/psintrp.c | 6 ++++--
- 1 file changed, 4 insertions(+), 2 deletions(-)
-
-diff --git a/src/psaux/psintrp.c b/src/psaux/psintrp.c
-index 5c0ee78..da5a8da 100644
---- a/src/psaux/psintrp.c
-+++ b/src/psaux/psintrp.c
-@@ -852,7 +852,8 @@
-
- curY = ADD_INT32( curY, cf2_stack_popFixed( opStack ) );
-
-- cf2_glyphpath_moveTo( &glyphPath, curX, curY );
-+ if ( !decoder->flex_state )
-+ cf2_glyphpath_moveTo( &glyphPath, curX, curY );
-
- break;
-
-@@ -2674,7 +2675,8 @@
-
- curX = ADD_INT32( curX, cf2_stack_popFixed( opStack ) );
-
-- cf2_glyphpath_moveTo( &glyphPath, curX, curY );
-+ if ( !decoder->flex_state )
-+ cf2_glyphpath_moveTo( &glyphPath, curX, curY );
-
- break;
-
---
-2.16.1
-
Deleted: 0002-Enable-infinality-subpixel-hinting.patch
===================================================================
--- 0002-Enable-infinality-subpixel-hinting.patch 2018-05-02 11:33:15 UTC (rev 318655)
+++ 0002-Enable-infinality-subpixel-hinting.patch 2018-05-02 11:34:24 UTC (rev 318656)
@@ -1,30 +0,0 @@
-From 438b8c65e900d4c28db9eeb2a45e5998048eb471 Mon Sep 17 00:00:00 2001
-Message-Id: <438b8c65e900d4c28db9eeb2a45e5998048eb471.1513462508.git.jan.steffens at gmail.com>
-In-Reply-To: <c7a6a2312313a971089fb592deb8c476be4dca0f.1513462508.git.jan.steffens at gmail.com>
-References: <c7a6a2312313a971089fb592deb8c476be4dca0f.1513462508.git.jan.steffens at gmail.com>
-From: "Jan Alexander Steffens (heftig)" <jan.steffens at gmail.com>
-Date: Mon, 29 Aug 2016 08:43:10 +0200
-Subject: [PATCH 2/4] Enable infinality subpixel hinting
-
----
- include/freetype/config/ftoption.h | 4 ++--
- 1 file changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/include/freetype/config/ftoption.h b/include/freetype/config/ftoption.h
-index 06f3d50bb02fb5ac..e6f9720df9b5d004 100644
---- a/include/freetype/config/ftoption.h
-+++ b/include/freetype/config/ftoption.h
-@@ -654,8 +654,8 @@ FT_BEGIN_HEADER
- /* [1] https://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 )
-
-
- /*************************************************************************/
---
-2.15.1
-
Copied: lib32-freetype2/repos/multilib-x86_64/0002-Enable-infinality-subpixel-hinting.patch (from rev 318655, lib32-freetype2/trunk/0002-Enable-infinality-subpixel-hinting.patch)
===================================================================
--- 0002-Enable-infinality-subpixel-hinting.patch (rev 0)
+++ 0002-Enable-infinality-subpixel-hinting.patch 2018-05-02 11:34:24 UTC (rev 318656)
@@ -0,0 +1,30 @@
+From ecb052d87dd80603aac454a65fd6e074bc57772c Mon Sep 17 00:00:00 2001
+Message-Id: <ecb052d87dd80603aac454a65fd6e074bc57772c.1525259379.git.jan.steffens at gmail.com>
+In-Reply-To: <7053fd3cef88991e2da6aac5f1dda2c30ce22b4c.1525259379.git.jan.steffens at gmail.com>
+References: <7053fd3cef88991e2da6aac5f1dda2c30ce22b4c.1525259379.git.jan.steffens at gmail.com>
+From: "Jan Alexander Steffens (heftig)" <jan.steffens at gmail.com>
+Date: Mon, 29 Aug 2016 08:43:10 +0200
+Subject: [PATCH 2/4] Enable infinality subpixel hinting
+
+---
+ include/freetype/config/ftoption.h | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/include/freetype/config/ftoption.h b/include/freetype/config/ftoption.h
+index 4bcab2af5..862b926d5 100644
+--- a/include/freetype/config/ftoption.h
++++ b/include/freetype/config/ftoption.h
+@@ -658,8 +658,8 @@ FT_BEGIN_HEADER
+ /* [1] https://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 )
+
+
+ /*************************************************************************/
+--
+2.17.0
+
Deleted: 0003-Enable-long-PCF-family-names.patch
===================================================================
--- 0003-Enable-long-PCF-family-names.patch 2018-05-02 11:33:15 UTC (rev 318655)
+++ 0003-Enable-long-PCF-family-names.patch 2018-05-02 11:34:24 UTC (rev 318656)
@@ -1,28 +0,0 @@
-From 7e262bff01573c67432f8b8fd879bf858e1611b3 Mon Sep 17 00:00:00 2001
-Message-Id: <7e262bff01573c67432f8b8fd879bf858e1611b3.1513462508.git.jan.steffens at gmail.com>
-In-Reply-To: <c7a6a2312313a971089fb592deb8c476be4dca0f.1513462508.git.jan.steffens at gmail.com>
-References: <c7a6a2312313a971089fb592deb8c476be4dca0f.1513462508.git.jan.steffens at gmail.com>
-From: "Jan Alexander Steffens (heftig)" <jan.steffens at gmail.com>
-Date: Sun, 14 May 2017 18:09:31 +0200
-Subject: [PATCH 3/4] Enable long PCF family names
-
----
- 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 e6f9720df9b5d004..832c9c3cd200f91a 100644
---- a/include/freetype/config/ftoption.h
-+++ b/include/freetype/config/ftoption.h
-@@ -845,7 +845,7 @@ FT_BEGIN_HEADER
- /* If this option is activated, it can be controlled with the */
- /* `no-long-family-names' property of the pcf driver module. */
- /* */
--/* #define PCF_CONFIG_OPTION_LONG_FAMILY_NAMES */
-+#define PCF_CONFIG_OPTION_LONG_FAMILY_NAMES
-
-
- /*************************************************************************/
---
-2.15.1
-
Copied: lib32-freetype2/repos/multilib-x86_64/0003-Enable-long-PCF-family-names.patch (from rev 318655, lib32-freetype2/trunk/0003-Enable-long-PCF-family-names.patch)
===================================================================
--- 0003-Enable-long-PCF-family-names.patch (rev 0)
+++ 0003-Enable-long-PCF-family-names.patch 2018-05-02 11:34:24 UTC (rev 318656)
@@ -0,0 +1,28 @@
+From bbb386e90cf9440c9c9952aa14bc309f2ec76205 Mon Sep 17 00:00:00 2001
+Message-Id: <bbb386e90cf9440c9c9952aa14bc309f2ec76205.1525259379.git.jan.steffens at gmail.com>
+In-Reply-To: <7053fd3cef88991e2da6aac5f1dda2c30ce22b4c.1525259379.git.jan.steffens at gmail.com>
+References: <7053fd3cef88991e2da6aac5f1dda2c30ce22b4c.1525259379.git.jan.steffens at gmail.com>
+From: "Jan Alexander Steffens (heftig)" <jan.steffens at gmail.com>
+Date: Sun, 14 May 2017 18:09:31 +0200
+Subject: [PATCH 3/4] Enable long PCF family names
+
+---
+ 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 862b926d5..bd6a4f7d3 100644
+--- a/include/freetype/config/ftoption.h
++++ b/include/freetype/config/ftoption.h
+@@ -849,7 +849,7 @@ FT_BEGIN_HEADER
+ /* If this option is activated, it can be controlled with the */
+ /* `no-long-family-names' property of the pcf driver module. */
+ /* */
+-/* #define PCF_CONFIG_OPTION_LONG_FAMILY_NAMES */
++#define PCF_CONFIG_OPTION_LONG_FAMILY_NAMES
+
+
+ /*************************************************************************/
+--
+2.17.0
+
Deleted: PKGBUILD
===================================================================
--- PKGBUILD 2018-05-02 11:33:15 UTC (rev 318655)
+++ PKGBUILD 2018-05-02 11:34:24 UTC (rev 318656)
@@ -1,67 +0,0 @@
-# $Id$
-# Contributor: Ionut Biru <ibiru at archlinux.org>
-# Contributor: Jan de Groot <jgc at archlinux.org>
-
-_pkgbasename=freetype2
-pkgname=lib32-$_pkgbasename
-pkgver=2.9
-pkgrel=2
-pkgdesc="TrueType font rendering library (32-bit)"
-arch=(x86_64)
-license=('GPL')
-url="https://www.freetype.org/"
-# 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')
-provides=('libfreetype.so')
-source=(https://download.savannah.gnu.org/releases/freetype/freetype-${pkgver}.tar.bz2{,.sig}
- 0001-Enable-table-validation-modules.patch
- 0002-Enable-infinality-subpixel-hinting.patch
- 0003-Enable-long-PCF-family-names.patch
- 0001-psaux-Correctly-handle-Flex-features-52846.patch)
-sha1sums=('94c4399b1a55c5892812e732843fcb4a7c2fe657'
- 'SKIP'
- 'b69531770c343d403be294b7e4d25ac45738c833'
- '3d26a569f0cb94c28a550577f5dcaadb4e193d91'
- '770f1981734a837bcf065564c91644b4cc5e256a'
- '21ad7dd31e16adb5b39adfa5671018a736626562')
-validpgpkeys=('58E0C111E39F5408C5D3EC76C1A60EACE707FDA5')
-
-prepare() {
- # Rename source dir to allow building the demos
- mv freetype-${pkgver} freetype2
-
- cd freetype2
- patch -Np1 -i ../0001-Enable-table-validation-modules.patch
- patch -Np1 -i ../0002-Enable-infinality-subpixel-hinting.patch
- patch -Np1 -i ../0003-Enable-long-PCF-family-names.patch
-
- # Freetype 2.9 regression: bad rendering for some Type 1 fonts
- # https://savannah.nongnu.org/bugs/?52846
- patch -Np1 -i ../0001-psaux-Correctly-handle-Flex-features-52846.patch
-}
-
-build() {
- export CC="gcc -m32"
- export CXX="g++ -m32"
- export PKG_CONFIG_PATH="/usr/lib32/pkgconfig"
-
- cd freetype2
- ./configure --prefix=/usr --disable-static --libdir=/usr/lib32
- make
-}
-
-check() {
- cd freetype2
- make -k check
-}
-
-package() {
- cd freetype2
- make DESTDIR="${pkgdir}" install
-
- rm -r "${pkgdir}"/usr/{include,share,bin}
-}
-
-# vim:set ts=2 sw=2 et:
Copied: lib32-freetype2/repos/multilib-x86_64/PKGBUILD (from rev 318655, lib32-freetype2/trunk/PKGBUILD)
===================================================================
--- PKGBUILD (rev 0)
+++ PKGBUILD 2018-05-02 11:34:24 UTC (rev 318656)
@@ -0,0 +1,61 @@
+# $Id$
+# Contributor: Ionut Biru <ibiru at archlinux.org>
+# Contributor: Jan de Groot <jgc at archlinux.org>
+
+_pkgbasename=freetype2
+pkgname=lib32-$_pkgbasename
+pkgver=2.9.1
+pkgrel=1
+pkgdesc="TrueType font rendering library (32-bit)"
+arch=(x86_64)
+license=('GPL')
+url="https://www.freetype.org/"
+# 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')
+provides=('libfreetype.so')
+source=(https://download.savannah.gnu.org/releases/freetype/freetype-${pkgver}.tar.bz2{,.sig}
+ 0001-Enable-table-validation-modules.patch
+ 0002-Enable-infinality-subpixel-hinting.patch
+ 0003-Enable-long-PCF-family-names.patch)
+sha1sums=('220c82062171c513e4017c523d196933c9de4a7d'
+ 'SKIP'
+ 'd9eb22e5c962923089b0c9fc5491cf28a19bd982'
+ 'd13503902e0404cf3558db76b477f23f9910d06e'
+ 'fc49742fb6c19fe0677e3552bb7c00aac8530265')
+validpgpkeys=('58E0C111E39F5408C5D3EC76C1A60EACE707FDA5')
+
+prepare() {
+ # Rename source dir to allow building the demos
+ mv freetype-${pkgver} freetype2
+
+ cd freetype2
+ patch -Np1 -i ../0001-Enable-table-validation-modules.patch
+ patch -Np1 -i ../0002-Enable-infinality-subpixel-hinting.patch
+ patch -Np1 -i ../0003-Enable-long-PCF-family-names.patch
+}
+
+build() {
+ export CC="gcc -m32"
+ export CXX="g++ -m32"
+ export PKG_CONFIG_PATH="/usr/lib32/pkgconfig"
+
+ cd freetype2
+ ./configure --prefix=/usr --disable-static --libdir=/usr/lib32
+ make
+}
+
+check() {
+ cd freetype2
+ make -k check
+}
+
+package() {
+ cd freetype2
+ make DESTDIR="${pkgdir}" install
+
+ rm -r "${pkgdir}"/usr/{include,share}
+}
+
+# vim:set ts=2 sw=2 et:
More information about the arch-commits
mailing list