Sync with testing

1 files changed, 29 insertions, 16 deletions

diff --git a/PKGBUILD b/PKGBUILD
index 85e8444ba7bb..6743f03946a2 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,11 +1,12 @@
 # Maintainer: Jan Alexander Steffens (heftig) <jan.steffens@gmail.com>
 # Contributor: Jan de Groot <jgc@archlinux.org>
 
-pkgname=freetype2-git
+pkgbase=freetype2-git
+pkgname=('freetype2-git' 'freetype2-demos-git')
+pkgver=2.8+p0+ga12a3445
+pkgrel=2
 epoch=1
-pkgver=2.7.1+p206+g538d571a
-pkgrel=1
-pkgdesc="TrueType font rendering library (from git)"
+pkgdesc="Font rasterization library (from git)"
 arch=(i686 x86_64)
 license=('GPL')
 url="https://www.freetype.org/"
@@ -13,22 +14,20 @@ url="https://www.freetype.org/"
 # introduces a cycle dep to harfbuzz depending on freetype wanted by upstream
 depends=('zlib' 'bzip2' 'sh' 'libpng' 'harfbuzz')
 makedepends=('libx11' 'git' 'python2')
-provides=('libfreetype.so' "freetype2=$pkgver")
-conflicts=('freetype2')
-install=freetype2.install
-backup=('etc/profile.d/freetype2.sh')
 source=(git://git.sv.gnu.org/freetype/freetype2.git
         git://git.sv.gnu.org/freetype/freetype2-demos.git
         0001-Enable-table-validation-modules.patch
         0002-Enable-subpixel-rendering.patch
         0003-Enable-infinality-subpixel-hinting.patch
+        0004-Enable-long-PCF-family-names.patch
         0005-freetype-2.5.2-more-demos.patch
         freetype2.sh)
 sha1sums=('SKIP'
           'SKIP'
-          'b31882ef5e8447e761acee1c4a44c0630cd4d465'
-          'b1494810ed3aca25cdd8e8cedf634e5adfe6c09e'
-          '41d27140fd590945e22e012c9dce62de3d6f11e6'
+          'c3e91e668936206d3c158bffde0f69788a086a5b'
+          '4ff958229a7f87e04a9894d5a6ed2df227071931'
+          '81586014ea44375ddc85dd9dbcabae6e91c34d62'
+          '334f229875039794adeb574e27d365bb445fb314'
           '72cfecbe738085eec475e012617661ad0cc9b76f'
           'bc6df1661c4c33e20f5ce30c2da8ad3c2083665f')
 validpgpkeys=('58E0C111E39F5408C5D3EC76C1A60EACE707FDA5')
@@ -41,10 +40,12 @@ prepare() {
   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
 
   ./autogen.sh
 
   cd ../freetype2-demos
+  # enable more demos
   patch -Np1 -i ../0005-freetype-2.5.2-more-demos.patch
 
   # Suppress RPATH
@@ -79,18 +80,30 @@ check() {
   make -k check
 }
 
-package() {
+package_freetype2-git() {
+  provides=('libfreetype.so' "freetype2=$pkgver")
+  conflicts=('freetype2')
+  install=freetype2.install
+  backup=('etc/profile.d/freetype2.sh')
+
   cd freetype2
   make DESTDIR="${pkgdir}" install
   install -Dm644 ../freetype2.sh "${pkgdir}/etc/profile.d/freetype2.sh"
 
   # Package docs
-  install -dm755 "${pkgdir}/usr/share/doc"
+  install -d "${pkgdir}/usr/share/doc"
   cp -a docs "${pkgdir}/usr/share/doc/freetype2"
+}
 
-  # Package demos
-  cd ../freetype2-demos
+package_freetype2-demos-git() {
+  pkgdesc="Freetype tools and demos (from git)"
+  depends=('freetype2-git' 'libx11')
+
+  cd freetype2-demos
+  install -d "${pkgdir}/usr/bin"
   for _i in bin/{f,t}t*; do
-    libtool --mode=install install $_i "$pkgdir/usr/bin/"
+    libtool --mode=install install $_i "${pkgdir}/usr/bin"
   done
 }
+
+# vim:set ts=2 sw=2 et: