[arch-commits] Commit in gnome-control-center/repos/extra-x86_64 (PKGBUILD PKGBUILD)

[Jan Steffens]

    Date: Wednesday, January 12, 2022 @ 19:00:40
  Author: heftig
Revision: 434316

archrelease: copy trunk to extra-x86_64

Added:
  gnome-control-center/repos/extra-x86_64/PKGBUILD
    (from rev 434315, gnome-control-center/trunk/PKGBUILD)
Deleted:
  gnome-control-center/repos/extra-x86_64/PKGBUILD

----------+
 PKGBUILD |  125 ++++++++++++++++++++++++++++++++-----------------------------
 1 file changed, 66 insertions(+), 59 deletions(-)

Deleted: PKGBUILD
===================================================================
--- PKGBUILD	2022-01-12 19:00:30 UTC (rev 434315)
+++ PKGBUILD	2022-01-12 19:00:40 UTC (rev 434316)
@@ -1,59 +0,0 @@
-# Maintainer: Jan Alexander Steffens (heftig) <heftig at archlinux.org>
-# Contributor: Jan de Groot <jgc at archlinux.org>
-
-pkgname=gnome-control-center
-pkgver=41.2
-pkgrel=1
-pkgdesc="GNOME's main interface to configure various aspects of the desktop"
-url="https://gitlab.gnome.org/GNOME/gnome-control-center"
-license=(GPL2)
-arch=(x86_64)
-depends=(accountsservice cups-pk-helper gnome-bluetooth gnome-desktop
-         gnome-online-accounts gnome-settings-daemon gsettings-desktop-schemas gtk3
-         libgtop nm-connection-editor sound-theme-freedesktop upower libpwquality
-         gnome-color-manager smbclient libmm-glib libgnomekbd libibus libcheese
-         libgudev bolt udisks2 libhandy gsound colord-gtk power-profiles-daemon)
-makedepends=(docbook-xsl modemmanager git python meson)
-checkdepends=(python-dbusmock python-gobject xorg-server-xvfb)
-optdepends=('system-config-printer: Printer settings'
-            'gnome-user-share: WebDAV file sharing'
-            'gnome-remote-desktop: screen sharing'
-            'rygel: media sharing'
-            'openssh: remote login')
-groups=(gnome)
-_commit=babeb0ce357d55406b0ba0a4597e0513a0419de8  # tags/41.2^0
-source=("git+https://gitlab.gnome.org/GNOME/gnome-control-center.git#commit=$_commit"
-        "git+https://gitlab.gnome.org/GNOME/libgnome-volume-control.git")
-sha256sums=('SKIP'
-            'SKIP')
-
-pkgver() {
-  cd $pkgname
-  git describe --tags | sed 's/^GNOME_CONTROL_CENTER_//;s/_/./g;s/[^-]*-g/r&/;s/-/+/g'
-}
-
-prepare() {
-  cd $pkgname
-
-  # Install bare logos into pixmaps, not icons
-  sed -i "/install_dir/s/'icons'/'pixmaps'/" panels/info-overview/meson.build
-
-  git submodule init
-  git submodule set-url subprojects/gvc "$srcdir/libgnome-volume-control"
-  git submodule update
-}
-
-
-build() {
-  arch-meson $pkgname build -D documentation=true
-  meson compile -C build
-}
-
-check() {
-  meson test -C build --print-errorlogs
-}
-
-package() {
-  meson install -C build --destdir "$pkgdir"
-  install -d -o root -g 102 -m 750 "$pkgdir/usr/share/polkit-1/rules.d"
-}

Copied: gnome-control-center/repos/extra-x86_64/PKGBUILD (from rev 434315, gnome-control-center/trunk/PKGBUILD)
===================================================================
--- PKGBUILD	                        (rev 0)
+++ PKGBUILD	2022-01-12 19:00:40 UTC (rev 434316)
@@ -0,0 +1,66 @@
+# Maintainer: Jan Alexander Steffens (heftig) <heftig at archlinux.org>
+# Contributor: Jan de Groot <jgc at archlinux.org>
+
+pkgname=gnome-control-center
+pkgver=41.2
+pkgrel=2
+pkgdesc="GNOME's main interface to configure various aspects of the desktop"
+url="https://gitlab.gnome.org/GNOME/gnome-control-center"
+license=(GPL2)
+arch=(x86_64)
+depends=(accountsservice cups-pk-helper gnome-bluetooth gnome-desktop
+         gnome-online-accounts gnome-settings-daemon gsettings-desktop-schemas gtk3
+         libgtop nm-connection-editor sound-theme-freedesktop upower libpwquality
+         gnome-color-manager smbclient libmm-glib libgnomekbd libibus libcheese
+         libgudev bolt udisks2 libhandy gsound colord-gtk)
+makedepends=(docbook-xsl modemmanager git python meson)
+checkdepends=(python-dbusmock python-gobject xorg-server-xvfb)
+optdepends=('system-config-printer: Printer settings'
+            'gnome-user-share: WebDAV file sharing'
+            'gnome-remote-desktop: screen sharing'
+            'rygel: media sharing'
+            'openssh: remote login'
+            'power-profiles-daemon: Power profiles support')
+groups=(gnome)
+_commit=babeb0ce357d55406b0ba0a4597e0513a0419de8  # tags/41.2^0
+source=("git+https://gitlab.gnome.org/GNOME/gnome-control-center.git#commit=$_commit"
+        "git+https://gitlab.gnome.org/GNOME/libgnome-volume-control.git")
+sha256sums=('SKIP'
+            'SKIP')
+
+pkgver() {
+  cd $pkgname
+  git describe --tags | sed 's/^GNOME_CONTROL_CENTER_//;s/_/./g;s/[^-]*-g/r&/;s/-/+/g'
+}
+
+prepare() {
+  cd $pkgname
+
+  # Fix build with Meson 0.61.0
+  git cherry-pick -n 37b29c32cbecfd89c9c5e0169e0f2876f00ef5eb
+
+  # https://gitlab.gnome.org/GNOME/gnome-control-center/-/issues/1562
+  git cherry-pick -n 293e191e399123c91ef5d7b5c796ea0f42b8bd91
+
+  # Install bare logos into pixmaps, not icons
+  sed -i "/install_dir/s/'icons'/'pixmaps'/" panels/info-overview/meson.build
+
+  git submodule init subprojects/gvc
+  git submodule set-url subprojects/gvc "$srcdir/libgnome-volume-control"
+  git submodule update
+}
+
+
+build() {
+  arch-meson $pkgname build -D documentation=true
+  meson compile -C build
+}
+
+check() {
+  meson test -C build --print-errorlogs
+}
+
+package() {
+  meson install -C build --destdir "$pkgdir"
+  install -d -o root -g 102 -m 750 "$pkgdir/usr/share/polkit-1/rules.d"
+}