upgpkg: cinnamon-control-center-slim 4.8.0-1

2 files changed, 28 insertions, 34 deletions

diff --git a/.SRCINFO b/.SRCINFO
index e2eafb6f9cf6..64b8b5959a54 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,23 +1,24 @@
 pkgbase = cinnamon-control-center-slim
 	pkgdesc = The Control Center for Cinnamon
-	pkgver = 4.6.1
+	pkgver = 4.8.0
 	pkgrel = 1
 	url = https://github.com/linuxmint/cinnamon-control-center
 	arch = x86_64
 	license = GPL
-	makedepends = intltool
-	makedepends = python
+	makedepends = meson
+	makedepends = samurai
 	depends = cinnamon-settings-daemon
 	depends = cinnamon-menus
 	depends = colord
 	depends = libgnomekbd
 	optdepends = cinnamon-translations: i18n
 	optdepends = gnome-color-manager: for color management tasks
-	provides = cinnamon-control-center=4.6.1
+	optdepends = gnome-online-accounts: for the online accounts module
+	provides = cinnamon-control-center=4.8.0
 	conflicts = cinnamon-control-center
 	replaces = cinnamon-control-center
 	options = !emptydirs
-	source = cinnamon-control-center-4.6.1.tar.gz::https://github.com/linuxmint/cinnamon-control-center/archive/4.6.1.tar.gz
+	source = cinnamon-control-center-4.8.0.tar.gz::https://github.com/linuxmint/cinnamon-control-center/archive/4.8.0.tar.gz
 	sha256sums = SKIP
 
 pkgname = cinnamon-control-center-slim
diff --git a/PKGBUILD b/PKGBUILD
index a1ffb8f1b673..995335d24972 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -2,54 +2,47 @@
 # Eli Schwartz <eschwartz@archlinux.org>
 
 pkgname=cinnamon-control-center-slim
-pkgver=4.6.1
+pkgver=4.8.0
 pkgrel=1
 pkgdesc="The Control Center for Cinnamon"
 arch=('x86_64')
-url="https://github.com/linuxmint/${pkgname%-*}"
+url="https://github.com/linuxmint/${pkgname%-slim}"
 license=('GPL')
 provides=("cinnamon-control-center=$pkgver")
 conflicts=('cinnamon-control-center')
 replaces=('cinnamon-control-center')
 depends=('cinnamon-settings-daemon' 'cinnamon-menus' 'colord' 'libgnomekbd')
 optdepends=('cinnamon-translations: i18n'
-            'gnome-color-manager: for color management tasks')
-makedepends=('intltool' 'python')
+            'gnome-color-manager: for color management tasks'
+            'gnome-online-accounts: for the online accounts module')
+makedepends=('meson' 'samurai')
 options=('!emptydirs')
-source=("${pkgname%-*}-${pkgver}.tar.gz::${url}/archive/${pkgver}.tar.gz")
+source=("${pkgname%-slim}-${pkgver}.tar.gz::${url}/archive/${pkgver}.tar.gz")
 sha256sums=('SKIP')
 
-prepare() {
-    cd "${srcdir}"/${pkgname%-*}-${pkgver}
-
-    NOCONFIGURE=1 ./autogen.sh
-}
 
 build() {
-    cd "${srcdir}"/${pkgname%-*}-${pkgver}
-
-    ./configure --prefix=/usr \
-                --sysconfdir=/etc \
-                --localstatedir=/var \
-                --enable-systemd \
-                --disable-modemmanager \
-                --disable-networkmanager \
-                --disable-onlineaccounts \
-                --disable-documentation
-
-    #https://bugzilla.gnome.org/show_bug.cgi?id=656229
-    sed -i -e 's/ -shared / -Wl,-O1,--as-needed\0 /g' -e 's/    if test "$export_dynamic" = yes && test -n "$export_dynamic_flag_spec"; then/      func_append compile_command " -Wl,-O1,--as-needed"\n      func_append finalize_command " -Wl,-O1,--as-needed"\n\0/' libtool
-    make
+    mkdir -p "${srcdir}"/${pkgname%-slim}-${pkgver}/builddir
+    cd "${srcdir}"/${pkgname%-slim}-${pkgver}/builddir
+
+    meson --prefix=/usr \
+          --buildtype=plain \
+          -Dmodemmanager=false \
+          -Dnetworkmanager=false \
+          -Donlineaccounts=false \
+        ..
+
+    samu
 }
 
 package() {
-    cd "${srcdir}"/${pkgname%-*}-${pkgver}
+    cd "${srcdir}"/${pkgname%-slim}-${pkgver}/builddir
+
+    DESTDIR="${pkgdir}" samu install
 
     # https://github.com/linuxmint/Cinnamon/pull/7382#issuecomment-374894901
     # /usr/bin/cinnamon-control-center is not meant for users, it is a development troubleshooting tool.
     # Just install the shell libs/headers.
-    make -C shell  DESTDIR="${pkgdir}" install-{libcinnamon_control_center_includeHEADERS,libLTLIBRARIES,pkgconfigDATA}
-    make -C panels DESTDIR="${pkgdir}" install
-
-    install -d -o root -g 102 -m 750 "${pkgdir}"/usr/share/polkit-1/rules.d
+    rm "${pkgdir}"/usr/bin/cinnamon-control-center
+    rm "${pkgdir}"/usr/share/cinnamon-control-center/ui/shell.ui
 }