As per official package, remove subpixel rendering patch and remove docs. the docs are now installed from a separate package.

3 files changed, 11 insertions, 50 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 6e5973b85312..ac9993a5b758 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,9 +1,9 @@
 # Generated by mksrcinfo v8
-# Sat Sep 16 20:30:08 UTC 2017
+# Sun Sep 17 08:44:00 UTC 2017
 pkgbase = freetype2-ttmetrics
 	pkgdesc = Font rasterization library with TrueType metrics enabled
 	pkgver = 2.8.1
-	pkgrel = 1
+	pkgrel = 2
 	url = https://www.freetype.org/
 	install = freetype2.install
 	arch = i686
@@ -20,18 +20,14 @@ pkgbase = freetype2-ttmetrics
 	conflicts = freetype2
 	backup = etc/profile.d/freetype2.sh
 	source = https://download-mirror.savannah.gnu.org/releases/freetype/freetype-2.8.1.tar.bz2
-	source = https://download-mirror.savannah.gnu.org/releases/freetype/freetype-doc-2.8.1.tar.bz2
 	source = 0001-Enable-table-validation-modules.patch
-	source = 0002-Enable-subpixel-rendering.patch
 	source = 0003-Enable-infinality-subpixel-hinting.patch
 	source = 0004-Enable-long-PCF-family-names.patch
 	source = freetype2.sh
 	source = enable_truetype_like_size_metrics.patch
 	source = revert_allow_linear_scaling.patch
 	sha1sums = 417bb3747c4ac95b6f2652024a53fad45581fa1c
-	sha1sums = 9ee079ee02e6b6895802104f58cd5e5be517dce7
 	sha1sums = c3e91e668936206d3c158bffde0f69788a086a5b
-	sha1sums = 4ff958229a7f87e04a9894d5a6ed2df227071931
 	sha1sums = 81586014ea44375ddc85dd9dbcabae6e91c34d62
 	sha1sums = 334f229875039794adeb574e27d365bb445fb314
 	sha1sums = bc6df1661c4c33e20f5ce30c2da8ad3c2083665f
diff --git a/0002-Enable-subpixel-rendering.patch b/0002-Enable-subpixel-rendering.patch
deleted file mode 100644
index 66b41029b3fd..000000000000
--- a/0002-Enable-subpixel-rendering.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-From a8f7f3068a8a5f94adfc77f4ddf03bf08da38f9b 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/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
-
diff --git a/PKGBUILD b/PKGBUILD
index 4ebdbfdc04b2..b7acfacc0cdd 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -2,8 +2,9 @@
 # Contributor: Jan de Groot <jgc@archlinux.org>
 
 pkgname=freetype2-ttmetrics
+_srcname=freetype
 pkgver=2.8.1
-pkgrel=1
+pkgrel=2
 pkgdesc="Font rasterization library with TrueType metrics enabled"
 arch=(i686 x86_64)
 license=('GPL')
@@ -17,18 +18,14 @@ conflicts=('freetype2')
 install=freetype2.install
 backup=('etc/profile.d/freetype2.sh')
 source=(https://download-mirror.savannah.gnu.org/releases/freetype/freetype-${pkgver}.tar.bz2
-        https://download-mirror.savannah.gnu.org/releases/freetype/freetype-doc-${pkgver}.tar.bz2
         0001-Enable-table-validation-modules.patch
-        0002-Enable-subpixel-rendering.patch
         0003-Enable-infinality-subpixel-hinting.patch
         0004-Enable-long-PCF-family-names.patch
         freetype2.sh
         enable_truetype_like_size_metrics.patch
         revert_allow_linear_scaling.patch)
 sha1sums=('417bb3747c4ac95b6f2652024a53fad45581fa1c'
-          '9ee079ee02e6b6895802104f58cd5e5be517dce7'
           'c3e91e668936206d3c158bffde0f69788a086a5b'
-          '4ff958229a7f87e04a9894d5a6ed2df227071931'
           '81586014ea44375ddc85dd9dbcabae6e91c34d62'
           '334f229875039794adeb574e27d365bb445fb314'
           'bc6df1661c4c33e20f5ce30c2da8ad3c2083665f'
@@ -36,39 +33,32 @@ sha1sums=('417bb3747c4ac95b6f2652024a53fad45581fa1c'
           'f2cc372aedce56b387ee0c5403745d642bd44fe8')
 
 prepare() {
-  # Rename source dir to allow building the demos
-  mv freetype-${pkgver} freetype2
+  cd ${_srcname}-${pkgver}
 
-  cd freetype2
+  # Official package patches
   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
 
-  # See https://bbs.archlinux.org/viewtopic.php?id=226380
+  # ttmetrics patches
+  # see https://bbs.archlinux.org/viewtopic.php?id=226380
   patch -Np1 -i ../enable_truetype_like_size_metrics.patch
-
-  # Also see https://bbs.archlinux.org/viewtopic.php?id=226380
   patch -Np1 -i ../revert_allow_linear_scaling.patch
 }
 
 build() {
-  cd freetype2
+  cd ${_srcname}-${pkgver}
   ./configure --prefix=/usr --disable-static
   make
 }
 
 check() {
-  cd freetype2
+  cd ${_srcname}-${pkgver}
   make -k check
 }
 
 package() {
-  cd freetype2
+  cd ${_srcname}-${pkgver}
   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"
 }