Switch to cinnamon-settings-daemon

5 files changed, 47 insertions, 69 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 0d07aac2e193..d7c131852e8d 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,6 +1,6 @@
 pkgbase = pantheon-workarounds
 	pkgdesc = Workarounds for Pantheon derivatives
-	pkgver = r1158.5898845
+	pkgver = 3.2.0.r73.gc49189b
 	pkgrel = 1
 	url = https://github.com/quequotion/pantheon-bzr-qq
 	install = gala.install
@@ -9,34 +9,39 @@ pkgbase = pantheon-workarounds
 	license = GPL3
 	makedepends = git
 	makedepends = intltool
-	depends = gnome-settings-daemon-elementary
-	depends = gnome-settings-daemon-compat
-	optdepends = pantheon-qq-default-settings-git: Pantheon configuration and themeing for Pantheon derivatives
-	optdepends = contractor-git: A desktop-wide extension service
-	optdepends = pantheon-print-git: Print settings dialog
-	optdepends = pantheon-polkit-agent-git: Polkit Authentication Agent
+	depends = cinnamon-settings-daemon
+	depends = dconf
+	depends = gnome-keyring
+	depends = gnome-session
+	depends = xdg-user-dirs-gtk
+	depends = pantheon-applications-menu
+	depends = plank
+	depends = wingpanel
+	optdepends = contractor: A desktop-wide extension service
+	optdepends = numlockx: Turn on the numlock key in X11
+	optdepends = pantheon-dpms-helper: Manage DPMS settigns in place of gnome-settings-daemon
+	optdepends = pantheon-default-settings: Pantheon configuration and themeing
 	optdepends = pantheon-geoclue2-agent-git: Pantheon Geoclue2 Agent
+	optdepends = pantheon-polkit-agent: Polkit Authentication Agent
+	optdepends = pantheon-print: Print settings dialog
+	optdepends = pantheon-screenshot: Screenshot utility
+	optdepends = pantheon-shortcut-overlay: OS-wide shortcut overlay
+	optdepends = simple-scan: Simple scan utility
+	optdepends = switchboard: Pluggable settings manager
 	optdepends = xscreensaver-dbus-screenlock: xscreensaver locker for gnome-derivative desktops
-	optdepends = numlockx: Turn on the numlock key in X11
-	provides = gala=r1158.5898845
-	provides = gala-bzr=r1158.5898845
-	provides = gala-git=r1158.5898845
+	provides = gala=3.2.0.r73.gc49189b
+	provides = gala-bzr=3.2.0.r73.gc49189b
+	provides = gala-git=3.2.0.r73.gc49189b
 	conflicts = gala
 	conflicts = gala-bzr
 	conflicts = gala-git
 	source = https://raw.githubusercontent.com/elementary/gala/master/data/org.pantheon.desktop.gala.gschema.xml.in
 	source = pantheon-session-qq
-	source = gnome-fallback-media-keys-helper-pantheon.desktop
-	source = gnome-fallback-background-helper-pantheon.desktop
-	source = gnome-fallback-mount-helper-pantheon.desktop
 	source = numlockx-pantheon.desktop
 	source = gtk.css
 	source = settings.ini
 	sha512sums = 30a488431a23ff5521a12e97fa69ed17b2033ba8f016bb922e07ad9bf2d671e14a90a38266de1567c4dcbf178b6919a8108fad3dd13e50573018dc2a8e9b070e
 	sha512sums = 842db1b456c96287865955741ba00c3ceeecf82691700f691d9fc45dc665230f1224ce7cdf5a1301826ab96cfe59e922c3878a5986ab3639da0cb79a2948f727
-	sha512sums = b01a18bb7829eb7a48b72c90bdf5aa5913c24247426e0bfc509cba22f49d2d8c9eb301e1937b70f3f7f01a873c987e0bdea6dd5f24f8d900b952188fa5635d39
-	sha512sums = 0df6355d85d2329e245593408a74d09281c0dcea206ed594a7312b78db4d3cd57941a5ec29be780f965128fe512532edae85ffaf11a94b57374d5906875967fc
-	sha512sums = c06e3b8c59681ebe64fa0dd724eea1d40a579956372ce0851f30ededdda3ac41d329d40e5463bd779daba0d55853faec357203b042a4de3d601eafc8b09c350e
 	sha512sums = bc5724ef255adad39e35e3fbd7beacbd3ea270c7019362ff6a8bc15cf8f503a4304c18c5e35ae2a6ddb8d1e6e7cc6973642a2ffdc8fe9e219c7f2dbacf5eab72
 	sha512sums = ee75dfaa7d887dbfe0c74b7fb6005d5aafbce22fa00b3b476b3c88628a9f786cfd3410237a2b22ca135ea85759b45b59068e5d00650f65449a19ae222e957784
 	sha512sums = 90b0927892e708b601542f317af52f42174bdcbb4e9df6f3d5667f2a8029deff42cef5459072c295f343d73a99f43b76eaeb5432b8367e69f42d5aac7f1b2f57
diff --git a/PKGBUILD b/PKGBUILD
index bea5e36e0e93..f6b2c14b9a42 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -3,47 +3,49 @@
 # Contributor: Ner0 <darkelfdarkelf666@yahoo.co.uk>
 
 pkgname=pantheon-workarounds
-pkgver=r1158.5898845
+pkgver=3.2.0.r73.gc49189b
+#pkgver=r1158.5898845
 pkgrel=1
 pkgdesc='Workarounds for Pantheon derivatives'
 arch=('any')
 url='https://github.com/quequotion/pantheon-bzr-qq'
 license=('GPL3')
 groups=('pantheon-qq')
-depends=(gnome-settings-daemon-{elementary,compat})
-optdepends=("pantheon-qq-default-settings-git: Pantheon configuration and themeing for Pantheon derivatives"
-            "contractor-git: A desktop-wide extension service"
-            "pantheon-print-git: Print settings dialog"
-            "pantheon-polkit-agent-git: Polkit Authentication Agent"
+depends=(cinnamon-settings-daemon
+         dconf gnome-{keyring,session} xdg-user-dirs-gtk
+         pantheon-applications-menu plank wingpanel)
+optdepends=("contractor: A desktop-wide extension service"
+            "numlockx: Turn on the numlock key in X11"
+            "pantheon-dpms-helper: Manage DPMS settigns in place of gnome-settings-daemon"
+            "pantheon-default-settings: Pantheon configuration and themeing"
             "pantheon-geoclue2-agent-git: Pantheon Geoclue2 Agent"
-            "xscreensaver-dbus-screenlock: xscreensaver locker for gnome-derivative desktops"
-            "numlockx: Turn on the numlock key in X11")
+            "pantheon-polkit-agent: Polkit Authentication Agent"
+            "pantheon-print: Print settings dialog"
+            "pantheon-screenshot: Screenshot utility"
+            "pantheon-shortcut-overlay: OS-wide shortcut overlay"
+            "simple-scan: Simple scan utility"
+            "switchboard: Pluggable settings manager"
+            "xscreensaver-dbus-screenlock: xscreensaver locker for gnome-derivative desktops")
 makedepends=('git' 'intltool')
 provides=(gala{,-bzr,-git}="${pkgver}")
 conflicts=(gala{,-bzr,-git})
 install='gala.install'
 source=("https://raw.githubusercontent.com/elementary/gala/master/data/org.pantheon.desktop.gala.gschema.xml.in"
         'pantheon-session-qq'
-        'gnome-fallback-media-keys-helper-pantheon.desktop'
-        'gnome-fallback-background-helper-pantheon.desktop'
-        'gnome-fallback-mount-helper-pantheon.desktop'
         'numlockx-pantheon.desktop'
         'gtk.css'
         'settings.ini')
 sha512sums=('30a488431a23ff5521a12e97fa69ed17b2033ba8f016bb922e07ad9bf2d671e14a90a38266de1567c4dcbf178b6919a8108fad3dd13e50573018dc2a8e9b070e'
             '842db1b456c96287865955741ba00c3ceeecf82691700f691d9fc45dc665230f1224ce7cdf5a1301826ab96cfe59e922c3878a5986ab3639da0cb79a2948f727'
-            'b01a18bb7829eb7a48b72c90bdf5aa5913c24247426e0bfc509cba22f49d2d8c9eb301e1937b70f3f7f01a873c987e0bdea6dd5f24f8d900b952188fa5635d39'
-            '0df6355d85d2329e245593408a74d09281c0dcea206ed594a7312b78db4d3cd57941a5ec29be780f965128fe512532edae85ffaf11a94b57374d5906875967fc'
-            'c06e3b8c59681ebe64fa0dd724eea1d40a579956372ce0851f30ededdda3ac41d329d40e5463bd779daba0d55853faec357203b042a4de3d601eafc8b09c350e'
             'bc5724ef255adad39e35e3fbd7beacbd3ea270c7019362ff6a8bc15cf8f503a4304c18c5e35ae2a6ddb8d1e6e7cc6973642a2ffdc8fe9e219c7f2dbacf5eab72'
             'ee75dfaa7d887dbfe0c74b7fb6005d5aafbce22fa00b3b476b3c88628a9f786cfd3410237a2b22ca135ea85759b45b59068e5d00650f65449a19ae222e957784'
             '90b0927892e708b601542f317af52f42174bdcbb4e9df6f3d5667f2a8029deff42cef5459072c295f343d73a99f43b76eaeb5432b8367e69f42d5aac7f1b2f57')
 
 pkgver() {
   cd "${srcdir}"
-  git clone -n "https://github.com/elementary/gala.git"
-  cd "${srcdir}/gala"
-  echo "r$(git rev-list --count HEAD).$(git rev-parse --short HEAD)"
+  git clone -n --quiet "https://github.com/elementary/gala.git"
+  cd "gala"
+  git describe --long --tags | sed 's/\([^-]*-g\)/r\1/;s/-/./g'
 }
 
 prepare() {
@@ -53,16 +55,17 @@ prepare() {
 }
 
 package() {
+  #Gala's dconf satisfies runtime dependencies in switchboard (plugs), etc.
   install -Dm644 {"${srcdir}","${pkgdir}"/usr/share/glib-2.0/schemas}/org.pantheon.desktop.gala.gschema.xml
 
-  #Old-school
-  install -Dm644 {"${srcdir}","${pkgdir}"/etc/xdg/autostart}/gnome-fallback-media-keys-helper-pantheon.desktop
-  install -Dm644 {"${srcdir}","${pkgdir}"/etc/xdg/autostart}/gnome-fallback-background-helper-pantheon.desktop
-  install -Dm644 {"${srcdir}","${pkgdir}"/etc/xdg/autostart}/gnome-fallback-mount-helper-pantheon.desktop
-
   #numlockx
   install -Dm644 {"${srcdir}","${pkgdir}"/etc/xdg/autostart}/numlockx-pantheon.desktop
 
   #Script to initiate Pantheon derivative gnome-sessions
   install -Dm755 {"${srcdir}","${pkgdir}"/usr/bin}/pantheon-session-qq
+
+  #Use cinnamon-settings-daemon (gnome-settings-daemon has deprecated modularity and xorg)
+  for i in /etc/xdg/autostart/cinnamon-settings-daemon-*.desktop; do
+    sed s/X-Cinnamon/Pantheon/ "${i}" > "${pkgdir}${i/.desktop/-pantheon.desktop}"
+  done
 }
diff --git a/gnome-fallback-background-helper-pantheon.desktop b/gnome-fallback-background-helper-pantheon.desktop
deleted file mode 100644
index bc534df5ea98..000000000000
--- a/gnome-fallback-background-helper-pantheon.desktop
+++ /dev/null
@@ -1,10 +0,0 @@
-[Desktop Entry]
-Name=Desktop Background
-Exec=/usr/lib/gnome-settings-daemon/gnome-fallback-background-helper
-Icon=multimedia
-Terminal=false
-Type=Application
-Categories=
-NoDisplay=true
-OnlyShowIn=Pantheon;
-X-GNOME-Autostart-Notify=true
diff --git a/gnome-fallback-media-keys-helper-pantheon.desktop b/gnome-fallback-media-keys-helper-pantheon.desktop
deleted file mode 100644
index c476e57a66a7..000000000000
--- a/gnome-fallback-media-keys-helper-pantheon.desktop
+++ /dev/null
@@ -1,10 +0,0 @@
-[Desktop Entry]
-Name=Media keys
-Exec=/usr/lib/gnome-settings-daemon/gnome-fallback-media-keys-helper
-Icon=multimedia
-Terminal=false
-Type=Application
-Categories=
-NoDisplay=true
-OnlyShowIn=Pantheon;
-X-GNOME-Autostart-Notify=true
diff --git a/gnome-fallback-mount-helper-pantheon.desktop b/gnome-fallback-mount-helper-pantheon.desktop
deleted file mode 100644
index 5ddb955bf147..000000000000
--- a/gnome-fallback-mount-helper-pantheon.desktop
+++ /dev/null
@@ -1,10 +0,0 @@
-[Desktop Entry]
-Name=Auto-mount
-Exec=/usr/lib/gnome-settings-daemon/gnome-fallback-mount-helper
-Icon=multimedia
-Terminal=false
-Type=Application
-Categories=
-NoDisplay=true
-OnlyShowIn=Pantheon;
-X-GNOME-Autostart-Notify=true