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

[Jan Steffens]

    Date: Monday, June 22, 2020 @ 21:38:15
  Author: heftig
Revision: 650878

archrelease: copy trunk to multilib-x86_64

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

----------+
 PKGBUILD |  149 ++++++++++++++++++++++++++++---------------------------------
 1 file changed, 69 insertions(+), 80 deletions(-)

Deleted: PKGBUILD
===================================================================
--- PKGBUILD	2020-06-22 21:37:34 UTC (rev 650877)
+++ PKGBUILD	2020-06-22 21:38:15 UTC (rev 650878)
@@ -1,80 +0,0 @@
-# Maintainer: Florian Pritz <bluewind at xinu.at>
-
-pkgbase=lib32-harfbuzz
-pkgname=(lib32-harfbuzz lib32-harfbuzz-icu)
-pkgver=2.6.7
-pkgrel=1
-pkgdesc="OpenType text shaping engine (32-bit)"
-url="https://www.freedesktop.org/wiki/Software/HarfBuzz"
-arch=(x86_64)
-license=(MIT)
-makedepends=(lib32-glib2 lib32-freetype2 lib32-cairo lib32-icu ragel git python
-             harfbuzz)
-checkdepends=(python-fonttools python-setuptools)
-_commit=fb46a32ed0322d3f617dbfc7b982ff26f47d789c  # tags/2.6.7^0
-source=("git+https://github.com/harfbuzz/harfbuzz#commit=$_commit")
-sha256sums=('SKIP')
-
-pkgver() {
-  cd harfbuzz
-  git describe --tags | sed 's/-/+/g'
-}
-
-prepare() {
-  cd harfbuzz
-  NOCONFIGURE=1 ./autogen.sh
-}
-
-build() {
-  export CC="gcc -m32"
-  export CXX="g++ -m32"
-  export PKG_CONFIG="i686-pc-linux-gnu-pkg-config"
-
-  cd harfbuzz
-  ./configure \
-    --prefix=/usr \
-    --libdir=/usr/lib32 \
-    --with-cairo \
-    --with-freetype \
-    --with-glib \
-    --with-gobject \
-    --without-graphite2 \
-    --with-icu \
-    --disable-gtk-doc
-  sed -i -e 's/ -shared / -Wl,-O1,--as-needed\0/g' libtool
-  make
-}
-
-check() {
-  cd harfbuzz
-  TMPDIR="$srcdir" make check
-  rm -rf "$srcdir"/tmp*
-}
-
-package_lib32-harfbuzz() {
-  depends=(lib32-glib2 lib32-freetype2 libglib-2.0.so libfreetype.so
-           libgobject-2.0.so harfbuzz)
-  provides=(libharfbuzz.so libharfbuzz-subset.so libharfbuzz-gobject.so)
-
-  cd harfbuzz
-  make DESTDIR="$pkgdir" install
-
-  rm -rf "${pkgdir}"/usr/{include,share,bin}
-
-  install -Dt "$pkgdir/usr/share/licenses/$pkgname" -m644 COPYING
-
-# 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="$pkgdesc (ICU integration)"
-  depends=("lib32-harfbuzz=$pkgver-$pkgrel" lib32-icu libharfbuzz.so harfbuzz-icu)
-  provides=(libharfbuzz-icu.so)
-
-  mv hb-icu/* "$pkgdir"
-
-  install -Dt "$pkgdir/usr/share/licenses/$pkgname" -m644 harfbuzz/COPYING
-}

Copied: lib32-harfbuzz/repos/multilib-x86_64/PKGBUILD (from rev 650877, lib32-harfbuzz/trunk/PKGBUILD)
===================================================================
--- PKGBUILD	                        (rev 0)
+++ PKGBUILD	2020-06-22 21:38:15 UTC (rev 650878)
@@ -0,0 +1,69 @@
+# Maintainer: Jan Alexander Steffens (heftig) <heftig at archlinux.org>
+# Maintainer: Florian Pritz <bluewind at xinu.at>
+
+pkgbase=lib32-harfbuzz
+pkgname=(lib32-harfbuzz lib32-harfbuzz-icu)
+pkgver=2.6.8
+pkgrel=1
+pkgdesc="OpenType text shaping engine (32-bit)"
+url="https://www.freedesktop.org/wiki/Software/HarfBuzz"
+arch=(x86_64)
+license=(MIT)
+makedepends=(lib32-glib2 lib32-freetype2 lib32-cairo lib32-icu ragel git python
+             meson harfbuzz)
+checkdepends=(python-fonttools python-setuptools)
+_commit=e4203c14699cc0903a2b4611167a7b99532cfdb0  # tags/2.6.8^0
+source=("git+https://github.com/harfbuzz/harfbuzz#commit=$_commit")
+sha256sums=('SKIP')
+
+pkgver() {
+  cd harfbuzz
+  git describe --tags | sed 's/-/+/g'
+}
+
+prepare() {
+  cd harfbuzz
+}
+
+build() {
+  export CC="gcc -m32"
+  export CXX="g++ -m32"
+  export PKG_CONFIG="i686-pc-linux-gnu-pkg-config"
+
+  arch-meson harfbuzz build \
+    --libdir=/usr/lib32 \
+    -D introspection=disabled \
+    -D gtk_doc=disabled
+  meson compile -C build
+}
+
+check() {
+  TMPDIR="$srcdir" meson test -C build --print-errorlogs
+  rm -rf "$srcdir"/tmp*
+}
+
+package_lib32-harfbuzz() {
+  depends=(lib32-glib2 lib32-freetype2 libglib-2.0.so libfreetype.so
+           libgobject-2.0.so harfbuzz)
+  provides=(libharfbuzz.so libharfbuzz-subset.so libharfbuzz-gobject.so)
+
+  DESTDIR="$pkgdir" meson install -C build
+  rm -rf "${pkgdir}"/usr/{include,share,bin}
+
+  # Split harfbuzz-icu
+  mkdir -p hb-icu/usr/lib32/pkgconfig
+  mv -t hb-icu/usr/lib32 "$pkgdir"/usr/lib32/libharfbuzz-icu*
+  mv -t hb-icu/usr/lib32/pkgconfig "$pkgdir"/usr/lib32/pkgconfig/harfbuzz-icu.pc
+
+  install -Dt "$pkgdir/usr/share/licenses/$pkgname" -m644 harfbuzz/COPYING
+}
+
+package_lib32-harfbuzz-icu() {
+  pkgdesc="$pkgdesc (ICU integration)"
+  depends=("lib32-harfbuzz=$pkgver-$pkgrel" lib32-icu libharfbuzz.so harfbuzz-icu)
+  provides=(libharfbuzz-icu.so)
+
+  mv hb-icu/* "$pkgdir"
+
+  install -Dt "$pkgdir/usr/share/licenses/$pkgname" -m644 harfbuzz/COPYING
+}