[arch-commits] Commit in lib32-harfbuzz/repos/multilib-x86_64 (PKGBUILD PKGBUILD)

[Jan Steffens]

    Date: Tuesday, January 10, 2017 @ 19:40:24
  Author: heftig
Revision: 206652

archrelease: copy trunk to multilib-x86_64

Added:
  lib32-harfbuzz/repos/multilib-x86_64/PKGBUILD
    (from rev 206651, lib32-harfbuzz/trunk/PKGBUILD)
Deleted:
  lib32-harfbuzz/repos/multilib-x86_64/PKGBUILD

----------+
 PKGBUILD |  112 ++++++++++++++++++++++++++++++++++++++-----------------------
 1 file changed, 70 insertions(+), 42 deletions(-)

Deleted: PKGBUILD
===================================================================
--- PKGBUILD	2017-01-10 19:39:47 UTC (rev 206651)
+++ PKGBUILD	2017-01-10 19:40:24 UTC (rev 206652)
@@ -1,42 +0,0 @@
-# Maintainer: Florian Pritz <bluewind at xinu.at>
-
-_pkgbasename=harfbuzz
-pkgname=lib32-$_pkgbasename
-pkgver=1.3.1
-pkgrel=2
-pkgdesc="OpenType text shaping engine. (32-bit)"
-arch=('x86_64')
-url="http://www.freedesktop.org/wiki/Software/HarfBuzz"
-license=('MIT')
-depends=('lib32-icu' 'lib32-glib2' 'lib32-freetype2' $_pkgbasename)
-makedepends=('gcc-multilib' 'ragel')
-source=(http://www.freedesktop.org/software/harfbuzz/release/${_pkgbasename}-${pkgver}.tar.bz2)
-sha256sums=('a242206dd119d5e6cc1b2253c116abbae03f9d930cb60b515fb0d248decf89a1')
-
-prepare() {
-  cd ${_pkgbasename}-$pkgver
-  NOCONFIGURE=1 ./autogen.sh
-}
-
-build() {
-  export CC="gcc -m32"
-  export CXX="g++ -m32"
-  export PKG_CONFIG_PATH="/usr/lib32/pkgconfig"
-
-  cd "${srcdir}/${_pkgbasename}-${pkgver}"
- 
-  CFLAGS+=' -DNDEBUG'
-  CXXFLAGS+=' -DNDEBUG'
-  ./configure --prefix=/usr --libdir=/usr/lib32 --disable-silent-rules --with-graphite2=no --without-cairo
-  make
-}
-
-package() {
-  cd "${srcdir}/${_pkgbasename}-${pkgver}"
-
-  make DESTDIR="${pkgdir}" install
-
-  rm -rf "${pkgdir}"/usr/{include,share,bin}
-  mkdir -p "$pkgdir/usr/share/licenses"
-  ln -s $_pkgbasename "$pkgdir/usr/share/licenses/$pkgname"
-}

Copied: lib32-harfbuzz/repos/multilib-x86_64/PKGBUILD (from rev 206651, lib32-harfbuzz/trunk/PKGBUILD)
===================================================================
--- PKGBUILD	                        (rev 0)
+++ PKGBUILD	2017-01-10 19:40:24 UTC (rev 206652)
@@ -0,0 +1,70 @@
+# $Id$
+# Maintainer: Florian Pritz <bluewind at xinu.at>
+
+_pkgbasename=harfbuzz
+pkgname=(lib32-harfbuzz lib32-harfbuzz-icu)
+pkgver=1.4.1
+pkgrel=1
+pkgdesc="OpenType text shaping engine (32-bit)"
+url="http://www.freedesktop.org/wiki/Software/HarfBuzz"
+arch=(x86_64)
+license=(MIT)
+makedepends=(lib32-glib2 lib32-freetype2 lib32-icu $_pkgbasename gcc-multilib ragel git)
+_commit=af596a5655ee2ed09da17a7de79f619e1547dcd9  # tags/1.4.1^0
+source=("git+https://anongit.freedesktop.org/git/harfbuzz#commit=$_commit")
+sha256sums=('SKIP')
+
+pkgver() {
+  cd $_pkgbasename
+  git describe --tags | sed 's/-/+/g'
+}
+
+prepare() {
+  cd $_pkgbasename
+  NOCONFIGURE=1 ./autogen.sh
+}
+
+build() {
+  export CC="gcc -m32"
+  export CXX="g++ -m32"
+  export PKG_CONFIG_PATH="/usr/lib32/pkgconfig"
+
+  cd $_pkgbasename
+ 
+  CFLAGS+=' -DNDEBUG'
+  CXXFLAGS+=' -DNDEBUG'
+  ./configure --prefix=/usr --libdir=/usr/lib32 \
+    --with-glib --with-freetype --without-cairo --with-icu --without-graphite2 \
+    --with-gobject --disable-gtk-doc
+  make
+}
+
+check() {
+  cd $_pkgbasename
+}
+
+package_lib32-harfbuzz() {
+  depends=(lib32-glib2 lib32-freetype2 harfbuzz)
+
+  cd $_pkgbasename
+  make DESTDIR="$pkgdir" install
+
+  rm -rf "${pkgdir}"/usr/{include,share,bin}
+  mkdir -p "$pkgdir/usr/share/licenses"
+  ln -s harfbuzz "$pkgdir/usr/share/licenses/lib32-harfbuzz"
+
+# Split harfbuzz-icu
+  mkdir -p ../hb-icu/usr/lib32/pkgconfig; cd ../hb-icu
+  mv "$pkgdir"/usr/lib32/libharfbuzz-icu* ./usr/lib32
+  mv "$pkgdir"/usr/lib32/pkgconfig/harfbuzz-icu.pc ./usr/lib32/pkgconfig
+}
+
+package_lib32-harfbuzz-icu() {
+  pkgdesc="OpenType text shaping engine (32-bit, ICU integration)"
+  depends=(lib32-harfbuzz lib32-icu harfbuzz-icu)
+
+  mv hb-icu/* "$pkgdir"
+
+  mkdir -p "$pkgdir/usr/share/licenses"
+  ln -s harfbuzz-icu "$pkgdir/usr/share/licenses/lib32-harfbuzz-icu"
+}