Remove obsolete patches

4 files changed, 7 insertions, 76 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 5e5d541744ee..91bb19c04905 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,6 +1,8 @@
+# Generated by mksrcinfo v8
+# Wed May 18 08:17:03 UTC 2016
 pkgbase = freetype2-git
 	pkgdesc = TrueType font rendering library (from git)
-	pkgver = 2.6.2+p0+g66cf29b
+	pkgver = 2.6.3+p80+g01de37e
 	pkgrel = 1
 	epoch = 1
 	url = http://www.freetype.org/
@@ -15,18 +17,14 @@ pkgbase = freetype2-git
 	depends = libpng
 	depends = harfbuzz
 	provides = libfreetype.so
-	provides = freetype2=2.6.2+p0+g66cf29b
+	provides = freetype2=2.6.3+p80+g01de37e
 	conflicts = freetype2
 	source = git://git.sv.gnu.org/freetype/freetype2.git
 	source = 0001-Enable-table-validation-modules.patch
 	source = 0002-Enable-subpixel-rendering.patch
-	source = 0003-Enable-subpixel-hinting.patch
-	source = 0004-Add-env-var-to-turn-off-subpixel-hinting.patch
 	sha1sums = SKIP
 	sha1sums = 1c7bc438df0428a63f881e7e4343b22c5b09ecb1
 	sha1sums = e2d2b8c4847ab9cfd497179c7140835e99ece711
-	sha1sums = ebe3d7a6fc41304a77c23cb56e94dc718146d963
-	sha1sums = 0a75db92c93c7a1576052348174fa510740d079f
 
 pkgname = freetype2-git
 
diff --git a/0003-Enable-subpixel-hinting.patch b/0003-Enable-subpixel-hinting.patch
deleted file mode 100644
index 00a5c2f79f3b..000000000000
--- a/0003-Enable-subpixel-hinting.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-From f96a1d21d787b173d6293330fbf782b977194aa7 Mon Sep 17 00:00:00 2001
-From: "Jan Alexander Steffens (heftig)" <jan.steffens@gmail.com>
-Date: Tue, 23 Jun 2015 08:43:57 +0200
-Subject: [PATCH 3/4] Enable subpixel hinting
-
----
- 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 ab407e3..a2eab6a 100644
---- a/include/freetype/config/ftoption.h
-+++ b/include/freetype/config/ftoption.h
-@@ -602,7 +602,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
- 
- 
-   /*************************************************************************/
--- 
-2.6.0
-
diff --git a/0004-Add-env-var-to-turn-off-subpixel-hinting.patch b/0004-Add-env-var-to-turn-off-subpixel-hinting.patch
deleted file mode 100644
index 26f9d7635d55..000000000000
--- a/0004-Add-env-var-to-turn-off-subpixel-hinting.patch
+++ /dev/null
@@ -1,31 +0,0 @@
-From 649f2e555fbed9d883892d7939a6c493ad716af7 Mon Sep 17 00:00:00 2001
-From: "Jan Alexander Steffens (heftig)" <jan.steffens@gmail.com>
-Date: Tue, 23 Jun 2015 08:33:22 +0200
-Subject: [PATCH 4/4] Add env var to turn off subpixel hinting
-
----
- src/truetype/ttobjs.c | 7 ++++---
- 1 file changed, 4 insertions(+), 3 deletions(-)
-
-diff --git a/src/truetype/ttobjs.c b/src/truetype/ttobjs.c
-index 202aa04..302d127 100644
---- a/src/truetype/ttobjs.c
-+++ b/src/truetype/ttobjs.c
-@@ -1253,10 +1253,11 @@
-     TT_Driver  driver = (TT_Driver)ttdriver;
- 
- #ifdef TT_CONFIG_OPTION_SUBPIXEL_HINTING
--    driver->interpreter_version = TT_INTERPRETER_VERSION_38;
--#else
--    driver->interpreter_version = TT_INTERPRETER_VERSION_35;
-+    if ( !getenv( "FT2_NO_SUBPIXEL_HINTING" ) )
-+      driver->interpreter_version = TT_INTERPRETER_VERSION_38;
-+    else
- #endif
-+      driver->interpreter_version = TT_INTERPRETER_VERSION_35;
- 
- #else /* !TT_USE_BYTECODE_INTERPRETER */
- 
--- 
-2.4.4
-
diff --git a/PKGBUILD b/PKGBUILD
index c5c59c6651dc..dd02a36060d3 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -3,7 +3,7 @@
 
 pkgname=freetype2-git
 epoch=1
-pkgver=2.6.2+p0+g66cf29b
+pkgver=2.6.3+p80+g01de37e
 pkgrel=1
 pkgdesc="TrueType font rendering library (from git)"
 arch=(i686 x86_64)
@@ -18,14 +18,10 @@ conflicts=('freetype2')
 install=freetype2.install
 source=(git://git.sv.gnu.org/freetype/freetype2.git
         0001-Enable-table-validation-modules.patch
-        0002-Enable-subpixel-rendering.patch
-        0003-Enable-subpixel-hinting.patch
-        0004-Add-env-var-to-turn-off-subpixel-hinting.patch)
+        0002-Enable-subpixel-rendering.patch)
 sha1sums=('SKIP'
           '1c7bc438df0428a63f881e7e4343b22c5b09ecb1'
-          'e2d2b8c4847ab9cfd497179c7140835e99ece711'
-          'ebe3d7a6fc41304a77c23cb56e94dc718146d963'
-          '0a75db92c93c7a1576052348174fa510740d079f')
+          'e2d2b8c4847ab9cfd497179c7140835e99ece711')
 validpgpkeys=('58E0C111E39F5408C5D3EC76C1A60EACE707FDA5')
 
 pkgver() {
@@ -42,13 +38,6 @@ prepare() {
   cd "${srcdir}/freetype2"
   patch -Np1 -i "${srcdir}/0001-Enable-table-validation-modules.patch"
   patch -Np1 -i "${srcdir}/0002-Enable-subpixel-rendering.patch"
-
-  # https://bugs.archlinux.org/task/35274
-  patch -Np1 -i "${srcdir}/0003-Enable-subpixel-hinting.patch"
-  # Provide a way to disable the above patch at runtime.
-  # Hopefully just a temporary measure until fontconfig picks up
-  # the necessary configurables.
-  patch -Np1 -i "${srcdir}/0004-Add-env-var-to-turn-off-subpixel-hinting.patch"
   ./autogen.sh
 }