Depend on pantheon-session-git, remove pantheon-session workarounds

4 files changed, 43 insertions, 51 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 5332647db863..b24d862d59ae 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,8 +1,8 @@
 # Generated by mksrcinfo v8
-# Mon Dec 25 17:03:13 UTC 2017
+# Mon Jan  8 15:33:00 UTC 2018
 pkgbase = pantheon-workarounds
 	pkgdesc = Workarounds for modular and minimal Pantheon Desktop Environments
-	pkgver = 6
+	pkgver = 7
 	pkgrel = 1
 	url = https://launchpad.net/gala
 	install = gala.install
@@ -12,46 +12,36 @@ pkgbase = pantheon-workarounds
 	license = GPL3
 	makedepends = git
 	makedepends = intltool
-	depends = dconf
-	depends = gnome-keyring
 	depends = gnome-settings-daemon-elementary
 	depends = gnome-settings-daemon-compat
-	depends = gnome-session
-	depends = gnome-user-share
 	depends = polkit-gnome
-	depends = xdg-user-dirs-gtk
+	depends = pantheon-session-git
 	optdepends = pantheon-default-settings-git: Pantheon configuration and themeing
-	optdepends = contractor-git: Service for sharing data between apps
+	optdepends = contractor-git: A desktop-wide extension service
 	optdepends = pantheon-print-git: Print settings dialog
 	optdepends = pantheon-polkit-agent-git: Polkit Authentication Agent
 	optdepends = pantheon-geoclue2-agent-git: Pantheon Geoclue2 Agent
-	optdepends = pantheon-dpms-helper-git: Script and settings for X DPMS
 	optdepends = xscreensaver-dbus-screenlock: xscreensaver locker for gnome-derivative desktops
-	provides = pantheon-session=r106.81b95c3
-	provides = pantheon-session-bzr=r106.81b95c3
-	provides = pantheon-session-git=r106.81b95c3
-	provides = gala=r1061.439fdf6
-	provides = gala-bzr=r1061.439fdf6
-	provides = gala-git=r1061.439fdf6
-	conflicts = pantheon-session
-	conflicts = pantheon-session-bzr
-	conflicts = pantheon-session-git
+	optdepends = numlockx: Turn on the numlock key in X11
+	provides = gala=
+	provides = gala-bzr=
+	provides = gala-git=
 	conflicts = gala
 	conflicts = gala-bzr
 	conflicts = gala-git
-	source = pantheon-session::git+https://github.com/elementary/session-settings#branch=meson
 	source = https://raw.githubusercontent.com/elementary/gala/master/data/org.pantheon.desktop.gala.gschema.xml.in
-	source = pantheon-session.sh
+	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 = xsessions-typo.patch
-	sha512sums = SKIP
 	sha512sums = 30a488431a23ff5521a12e97fa69ed17b2033ba8f016bb922e07ad9bf2d671e14a90a38266de1567c4dcbf178b6919a8108fad3dd13e50573018dc2a8e9b070e
-	sha512sums = b2630c31724675c247b7017eea0862c76ec80a9f46691b65bc7f76702a9cacda46d9350d3bddc05ee21ded154f4d8ab277d536439152972dca0764f28e62cb38
+	sha512sums = 2f7b9769c97ca79f61c4eaa0c894f6085e0183025de319d9045f771355f605f234ab53ff1e19d5afc42547b46a4c7b732444cd93b5b9ccc7d56588b72d2bebd9
 	sha512sums = b01a18bb7829eb7a48b72c90bdf5aa5913c24247426e0bfc509cba22f49d2d8c9eb301e1937b70f3f7f01a873c987e0bdea6dd5f24f8d900b952188fa5635d39
 	sha512sums = 0df6355d85d2329e245593408a74d09281c0dcea206ed594a7312b78db4d3cd57941a5ec29be780f965128fe512532edae85ffaf11a94b57374d5906875967fc
 	sha512sums = c06e3b8c59681ebe64fa0dd724eea1d40a579956372ce0851f30ededdda3ac41d329d40e5463bd779daba0d55853faec357203b042a4de3d601eafc8b09c350e
+	sha512sums = bc5724ef255adad39e35e3fbd7beacbd3ea270c7019362ff6a8bc15cf8f503a4304c18c5e35ae2a6ddb8d1e6e7cc6973642a2ffdc8fe9e219c7f2dbacf5eab72
 	sha512sums = 09248891b1f5dc41add3ded2150e564b86dc11eee4a695fa8eea11b51e040ca1daaa28701f791d681c88d8869821b7304e2d11eb771d439d13b708e893702108
 
 pkgname = pantheon-workarounds
diff --git a/PKGBUILD b/PKGBUILD
index 20196decf1e6..c4375aeed489 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -3,38 +3,38 @@
 # Contributor: Ner0 <darkelfdarkelf666@yahoo.co.uk>
 
 pkgname=pantheon-workarounds
-pkgver=6
+pkgver=7
 pkgrel=1
 pkgdesc='Workarounds for modular and minimal Pantheon Desktop Environments'
 arch=('i686' 'x86_64')
 url='https://launchpad.net/gala'
 license=('GPL3')
 groups=('pantheon-qq')
-depends=('dconf' gnome-{keyring,settings-daemon-{elementary,compat},session,user-share}
-         'polkit-gnome' 'xdg-user-dirs-gtk')
+depends=(gnome-settings-daemon-{elementary,compat}
+         'polkit-gnome' 'pantheon-session-git')
 optdepends=("pantheon-default-settings-git: Pantheon configuration and themeing"
-            "contractor-git: Service for sharing data between apps"
+            "contractor-git: A desktop-wide extension service"
             "pantheon-print-git: Print settings dialog"
             "pantheon-polkit-agent-git: Polkit Authentication Agent"
             "pantheon-geoclue2-agent-git: Pantheon Geoclue2 Agent"
-            "pantheon-dpms-helper-git: Script and settings for X DPMS"
-            "xscreensaver-dbus-screenlock: xscreensaver locker for gnome-derivative desktops")
+            "xscreensaver-dbus-screenlock: xscreensaver locker for gnome-derivative desktops"
+            "numlockx: Turn on the numlock key in X11")
 makedepends=('git' 'intltool')
-conflicts=(pantheon-session{,-bzr,-git} gala{,-bzr,-git})
+conflicts=(gala{,-bzr,-git})
 install='gala.install'
-source=("pantheon-session::git+https://github.com/elementary/session-settings#branch=meson"
-        "https://raw.githubusercontent.com/elementary/gala/master/data/org.pantheon.desktop.gala.gschema.xml.in"
-        'pantheon-session.sh'
+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'
         'xsessions-typo.patch')
-sha512sums=('SKIP'
-            '30a488431a23ff5521a12e97fa69ed17b2033ba8f016bb922e07ad9bf2d671e14a90a38266de1567c4dcbf178b6919a8108fad3dd13e50573018dc2a8e9b070e'
-            'b2630c31724675c247b7017eea0862c76ec80a9f46691b65bc7f76702a9cacda46d9350d3bddc05ee21ded154f4d8ab277d536439152972dca0764f28e62cb38'
+sha512sums=('30a488431a23ff5521a12e97fa69ed17b2033ba8f016bb922e07ad9bf2d671e14a90a38266de1567c4dcbf178b6919a8108fad3dd13e50573018dc2a8e9b070e'
+            '2f7b9769c97ca79f61c4eaa0c894f6085e0183025de319d9045f771355f605f234ab53ff1e19d5afc42547b46a4c7b732444cd93b5b9ccc7d56588b72d2bebd9'
             'b01a18bb7829eb7a48b72c90bdf5aa5913c24247426e0bfc509cba22f49d2d8c9eb301e1937b70f3f7f01a873c987e0bdea6dd5f24f8d900b952188fa5635d39'
             '0df6355d85d2329e245593408a74d09281c0dcea206ed594a7312b78db4d3cd57941a5ec29be780f965128fe512532edae85ffaf11a94b57374d5906875967fc'
             'c06e3b8c59681ebe64fa0dd724eea1d40a579956372ce0851f30ededdda3ac41d329d40e5463bd779daba0d55853faec357203b042a4de3d601eafc8b09c350e'
+            'bc5724ef255adad39e35e3fbd7beacbd3ea270c7019362ff6a8bc15cf8f503a4304c18c5e35ae2a6ddb8d1e6e7cc6973642a2ffdc8fe9e219c7f2dbacf5eab72'
             '09248891b1f5dc41add3ded2150e564b86dc11eee4a695fa8eea11b51e040ca1daaa28701f791d681c88d8869821b7304e2d11eb771d439d13b708e893702108')
 
 prepare() {
@@ -46,32 +46,23 @@ prepare() {
   cd "${srcdir}/gala"
   export pkgvergala="r$(git rev-list --count HEAD).$(git rev-parse --short HEAD)"
 
-
-  cd "${srcdir}/pantheon-session"
-  export pkgverpantheonsession="$(printf "r%s.%s" "$(git rev-list --count HEAD)" "$(git rev-parse --short HEAD)")"
-
-  patch -Np2 < ../xsessions-typo.patch
-
-  # This space reserved for pantheon-default-settings(-git)
+  # This space reserved for pantheon-default-settings-git
 }
 
-provides=(pantheon-session{,-bzr,-git}="${pkgverpantheonsession}" gala{,-bzr,-git}="${pkgvergala}")
+provides=(gala{,-bzr,-git}="${pkgvergala}")
 
 package() {
   install -Dm644 {"${srcdir}","${pkgdir}"/usr/share/glib-2.0/schemas}/org.pantheon.desktop.gala.gschema.xml
 
-  cd "${srcdir}"/pantheon-session
-  meson --prefix=/usr --datadir=share builddir
-  DESTDIR=$pkgdir ninja -C builddir install
-
-  #These may no longer be needed
+  #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
+  install -Dm644 {"${srcdir}","${pkgdir}"/etc/xdg/autostart}/numlockx-pantheon.desktop
 
-  # This space reserved for pantheon-default-settings-bzr
+  # This space reserved for pantheon-default-settings-git
 
   # gnome-session workaround
-  install -Dm755 "${srcdir}"/pantheon-session.sh "${pkgdir}"/usr/bin/pantheon-session
+  install -Dm755 {"${srcdir}","${pkgdir}"/usr/bin}/pantheon-session-qq
 }
 
diff --git a/numlockx-pantheon.desktop b/numlockx-pantheon.desktop
new file mode 100644
index 000000000000..7d9858abd4f3
--- /dev/null
+++ b/numlockx-pantheon.desktop
@@ -0,0 +1,11 @@
+[Desktop Entry]
+Name=numlockx
+Comment=Enable Numlock in X11
+Icon=xorg
+Exec=numlockx on
+Terminal=false
+Type=Application
+Categories=System
+NoDisplay=true
+OnlyShowIn=Pantheon;
+X-GNOME-Autostart-Phase=Initialization
diff --git a/pantheon-session.sh b/pantheon-session-qq
index 273b97d8ee0a..c5ad07fba7e8 100755
--- a/pantheon-session.sh
+++ b/pantheon-session-qq
@@ -1,6 +1,6 @@
 #!/bin/sh
 
-export XDG_CURRENT_DESKTOP=Pantheon
+export {XDG_{CURRENT,SESSION}_DESKTOP,DESKTOP_SESSION}=Pantheon
 if [ -n "$1" ]; then
   case $1 in
     lite) # Reduced resource usage with openbox in place of gala