[arch-commits] Commit in lib32-pango/trunk (PKGBUILD)

[Jan Steffens via arch-commits]

    Date: Thursday, March 1, 2018 @ 16:52:17
  Author: heftig
Revision: 301012

1.40.14-1

Modified:
  lib32-pango/trunk/PKGBUILD

----------+
 PKGBUILD |   49 ++++++++++++++++++-------------------------------
 1 file changed, 18 insertions(+), 31 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD    2018-03-01 16:46:54 UTC (rev 301011)
+++ PKGBUILD    2018-03-01 16:52:17 UTC (rev 301012)
@@ -1,34 +1,29 @@
 # $Id$
+# Contributor: Biru Ionut <io...@archlinux.ro>
 # Contributor: Pierre Schmitz <pie...@archlinux.de>
 # Contributor: Mikko Seppälä <t-r-...@mbnet.fi>
-# Maintainer: Biru Ionut <io...@archlinux.ro>
 
-_pkgbasename=pango
-pkgname=lib32-$_pkgbasename
-pkgver=1.40.6+9+g92cc73c8
+pkgname=lib32-pango
+pkgver=1.40.14
 pkgrel=1
 pkgdesc="A library for layout and rendering of text (32-bit)"
 url="https://www.pango.org/";
 arch=(x86_64)
 license=(LGPL)
-depends=(lib32-libthai lib32-libgl lib32-cairo lib32-libxft
-         $_pkgbasename)
-makedepends=(gcc-multilib gobject-introspection meson git)
-options=('!emptydirs')
-_commit=92cc73c898e4665fd739704417d487d137dd271b  # master
+depends=(lib32-libthai lib32-cairo lib32-libxft lib32-harfbuzz pango)
+makedepends=(gcc-multilib gobject-introspection git meson)
+checkdepends=(ttf-dejavu cantarell-fonts)
+_commit=cd26b69cf0d45e30cb8c08ca5aa32ed0c83e6605  # tags/1.40.14^0
 source=("git+https://git.gnome.org/browse/pango#commit=$_commit";)
 sha256sums=('SKIP')
 
 pkgver() {
-  cd $_pkgbasename
-
+  cd pango
   git describe --tags | sed 's/-/+/g'
 }
- 
- prepare() {
-  cd $_pkgbasename
 
-  mkdir ../build
+prepare() {
+  cd pango
   sed -i 's#"pango.modules"#"pango.modules-32"#' pango/modules.c
 }
 
@@ -37,24 +32,16 @@
   export CXX="g++ -m32"
   export PKG_CONFIG_PATH="/usr/lib32/pkgconfig"
 
+  arch-meson pango build --libdir=/usr/lib32
+  ninja -C build
+}
+
+check() {
   cd build
-
-  meson --prefix=/usr --libdir=/usr/lib32 --libexecdir=/usr/lib32 \
-    --buildtype=release ../$_pkgbasename
-  ninja -v
-
-#   ./configure --prefix=/usr --libdir=/usr/lib32 --sysconfdir=/etc \
-#       --localstatedir=/var \
-#       
--with-dynamic-modules=arabic-fc,arabic-lang,basic-fc,basic-win32,basic-x,basic-atsui,hangul-fc,hebrew-fc,indic-fc,indic-lang,khmer-fc,syriac-fc,tibetan-fc
 \
-#       --disable-introspection
-#   sed -i -e 's/ -shared / -Wl,-O1,--as-needed\0/g' libtool
-#   make
+  meson test
 }
 
 package() {
-  cd build
-
-  DESTDIR="$pkgdir" ninja install
-  rm -rf "$pkgdir"/etc
-  rm -rf "$pkgdir"/usr/{bin/pango-view,share,include}
+  DESTDIR="$pkgdir" ninja -C build install
+  rm -r "$pkgdir"/usr/{bin,lib,share,include}
 }