[arch-commits] Commit in gnome-desktop/trunk (PKGBUILD)

[Jan Steffens]

    Date: Tuesday, March 29, 2022 @ 20:56:16
  Author: heftig
Revision: 440938

42.0-1

Modified:
  gnome-desktop/trunk/PKGBUILD

----------+
 PKGBUILD |   66 ++++++++++++++++++++++++++++++++++++++++++++++++++-----------
 1 file changed, 55 insertions(+), 11 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2022-03-29 20:55:30 UTC (rev 440937)
+++ PKGBUILD	2022-03-29 20:56:16 UTC (rev 440938)
@@ -1,8 +1,9 @@
 # Maintainer: Jan Alexander Steffens (heftig) <heftig at archlinux.org>
 # Contributor: Jan de Groot <jan at archlinux.org>
 
-pkgname=gnome-desktop
-pkgver=41.5
+pkgbase=gnome-desktop
+pkgname=(gnome-desktop-common gnome-desktop gnome-desktop-4)
+pkgver=42.0
 pkgrel=1
 epoch=1
 pkgdesc="Library with common API for various GNOME modules"
@@ -9,27 +10,26 @@
 url="https://gitlab.gnome.org/GNOME/gnome-desktop"
 arch=(x86_64)
 license=(GPL LGPL)
-depends=(gsettings-desktop-schemas gtk3 xkeyboard-config iso-codes libseccomp
-         bubblewrap systemd libxkbcommon)
-makedepends=(gobject-introspection git meson gtk-doc yelp-tools)
+makedepends=(gobject-introspection git meson gtk-doc yelp-tools
+             gsettings-desktop-schemas gtk3 gtk4 xkeyboard-config iso-codes
+             libseccomp bubblewrap systemd libxkbcommon)
 checkdepends=(xorg-server-xvfb)
-provides=(libgnome-desktop-3.so)
 options=(debug)
-_commit=49aeb355e99b49585e2c4f64535b6394cec5de0d  # tags/41.5^0
+_commit=c3e756b28ddfeda0fa061d51cb11e47e09791770  # tags/42.0^0
 source=("git+https://gitlab.gnome.org/GNOME/gnome-desktop.git#commit=$_commit")
 sha256sums=('SKIP')
 
 pkgver() {
-  cd $pkgname
+  cd $pkgbase
   git describe --tags | sed 's/[^-]*-g/r&/;s/-/+/g'
 }
 
 prepare() {
-  cd $pkgname
+  cd $pkgbase
 }
 
 build() {
-  arch-meson $pkgname build \
+  arch-meson $pkgbase build \
     -D gnome_distributor="Arch Linux" \
     -D gtk_doc=true \
     -D debug_tools=false \
@@ -42,8 +42,52 @@
     meson test -C build --print-errorlogs
 }
 
-package() {
+_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_gnome-desktop-common() {
+  pkgdesc+=" (common files)"
+  depends=(gsettings-desktop-schemas xkeyboard-config iso-codes libseccomp
+           bubblewrap systemd libxkbcommon)
+
   meson install -C build --destdir "$pkgdir"
+
+  cd "$pkgdir"
+
+  _pick gtk3 usr/include/gnome-desktop-3.0
+  _pick gtk3 usr/lib/libgnome-desktop-3.so*
+  _pick gtk3 usr/lib/pkgconfig/gnome-desktop-3.0.pc
+  _pick gtk3 usr/lib/girepository-1.0/GnomeDesktop-3.0.typelib
+  _pick gtk3 usr/share/gir-1.0/GnomeDesktop-3.0.gir
+
+  _pick gtk4 usr/include/gnome-desktop-4.0
+  _pick gtk4 usr/lib/libgnome-*-4.so*
+  _pick gtk4 usr/lib/pkgconfig/gnome-*-4.pc
+  _pick gtk4 usr/lib/girepository-1.0/Gnome*-4.0.typelib
+  _pick gtk4 usr/share/gir-1.0/Gnome*-4.0.gir
 }
 
+package_gnome-desktop() {
+  pkgdesc+=" (GTK3)"
+  depends=(gnome-desktop-common="$epoch:$pkgver-$pkgrel" gtk3)
+  provides=(libgnome-desktop-3.so)
+
+  mv gtk3/* "$pkgdir"
+}
+
+package_gnome-desktop-4() {
+  pkgdesc+=" (GTK4)"
+  depends=(gnome-desktop-common="$epoch:$pkgver-$pkgrel" gtk4)
+  provides=(libgnome-{bg,desktop,rr}-4.so)
+
+  mv gtk4/* "$pkgdir"
+}
+
 # vim:set sw=2 et: