Sync with extra—build docs and demos

1 files changed, 44 insertions, 17 deletions

diff --git a/PKGBUILD b/PKGBUILD
index b97b44eac5e4..afc9dc4bc2e6 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -3,7 +3,7 @@
 
 pkgname=freetype2-git
 epoch=1
-pkgver=2.6.4+p0+gd80fe69
+pkgver=2.6.4+p12+g605946a
 pkgrel=1
 pkgdesc="TrueType font rendering library (from git)"
 arch=(i686 x86_64)
@@ -12,20 +12,42 @@ url="http://www.freetype.org/"
 # adding harfbuzz for improved OpenType features auto-hinting
 # introduces a cycle dep to harfbuzz depending on freetype wanted by upstream
 depends=('zlib' 'bzip2' 'sh' 'libpng' 'harfbuzz')
-makedepends=('git')
+makedepends=('libx11' 'git' 'python2')
 provides=('libfreetype.so' "freetype2=$pkgver")
 conflicts=('freetype2')
 install=freetype2.install
 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-Make-subpixel-hinting-mode-configurable.patch)
 sha1sums=('SKIP'
+          'SKIP'
           '045b1b6a56151ab46a8300e6fd09f24294258e97'
           'afd6f9504516fa02e57890dde820f488e0df36bb'
           '2a1d6e734001e196c7a7790c78165d9b9fe49f7f')
 validpgpkeys=('58E0C111E39F5408C5D3EC76C1A60EACE707FDA5')
 
+prepare() {
+  mkdir path
+  ln -s /usr/bin/python2 path/python
+
+  cd freetype2
+  patch -Np1 -i ../0001-Enable-table-validation-modules.patch
+  patch -Np1 -i ../0002-Enable-subpixel-rendering.patch
+
+  # Provide a way to set the default subpixel hinting mode
+  # at runtime, without depending on the application to do so.
+  patch -Np1 -i ../0003-Make-subpixel-hinting-mode-configurable.patch
+
+  ./autogen.sh
+
+  cd ../freetype2-demos
+
+  # Suppress RPATH
+  sed -i '/X11_LIB:%=-R%/d' graph/x11/rules.mk
+}
+
 pkgver() {
   local _tag _count
 
@@ -36,30 +58,35 @@ pkgver() {
   echo ${_tag//-/.}+p$_count+g$(git rev-parse --short HEAD)
 }
 
-prepare() {
-  cd "${srcdir}/freetype2"
-  patch -Np1 -i "${srcdir}/0001-Enable-table-validation-modules.patch"
-  patch -Np1 -i "${srcdir}/0002-Enable-subpixel-rendering.patch"
-
-  # Provide a way to set the default subpixel hinting mode
-  # at runtime, without depending on the application to do so.
-  patch -Np1 -i "${srcdir}/0003-Make-subpixel-hinting-mode-configurable.patch"
-
-  ./autogen.sh
-}
-
 build() {
-  cd "${srcdir}/freetype2"
+  cd freetype2
   ./configure --prefix=/usr --disable-static
   make
+
+  # Build docs
+  PATH="$srcdir/path:$PATH" make refdoc
+
+  # Build demos
+  cd ../freetype2-demos
+  make
 }
 
 check() {
-  cd "${srcdir}/freetype2"
+  cd freetype2
   make -k check
 }
 
 package() {
-  cd "${srcdir}/freetype2"
+  cd freetype2
   make DESTDIR="${pkgdir}" install
+
+  # Package docs
+  install -dm755 "${pkgdir}/usr/share/doc"
+  cp -a docs "${pkgdir}/usr/share/doc/freetype2"
+
+  # Package demos
+  cd ../freetype2-demos
+  for _i in bin/{f,t}t*; do
+    libtool --mode=install install $_i "$pkgdir/usr/bin/"
+  done
 }