* Upstream upgrade to 2.8.

* For now use patches from djpohly's repo instead of archfan's.
* Drop compiling demos at all.

2 files changed, 34 insertions, 61 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 74328bbbbb41..a2cf043f2bd5 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,8 +1,8 @@
 # Generated by mksrcinfo v8
-# Fri Jan 13 23:53:49 UTC 2017
+# Wed Jul 12 21:20:18 UTC 2017
 pkgbase = freetype2-infinality
-	pkgdesc = TrueType font rendering library with Infinality patches and custom settings.
-	pkgver = 2.7.1
+	pkgdesc = Font rasterization library with Infinality patches and custom settings.
+	pkgver = 2.8
 	pkgrel = 1
 	url = http://www.freetype.org/
 	install = freetype2.install
@@ -16,32 +16,27 @@ pkgbase = freetype2-infinality
 	depends = sh
 	depends = libpng
 	depends = harfbuzz
-	optdepends = libx11: Some demo programs
-	provides = freetype2=2.7.1
+	provides = freetype2=2.8
 	provides = libfreetype.so
 	provides = freetype2-infinality-ultimate
 	conflicts = freetype2
 	backup = etc/profile.d/freetype2.sh
-	source = http://download.savannah.gnu.org/releases/freetype/freetype-2.7.1.tar.bz2
-	source = http://download.savannah.gnu.org/releases/freetype/freetype-2.7.1.tar.bz2.sig
-	source = http://download.savannah.gnu.org/releases/freetype/freetype-doc-2.7.1.tar.bz2
-	source = http://download.savannah.gnu.org/releases/freetype/freetype-doc-2.7.1.tar.bz2.sig
-	source = http://download.savannah.gnu.org/releases/freetype/ft2demos-2.7.1.tar.bz2
-	source = http://download.savannah.gnu.org/releases/freetype/ft2demos-2.7.1.tar.bz2.sig
-	source = 0001-Enable-table-validation-modules.patch::https://git.archlinux.org/svntogit/packages.git/plain/trunk/0001-Enable-table-validation-modules.patch?id=f6f3016966633b17d3ec6360b4b8d62075ea6af4
-	source = 0005-freetype-2.5.2-more-demos.patch::https://git.archlinux.org/svntogit/packages.git/plain/trunk/0005-freetype-2.5.2-more-demos.patch?id=f6f3016966633b17d3ec6360b4b8d62075ea6af4
-	source = freetype2.sh::https://git.archlinux.org/svntogit/packages.git/plain/trunk/freetype2.sh?id=f6f3016966633b17d3ec6360b4b8d62075ea6af4
-	source = https://raw.githubusercontent.com/archfan/infinality_bundle/6f49922d2d59623169136b52d23c08334998d2bb/01_freetype2-iu/0002-infinality-2.7.1-2017.01.11.patch
-	sha1sums = 4d08a9a6567c6332d58e9a5f9a7e9e3fbce66789
+	source = http://download.savannah.gnu.org/releases/freetype/freetype-2.8.tar.bz2
+	source = http://download.savannah.gnu.org/releases/freetype/freetype-2.8.tar.bz2.sig
+	source = http://download.savannah.gnu.org/releases/freetype/freetype-doc-2.8.tar.bz2
+	source = http://download.savannah.gnu.org/releases/freetype/freetype-doc-2.8.tar.bz2.sig
+	source = 0001-Enable-table-validation-modules.patch::https://git.archlinux.org/svntogit/packages.git/plain/trunk/0001-Enable-table-validation-modules.patch?id=c419271e92acf355fc52824eb93e69b5c9f29d40
+	source = 0004-Enable-long-PCF-family-names.patch::https://git.archlinux.org/svntogit/packages.git/plain/trunk/0004-Enable-long-PCF-family-names.patch?id=c419271e92acf355fc52824eb93e69b5c9f29d40
+	source = freetype2.sh::https://git.archlinux.org/svntogit/packages.git/plain/trunk/freetype2.sh?id=c419271e92acf355fc52824eb93e69b5c9f29d40
+	source = https://raw.githubusercontent.com/djpohly/infinality_bundle/4db742f46f3b790d90183d44b166b44fb8e8197c/01_freetype2-iu/0002-infinality-2.8-2017.05.24.patch
+	sha1sums = 42c6b1f733fe13a3eba135f5025b22cb68450f91
 	sha1sums = SKIP
-	sha1sums = d8ce472cd775b8ce50d127689acab59181e72ecf
+	sha1sums = 5b221ee14fe674cd5f6db0193d55360bc0bd3655
 	sha1sums = SKIP
-	sha1sums = 2ebe93df13eb45dac8515c5ed0216ef694c33f18
-	sha1sums = SKIP
-	sha1sums = b31882ef5e8447e761acee1c4a44c0630cd4d465
-	sha1sums = 72cfecbe738085eec475e012617661ad0cc9b76f
+	sha1sums = c3e91e668936206d3c158bffde0f69788a086a5b
+	sha1sums = 334f229875039794adeb574e27d365bb445fb314
 	sha1sums = bc6df1661c4c33e20f5ce30c2da8ad3c2083665f
-	sha1sums = 7a23342d5d56274ff8a05c67f64b96e85929f629
+	sha1sums = 4b442f097eeae28516b43c659a3d7a679129052c
 
 pkgname = freetype2-infinality
 
diff --git a/PKGBUILD b/PKGBUILD
index f3ff43d71f0d..fdac862c9b1d 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -4,9 +4,9 @@
 # Contributor: bohoomil <@zoho.com>
 
 pkgname=freetype2-infinality
-pkgver=2.7.1
+pkgver=2.8
 pkgrel=1
-pkgdesc="TrueType font rendering library with Infinality patches and custom settings."
+pkgdesc="Font rasterization library with Infinality patches and custom settings."
 arch=(armv7h i686 x86_64)
 license=('GPL')
 url="http://www.freetype.org/"
@@ -14,75 +14,53 @@ url="http://www.freetype.org/"
 # introduces a cycle dep to harfbuzz depending on freetype wanted by upstream
 depends=('zlib' 'bzip2' 'sh' 'libpng' 'harfbuzz')
 makedepends=('libx11')
-optdepends=('libx11: Some demo programs')
 conflicts=('freetype2')
 provides=("freetype2=$pkgver" 'libfreetype.so' 'freetype2-infinality-ultimate')
 install=freetype2.install
 backup=('etc/profile.d/freetype2.sh')
-_abs_commit=f6f3016966633b17d3ec6360b4b8d62075ea6af4
-_infinality_commit=6f49922d2d59623169136b52d23c08334998d2bb
+_abs_commit=c419271e92acf355fc52824eb93e69b5c9f29d40
+_infinality_commit=4db742f46f3b790d90183d44b166b44fb8e8197c
 source=(http://download.savannah.gnu.org/releases/freetype/freetype-${pkgver}.tar.bz2{,.sig}
         http://download.savannah.gnu.org/releases/freetype/freetype-doc-${pkgver}.tar.bz2{,.sig}
-        http://download.savannah.gnu.org/releases/freetype/ft2demos-${pkgver}.tar.bz2{,.sig}
         "0001-Enable-table-validation-modules.patch::https://git.archlinux.org/svntogit/packages.git/plain/trunk/0001-Enable-table-validation-modules.patch?id=${_abs_commit}"
-        "0005-freetype-2.5.2-more-demos.patch::https://git.archlinux.org/svntogit/packages.git/plain/trunk/0005-freetype-2.5.2-more-demos.patch?id=${_abs_commit}"
+        "0004-Enable-long-PCF-family-names.patch::https://git.archlinux.org/svntogit/packages.git/plain/trunk/0004-Enable-long-PCF-family-names.patch?id=${_abs_commit}"
         "freetype2.sh::https://git.archlinux.org/svntogit/packages.git/plain/trunk/freetype2.sh?id=${_abs_commit}"
-        "https://raw.githubusercontent.com/archfan/infinality_bundle/${_infinality_commit}/01_freetype2-iu/0002-infinality-2.7.1-2017.01.11.patch")
-sha1sums=('4d08a9a6567c6332d58e9a5f9a7e9e3fbce66789'
+        "https://raw.githubusercontent.com/djpohly/infinality_bundle/${_infinality_commit}/01_freetype2-iu/0002-infinality-2.8-2017.05.24.patch")
+sha1sums=('42c6b1f733fe13a3eba135f5025b22cb68450f91'
           'SKIP'
-          'd8ce472cd775b8ce50d127689acab59181e72ecf'
+          '5b221ee14fe674cd5f6db0193d55360bc0bd3655'
           'SKIP'
-          '2ebe93df13eb45dac8515c5ed0216ef694c33f18'
-          'SKIP'
-          'b31882ef5e8447e761acee1c4a44c0630cd4d465'
-          '72cfecbe738085eec475e012617661ad0cc9b76f'
+          'c3e91e668936206d3c158bffde0f69788a086a5b'
+          '334f229875039794adeb574e27d365bb445fb314'
           'bc6df1661c4c33e20f5ce30c2da8ad3c2083665f'
-          '7a23342d5d56274ff8a05c67f64b96e85929f629')
+          '4b442f097eeae28516b43c659a3d7a679129052c')
 validpgpkeys=('58E0C111E39F5408C5D3EC76C1A60EACE707FDA5')
 
 prepare() {
-  # Rename source dir to allow building the demos
-  mv freetype-${pkgver} freetype2
+  cd freetype-${pkgver}
 
-  cd freetype2
   patch -Np1 -i ../0001-Enable-table-validation-modules.patch
-  patch -Np1 -i ../0002-infinality-2.7.1-2017.01.11.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
+  patch -Np1 -i ../0004-Enable-long-PCF-family-names.patch
+  patch -Np1 -i ../0002-infinality-2.8-2017.05.24.patch
 }
 
 build() {
-  cd freetype2
+  cd freetype-${pkgver}
   ./configure --prefix=/usr --disable-static
   make
-
-  # Build demos
-  cd ../ft2demos-${pkgver}
-  make
 }
 
 check() {
-  cd freetype2
+  cd freetype-${pkgver}
   make -k check
 }
 
 package() {
-  cd freetype2
+  cd freetype-${pkgver}
   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}"
-
-  # Package demos
-  cd ../ft2demos-${pkgver}
-  for _i in bin/{f,t}t*; do
-    libtool --mode=install install $_i "$pkgdir/usr/bin/"
-  done
 }