summarylogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--.SRCINFO8
-rw-r--r--PKGBUILD15
-rw-r--r--gnome-flashback-xmonad.session2
-rw-r--r--gnome-session-x11@gnome-flashback-xmonad.target21
-rw-r--r--session.conf19
5 files changed, 33 insertions, 32 deletions
diff --git a/.SRCINFO b/.SRCINFO
index 6bb0eb15a30..ca8f94e846e 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,6 +1,6 @@
pkgbase = gnome-flashback-xmonad-nopanel
pkgdesc = XMonad support for Gnome Flashback
- pkgver = 0.1.0
+ pkgver = 0.2.0
pkgrel = 1
arch = any
license = GPL2
@@ -12,12 +12,12 @@ pkgbase = gnome-flashback-xmonad-nopanel
source = gnome-flashback-xmonad
source = gnome-flashback-xmonad.desktop
source = gnome-flashback-xmonad.session
- source = gnome-session-x11@gnome-flashback-xmonad.target
+ source = session.conf
source = xmonad.desktop
sha256sums = 55c410abe2b3743cda316de9bd4b520bc0cb06cf34fcdc98e56a07a534d3959e
sha256sums = 263b22e38d661991224460cfeeb83b3993f51d85e9fc02425ddde235167e0f74
- sha256sums = 038f3cf81d27c56c5f52d43d59c931a031c06cb78e2911b9daf4c2f86dee13e9
- sha256sums = 6ff49d3d4fbd6a10024a479cdcbace1a66632fb49976e501a5b244558d64ff2f
+ sha256sums = fdfe8bf784bd7f5806a693034f28702296c8a7cefab7f3e01af1a91c8d03bca2
+ sha256sums = 323c0f8b0c04d5580067816d2a23bf34c0818462181a7a08f29c4aba097ca111
sha256sums = c7260b897c32261f74c0b43e1094df405b661057180422b7913c8ac3fb7aafc0
pkgname = gnome-flashback-xmonad-nopanel
diff --git a/PKGBUILD b/PKGBUILD
index 6bddb9dd35f..f6000d4afd3 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,6 +1,9 @@
-# Maintainer: Yadav Gowda <yadav . gowda __at__ gmail . com>
+# Maintainer: Simon Reiser <me@sfxr.de>
+
+# Mostly based on https://github.com/Gekkio/gnome-session-xmonad/
+
pkgname=gnome-flashback-xmonad-nopanel
-pkgver=0.1.0
+pkgver=0.2.0
pkgrel=1
pkgdesc="XMonad support for Gnome Flashback"
arch=('any')
@@ -15,13 +18,13 @@ source=(
'gnome-flashback-xmonad'
'gnome-flashback-xmonad.desktop'
'gnome-flashback-xmonad.session'
- 'gnome-session-x11@gnome-flashback-xmonad.target'
+ 'session.conf'
'xmonad.desktop'
)
sha256sums=('55c410abe2b3743cda316de9bd4b520bc0cb06cf34fcdc98e56a07a534d3959e'
'263b22e38d661991224460cfeeb83b3993f51d85e9fc02425ddde235167e0f74'
- '038f3cf81d27c56c5f52d43d59c931a031c06cb78e2911b9daf4c2f86dee13e9'
- '6ff49d3d4fbd6a10024a479cdcbace1a66632fb49976e501a5b244558d64ff2f'
+ 'fdfe8bf784bd7f5806a693034f28702296c8a7cefab7f3e01af1a91c8d03bca2'
+ '323c0f8b0c04d5580067816d2a23bf34c0818462181a7a08f29c4aba097ca111'
'c7260b897c32261f74c0b43e1094df405b661057180422b7913c8ac3fb7aafc0')
package() {
@@ -31,7 +34,7 @@ package() {
'gnome-flashback-xmonad' /usr/lib/gnome-flashback 0755
'gnome-flashback-xmonad.desktop' /usr/share/xsessions 0644
'gnome-flashback-xmonad.session' /usr/share/gnome-session/sessions 0644
- 'gnome-session-x11@gnome-flashback-xmonad.target' /usr/lib/systemd/user 0644
+ 'session.conf' /usr/lib/systemd/user/gnome-session@gnome-flashback-xmonad.target.d 0644
'xmonad.desktop' /usr/share/applications 0644
)
for ((i=0; i < ${#fs[@]}; i+=3)); do
diff --git a/gnome-flashback-xmonad.session b/gnome-flashback-xmonad.session
index b9d092f3e1e..cdaed88e388 100644
--- a/gnome-flashback-xmonad.session
+++ b/gnome-flashback-xmonad.session
@@ -1,3 +1,3 @@
[GNOME Session]
Name=GNOME Flashback (XMonad)
-RequiredComponents=gnome-flashback;xmonad;org.gnome.SettingsDaemon.A11ySettings;org.gnome.SettingsDaemon.Color;org.gnome.SettingsDaemon.Datetime;org.gnome.SettingsDaemon.Housekeeping;org.gnome.SettingsDaemon.Keyboard;org.gnome.SettingsDaemon.MediaKeys;org.gnome.SettingsDaemon.Power;org.gnome.SettingsDaemon.PrintNotifications;org.gnome.SettingsDaemon.Rfkill;org.gnome.SettingsDaemon.ScreensaverProxy;org.gnome.SettingsDaemon.Sharing;org.gnome.SettingsDaemon.Smartcard;org.gnome.SettingsDaemon.Sound;org.gnome.SettingsDaemon.Wacom;org.gnome.SettingsDaemon.XSettings;
+RequiredComponents=gnome-flashback;xmonad;org.gnome.SettingsDaemon.A11ySettings;org.gnome.SettingsDaemon.Color;org.gnome.SettingsDaemon.Datetime;org.gnome.SettingsDaemon.Housekeeping;org.gnome.SettingsDaemon.Keyboard;org.gnome.SettingsDaemon.MediaKeys;org.gnome.SettingsDaemon.Power;org.gnome.SettingsDaemon.PrintNotifications;org.gnome.SettingsDaemon.Rfkill;org.gnome.SettingsDaemon.ScreensaverProxy;org.gnome.SettingsDaemon.Sharing;org.gnome.SettingsDaemon.Smartcard;org.gnome.SettingsDaemon.Sound;org.gnome.SettingsDaemon.UsbProtection;org.gnome.SettingsDaemon.Wacom;org.gnome.SettingsDaemon.XSettings;
diff --git a/gnome-session-x11@gnome-flashback-xmonad.target b/gnome-session-x11@gnome-flashback-xmonad.target
deleted file mode 100644
index c9601f42159..00000000000
--- a/gnome-session-x11@gnome-flashback-xmonad.target
+++ /dev/null
@@ -1,21 +0,0 @@
-[Unit]
-Description=GNOME Flashback Session
-OnFailure=gnome-session-failed.target
-OnFailureJobMode=replace
-DefaultDependencies=no
-RefuseManualStart=no
-
-Conflicts=shutdown.target gnome-session-shutdown.target
-PartOf=graphical-session.target
-
-# Pull in all X11-specific services the session might depend on
-Requires=gnome-session-x11-services.target
-
-BindsTo=gnome-session@.target
-After=gnome-session@.target
-
-BindsTo=gnome-flashback.target
-After=gnome-flashback.target
-
-BindsTo=gnome-session.target
-After=gnome-session.target
diff --git a/session.conf b/session.conf
new file mode 100644
index 00000000000..5840b191ca4
--- /dev/null
+++ b/session.conf
@@ -0,0 +1,19 @@
+[Unit]
+Wants=org.gnome.SettingsDaemon.A11ySettings.target
+Wants=org.gnome.SettingsDaemon.Color.target
+Wants=org.gnome.SettingsDaemon.Datetime.target
+Wants=org.gnome.SettingsDaemon.Housekeeping.target
+Wants=org.gnome.SettingsDaemon.Keyboard.target
+Wants=org.gnome.SettingsDaemon.MediaKeys.target
+Wants=org.gnome.SettingsDaemon.Power.target
+Wants=org.gnome.SettingsDaemon.PrintNotifications.target
+Wants=org.gnome.SettingsDaemon.Rfkill.target
+Wants=org.gnome.SettingsDaemon.ScreensaverProxy.target
+Wants=org.gnome.SettingsDaemon.Sharing.target
+Wants=org.gnome.SettingsDaemon.Smartcard.target
+Wants=org.gnome.SettingsDaemon.Sound.target
+Wants=org.gnome.SettingsDaemon.UsbProtection.target
+Wants=org.gnome.SettingsDaemon.Wacom.target
+Wants=org.gnome.SettingsDaemon.XSettings.target
+
+Requires=gnome-flashback.target