From 3b065d401b3d246129106ab2b53a25486dc57c98 Mon Sep 17 00:00:00 2001
From: Juan RP <xtraeme@gmail.com>
Date: Tue, 2 Jul 2019 09:43:10 +0200
Subject: [PATCH] freetype: update to 2.10.1.

Get rid of these stupid build options... the infinality
mode is slow and unmaintained as explained in the
ftoption.h file.

The default is good for everyone.

It's stupid to have to maintain these patches just to
make one or two people in the world happy.
---
 .../patches/default-interpreter.patch         | 12 --------
 srcpkgs/freetype/patches/subpixel.patch       | 22 --------------
 srcpkgs/freetype/patches/validate.patch       | 20 -------------
 srcpkgs/freetype/template                     | 29 +++----------------
 4 files changed, 4 insertions(+), 79 deletions(-)
 delete mode 100644 srcpkgs/freetype/patches/default-interpreter.patch
 delete mode 100644 srcpkgs/freetype/patches/subpixel.patch
 delete mode 100644 srcpkgs/freetype/patches/validate.patch

diff --git a/srcpkgs/freetype/patches/default-interpreter.patch b/srcpkgs/freetype/patches/default-interpreter.patch
deleted file mode 100644
index 66668375ed9..00000000000
--- a/srcpkgs/freetype/patches/default-interpreter.patch
+++ /dev/null
@@ -1,12 +0,0 @@
---- src/truetype/ttobjs.c.orig
-+++ src/truetype/ttobjs.c
-@@ -1294,6 +1294,9 @@
- #ifdef TT_SUPPORT_SUBPIXEL_HINTING_MINIMAL
-     driver->interpreter_version = TT_INTERPRETER_VERSION_40;
- #endif
-+#ifdef DEFAULT_TT_INTERPRETER_VERSION
-+    driver->interpreter_version = DEFAULT_TT_INTERPRETER_VERSION;
-+#endif
- 
- #else /* !TT_USE_BYTECODE_INTERPRETER */
- 
diff --git a/srcpkgs/freetype/patches/subpixel.patch b/srcpkgs/freetype/patches/subpixel.patch
deleted file mode 100644
index d30fc472d9c..00000000000
--- a/srcpkgs/freetype/patches/subpixel.patch
+++ /dev/null
@@ -1,22 +0,0 @@
---- include/freetype/config/ftoption.h.orig
-+++ include/freetype/config/ftoption.h
-@@ -122,7 +122,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
- 
- 
-   /*************************************************************************/
-@@ -675,8 +675,8 @@
-   /* [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/srcpkgs/freetype/patches/validate.patch b/srcpkgs/freetype/patches/validate.patch
deleted file mode 100644
index 39b22f67af5..00000000000
--- a/srcpkgs/freetype/patches/validate.patch
+++ /dev/null
@@ -1,20 +0,0 @@
---- modules.cfg.orig
-+++ modules.cfg
-@@ -120,7 +120,7 @@
- # 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 @@
- # 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.
- #
diff --git a/srcpkgs/freetype/template b/srcpkgs/freetype/template
index 2b309b54f06..9b08f374592 100644
--- a/srcpkgs/freetype/template
+++ b/srcpkgs/freetype/template
@@ -1,8 +1,7 @@
 # Template file for 'freetype'
 pkgname=freetype
-reverts="2.10.0_1"
-version=2.9.1
-revision=4
+version=2.10.1
+revision=1
 build_style=gnu-configure
 configure_args="--enable-freetype-config"
 hostmakedepends="pkg-config"
@@ -11,28 +10,8 @@ short_desc="Font rendering engine and library API"
 maintainer="Juan RP <xtraeme@voidlinux.org>"
 license="GPL-2.0-or-later"
 homepage="https://www.freetype.org/"
-distfiles="${SOURCEFORGE_SITE}/${pkgname}/${pkgname}-${version}.tar.bz2"
-checksum=db8d87ea720ea9d5edc5388fc7a0497bb11ba9fe972245e0f7f4c7e8b1e1e84d
-
-build_options="v35 v38 v40"
-build_options_default="v40"
-desc_option_v35="Use default interpreter version 35 (Classic mode)"
-desc_option_v38="Use default interpreter version 38 (Infinality mode)"
-desc_option_v40="Use default interpreter version 40 (Minimal mode)"
-vopt_conflict v35 v38
-vopt_conflict v35 v40
-vopt_conflict v38 v40
-
-pre_configure() {
-	CFLAGS+=" -DDEFAULT_TT_INTERPRETER_VERSION=TT_INTERPRETER_VERSION_"
-	if [ "$build_option_v35" ]; then
-		CFLAGS+="35"
-	elif [ "$build_option_v38" ]; then
-		CFLAGS+="38"
-	elif [ "$build_option_v40" ]; then
-		CFLAGS+="40"
-	fi
-}
+distfiles="${NONGNU_SITE}/${pkgname}/${pkgname}-${version}.tar.xz"
+checksum=16dbfa488a21fe827dc27eaf708f42f7aa3bb997d745d31a19781628c36ba26f
 
 freetype-devel_package() {
 	depends="${makedepends} ${sourcepkg}>=${version}_${revision}"