[arch-commits] Commit in freetype2/repos (30 files)
Jan Steffens
heftig at archlinux.org
Sun May 14 16:30:06 UTC 2017
Date: Sunday, May 14, 2017 @ 16:30:05
Author: heftig
Revision: 295994
archrelease: copy trunk to testing-i686, testing-x86_64
Added:
freetype2/repos/testing-i686/0001-Enable-table-validation-modules.patch
(from rev 295993, freetype2/trunk/0001-Enable-table-validation-modules.patch)
freetype2/repos/testing-i686/0002-Enable-subpixel-rendering.patch
(from rev 295993, freetype2/trunk/0002-Enable-subpixel-rendering.patch)
freetype2/repos/testing-i686/0003-Enable-infinality-subpixel-hinting.patch
(from rev 295993, freetype2/trunk/0003-Enable-infinality-subpixel-hinting.patch)
freetype2/repos/testing-i686/0004-Enable-long-PCF-family-names.patch
(from rev 295993, freetype2/trunk/0004-Enable-long-PCF-family-names.patch)
freetype2/repos/testing-i686/0005-freetype-2.5.2-more-demos.patch
(from rev 295993, freetype2/trunk/0005-freetype-2.5.2-more-demos.patch)
freetype2/repos/testing-i686/PKGBUILD
(from rev 295993, freetype2/trunk/PKGBUILD)
freetype2/repos/testing-i686/freetype2.install
(from rev 295993, freetype2/trunk/freetype2.install)
freetype2/repos/testing-i686/freetype2.sh
(from rev 295993, freetype2/trunk/freetype2.sh)
freetype2/repos/testing-x86_64/0001-Enable-table-validation-modules.patch
(from rev 295993, freetype2/trunk/0001-Enable-table-validation-modules.patch)
freetype2/repos/testing-x86_64/0002-Enable-subpixel-rendering.patch
(from rev 295993, freetype2/trunk/0002-Enable-subpixel-rendering.patch)
freetype2/repos/testing-x86_64/0003-Enable-infinality-subpixel-hinting.patch
(from rev 295993, freetype2/trunk/0003-Enable-infinality-subpixel-hinting.patch)
freetype2/repos/testing-x86_64/0004-Enable-long-PCF-family-names.patch
(from rev 295993, freetype2/trunk/0004-Enable-long-PCF-family-names.patch)
freetype2/repos/testing-x86_64/0005-freetype-2.5.2-more-demos.patch
(from rev 295993, freetype2/trunk/0005-freetype-2.5.2-more-demos.patch)
freetype2/repos/testing-x86_64/PKGBUILD
(from rev 295993, freetype2/trunk/PKGBUILD)
freetype2/repos/testing-x86_64/freetype2.install
(from rev 295993, freetype2/trunk/freetype2.install)
freetype2/repos/testing-x86_64/freetype2.sh
(from rev 295993, freetype2/trunk/freetype2.sh)
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-Enable-infinality-subpixel-hinting.patch
freetype2/repos/testing-i686/0005-freetype-2.5.2-more-demos.patch
freetype2/repos/testing-i686/PKGBUILD
freetype2/repos/testing-i686/freetype2.install
freetype2/repos/testing-i686/freetype2.sh
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-Enable-infinality-subpixel-hinting.patch
freetype2/repos/testing-x86_64/0005-freetype-2.5.2-more-demos.patch
freetype2/repos/testing-x86_64/PKGBUILD
freetype2/repos/testing-x86_64/freetype2.install
freetype2/repos/testing-x86_64/freetype2.sh
--------------------------------------------------------------+
/0001-Enable-table-validation-modules.patch | 98 +++++
/0002-Enable-subpixel-rendering.patch | 50 ++
/0003-Enable-infinality-subpixel-hinting.patch | 54 ++
/0005-freetype-2.5.2-more-demos.patch | 34 +
/PKGBUILD | 196 ++++++++++
/freetype2.install | 16
/freetype2.sh | 24 +
testing-i686/0001-Enable-table-validation-modules.patch | 34 -
testing-i686/0002-Enable-subpixel-rendering.patch | 25 -
testing-i686/0003-Enable-infinality-subpixel-hinting.patch | 27 -
testing-i686/0004-Enable-long-PCF-family-names.patch | 25 +
testing-i686/0005-freetype-2.5.2-more-demos.patch | 17
testing-i686/PKGBUILD | 97 ----
testing-i686/freetype2.install | 8
testing-i686/freetype2.sh | 12
testing-x86_64/0001-Enable-table-validation-modules.patch | 34 -
testing-x86_64/0002-Enable-subpixel-rendering.patch | 25 -
testing-x86_64/0003-Enable-infinality-subpixel-hinting.patch | 27 -
testing-x86_64/0004-Enable-long-PCF-family-names.patch | 25 +
testing-x86_64/0005-freetype-2.5.2-more-demos.patch | 17
testing-x86_64/PKGBUILD | 97 ----
testing-x86_64/freetype2.install | 8
testing-x86_64/freetype2.sh | 12
23 files changed, 522 insertions(+), 440 deletions(-)
Deleted: testing-i686/0001-Enable-table-validation-modules.patch
===================================================================
--- testing-i686/0001-Enable-table-validation-modules.patch 2017-05-14 16:28:08 UTC (rev 295993)
+++ testing-i686/0001-Enable-table-validation-modules.patch 2017-05-14 16:30:05 UTC (rev 295994)
@@ -1,34 +0,0 @@
-From c3680bf8d38cf759c1e33dcc2d2d51e0a4fea2f9 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 f30049c38cc45159..7b8e50fe1b34584a 100644
---- a/modules.cfg
-+++ b/modules.cfg
-@@ -120,7 +120,7 @@ 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).
- #
-@@ -143,7 +143,7 @@ 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.9.3
-
Copied: freetype2/repos/testing-i686/0001-Enable-table-validation-modules.patch (from rev 295993, 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 2017-05-14 16:30:05 UTC (rev 295994)
@@ -0,0 +1,49 @@
+From 17dd2751813c3c8b37dac474cc5024473eb9bece 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/4] Enable table validation modules
+
+---
+ modules.cfg | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/modules.cfg b/modules.cfg
+index 517111efeb642459..64b2a34d510ce8f7 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.13.0
+
Deleted: testing-i686/0002-Enable-subpixel-rendering.patch
===================================================================
--- testing-i686/0002-Enable-subpixel-rendering.patch 2017-05-14 16:28:08 UTC (rev 295993)
+++ testing-i686/0002-Enable-subpixel-rendering.patch 2017-05-14 16:30:05 UTC (rev 295994)
@@ -1,25 +0,0 @@
-From 96f09f08417887b2618c177bccfb6da2906568d9 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 90c123ef93e9ea04..67a361dd41e0b026 100644
---- a/include/freetype/config/ftoption.h
-+++ b/include/freetype/config/ftoption.h
-@@ -122,7 +122,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.9.3
-
Copied: freetype2/repos/testing-i686/0002-Enable-subpixel-rendering.patch (from rev 295993, freetype2/trunk/0002-Enable-subpixel-rendering.patch)
===================================================================
--- testing-i686/0002-Enable-subpixel-rendering.patch (rev 0)
+++ testing-i686/0002-Enable-subpixel-rendering.patch 2017-05-14 16:30:05 UTC (rev 295994)
@@ -0,0 +1,25 @@
+From a8f7f3068a8a5f94adfc77f4ddf03bf08da38f9b 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/4] 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 1bf6e8f534ff0734..1126716626b570df 100644
+--- a/include/freetype/config/ftoption.h
++++ b/include/freetype/config/ftoption.h
+@@ -122,7 +122,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.13.0
+
Deleted: testing-i686/0003-Enable-infinality-subpixel-hinting.patch
===================================================================
--- testing-i686/0003-Enable-infinality-subpixel-hinting.patch 2017-05-14 16:28:08 UTC (rev 295993)
+++ testing-i686/0003-Enable-infinality-subpixel-hinting.patch 2017-05-14 16:30:05 UTC (rev 295994)
@@ -1,27 +0,0 @@
-From 220e96a9a8d7aff6ad0f0f1aa12c79cdb563331c Mon Sep 17 00:00:00 2001
-From: "Jan Alexander Steffens (heftig)" <jan.steffens at gmail.com>
-Date: Mon, 29 Aug 2016 08:43:10 +0200
-Subject: [PATCH 3/3] 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 67a361dd41e0b026..c4812862518b66a6 100644
---- a/include/freetype/config/ftoption.h
-+++ b/include/freetype/config/ftoption.h
-@@ -675,8 +675,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 )
-
-
- /*************************************************************************/
---
-2.9.3
-
Copied: freetype2/repos/testing-i686/0003-Enable-infinality-subpixel-hinting.patch (from rev 295993, freetype2/trunk/0003-Enable-infinality-subpixel-hinting.patch)
===================================================================
--- testing-i686/0003-Enable-infinality-subpixel-hinting.patch (rev 0)
+++ testing-i686/0003-Enable-infinality-subpixel-hinting.patch 2017-05-14 16:30:05 UTC (rev 295994)
@@ -0,0 +1,27 @@
+From 239cd8209c8d15a641d4548d386aeae4853b7d23 Mon Sep 17 00:00:00 2001
+From: "Jan Alexander Steffens (heftig)" <jan.steffens at gmail.com>
+Date: Mon, 29 Aug 2016 08:43:10 +0200
+Subject: [PATCH 3/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 1126716626b570df..ebb44acdbbef9a47 100644
+--- a/include/freetype/config/ftoption.h
++++ b/include/freetype/config/ftoption.h
+@@ -684,8 +684,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 )
+
+
+ /*************************************************************************/
+--
+2.13.0
+
Copied: freetype2/repos/testing-i686/0004-Enable-long-PCF-family-names.patch (from rev 295993, freetype2/trunk/0004-Enable-long-PCF-family-names.patch)
===================================================================
--- testing-i686/0004-Enable-long-PCF-family-names.patch (rev 0)
+++ testing-i686/0004-Enable-long-PCF-family-names.patch 2017-05-14 16:30:05 UTC (rev 295994)
@@ -0,0 +1,25 @@
+From 62da6a0f7f5cb77859a793863c386c452411e2a6 Mon Sep 17 00:00:00 2001
+From: "Jan Alexander Steffens (heftig)" <jan.steffens at gmail.com>
+Date: Sun, 14 May 2017 18:09:31 +0200
+Subject: [PATCH 4/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 ebb44acdbbef9a47..0b39b417162707e4 100644
+--- a/include/freetype/config/ftoption.h
++++ b/include/freetype/config/ftoption.h
+@@ -865,7 +865,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.13.0
+
Deleted: testing-i686/0005-freetype-2.5.2-more-demos.patch
===================================================================
--- testing-i686/0005-freetype-2.5.2-more-demos.patch 2017-05-14 16:28:08 UTC (rev 295993)
+++ testing-i686/0005-freetype-2.5.2-more-demos.patch 2017-05-14 16:30:05 UTC (rev 295994)
@@ -1,17 +0,0 @@
---- ft2demos-2.5.2/Makefile
-+++ ft2demos-2.5.2/Makefile
-@@ -296,10 +296,10 @@ else
- # The following programs are not compiled automatically; either comment
- # out the affected line or use the program name as a Makefile target.
- #
-- # EXES += ftchkwd
-- # EXES += ftmemchk
-- # EXES += ftpatchk
-- # EXES += fttimer
-+ EXES += ftchkwd
-+ EXES += ftmemchk
-+ EXES += ftpatchk
-+ EXES += fttimer
- # EXES += testname
-
- exes: $(EXES:%=$(BIN_DIR_2)/%$E)
Copied: freetype2/repos/testing-i686/0005-freetype-2.5.2-more-demos.patch (from rev 295993, freetype2/trunk/0005-freetype-2.5.2-more-demos.patch)
===================================================================
--- testing-i686/0005-freetype-2.5.2-more-demos.patch (rev 0)
+++ testing-i686/0005-freetype-2.5.2-more-demos.patch 2017-05-14 16:30:05 UTC (rev 295994)
@@ -0,0 +1,17 @@
+--- ft2demos-2.5.2/Makefile
++++ ft2demos-2.5.2/Makefile
+@@ -296,10 +296,10 @@ else
+ # The following programs are not compiled automatically; either comment
+ # out the affected line or use the program name as a Makefile target.
+ #
+- # EXES += ftchkwd
+- # EXES += ftmemchk
+- # EXES += ftpatchk
+- # EXES += fttimer
++ EXES += ftchkwd
++ EXES += ftmemchk
++ EXES += ftpatchk
++ EXES += fttimer
+ # EXES += testname
+
+ exes: $(EXES:%=$(BIN_DIR_2)/%$E)
Deleted: testing-i686/PKGBUILD
===================================================================
--- testing-i686/PKGBUILD 2017-05-14 16:28:08 UTC (rev 295993)
+++ testing-i686/PKGBUILD 2017-05-14 16:30:05 UTC (rev 295994)
@@ -1,97 +0,0 @@
-# $Id$
-# Maintainer: Jan de Groot <jgc at archlinux.org>
-
-pkgbase=freetype2
-pkgname=('freetype2' 'freetype2-demos')
-pkgver=2.8
-pkgrel=1
-arch=(i686 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
-makedepends=('libx11' 'zlib' 'bzip2' 'sh' 'libpng' 'harfbuzz')
-source=(https://download-mirror.savannah.gnu.org/releases/freetype/freetype-${pkgver}.tar.bz2{,.sig}
- https://download-mirror.savannah.gnu.org/releases/freetype/freetype-doc-${pkgver}.tar.bz2{,.sig}
- https://download-mirror.savannah.gnu.org/releases/freetype/ft2demos-${pkgver}.tar.bz2{,.sig}
- 0001-Enable-table-validation-modules.patch
- 0002-Enable-subpixel-rendering.patch
- 0003-Enable-infinality-subpixel-hinting.patch
- 0005-freetype-2.5.2-more-demos.patch
- freetype2.sh)
-sha1sums=('42c6b1f733fe13a3eba135f5025b22cb68450f91'
- 'SKIP'
- '5b221ee14fe674cd5f6db0193d55360bc0bd3655'
- 'SKIP'
- '7849f1ac4a352971fab61a5fc2e5c6a597201201'
- 'SKIP'
- 'b31882ef5e8447e761acee1c4a44c0630cd4d465'
- 'b1494810ed3aca25cdd8e8cedf634e5adfe6c09e'
- '41d27140fd590945e22e012c9dce62de3d6f11e6'
- '72cfecbe738085eec475e012617661ad0cc9b76f'
- 'bc6df1661c4c33e20f5ce30c2da8ad3c2083665f')
-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-subpixel-rendering.patch
- patch -Np1 -i ../0003-Enable-infinality-subpixel-hinting.patch
-
- cd ../ft2demos-${pkgver}
- # enable more demos
- patch -Np1 -i ../0005-freetype-2.5.2-more-demos.patch
-
- # Suppress RPATH
- sed -i '/X11_LIB:%=-R%/d' graph/x11/rules.mk
-}
-
-build() {
- cd freetype2
- ./configure --prefix=/usr --disable-static
- make
-
- # Build demos
- cd ../ft2demos-${pkgver}
- make
-}
-
-check() {
- cd freetype2
- make -k check
-}
-
-package_freetype2() {
- pkgdesc="TrueType font rendering library"
- depends=('zlib' 'bzip2' 'sh' 'libpng' 'harfbuzz')
- provides=('libfreetype.so')
- install=freetype2.install
- backup=('etc/profile.d/freetype2.sh')
-
- cd freetype2
- make DESTDIR="${pkgdir}" install
- install -Dm644 ../freetype2.sh "${pkgdir}/etc/profile.d/freetype2.sh"
-
- # Package docs
- install -dm755 "${pkgdir}/usr/share/doc"
- cp -a docs "${pkgdir}/usr/share/doc/${pkgname}"
-
- cd ../ft2demos-${pkgver}
- mkdir -p $srcdir/ft-demos
- for _i in bin/{f,t}t*; do
- libtool --mode=install install $_i "$srcdir/ft-demos"
- done
-}
-
-package_freetype2-demos() {
- pkgdesc="Freetype tools and demos"
- depends=('freetype2' 'libx11')
-
- install -dm755 "${pkgdir}/usr/bin"
- cp -a $srcdir/ft-demos/* "${pkgdir}/usr/bin"
-}
-
-# vim:set ts=2 sw=2 et:
Copied: freetype2/repos/testing-i686/PKGBUILD (from rev 295993, freetype2/trunk/PKGBUILD)
===================================================================
--- testing-i686/PKGBUILD (rev 0)
+++ testing-i686/PKGBUILD 2017-05-14 16:30:05 UTC (rev 295994)
@@ -0,0 +1,98 @@
+# $Id$
+# Maintainer: Jan de Groot <jgc at archlinux.org>
+
+pkgbase=freetype2
+pkgname=('freetype2' 'freetype2-demos')
+pkgver=2.8
+pkgrel=2
+pkgdesc="Font rasterization library"
+arch=(i686 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=('zlib' 'bzip2' 'sh' 'libpng' 'harfbuzz')
+makedepends=('libx11')
+source=(https://download-mirror.savannah.gnu.org/releases/freetype/freetype-${pkgver}.tar.bz2{,.sig}
+ https://download-mirror.savannah.gnu.org/releases/freetype/freetype-doc-${pkgver}.tar.bz2{,.sig}
+ https://download-mirror.savannah.gnu.org/releases/freetype/ft2demos-${pkgver}.tar.bz2{,.sig}
+ 0001-Enable-table-validation-modules.patch
+ 0002-Enable-subpixel-rendering.patch
+ 0003-Enable-infinality-subpixel-hinting.patch
+ 0004-Enable-long-PCF-family-names.patch
+ 0005-freetype-2.5.2-more-demos.patch
+ freetype2.sh)
+sha1sums=('42c6b1f733fe13a3eba135f5025b22cb68450f91'
+ 'SKIP'
+ '5b221ee14fe674cd5f6db0193d55360bc0bd3655'
+ 'SKIP'
+ '7849f1ac4a352971fab61a5fc2e5c6a597201201'
+ 'SKIP'
+ 'c3e91e668936206d3c158bffde0f69788a086a5b'
+ '4ff958229a7f87e04a9894d5a6ed2df227071931'
+ '81586014ea44375ddc85dd9dbcabae6e91c34d62'
+ '334f229875039794adeb574e27d365bb445fb314'
+ '72cfecbe738085eec475e012617661ad0cc9b76f'
+ 'bc6df1661c4c33e20f5ce30c2da8ad3c2083665f')
+validpgpkeys=('58E0C111E39F5408C5D3EC76C1A60EACE707FDA5')
+
+prepare() {
+ # Rename source dir to allow building the demos
+ mv freetype-${pkgver} freetype2
+ mv ft2demos-${pkgver} freetype2-demos
+
+ cd freetype2
+ patch -Np1 -i ../0001-Enable-table-validation-modules.patch
+ patch -Np1 -i ../0002-Enable-subpixel-rendering.patch
+ patch -Np1 -i ../0003-Enable-infinality-subpixel-hinting.patch
+ patch -Np1 -i ../0004-Enable-long-PCF-family-names.patch
+
+ cd ../freetype2-demos
+ # enable more demos
+ patch -Np1 -i ../0005-freetype-2.5.2-more-demos.patch
+
+ # Suppress RPATH
+ sed -i '/X11_LIB:%=-R%/d' graph/x11/rules.mk
+}
+
+build() {
+ cd freetype2
+ ./configure --prefix=/usr --disable-static
+ make
+
+ # Build demos
+ cd ../freetype2-demos
+ make
+}
+
+check() {
+ cd freetype2
+ make -k check
+}
+
+package_freetype2() {
+ provides=('libfreetype.so')
+ install=freetype2.install
+ backup=('etc/profile.d/freetype2.sh')
+
+ cd freetype2
+ make DESTDIR="${pkgdir}" install
+ install -Dm644 ../freetype2.sh "${pkgdir}/etc/profile.d/freetype2.sh"
+
+ # Package docs
+ install -d "${pkgdir}/usr/share/doc"
+ cp -a docs "${pkgdir}/usr/share/doc/freetype2"
+}
+
+package_freetype2-demos() {
+ pkgdesc="Freetype tools and demos"
+ depends=('freetype2' 'libx11')
+
+ cd freetype2-demos
+ install -d "${pkgdir}/usr/bin"
+ for _i in bin/{f,t}t*; do
+ libtool --mode=install install $_i "${pkgdir}/usr/bin"
+ done
+}
+
+# vim:set ts=2 sw=2 et:
Deleted: testing-i686/freetype2.install
===================================================================
--- testing-i686/freetype2.install 2017-05-14 16:28:08 UTC (rev 295993)
+++ testing-i686/freetype2.install 2017-05-14 16:30:05 UTC (rev 295994)
@@ -1,8 +0,0 @@
-post_upgrade() {
- if (( $(vercmp $2 2.7-1) < 0 )); then
- cat <<MSG
- The Arch-specific FT2_SUBPIXEL_HINTING has been removed.
- Subpixel hinting is now configured in /etc/profile.d/freetype2.sh .
-MSG
- fi
-}
Copied: freetype2/repos/testing-i686/freetype2.install (from rev 295993, freetype2/trunk/freetype2.install)
===================================================================
--- testing-i686/freetype2.install (rev 0)
+++ testing-i686/freetype2.install 2017-05-14 16:30:05 UTC (rev 295994)
@@ -0,0 +1,8 @@
+post_upgrade() {
+ if (( $(vercmp $2 2.7-1) < 0 )); then
+ cat <<MSG
+ The Arch-specific FT2_SUBPIXEL_HINTING has been removed.
+ Subpixel hinting is now configured in /etc/profile.d/freetype2.sh .
+MSG
+ fi
+}
Deleted: testing-i686/freetype2.sh
===================================================================
--- testing-i686/freetype2.sh 2017-05-14 16:28:08 UTC (rev 295993)
+++ testing-i686/freetype2.sh 2017-05-14 16:30:05 UTC (rev 295994)
@@ -1,12 +0,0 @@
-# Subpixel hinting mode can be chosen by setting the right TrueType interpreter
-# version. The available settings are:
-#
-# truetype:interpreter-version=35 # Classic mode (default in 2.6)
-# truetype:interpreter-version=38 # Infinality mode
-# truetype:interpreter-version=40 # Minimal mode (default in 2.7)
-#
-# There are more properties that can be set, separated by whitespace. Please
-# refer to the FreeType documentation for details.
-
-# Uncomment and configure below
-#export FREETYPE_PROPERTIES="truetype:interpreter-version=40"
Copied: freetype2/repos/testing-i686/freetype2.sh (from rev 295993, freetype2/trunk/freetype2.sh)
===================================================================
--- testing-i686/freetype2.sh (rev 0)
+++ testing-i686/freetype2.sh 2017-05-14 16:30:05 UTC (rev 295994)
@@ -0,0 +1,12 @@
+# Subpixel hinting mode can be chosen by setting the right TrueType interpreter
+# version. The available settings are:
+#
+# truetype:interpreter-version=35 # Classic mode (default in 2.6)
+# truetype:interpreter-version=38 # Infinality mode
+# truetype:interpreter-version=40 # Minimal mode (default in 2.7)
+#
+# There are more properties that can be set, separated by whitespace. Please
+# refer to the FreeType documentation for details.
+
+# Uncomment and configure below
+#export FREETYPE_PROPERTIES="truetype:interpreter-version=40"
Deleted: testing-x86_64/0001-Enable-table-validation-modules.patch
===================================================================
--- testing-x86_64/0001-Enable-table-validation-modules.patch 2017-05-14 16:28:08 UTC (rev 295993)
+++ testing-x86_64/0001-Enable-table-validation-modules.patch 2017-05-14 16:30:05 UTC (rev 295994)
@@ -1,34 +0,0 @@
-From c3680bf8d38cf759c1e33dcc2d2d51e0a4fea2f9 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 f30049c38cc45159..7b8e50fe1b34584a 100644
---- a/modules.cfg
-+++ b/modules.cfg
-@@ -120,7 +120,7 @@ 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).
- #
-@@ -143,7 +143,7 @@ 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.9.3
-
Copied: freetype2/repos/testing-x86_64/0001-Enable-table-validation-modules.patch (from rev 295993, 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 2017-05-14 16:30:05 UTC (rev 295994)
@@ -0,0 +1,49 @@
+From 17dd2751813c3c8b37dac474cc5024473eb9bece 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/4] Enable table validation modules
+
+---
+ modules.cfg | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/modules.cfg b/modules.cfg
+index 517111efeb642459..64b2a34d510ce8f7 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.13.0
+
Deleted: testing-x86_64/0002-Enable-subpixel-rendering.patch
===================================================================
--- testing-x86_64/0002-Enable-subpixel-rendering.patch 2017-05-14 16:28:08 UTC (rev 295993)
+++ testing-x86_64/0002-Enable-subpixel-rendering.patch 2017-05-14 16:30:05 UTC (rev 295994)
@@ -1,25 +0,0 @@
-From 96f09f08417887b2618c177bccfb6da2906568d9 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 90c123ef93e9ea04..67a361dd41e0b026 100644
---- a/include/freetype/config/ftoption.h
-+++ b/include/freetype/config/ftoption.h
-@@ -122,7 +122,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.9.3
-
Copied: freetype2/repos/testing-x86_64/0002-Enable-subpixel-rendering.patch (from rev 295993, 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 2017-05-14 16:30:05 UTC (rev 295994)
@@ -0,0 +1,25 @@
+From a8f7f3068a8a5f94adfc77f4ddf03bf08da38f9b 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/4] 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 1bf6e8f534ff0734..1126716626b570df 100644
+--- a/include/freetype/config/ftoption.h
++++ b/include/freetype/config/ftoption.h
+@@ -122,7 +122,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.13.0
+
Deleted: testing-x86_64/0003-Enable-infinality-subpixel-hinting.patch
===================================================================
--- testing-x86_64/0003-Enable-infinality-subpixel-hinting.patch 2017-05-14 16:28:08 UTC (rev 295993)
+++ testing-x86_64/0003-Enable-infinality-subpixel-hinting.patch 2017-05-14 16:30:05 UTC (rev 295994)
@@ -1,27 +0,0 @@
-From 220e96a9a8d7aff6ad0f0f1aa12c79cdb563331c Mon Sep 17 00:00:00 2001
-From: "Jan Alexander Steffens (heftig)" <jan.steffens at gmail.com>
-Date: Mon, 29 Aug 2016 08:43:10 +0200
-Subject: [PATCH 3/3] 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 67a361dd41e0b026..c4812862518b66a6 100644
---- a/include/freetype/config/ftoption.h
-+++ b/include/freetype/config/ftoption.h
-@@ -675,8 +675,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 )
-
-
- /*************************************************************************/
---
-2.9.3
-
Copied: freetype2/repos/testing-x86_64/0003-Enable-infinality-subpixel-hinting.patch (from rev 295993, freetype2/trunk/0003-Enable-infinality-subpixel-hinting.patch)
===================================================================
--- testing-x86_64/0003-Enable-infinality-subpixel-hinting.patch (rev 0)
+++ testing-x86_64/0003-Enable-infinality-subpixel-hinting.patch 2017-05-14 16:30:05 UTC (rev 295994)
@@ -0,0 +1,27 @@
+From 239cd8209c8d15a641d4548d386aeae4853b7d23 Mon Sep 17 00:00:00 2001
+From: "Jan Alexander Steffens (heftig)" <jan.steffens at gmail.com>
+Date: Mon, 29 Aug 2016 08:43:10 +0200
+Subject: [PATCH 3/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 1126716626b570df..ebb44acdbbef9a47 100644
+--- a/include/freetype/config/ftoption.h
++++ b/include/freetype/config/ftoption.h
+@@ -684,8 +684,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 )
+
+
+ /*************************************************************************/
+--
+2.13.0
+
Copied: freetype2/repos/testing-x86_64/0004-Enable-long-PCF-family-names.patch (from rev 295993, freetype2/trunk/0004-Enable-long-PCF-family-names.patch)
===================================================================
--- testing-x86_64/0004-Enable-long-PCF-family-names.patch (rev 0)
+++ testing-x86_64/0004-Enable-long-PCF-family-names.patch 2017-05-14 16:30:05 UTC (rev 295994)
@@ -0,0 +1,25 @@
+From 62da6a0f7f5cb77859a793863c386c452411e2a6 Mon Sep 17 00:00:00 2001
+From: "Jan Alexander Steffens (heftig)" <jan.steffens at gmail.com>
+Date: Sun, 14 May 2017 18:09:31 +0200
+Subject: [PATCH 4/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 ebb44acdbbef9a47..0b39b417162707e4 100644
+--- a/include/freetype/config/ftoption.h
++++ b/include/freetype/config/ftoption.h
+@@ -865,7 +865,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.13.0
+
Deleted: testing-x86_64/0005-freetype-2.5.2-more-demos.patch
===================================================================
--- testing-x86_64/0005-freetype-2.5.2-more-demos.patch 2017-05-14 16:28:08 UTC (rev 295993)
+++ testing-x86_64/0005-freetype-2.5.2-more-demos.patch 2017-05-14 16:30:05 UTC (rev 295994)
@@ -1,17 +0,0 @@
---- ft2demos-2.5.2/Makefile
-+++ ft2demos-2.5.2/Makefile
-@@ -296,10 +296,10 @@ else
- # The following programs are not compiled automatically; either comment
- # out the affected line or use the program name as a Makefile target.
- #
-- # EXES += ftchkwd
-- # EXES += ftmemchk
-- # EXES += ftpatchk
-- # EXES += fttimer
-+ EXES += ftchkwd
-+ EXES += ftmemchk
-+ EXES += ftpatchk
-+ EXES += fttimer
- # EXES += testname
-
- exes: $(EXES:%=$(BIN_DIR_2)/%$E)
Copied: freetype2/repos/testing-x86_64/0005-freetype-2.5.2-more-demos.patch (from rev 295993, freetype2/trunk/0005-freetype-2.5.2-more-demos.patch)
===================================================================
--- testing-x86_64/0005-freetype-2.5.2-more-demos.patch (rev 0)
+++ testing-x86_64/0005-freetype-2.5.2-more-demos.patch 2017-05-14 16:30:05 UTC (rev 295994)
@@ -0,0 +1,17 @@
+--- ft2demos-2.5.2/Makefile
++++ ft2demos-2.5.2/Makefile
+@@ -296,10 +296,10 @@ else
+ # The following programs are not compiled automatically; either comment
+ # out the affected line or use the program name as a Makefile target.
+ #
+- # EXES += ftchkwd
+- # EXES += ftmemchk
+- # EXES += ftpatchk
+- # EXES += fttimer
++ EXES += ftchkwd
++ EXES += ftmemchk
++ EXES += ftpatchk
++ EXES += fttimer
+ # EXES += testname
+
+ exes: $(EXES:%=$(BIN_DIR_2)/%$E)
Deleted: testing-x86_64/PKGBUILD
===================================================================
--- testing-x86_64/PKGBUILD 2017-05-14 16:28:08 UTC (rev 295993)
+++ testing-x86_64/PKGBUILD 2017-05-14 16:30:05 UTC (rev 295994)
@@ -1,97 +0,0 @@
-# $Id$
-# Maintainer: Jan de Groot <jgc at archlinux.org>
-
-pkgbase=freetype2
-pkgname=('freetype2' 'freetype2-demos')
-pkgver=2.8
-pkgrel=1
-arch=(i686 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
-makedepends=('libx11' 'zlib' 'bzip2' 'sh' 'libpng' 'harfbuzz')
-source=(https://download-mirror.savannah.gnu.org/releases/freetype/freetype-${pkgver}.tar.bz2{,.sig}
- https://download-mirror.savannah.gnu.org/releases/freetype/freetype-doc-${pkgver}.tar.bz2{,.sig}
- https://download-mirror.savannah.gnu.org/releases/freetype/ft2demos-${pkgver}.tar.bz2{,.sig}
- 0001-Enable-table-validation-modules.patch
- 0002-Enable-subpixel-rendering.patch
- 0003-Enable-infinality-subpixel-hinting.patch
- 0005-freetype-2.5.2-more-demos.patch
- freetype2.sh)
-sha1sums=('42c6b1f733fe13a3eba135f5025b22cb68450f91'
- 'SKIP'
- '5b221ee14fe674cd5f6db0193d55360bc0bd3655'
- 'SKIP'
- '7849f1ac4a352971fab61a5fc2e5c6a597201201'
- 'SKIP'
- 'b31882ef5e8447e761acee1c4a44c0630cd4d465'
- 'b1494810ed3aca25cdd8e8cedf634e5adfe6c09e'
- '41d27140fd590945e22e012c9dce62de3d6f11e6'
- '72cfecbe738085eec475e012617661ad0cc9b76f'
- 'bc6df1661c4c33e20f5ce30c2da8ad3c2083665f')
-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-subpixel-rendering.patch
- patch -Np1 -i ../0003-Enable-infinality-subpixel-hinting.patch
-
- cd ../ft2demos-${pkgver}
- # enable more demos
- patch -Np1 -i ../0005-freetype-2.5.2-more-demos.patch
-
- # Suppress RPATH
- sed -i '/X11_LIB:%=-R%/d' graph/x11/rules.mk
-}
-
-build() {
- cd freetype2
- ./configure --prefix=/usr --disable-static
- make
-
- # Build demos
- cd ../ft2demos-${pkgver}
- make
-}
-
-check() {
- cd freetype2
- make -k check
-}
-
-package_freetype2() {
- pkgdesc="TrueType font rendering library"
- depends=('zlib' 'bzip2' 'sh' 'libpng' 'harfbuzz')
- provides=('libfreetype.so')
- install=freetype2.install
- backup=('etc/profile.d/freetype2.sh')
-
- cd freetype2
- make DESTDIR="${pkgdir}" install
- install -Dm644 ../freetype2.sh "${pkgdir}/etc/profile.d/freetype2.sh"
-
- # Package docs
- install -dm755 "${pkgdir}/usr/share/doc"
- cp -a docs "${pkgdir}/usr/share/doc/${pkgname}"
-
- cd ../ft2demos-${pkgver}
- mkdir -p $srcdir/ft-demos
- for _i in bin/{f,t}t*; do
- libtool --mode=install install $_i "$srcdir/ft-demos"
- done
-}
-
-package_freetype2-demos() {
- pkgdesc="Freetype tools and demos"
- depends=('freetype2' 'libx11')
-
- install -dm755 "${pkgdir}/usr/bin"
- cp -a $srcdir/ft-demos/* "${pkgdir}/usr/bin"
-}
-
-# vim:set ts=2 sw=2 et:
Copied: freetype2/repos/testing-x86_64/PKGBUILD (from rev 295993, freetype2/trunk/PKGBUILD)
===================================================================
--- testing-x86_64/PKGBUILD (rev 0)
+++ testing-x86_64/PKGBUILD 2017-05-14 16:30:05 UTC (rev 295994)
@@ -0,0 +1,98 @@
+# $Id$
+# Maintainer: Jan de Groot <jgc at archlinux.org>
+
+pkgbase=freetype2
+pkgname=('freetype2' 'freetype2-demos')
+pkgver=2.8
+pkgrel=2
+pkgdesc="Font rasterization library"
+arch=(i686 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=('zlib' 'bzip2' 'sh' 'libpng' 'harfbuzz')
+makedepends=('libx11')
+source=(https://download-mirror.savannah.gnu.org/releases/freetype/freetype-${pkgver}.tar.bz2{,.sig}
+ https://download-mirror.savannah.gnu.org/releases/freetype/freetype-doc-${pkgver}.tar.bz2{,.sig}
+ https://download-mirror.savannah.gnu.org/releases/freetype/ft2demos-${pkgver}.tar.bz2{,.sig}
+ 0001-Enable-table-validation-modules.patch
+ 0002-Enable-subpixel-rendering.patch
+ 0003-Enable-infinality-subpixel-hinting.patch
+ 0004-Enable-long-PCF-family-names.patch
+ 0005-freetype-2.5.2-more-demos.patch
+ freetype2.sh)
+sha1sums=('42c6b1f733fe13a3eba135f5025b22cb68450f91'
+ 'SKIP'
+ '5b221ee14fe674cd5f6db0193d55360bc0bd3655'
+ 'SKIP'
+ '7849f1ac4a352971fab61a5fc2e5c6a597201201'
+ 'SKIP'
+ 'c3e91e668936206d3c158bffde0f69788a086a5b'
+ '4ff958229a7f87e04a9894d5a6ed2df227071931'
+ '81586014ea44375ddc85dd9dbcabae6e91c34d62'
+ '334f229875039794adeb574e27d365bb445fb314'
+ '72cfecbe738085eec475e012617661ad0cc9b76f'
+ 'bc6df1661c4c33e20f5ce30c2da8ad3c2083665f')
+validpgpkeys=('58E0C111E39F5408C5D3EC76C1A60EACE707FDA5')
+
+prepare() {
+ # Rename source dir to allow building the demos
+ mv freetype-${pkgver} freetype2
+ mv ft2demos-${pkgver} freetype2-demos
+
+ cd freetype2
+ patch -Np1 -i ../0001-Enable-table-validation-modules.patch
+ patch -Np1 -i ../0002-Enable-subpixel-rendering.patch
+ patch -Np1 -i ../0003-Enable-infinality-subpixel-hinting.patch
+ patch -Np1 -i ../0004-Enable-long-PCF-family-names.patch
+
+ cd ../freetype2-demos
+ # enable more demos
+ patch -Np1 -i ../0005-freetype-2.5.2-more-demos.patch
+
+ # Suppress RPATH
+ sed -i '/X11_LIB:%=-R%/d' graph/x11/rules.mk
+}
+
+build() {
+ cd freetype2
+ ./configure --prefix=/usr --disable-static
+ make
+
+ # Build demos
+ cd ../freetype2-demos
+ make
+}
+
+check() {
+ cd freetype2
+ make -k check
+}
+
+package_freetype2() {
+ provides=('libfreetype.so')
+ install=freetype2.install
+ backup=('etc/profile.d/freetype2.sh')
+
+ cd freetype2
+ make DESTDIR="${pkgdir}" install
+ install -Dm644 ../freetype2.sh "${pkgdir}/etc/profile.d/freetype2.sh"
+
+ # Package docs
+ install -d "${pkgdir}/usr/share/doc"
+ cp -a docs "${pkgdir}/usr/share/doc/freetype2"
+}
+
+package_freetype2-demos() {
+ pkgdesc="Freetype tools and demos"
+ depends=('freetype2' 'libx11')
+
+ cd freetype2-demos
+ install -d "${pkgdir}/usr/bin"
+ for _i in bin/{f,t}t*; do
+ libtool --mode=install install $_i "${pkgdir}/usr/bin"
+ done
+}
+
+# vim:set ts=2 sw=2 et:
Deleted: testing-x86_64/freetype2.install
===================================================================
--- testing-x86_64/freetype2.install 2017-05-14 16:28:08 UTC (rev 295993)
+++ testing-x86_64/freetype2.install 2017-05-14 16:30:05 UTC (rev 295994)
@@ -1,8 +0,0 @@
-post_upgrade() {
- if (( $(vercmp $2 2.7-1) < 0 )); then
- cat <<MSG
- The Arch-specific FT2_SUBPIXEL_HINTING has been removed.
- Subpixel hinting is now configured in /etc/profile.d/freetype2.sh .
-MSG
- fi
-}
Copied: freetype2/repos/testing-x86_64/freetype2.install (from rev 295993, freetype2/trunk/freetype2.install)
===================================================================
--- testing-x86_64/freetype2.install (rev 0)
+++ testing-x86_64/freetype2.install 2017-05-14 16:30:05 UTC (rev 295994)
@@ -0,0 +1,8 @@
+post_upgrade() {
+ if (( $(vercmp $2 2.7-1) < 0 )); then
+ cat <<MSG
+ The Arch-specific FT2_SUBPIXEL_HINTING has been removed.
+ Subpixel hinting is now configured in /etc/profile.d/freetype2.sh .
+MSG
+ fi
+}
Deleted: testing-x86_64/freetype2.sh
===================================================================
--- testing-x86_64/freetype2.sh 2017-05-14 16:28:08 UTC (rev 295993)
+++ testing-x86_64/freetype2.sh 2017-05-14 16:30:05 UTC (rev 295994)
@@ -1,12 +0,0 @@
-# Subpixel hinting mode can be chosen by setting the right TrueType interpreter
-# version. The available settings are:
-#
-# truetype:interpreter-version=35 # Classic mode (default in 2.6)
-# truetype:interpreter-version=38 # Infinality mode
-# truetype:interpreter-version=40 # Minimal mode (default in 2.7)
-#
-# There are more properties that can be set, separated by whitespace. Please
-# refer to the FreeType documentation for details.
-
-# Uncomment and configure below
-#export FREETYPE_PROPERTIES="truetype:interpreter-version=40"
Copied: freetype2/repos/testing-x86_64/freetype2.sh (from rev 295993, freetype2/trunk/freetype2.sh)
===================================================================
--- testing-x86_64/freetype2.sh (rev 0)
+++ testing-x86_64/freetype2.sh 2017-05-14 16:30:05 UTC (rev 295994)
@@ -0,0 +1,12 @@
+# Subpixel hinting mode can be chosen by setting the right TrueType interpreter
+# version. The available settings are:
+#
+# truetype:interpreter-version=35 # Classic mode (default in 2.6)
+# truetype:interpreter-version=38 # Infinality mode
+# truetype:interpreter-version=40 # Minimal mode (default in 2.7)
+#
+# There are more properties that can be set, separated by whitespace. Please
+# refer to the FreeType documentation for details.
+
+# Uncomment and configure below
+#export FREETYPE_PROPERTIES="truetype:interpreter-version=40"
More information about the arch-commits
mailing list