main/freetype: upgrade to 2.7

This introduces buildin infinality font rendering
thus removing the infinality patchset

7 files changed, 114 insertions, 78 deletions

diff --git a/main/freetype/0001-Enable-table-validation-modules.patch b/main/freetype/0001-Enable-table-validation-modules.patch
new file mode 100644
index 0000000000..3e9451fa8b
--- /dev/null
+++ b/main/freetype/0001-Enable-table-validation-modules.patch
@@ -0,0 +1,34 @@
+From c3680bf8d38cf759c1e33dcc2d2d51e0a4fea2f9 Mon Sep 17 00:00:00 2001
+From: "Jan Alexander Steffens (heftig)" <jan.steffens@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
+
diff --git a/main/freetype/0002-Enable-subpixel-rendering.patch b/main/freetype/0002-Enable-subpixel-rendering.patch
new file mode 100644
index 0000000000..dfb57966e2
--- /dev/null
+++ b/main/freetype/0002-Enable-subpixel-rendering.patch
@@ -0,0 +1,25 @@
+From 96f09f08417887b2618c177bccfb6da2906568d9 Mon Sep 17 00:00:00 2001
+From: "Jan Alexander Steffens (heftig)" <jan.steffens@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
+
diff --git a/main/freetype/0003-Enable-infinality-subpixel-hinting.patch b/main/freetype/0003-Enable-infinality-subpixel-hinting.patch
new file mode 100644
index 0000000000..bbfa2a2cd8
--- /dev/null
+++ b/main/freetype/0003-Enable-infinality-subpixel-hinting.patch
@@ -0,0 +1,27 @@
+From 220e96a9a8d7aff6ad0f0f1aa12c79cdb563331c Mon Sep 17 00:00:00 2001
+From: "Jan Alexander Steffens (heftig)" <jan.steffens@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
+
diff --git a/main/freetype/20-enable-spr.patch b/main/freetype/20-enable-spr.patch
deleted file mode 100644
index d38f4b7028..0000000000
--- a/main/freetype/20-enable-spr.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- ./include/config/ftoption.h.spf	2007-01-18 14:27:34.000000000 -0500
-+++ ./include/config/ftoption.h	2007-01-18 14:27:48.000000000 -0500
-@@ -92,7 +92,7 @@
-   /* 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
- 
- 
-   /*************************************************************************/
diff --git a/main/freetype/30-enable-valid.patch b/main/freetype/30-enable-valid.patch
deleted file mode 100644
index b61a792219..0000000000
--- a/main/freetype/30-enable-valid.patch
+++ /dev/null
@@ -1,20 +0,0 @@
---- modules.cfg.orig	2006-07-07 21:01:09.000000000 -0400
-+++ 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.
- #
diff --git a/main/freetype/40-memcpy-fix.patch b/main/freetype/40-memcpy-fix.patch
index 95c1cd6430..89e61cd0b7 100644
--- a/main/freetype/40-memcpy-fix.patch
+++ b/main/freetype/40-memcpy-fix.patch
@@ -1,5 +1,5 @@
---- src/psaux/psobjs.c~	2006-04-26 16:38:17.000000000 +0200
-+++ src/psaux/psobjs.c	2006-09-10 15:01:13.000000000 +0200
+--- ./src/psaux/psobjs.c~	2006-04-26 16:38:17.000000000 +0200
++++ ./src/psaux/psobjs.c	2006-09-10 15:01:13.000000000 +0200
 @@ -165,6 +165,11 @@
        return PSaux_Err_Invalid_Argument;
      }
diff --git a/main/freetype/APKBUILD b/main/freetype/APKBUILD
index b17786d4f5..2a3beb3cc0 100644
--- a/main/freetype/APKBUILD
+++ b/main/freetype/APKBUILD
@@ -1,7 +1,7 @@
 # Contributor: Carlo Landmeter <clandmeter@gmail.com>
 # Maintainer: Carlo Landmeter <clandmeter@gmail.com>
 pkgname=freetype
-pkgver=2.6.3
+pkgver=2.7
 pkgrel=0
 pkgdesc="TrueType font rendering library"
 url="http://freetype.sourceforge.net"
@@ -9,38 +9,19 @@ arch="all"
 license="GPL"
 depends=""
 depends_dev=""
-makedepends="$depends_dev zlib-dev libpng-dev"
+makedepends="$depends_dev zlib-dev libpng-dev bzip2-dev"
 subpackages="$pkgname-dev $pkgname-doc"
-# fontconfig-ultimate https://github.com/bohoomil/fontconfig-ultimate
-_ultver="2016-02-12"
 source="http://download.savannah.gnu.org/releases/freetype/freetype-$pkgver.tar.bz2
-	fontconfig-ultimate-$_ultver.tar.gz::https://github.com/renatoaguiar/fontconfig-ultimate/archive/$_ultver.tar.gz
-	40-memcpy-fix.patch"
+	40-memcpy-fix.patch
+	0001-Enable-table-validation-modules.patch
+	0002-Enable-subpixel-rendering.patch
+	0003-Enable-infinality-subpixel-hinting.patch
+	"
 
-_builddir="$srcdir/$pkgname-$pkgver"
-
-prepare() {
-	cd "$_builddir"
-	for i in "$srcdir"/*.patch; do
-		msg "Applying ${i}"
-		patch -p0 -i $i || return 1
-	done
-	# apply infinality
-	for j in "$srcdir"/fontconfig-ultimate-$_ultver/$pkgname/*.patch; do
-		case $j in
-			*/gperf-for-infinality.patch)
-				msg "Skipping ${j}"
-			;;
-			*)
-				msg "Applying ${j}"
-				patch -p1 -i $j || return 1
-			;;
-		esac
-	done
-}
+builddir="$srcdir/$pkgname-$pkgver"
 
 build() {
-	cd "$_builddir"
+	cd "$builddir"
 	./configure \
 		--build=$CBUILD \
 		--host=$CHOST \
@@ -54,26 +35,26 @@ build() {
 }
 
 package() {
-	cd "$_builddir"
-	make -j1 DESTDIR="$pkgdir" install || return 1
+	cd "$builddir"
+	make DESTDIR="$pkgdir" install || return 1
 
 	# for compat. This should be removed once all apps are properly using
 	# pkg-config
 	ln -s freetype2 "$pkgdir"/usr/include/freetype
-
-	# install infinality profile settings
-	install -Dm755 "$srcdir"/fontconfig-ultimate-$_ultver/$pkgname/infinality-settings.sh \
-		"$pkgdir"/etc/X11/xinit/xinitrc.d/infinality-settings.sh || return 1
-	sed -i "1i #!/bin/sh" \
-		"$pkgdir"/etc/X11/xinit/xinitrc.d/infinality-settings.sh || return 1
 }
 
-md5sums="0037b25a8c090bc8a1218e867b32beb1  freetype-2.6.3.tar.bz2
-d5d9467394b73baf4e830b3f6fc944cd  fontconfig-ultimate-2016-02-12.tar.gz
-bd2d808a0c00dcf9f1d1c0a9a8227ad9  40-memcpy-fix.patch"
-sha256sums="371e707aa522acf5b15ce93f11183c725b8ed1ee8546d7b3af549863045863a2  freetype-2.6.3.tar.bz2
-c67e3a8c5cdb19636e936a822df862e59f84b468e3d70d0991b23bb37099d356  fontconfig-ultimate-2016-02-12.tar.gz
-574c265c7a7032c5afb32a9807e5d04354ad0def656194cfcfff1ccca6a5540e  40-memcpy-fix.patch"
-sha512sums="e1f9018835fc88beeb4479537b59f866c52393ae18d24a1e0710a464cf948ab02b35c2c6043bc20c1db3a04871ee4eb0bb1d210550c0ea2780c8b1aea98fbf0d  freetype-2.6.3.tar.bz2
-b6d7a59c4a26b3b99a817e27eead2ca58538770b48af935100262223d5422c835c48590736cedb59ad220be3d7af6a7933e3137da99fdc8603f8fc8d81b8e4b9  fontconfig-ultimate-2016-02-12.tar.gz
-1553f7f0514238012e300bc8d0b1e260145db17fb56f13e4aa667435e98c3749c00e150caa0e318289b84bca33b9a06a68b8342575e10ac3bf5af3d5cc861537  40-memcpy-fix.patch"
+md5sums="be4601619827b7935e1d861745923a68  freetype-2.7.tar.bz2
+4e87d814f54a8047c3b8c4f7f01af5ff  40-memcpy-fix.patch
+cf20a9583d164ffbdb2e5daeea679481  0001-Enable-table-validation-modules.patch
+8814c204656c808588d79348ee5e292e  0002-Enable-subpixel-rendering.patch
+febde7721bbb4e3276840bc242930848  0003-Enable-infinality-subpixel-hinting.patch"
+sha256sums="d6a451f5b754857d2aa3964fd4473f8bc5c64e879b24516d780fb26bec7f7d48  freetype-2.7.tar.bz2
+b613951938c03d2ab35a7320dd60c8fb14951877bc17b7da57d4c93d3cd44298  40-memcpy-fix.patch
+6d273254fd925d284e5f66e3861eaef69a4393f34872398b2c93af0d5e15d34e  0001-Enable-table-validation-modules.patch
+9da762d69d85ca825a8e4578aaaeba28aa17b8d8a3bca29929c4786b3a82c104  0002-Enable-subpixel-rendering.patch
+d043fa4ce22b6e6cfafa0d2e2898b1c5cd000ec66094a97ab57c9126934ba371  0003-Enable-infinality-subpixel-hinting.patch"
+sha512sums="cd5bcde276d6d59379d9c60a90095be59b0692ec8fd2817aa44ff80ebb84840e8a72be2cfbbbcf7e13258026fa691f28c2673f03c3a3961a859900e61a62d761  freetype-2.7.tar.bz2
+9981be8a3ea6f2cf856860b87a4e895e4610c9d5ea4beb611815e757e6080e060f6853ace02dd8ea55e5888cdf4bae5ad5eadd2d8a123754bb3c0bfe7ef41dea  40-memcpy-fix.patch
+41a84be2631b53072a76b78c582575aa48b650ee7b00017d018381002bc25df10cf33da4954c95ef50db39f1fa566678e3b4ae9bfee1dfd705423fb53e53e494  0001-Enable-table-validation-modules.patch
+65be5283f5050e9d6ebe1c6808ec28bb46d5290ee84aede570977b66988eeb674524d0a834dbb2999a487e3a85ca292774212dadc5a3e713e1f5b8a80d75ddf3  0002-Enable-subpixel-rendering.patch
+7b52a3d67750d59b2c98e83dab4e0a0ab263142c2ca7bd5f8be5f8fe9cd1dc1f4debad44111c7886665329d8d2a3163756455618a6615df8f85d82bb0372d4dd  0003-Enable-infinality-subpixel-hinting.patch"