Adopted and rewritten

2 files changed, 18 insertions, 29 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 8ec11f944f6a..1b843bbe655e 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,6 +1,6 @@
 pkgbase = pango-git
 	pkgdesc = A library for layout and rendering of text
-	pkgver = 1.37.1.3744.65214f2
+	pkgver = 1.43.0.r21.gbe035735
 	pkgrel = 1
 	url = http://gnome.org/
 	install = pango.install
@@ -10,6 +10,7 @@ pkgbase = pango-git
 	makedepends = gobject-introspection
 	makedepends = libxt
 	makedepends = gtk-doc
+	makedepends = meson
 	depends = glib2
 	depends = cairo
 	depends = libxft
@@ -17,15 +18,15 @@ pkgbase = pango-git
 	depends = freetype2
 	depends = harfbuzz
 	depends = fontconfig
-	provides = pango=1.37.1.3744.65214f2
+	provides = pango=1.43.0.r21.gbe035735
 	conflicts = pango
 	options = !libtool
 	options = strip
 	options = debug
-	source = git+git://git.gnome.org/pango
+	source = git+https://gitlab.gnome.org/GNOME/pango
 	source = pango.install
 	sha256sums = SKIP
-	sha256sums = f1e5094509e01a9eeefd29830e8be7c8b9fab4eafccd4daac4cd50c9a811c992
+	sha256sums = 1e69feead9d9e5a76e7e0dc1b3da3b8938f65f58c02449478900559be50e9ac7
 
 pkgname = pango-git
 
diff --git a/PKGBUILD b/PKGBUILD
index fcd6462e4f4b..ae1a6c133644 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,49 +1,37 @@
-# Maintainer: Lubosz Sarnecki <lubosz@gmail.com>
+# Contributor: Lubosz Sarnecki <lubosz@gmail.com>
 # Contributor: mariusz - myswiat <my.swiat@o2.pl>
+# Contributor:Jan de Groot <jgc@archlinux.org>
+# Maintainer: Stefan Husmann <stefan-husmann@t-online.de>
 
 _realname=pango
 pkgname=$_realname-git
-pkgver=1.37.1.3744.65214f2
+pkgver=1.43.0.r21.gbe035735
 pkgrel=1
 pkgdesc="A library for layout and rendering of text"
 arch=('i686' 'x86_64')
 url="http://gnome.org/"
 license=('LGPL')
 depends=('glib2' 'cairo' 'libxft' 'libthai' 'freetype2' 'harfbuzz' 'fontconfig')
-makedepends=('gobject-introspection' 'libxt' 'gtk-doc')
+makedepends=('gobject-introspection' 'libxt' 'gtk-doc' 'meson')
 provides=("${_realname}=${pkgver}")
 conflicts=("${_realname}")
 install=${_realname}.install
 options=('!libtool' 'strip' 'debug')
-
-source=("git+git://git.gnome.org/pango" "pango.install")
-
-sha256sums=("SKIP" "1e69feead9d9e5a76e7e0dc1b3da3b8938f65f58c02449478900559be50e9ac7")
-
-subver() {
-  PREFIX="m4_define(\[pango_version_$1\], \["
-  echo $(grep "$PREFIX" configure.ac | eval sed "'s/$PREFIX//'" | sed 's/\])//')
-}
+source=("git+https://gitlab.gnome.org/GNOME/pango" "pango.install")
+sha256sums=('SKIP'
+            '1e69feead9d9e5a76e7e0dc1b3da3b8938f65f58c02449478900559be50e9ac7')
  
 pkgver() {
   cd $_realname
-  hash=$(git log --pretty=format:'%h' -n 1)
-  revision=$(git rev-list --count HEAD)
-  echo $(subver major).$(subver minor).$(subver micro).$revision.$hash
+  git describe --tags | sed 's/-/.r/' |tr - .
 }
 
 build() {
-  cd $_realname
-  ./autogen.sh \
-    --prefix=/usr \
-    --sysconfdir=/etc \
-    --localstatedir=/var \
-    --with-included-modules=basic-fc
-  make
+  arch-meson $_realname build -D enable_docs=true 
+  ninja -C build
 }
 
 package() {
-  cd $_realname
-  make DESTDIR=$pkgdir install
-  install -m755 -d "${pkgdir}/etc/pango"
+  DESTDIR=$pkgdir ninja -C build install
+  rm -r "$pkgdir"/usr/{lib,share}/installed-tests
 }