upgpkg: cinnamon-control-center-git 4.0.1.r0.ga34d4dd-1

rebase on top of community PKGBUILD

4 files changed, 54 insertions, 85 deletions

diff --git a/.AURINFO b/.AURINFO
deleted file mode 100644
index 56a67e7c6bf8..000000000000
--- a/.AURINFO
+++ /dev/null
@@ -1,26 +0,0 @@
-pkgbase = cinnamon-control-center-git
-	pkgdesc = The Control Center for Cinnamon
-	pkgver = 337.9677670
-	pkgrel = 1
-	url = https://github.com/linuxmint/cinnamon-control-center
-	install = cinnamon-control-center-git.install
-	arch = i686
-	arch = x86_64
-	license = GPL
-	makedepends = intltool
-	makedepends = gnome-common
-	makedepends = docbook-xsl
-	makedepends = git
-	depends = cinnamon-settings-daemon-git
-	depends = cinnamon-translations-git
-	depends = cinnamon-menus-git
-	depends = libgnomekbd
-	depends = network-manager-applet
-	optdepends = gnome-color-manager: for color management tasks
-	provides = cinnamon-control-center
-	conflicts = cinnamon-control-center
-	source = cinnamon-control-center::git+https://github.com/linuxmint/cinnamon-control-center.git
-	options = !emptydirs
-
-pkgname = cinnamon-control-center-git
-
diff --git a/.SRCINFO b/.SRCINFO
index bb8d66c1d6e1..b7fb5a0b3149 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,26 +1,28 @@
 pkgbase = cinnamon-control-center-git
 	pkgdesc = The Control Center for Cinnamon
-	pkgver = 337.9677670
+	pkgver = 4.0.1.r0.ga34d4dd
 	pkgrel = 1
 	url = https://github.com/linuxmint/cinnamon-control-center
-	install = cinnamon-control-center-git.install
 	arch = i686
 	arch = x86_64
 	license = GPL
-	makedepends = intltool
-	makedepends = gnome-common
-	makedepends = docbook-xsl
 	makedepends = git
-	depends = cinnamon-settings-daemon-git
-	depends = cinnamon-translations-git
-	depends = cinnamon-menus-git
+	makedepends = gnome-online-accounts
+	makedepends = intltool
+	makedepends = python
+	depends = cinnamon-settings-daemon
+	depends = cinnamon-menus
+	depends = colord
 	depends = libgnomekbd
-	depends = network-manager-applet
+	depends = libmm-glib
+	depends = nm-connection-editor
+	optdepends = cinnamon-translations: i18n
 	optdepends = gnome-color-manager: for color management tasks
+	optdepends = gnome-online-accounts: for the online accounts module
 	provides = cinnamon-control-center
 	conflicts = cinnamon-control-center
 	options = !emptydirs
-	source = cinnamon-control-center::git+https://github.com/linuxmint/cinnamon-control-center.git
+	source = git+https://github.com/linuxmint/cinnamon-control-center.git
 	sha256sums = SKIP
 
 pkgname = cinnamon-control-center-git
diff --git a/PKGBUILD b/PKGBUILD
index aff97761e13a..cdb6d1d4870a 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,57 +1,61 @@
-# $Id$
-# Maintainer: Realex
-# Based on cinnamon-control-center PKGBUILD
-
-_pkgname=cinnamon-control-center
-pkgname=${_pkgname}-git
-pkgver=337.9677670
+# Maintainer: Eli Schwartz <eschwartz@archlinux.org>
+# Contributor: Alexandre Filgueira <alexfilgueira@cinnarch.com>
+# Based on gnome-control-center:
+# Jan Alexander Steffens (heftig) <jan.steffens@gmail.com>
+# Jan de Groot <jgc@archlinux.org>
+
+pkgname=cinnamon-control-center-git
+pkgver=4.0.1.r0.ga34d4dd
 pkgrel=1
 pkgdesc="The Control Center for Cinnamon"
 arch=('i686' 'x86_64')
-depends=('cinnamon-settings-daemon-git' 'cinnamon-translations-git' 'cinnamon-menus-git' 'libgnomekbd' 'network-manager-applet')
-optdepends=('gnome-color-manager: for color management tasks')
-makedepends=('intltool' 'gnome-common' 'docbook-xsl' 'git')
-url="https://github.com/linuxmint/cinnamon-control-center"
-install=${pkgname}.install
+url="https://github.com/linuxmint/${pkgname%-git}"
 license=('GPL')
+depends=('cinnamon-settings-daemon' 'cinnamon-menus' 'colord'
+         'libgnomekbd' 'libmm-glib' 'nm-connection-editor')
+optdepends=('cinnamon-translations: i18n'
+            'gnome-color-manager: for color management tasks'
+            'gnome-online-accounts: for the online accounts module')
+makedepends=('git' 'gnome-online-accounts' 'intltool' 'python')
+provides=("${pkgname%-git}")
+conflicts=("${pkgname%-git}")
 options=('!emptydirs')
-conflicts=("${_pkgname}")
-provides=("${_pkgname}")
-source=("${_pkgname}::git+https://github.com/linuxmint/${_pkgname}.git")
+source=("git+${url}.git")
 sha256sums=('SKIP')
 
 pkgver() {
-  cd "${srcdir}/${_pkgname}"
-  echo $(git rev-list --count master).$(git rev-parse --short master)
+    cd "${srcdir}"/${pkgname%-git}
+
+    git describe --long | sed 's/\([^-]*-g\)/r\1/;s/-/./g'
 }
 
-build() {
-  cd "${srcdir}/${_pkgname}"
+prepare() {
+    cd "${srcdir}"/${pkgname%-git}
 
-./autogen.sh --prefix=/usr --sysconfdir=/etc \
-      --localstatedir=/var --disable-static \
-      --enable-systemd \
-      --disable-update-mimedb
+    NOCONFIGURE=1 ./autogen.sh
+}
 
-  #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
+build() {
+    cd "${srcdir}"/${pkgname%-git}
+
+    ./configure --prefix=/usr \
+                --sysconfdir=/etc \
+                --localstatedir=/var \
+                --enable-systemd
 
-  make
+    #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
 }
 
 package() {
-  cd "${srcdir}/${_pkgname}"
-
-  make DESTDIR="$pkgdir" install
+    cd "${srcdir}"/${pkgname%-git}
 
-  # Remove unused stuff
-  make -C panels/sound DESTDIR="$pkgdir" uninstall
-  make -C panels/sound/data DESTDIR="$pkgdir" install
-  make -C shell DESTDIR="$pkgdir" uninstall-binPROGRAMS uninstall-directoryDATA uninstall-uiDATA
-  rm -R "$pkgdir"/usr/share/applications/cinnamon-{control-center,datetime-panel,region-panel,sound-panel}.desktop
-  rm -R "$pkgdir/etc"
+    # 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
 
-  # Fix a warning
-  chown 102:0 "$pkgdir/usr/share/polkit-1/rules.d"
-  chmod 700 "$pkgdir/usr/share/polkit-1/rules.d"
+    install -d -o root -g 102 -m 750 "${pkgdir}"/usr/share/polkit-1/rules.d
 }
diff --git a/cinnamon-control-center-git.install b/cinnamon-control-center-git.install
deleted file mode 100644
index 079e0fa341c2..000000000000
--- a/cinnamon-control-center-git.install
+++ /dev/null
@@ -1,11 +0,0 @@
-post_install() {
-    gtk-update-icon-cache -q -t -f /usr/share/icons/hicolor
-}
-
-post_upgrade() {
-    post_install $1
-}
-
-post_remove() {
-    post_install $1
-}