[arch-commits] Commit in gtkmm-4.0/trunk (PKGBUILD)

[Jan Steffens]

    Date: Tuesday, March 22, 2022 @ 01:53:01
  Author: heftig
Revision: 440514

4.6.1-1

Modified:
  gtkmm-4.0/trunk/PKGBUILD

----------+
 PKGBUILD |   30 +++++++++++++++++++++---------
 1 file changed, 21 insertions(+), 9 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2022-03-22 01:46:57 UTC (rev 440513)
+++ PKGBUILD	2022-03-22 01:53:01 UTC (rev 440514)
@@ -3,7 +3,7 @@
 
 pkgbase=gtkmm-4.0
 pkgname=(gtkmm-4.0 gtkmm-4.0-docs)
-pkgver=4.6.0
+pkgver=4.6.1
 pkgrel=1
 pkgdesc="C++ bindings for GTK 4"
 url="https://www.gtkmm.org/"
@@ -13,14 +13,14 @@
 makedepends=(git meson mm-common glibmm-2.68-docs cairomm-1.16-docs
              pangomm-2.48-docs)
 checkdepends=(xorg-server-xvfb)
-options=(!emptydirs)
-_commit=e4b84c821bb744f6fee6fa47c747bfd6829a5a00  # tags/4.6.0^0
+options=(debug)
+_commit=7f4f5383de930f5e486001d313ce38834b455787  # tags/4.6.1^0
 source=("git+https://gitlab.gnome.org/GNOME/gtkmm.git#commit=$_commit")
 sha256sums=('SKIP')
 
 pkgver() {
   cd gtkmm
-  git describe --tags | sed 's/-/+/g'
+  git describe --tags | sed 's/[^-]*-g/r&/;s/-/+/g'
 }
 
 prepare() {
@@ -33,9 +33,20 @@
 }
 
 check() {
-  xvfb-run -s '-nolisten local' meson test -C build --print-errorlogs
+  xvfb-run -s '-nolisten local' \
+    meson test -C build --print-errorlogs
 }
 
+_pick() {
+  local p="$1" f d; shift
+  for f; do
+    d="$srcdir/$p/${f#$pkgdir/}"
+    mkdir -p "$(dirname "$d")"
+    mv "$f" "$d"
+    rmdir -p --ignore-fail-on-non-empty "$(dirname "$f")"
+  done
+}
+
 package_gtkmm-4.0() {
   depends+=(libsigc-3.0.so libglibmm-2.68.so libcairomm-1.16.so
             libpangomm-2.48.so)
@@ -43,9 +54,8 @@
 
   meson install -C build --destdir "$pkgdir"
 
-  # Split -docs
-  mkdir -p docs/usr/share
-  mv -t docs/usr/share "$pkgdir"/usr/share/{devhelp,doc}
+  cd "$pkgdir"
+  _pick docs usr/share/{devhelp,doc}
 }
 
 package_gtkmm-4.0-docs() {
@@ -53,5 +63,7 @@
   depends=()
   options=(!strip)
 
-  mv -t "$pkgdir" docs/*
+  mv docs/* "$pkgdir"
 }
+
+# vim:set sw=2 et: