41.2-2

2 files changed, 21 insertions, 6 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 8dfb29030cff..a17dc45ff162 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,7 +1,7 @@
 pkgbase = gnome-control-center-system76
 	pkgdesc = GNOME's main interface to configure various aspects of the desktop (with System76 patches)
 	pkgver = 41.2
-	pkgrel = 1
+	pkgrel = 2
 	url = https://gitlab.gnome.org/GNOME/gnome-control-center
 	arch = x86_64
 	license = GPL2
@@ -38,13 +38,13 @@ pkgbase = gnome-control-center-system76
 	depends = libhandy
 	depends = gsound
 	depends = colord-gtk
-	depends = power-profiles-daemon
 	depends = libfirmware-manager
 	optdepends = system-config-printer: Printer settings
 	optdepends = gnome-user-share: WebDAV file sharing
 	optdepends = gnome-remote-desktop: screen sharing
 	optdepends = rygel: media sharing
 	optdepends = openssh: remote login
+	optdepends = power-profiles-daemon: Power profiles support
 	provides = gnome-control-center
 	provides = firmware-manager-virtual
 	conflicts = gnome-control-center
diff --git a/PKGBUILD b/PKGBUILD
index af6d54c4b634..562da0c72138 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -2,7 +2,7 @@
 pkgname=gnome-control-center-system76
 _pkgname=${pkgname%-system76}
 pkgver=41.2
-pkgrel=1
+pkgrel=2
 pkgdesc="GNOME's main interface to configure various aspects of the desktop (with System76 patches)"
 url="https://gitlab.gnome.org/GNOME/gnome-control-center"
 license=(GPL2)
@@ -11,7 +11,7 @@ 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
+         libgudev bolt udisks2 libhandy gsound colord-gtk
          libfirmware-manager
 #         libs76-hidpi-widget
          )
@@ -22,6 +22,7 @@ optdepends=('system-config-printer: Printer settings'
             'gnome-remote-desktop: screen sharing'
             'rygel: media sharing'
             'openssh: remote login'
+            'power-profiles-daemon: Power profiles support'
 #            'hidpi-daemon'
             )
 provides=("$_pkgname" 'firmware-manager-virtual')
@@ -39,12 +40,22 @@ sha256sums=('SKIP'
 
 pkgver() {
   cd $_pkgname
-  git describe --tags | sed 's/^GNOME_CONTROL_CENTER_//;s/_/./g;s/-/+/g'
+  git describe --tags | sed 's/^GNOME_CONTROL_CENTER_//;s/_/./g;s/[^-]*-g/r&/;s/-/+/g'
 }
 
 prepare() {
   cd $_pkgname
-  git submodule init
+
+  # 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 set-url subprojects/libhandy "$srcdir/libhandy"
   git submodule update
@@ -53,6 +64,10 @@ prepare() {
 #  patch -Np1 -i ../pop-gcc/debian/patches/pop/pop-mouse-accel.patch
 #  patch -Np1 -i ../pop-gcc/debian/patches/pop/pop-hidpi.patch
   patch -Np1 -i ../pop-gcc/debian/patches/pop/system76-firmware.patch
+
+  # meson: drop unused argument for i18n.merge_file()
+  # https://gitlab.gnome.org/GNOME/gnome-control-center/-/commit/37b29c32cbecfd89c9c5e0169e0f2876f00ef5eb
+  sed -i "/       desktop,/d" panels/firmware/meson.build
 }