[arch-commits] Commit in xfce4-session/trunk (3 files)
Date: Tuesday, January 8, 2019 @ 06:44:17
Author: foutrelis
Revision: 343102
upgpkg: xfce4-session 4.12.1-11
- Remove DBUS_SESSION_BUS_ADDRESS patch (unneeded since systemd 240.0-2).
- Rename "source system xinitrc scripts" patch.
Added:
xfce4-session/trunk/0003-source-system-xinitrc-scripts.patch
(from rev 343101,
xfce4-session/trunk/0003-xfce4-session-source-system-xinitrc-scripts.patch)
Modified:
xfce4-session/trunk/PKGBUILD
Deleted:
xfce4-session/trunk/0003-xfce4-session-source-system-xinitrc-scripts.patch
+
0003-source-system-xinitrc-scripts.patch | 18 +++
0003-xfce4-session-source-system-xinitrc-scripts.patch | 18 ---
PKGBUILD | 15 ++--
3 files changed, 21 insertions(+), 30 deletions(-)
Copied: xfce4-session/trunk/0003-source-system-xinitrc-scripts.patch (from rev
343101,
xfce4-session/trunk/0003-xfce4-session-source-system-xinitrc-scripts.patch)
===
--- 0003-source-system-xinitrc-scripts.patch(rev 0)
+++ 0003-source-system-xinitrc-scripts.patch2019-01-08 06:44:17 UTC (rev
343102)
@@ -0,0 +1,18 @@
+diff -upr xfce4-session-4.12.1.orig/scripts/xinitrc.in.in
xfce4-session-4.12.1/scripts/xinitrc.in.in
+--- xfce4-session-4.12.1.orig/scripts/xinitrc.in.in2015-03-16
09:29:52.0 +0200
xfce4-session-4.12.1/scripts/xinitrc.in.in 2017-03-03 04:11:03.591724694
+0200
+@@ -87,6 +87,14 @@ cat /dev/null $XRESOURCES | xrdb -nocpp
+ # load local modmap
+ test -r $HOME/.Xmodmap && xmodmap $HOME/.Xmodmap
+
++# source system xinitrc scripts
++if [ -d /etc/X11/xinit/xinitrc.d ]; then
++for f in /etc/X11/xinit/xinitrc.d/?*.sh; do
++[ -x "$f" ] && . "$f"
++done
++unset f
++fi
++
+ # run xfce4-session if installed
+ if which xfce4-session >/dev/null 2>&1; then
+
Deleted: 0003-xfce4-session-source-system-xinitrc-scripts.patch
===
--- 0003-xfce4-session-source-system-xinitrc-scripts.patch 2019-01-08
06:42:29 UTC (rev 343101)
+++ 0003-xfce4-session-source-system-xinitrc-scripts.patch 2019-01-08
06:44:17 UTC (rev 343102)
@@ -1,18 +0,0 @@
-diff -upr xfce4-session-4.12.1.orig/scripts/xinitrc.in.in
xfce4-session-4.12.1/scripts/xinitrc.in.in
xfce4-session-4.12.1.orig/scripts/xinitrc.in.in2015-03-16
09:29:52.0 +0200
-+++ xfce4-session-4.12.1/scripts/xinitrc.in.in 2017-03-03 04:11:03.591724694
+0200
-@@ -87,6 +87,14 @@ cat /dev/null $XRESOURCES | xrdb -nocpp
- # load local modmap
- test -r $HOME/.Xmodmap && xmodmap $HOME/.Xmodmap
-
-+# source system xinitrc scripts
-+if [ -d /etc/X11/xinit/xinitrc.d ]; then
-+for f in /etc/X11/xinit/xinitrc.d/?*.sh; do
-+[ -x "$f" ] && . "$f"
-+done
-+unset f
-+fi
-+
- # run xfce4-session if installed
- if which xfce4-session >/dev/null 2>&1; then
-
Modified: PKGBUILD
===
--- PKGBUILD2019-01-08 06:42:29 UTC (rev 343101)
+++ PKGBUILD2019-01-08 06:44:17 UTC (rev 343102)
@@ -3,7 +3,7 @@
pkgname=xfce4-session
pkgver=4.12.1
-pkgrel=10
+pkgrel=11
pkgdesc="A session manager for Xfce"
arch=('x86_64')
url="http://www.xfce.org/;
@@ -21,9 +21,8 @@
source=(https://archive.xfce.org/src/xfce/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.bz2
0001-Pass-VT-number-to-xinit-if-XDG_VTNR-is-set.patch
0002-Make-verbose-logging-conditional-Bug-11698.patch
-0003-xfce4-session-source-system-xinitrc-scripts.patch
+0003-source-system-xinitrc-scripts.patch
0004-screenlockers.patch
-0005-dbus-user-session.patch
xfce-polkit-gnome-authentication-agent-1.desktop)
sha256sums=('97d7f2a2d0af7f3623b68d1f04091e02913b28f9555dab8b0d26c8a1299d08fd'
'7ea702a1d3391d36958cff57496ba2474592dd915cf7569a65501522c2410cf1'
@@ -30,7 +29,6 @@
'6bbd714008f31198f9631cdfb3ed8aac1c780f00d15b81c32c00860ae37521a6'
'a717a0ee6289c9ce06a8e18c6a7cb5a6d6f1769c05c456a6a84843df6a0111da'
'1d4063889af073c3de221e0bbd3cacc11dfc95ee11f6e530c6e35f7714a6e295'
-'cb9d9f2adf9748760fb24412b16d84b13ff29e2601d29f3a4ebb4eb7bcb27c24'
'74c94c5f7893d714e04ec7d8b8520c978a5748757a0cdcf5128492f09f31b643')
prepare() {
@@ -43,18 +41,11 @@
patch -Np1 -i ../0002-Make-verbose-logging-conditional-Bug-11698.patch
# https://bugzilla.xfce.org/show_bug.cgi?id=12754
- patch -Np1 -i ../0003-xfce4-session-source-system-xinitrc-scripts.patch
+ patch -Np1 -i ../0003-source-system-xinitrc-scripts.patch
#
https://git.xfce.org/xfce/xfce4-session/commit/?id=e940818853582290af21bf38d73ee26143d500ad
#
https://git.xfce.org/xfce/xfce4-session/commit/?id=495aac78058cd78e2d34505af204e72a1b4f19ac
patch -Np1 -i ../0004-screenlockers.patch
-
[arch-commits] Commit in xfce4-session/trunk (3 files)
Date: Sunday, December 30, 2018 @ 03:29:42
Author: foutrelis
Revision: 342790
upgpkg: xfce4-session 4.12.1-10
Follow-up workaround for FS#61177. Leaving DBUS_SESSION_BUS_ADDRESS unset
prevents Chromium from connecting to the user bus and decrypting cookies:
ERROR:bus.cc(396)] Failed to connect to the bus: Could not parse server
address: Unknown address type (examples of valid types are "tcp" and on
UNIX "unix")
Added:
xfce4-session/trunk/0005-dbus-user-session.patch
Modified:
xfce4-session/trunk/PKGBUILD
Deleted:
xfce4-session/trunk/0005-dbus-launch.patch
--+
0005-dbus-launch.patch | 15 ---
0005-dbus-user-session.patch | 18 ++
PKGBUILD | 15 +--
3 files changed, 27 insertions(+), 21 deletions(-)
Deleted: 0005-dbus-launch.patch
===
--- 0005-dbus-launch.patch 2018-12-29 23:09:57 UTC (rev 342789)
+++ 0005-dbus-launch.patch 2018-12-30 03:29:42 UTC (rev 342790)
@@ -1,15 +0,0 @@
-diff --git a/xfce4-session/main.c b/xfce4-session/main.c
-index 0c27a55..925069f 100644
a/xfce4-session/main.c
-+++ b/xfce4-session/main.c
-@@ -243,8 +243,10 @@ main (int argc, char **argv)
- XfsmShutdown *shutdown_helper;
- gboolean succeed = TRUE;
-
-+#if 0
- if (!xfsm_dbus_require_session (argc, argv))
- return EXIT_SUCCESS;
-+#endif
-
- xfce_textdomain (GETTEXT_PACKAGE, PACKAGE_LOCALE_DIR, "UTF-8");
-
Added: 0005-dbus-user-session.patch
===
--- 0005-dbus-user-session.patch(rev 0)
+++ 0005-dbus-user-session.patch2018-12-30 03:29:42 UTC (rev 342790)
@@ -0,0 +1,18 @@
+diff -upr xfce4-session-4.12.1.orig/scripts/xinitrc.in.in
xfce4-session-4.12.1/scripts/xinitrc.in.in
+--- xfce4-session-4.12.1.orig/scripts/xinitrc.in.in2018-12-30
05:05:04.201829621 +0200
xfce4-session-4.12.1/scripts/xinitrc.in.in 2018-12-30 05:08:45.200127486
+0200
+@@ -95,6 +95,14 @@ if [ -d /etc/X11/xinit/xinitrc.d ]; then
+ unset f
+ fi
+
++# unless DBUS_SESSION_BUS_ADDRESS is set elsewhere
++if [ -z "$DBUS_SESSION_BUS_ADDRESS" ]; then
++# use the user session bus if available
++if [ -S "$XDG_RUNTIME_DIR/bus" -a -O "$XDG_RUNTIME_DIR/bus" ]; then
++export DBUS_SESSION_BUS_ADDRESS="unix:path=$XDG_RUNTIME_DIR/bus"
++fi
++fi
++
+ # run xfce4-session if installed
+ if which xfce4-session >/dev/null 2>&1; then
+
Modified: PKGBUILD
===
--- PKGBUILD2018-12-29 23:09:57 UTC (rev 342789)
+++ PKGBUILD2018-12-30 03:29:42 UTC (rev 342790)
@@ -3,7 +3,7 @@
pkgname=xfce4-session
pkgver=4.12.1
-pkgrel=9
+pkgrel=10
pkgdesc="A session manager for Xfce"
arch=('x86_64')
url="http://www.xfce.org/;
@@ -22,8 +22,8 @@
0001-Pass-VT-number-to-xinit-if-XDG_VTNR-is-set.patch
0002-Make-verbose-logging-conditional-Bug-11698.patch
0003-xfce4-session-source-system-xinitrc-scripts.patch
-0004-screenlockers.patch
-0005-dbus-launch.patch
+0004-screenlockers.patch
+0005-dbus-user-session.patch
xfce-polkit-gnome-authentication-agent-1.desktop)
sha256sums=('97d7f2a2d0af7f3623b68d1f04091e02913b28f9555dab8b0d26c8a1299d08fd'
'7ea702a1d3391d36958cff57496ba2474592dd915cf7569a65501522c2410cf1'
@@ -30,7 +30,7 @@
'6bbd714008f31198f9631cdfb3ed8aac1c780f00d15b81c32c00860ae37521a6'
'a717a0ee6289c9ce06a8e18c6a7cb5a6d6f1769c05c456a6a84843df6a0111da'
'1d4063889af073c3de221e0bbd3cacc11dfc95ee11f6e530c6e35f7714a6e295'
-'842258be04687cd0da898eb0d8a9629ec444e9151fede50b0c18e7f61e54'
+'cb9d9f2adf9748760fb24412b16d84b13ff29e2601d29f3a4ebb4eb7bcb27c24'
'74c94c5f7893d714e04ec7d8b8520c978a5748757a0cdcf5128492f09f31b643')
prepare() {
@@ -49,9 +49,12 @@
#
https://git.xfce.org/xfce/xfce4-session/commit/?id=495aac78058cd78e2d34505af204e72a1b4f19ac
patch -Np1 -i ../0004-screenlockers.patch
- # not not start dbus-session but fall back to socket
+ # The idea of having a magic fallback for when DBUS_SESSION_BUS_ADDRESS is
+ # empty is nice and all but all hell breaks lose (Xfce doesn't start and/or
+ # Chromium can't access its cookies). Magic is bad; just set the silly var!
+ # (It feels like this should be a script under /etc/X11/xinit/xinitrc.d/.)
# https://bugs.archlinux.org/task/61177
- patch -Np1 -i ../0005-dbus-launch.patch
+ patch -Np1 -i ../0005-dbus-user-session.patch
}
build() {
[arch-commits] Commit in xfce4-session/trunk (3 files)
Date: Monday, April 29, 2013 @ 07:42:36
Author: foutrelis
Revision: 183870
upgpkg: xfce4-session 4.10.0-7
Add upstream fixes to avoid crashes with glib 2.36.
Added:
xfce4-session/trunk/xfce4-session-4.10.0-store-the-watch-function-id.patch
xfce4-session/trunk/xfce4-session-4.10.0-use-the-async-spawn-function-of-glib.patch
Modified:
xfce4-session/trunk/PKGBUILD
-+
PKGBUILD| 22 ++
xfce4-session-4.10.0-store-the-watch-function-id.patch | 26 +++
xfce4-session-4.10.0-use-the-async-spawn-function-of-glib.patch | 79
++
3 files changed, 123 insertions(+), 4 deletions(-)
Modified: PKGBUILD
===
--- PKGBUILD2013-04-28 21:05:12 UTC (rev 183869)
+++ PKGBUILD2013-04-29 05:42:36 UTC (rev 183870)
@@ -4,7 +4,7 @@
pkgname=xfce4-session
pkgver=4.10.0
-pkgrel=6
+pkgrel=7
pkgdesc=A session manager for Xfce
arch=('i686' 'x86_64')
url=http://www.xfce.org/;
@@ -21,18 +21,32 @@
options=('!libtool')
install=$pkgname.install
source=(http://archive.xfce.org/src/xfce/$pkgname/4.10/$pkgname-$pkgver.tar.bz2
-xfce4-session-4.10.0-add-systemd-support.patch)
+xfce4-session-4.10.0-add-systemd-support.patch
+xfce4-session-4.10.0-use-the-async-spawn-function-of-glib.patch
+xfce4-session-4.10.0-store-the-watch-function-id.patch)
sha256sums=('bb8aa9a74c3d382840596fb4875144d66c7f3f47c8e9ee81d31e3428a72c46ce'
-'ffae61c48a4bd0cb51d422cb93f2de9567abaf29085370c455ef349b6a10234b')
+'ffae61c48a4bd0cb51d422cb93f2de9567abaf29085370c455ef349b6a10234b'
+'18ed175dd4242e39161a093045c6c6aebf9a408350652bde1454fe07411cdf3c'
+'5eb5319a38f58a2d518d0e3d24b6d01c487871711fb36b55cb03a10a4591cdcf')
-build() {
+prepare() {
cd $srcdir/$pkgname-$pkgver
# https://bugzilla.xfce.org/show_bug.cgi?id=8729
patch -Np1 -i $srcdir/xfce4-session-4.10.0-add-systemd-support.patch
+ # https://bugzilla.xfce.org/show_bug.cgi?id=9709
+ patch -Np1 -i
$srcdir/xfce4-session-4.10.0-use-the-async-spawn-function-of-glib.patch
+ patch -Np1 -i
$srcdir/xfce4-session-4.10.0-store-the-watch-function-id.patch
+
+ sed -i 's/AM_CONFIG_HEADER/AC_CONFIG_HEADERS/' configure.in
+
xdt-autogen
+}
+build() {
+ cd $srcdir/$pkgname-$pkgver
+
./configure \
--prefix=/usr \
--sysconfdir=/etc \
Added: xfce4-session-4.10.0-store-the-watch-function-id.patch
===
--- xfce4-session-4.10.0-store-the-watch-function-id.patch
(rev 0)
+++ xfce4-session-4.10.0-store-the-watch-function-id.patch 2013-04-29
05:42:36 UTC (rev 183870)
@@ -0,0 +1,26 @@
+From ab391138cacc62ab184a338e237c4430356b41f9 Mon Sep 17 00:00:00 2001
+From: Nick Schermer n...@xfce.org
+Date: Fri, 26 Apr 2013 18:05:10 +
+Subject: Store the watch function id to avoid possible double free (bug #9709).
+
+---
+diff --git a/xfce4-session/xfsm-startup.c b/xfce4-session/xfsm-startup.c
+index e43c53c..c621397 100644
+--- a/xfce4-session/xfsm-startup.c
b/xfce4-session/xfsm-startup.c
+@@ -903,9 +903,10 @@ xfsm_startup_start_properties (XfsmProperties *properties,
+ child_watch_data = g_new0 (XfsmStartupData, 1);
+ child_watch_data-manager = g_object_ref (manager);
+ child_watch_data-properties = properties;
+- g_child_watch_add_full (G_PRIORITY_LOW, properties-pid,
+- xfsm_startup_child_watch, child_watch_data,
+- (GDestroyNotify) xfsm_startup_data_free);
++ child_watch_data-properties-child_watch_id =
++ g_child_watch_add_full (G_PRIORITY_LOW, properties-pid,
++ xfsm_startup_child_watch, child_watch_data,
++ (GDestroyNotify) xfsm_startup_data_free);
+
+ /* set a timeout -- client must register in a a certain amount of time
+* or it's assumed to be broken/have issues. */
+--
+cgit v0.9.1
Added: xfce4-session-4.10.0-use-the-async-spawn-function-of-glib.patch
===
--- xfce4-session-4.10.0-use-the-async-spawn-function-of-glib.patch
(rev 0)
+++ xfce4-session-4.10.0-use-the-async-spawn-function-of-glib.patch
2013-04-29 05:42:36 UTC (rev 183870)
@@ -0,0 +1,79 @@
+From dee0200fa5dc4de064f288281ddd13199ba7fcde Mon Sep 17 00:00:00 2001
+From: Nick Schermer n...@xfce.org
+Date: Fri, 26 Apr 2013 17:46:29 +
+Subject: Use the async spawn function of glib.
+
+---
+diff --git a/xfce4-session/xfsm-startup.c b/xfce4-session/xfsm-startup.c
+index 911eec6..e43c53c 100644
+--- a/xfce4-session/xfsm-startup.c
b/xfce4-session/xfsm-startup.c
+@@ -864,6 +864,7 @@ xfsm_startup_start_properties (XfsmProperties *properties,
+ gint n;
+ const gchar *current_directory;
+
[arch-commits] Commit in xfce4-session/trunk (3 files)
Date: Wednesday, November 2, 2011 @ 11:10:28
Author: foutrelis
Revision: 141721
upgpkg: xfce4-session 4.8.2-2
Remove .pkla files; shutdown/suspend/etc should continue to work for people
with correct ConsoleKit sessions.
Modified:
xfce4-session/trunk/PKGBUILD
Deleted:
xfce4-session/trunk/org.freedesktop.consolekit.pkla
xfce4-session/trunk/org.freedesktop.upower.pkla
-+
PKGBUILD| 21 +++--
org.freedesktop.consolekit.pkla | 31 ---
org.freedesktop.upower.pkla | 15 ---
3 files changed, 3 insertions(+), 64 deletions(-)
Modified: PKGBUILD
===
--- PKGBUILD2011-11-02 15:09:38 UTC (rev 141720)
+++ PKGBUILD2011-11-02 15:10:28 UTC (rev 141721)
@@ -4,7 +4,7 @@
pkgname=xfce4-session
pkgver=4.8.2
-pkgrel=1
+pkgrel=2
pkgdesc=A session manager for Xfce
arch=('i686' 'x86_64')
url=http://www.xfce.org/;
@@ -17,16 +17,10 @@
makedepends=('intltool')
optdepends=('fortune-mod: for xfce4-tips')
replaces=('xfce4-toys')
-backup=(etc/polkit-1/localauthority/50-local.d/org.freedesktop.consolekit.pkla
-etc/polkit-1/localauthority/50-local.d/org.freedesktop.upower.pkla)
options=('!libtool')
install=$pkgname.install
-source=(http://archive.xfce.org/src/xfce/$pkgname/4.8/$pkgname-$pkgver.tar.bz2
-org.freedesktop.consolekit.pkla
-org.freedesktop.upower.pkla)
-sha1sums=('636c2983552861a959225e554898675152a4d812'
- '378eb741d4cf31a721dd37d15196cff7dc7cd064'
- '2f2f70824ebaf61554754b8ec2e995646e4a97c2')
+source=(http://archive.xfce.org/src/xfce/$pkgname/4.8/$pkgname-$pkgver.tar.bz2)
+sha256sums=('31bca2a559e05a8a859f150394a901517e5842414ef171a85c5da234e344c0d0')
build() {
cd $srcdir/$pkgname-$pkgver
@@ -50,16 +44,7 @@
package() {
cd $srcdir/$pkgname-$pkgver
-
make DESTDIR=$pkgdir install
-
- # install polkit/consolekit permission file needed for usage without a
- # display manager
- install -dm700 $pkgdir/etc/polkit-1/localauthority
- install -d $pkgdir/etc/polkit-1/localauthority/50-local.d
- install -m644 -t $pkgdir/etc/polkit-1/localauthority/50-local.d/ \
-$srcdir/org.freedesktop.{consolekit,upower}.pkla
}
-
# vim:set ts=2 sw=2 et:
Deleted: org.freedesktop.consolekit.pkla
===
--- org.freedesktop.consolekit.pkla 2011-11-02 15:09:38 UTC (rev 141720)
+++ org.freedesktop.consolekit.pkla 2011-11-02 15:10:28 UTC (rev 141721)
@@ -1,31 +0,0 @@
-[Local restart]
-#Identity=unix-user: your_username
-Identity=unix-group:power
-Action=org.freedesktop.consolekit.system.restart
-ResultAny=yes
-ResultInactive=no
-ResultActive=yes
-
-[Local shutdown]
-#Identity=unix-user: your_username
-Identity=unix-group:power
-Action=org.freedesktop.consolekit.system.stop
-ResultAny=yes
-ResultInactive=no
-ResultActive=yes
-
-[Local restart - multiple]
-#Identity=unix-user: your_username
-Identity=unix-group:power
-Action=org.freedesktop.consolekit.system.restart-multiple-users
-ResultAny=yes
-ResultInactive=no
-ResultActive=yes
-
-[Local shutdown - multiple]
-#Identity=unix-user: your_username
-Identity=unix-group:power
-Action=org.freedesktop.consolekit.system.stop-multiple-users
-ResultAny=yes
-ResultInactive=no
-ResultActive=yes
Deleted: org.freedesktop.upower.pkla
===
--- org.freedesktop.upower.pkla 2011-11-02 15:09:38 UTC (rev 141720)
+++ org.freedesktop.upower.pkla 2011-11-02 15:10:28 UTC (rev 141721)
@@ -1,15 +0,0 @@
-[Local hibernate]
-#Identity=unix-user: your_username
-Identity=unix-group:power
-Action=org.freedesktop.upower.hibernate
-ResultAny=yes
-ResultInactive=no
-ResultActive=yes
-
-[Local suspend]
-#Identity=unix-user: your_username
-Identity=unix-group:power
-Action=org.freedesktop.upower.suspend
-ResultAny=yes
-ResultInactive=no
-ResultActive=yes
[arch-commits] Commit in xfce4-session/trunk (3 files)
Date: Thursday, January 6, 2011 @ 16:29:10
Author: andyrtr
Revision: 105152
upgpkg: xfce4-session 4.7.3-2
add deps on upower +consolekit
Modified:
xfce4-session/trunk/PKGBUILD
xfce4-session/trunk/org.freedesktop.consolekit.pkla
xfce4-session/trunk/org.freedesktop.upower.pkla
-+
PKGBUILD| 10 ++
org.freedesktop.consolekit.pkla | 24
org.freedesktop.upower.pkla |8
3 files changed, 30 insertions(+), 12 deletions(-)
Modified: PKGBUILD
===
--- PKGBUILD2011-01-06 21:13:19 UTC (rev 105151)
+++ PKGBUILD2011-01-06 21:29:10 UTC (rev 105152)
@@ -4,13 +4,15 @@
pkgname=xfce4-session
pkgver=4.7.3
-pkgrel=1
+pkgrel=2
pkgdesc=A session manager for Xfce
arch=('i686' 'x86_64')
license=('GPL2')
url=http://www.xfce.org/;
groups=('xfce4')
-depends=('xfce4-panel' 'libwnck' 'xorg-iceauth' 'hicolor-icon-theme' ) # keep
xorg-server-utils for https://bugs.archlinux.org/task/21096 'xorg-server-utils'
+ # keep xorg-server-utils for https://bugs.archlinux.org/task/21096
'xorg-server-utils'
+ # upower and consolekit for reboot/shutdown/hibernate/suspend
+depends=('xfce4-panel' 'libwnck' 'xorg-iceauth' 'upower' 'consolekit'
'hicolor-icon-theme' )
makedepends=('pkgconfig' 'intltool')
optdepends=('fortune-mod: for xfce4-tips')
replaces=('xfce4-toys')
@@ -22,8 +24,8 @@
org.freedesktop.consolekit.pkla
org.freedesktop.upower.pkla)
md5sums=('ae6c98b4419cc4b651a7e68c4afdf432'
- '73e8925488386bbf38129ba3b960fce4'
- '75ccbdb1271cb7ff21f8a65e548f409f')
+ '2e2519950d8c591dc9440ed8957a49ed'
+ '5fa270637b5e685f033863d8664795a2')
build() {
cd ${srcdir}/${pkgname}-${pkgver}
Modified: org.freedesktop.consolekit.pkla
===
--- org.freedesktop.consolekit.pkla 2011-01-06 21:13:19 UTC (rev 105151)
+++ org.freedesktop.consolekit.pkla 2011-01-06 21:29:10 UTC (rev 105152)
@@ -1,15 +1,31 @@
[Local restart]
-Identity=unix-user:
-#Identity=unix-group:
+#Identity=unix-user: your_username
+Identity=unix-group:power
Action=org.freedesktop.consolekit.system.restart
ResultAny=yes
ResultInactive=no
ResultActive=yes
[Local shutdown]
-Identity=unix-user:
-#Identity=unix-group:
+#Identity=unix-user: your_username
+Identity=unix-group:power
Action=org.freedesktop.consolekit.system.stop
ResultAny=yes
ResultInactive=no
ResultActive=yes
+
+[Local restart - multiple]
+#Identity=unix-user: your_username
+Identity=unix-group:power
+Action=org.freedesktop.consolekit.system.restart-multiple-users
+ResultAny=yes
+ResultInactive=no
+ResultActive=yes
+
+[Local shutdown - multiple]
+#Identity=unix-user: your_username
+Identity=unix-group:power
+Action=org.freedesktop.consolekit.system.stop-multiple-users
+ResultAny=yes
+ResultInactive=no
+ResultActive=yes
Modified: org.freedesktop.upower.pkla
===
--- org.freedesktop.upower.pkla 2011-01-06 21:13:19 UTC (rev 105151)
+++ org.freedesktop.upower.pkla 2011-01-06 21:29:10 UTC (rev 105152)
@@ -1,14 +1,14 @@
[Local hibernate]
-Identity=unix-user:
-#Identity=unix-group:
+#Identity=unix-user: your_username
+Identity=unix-group:power
Action=org.freedesktop.upower.hibernate
ResultAny=yes
ResultInactive=no
ResultActive=yes
[Local suspend]
-Identity=unix-user:
-#Identity=unix-group:
+#Identity=unix-user: your_username
+Identity=unix-group:power
Action=org.freedesktop.upower.suspend
ResultAny=yes
ResultInactive=no
[arch-commits] Commit in xfce4-session/trunk (3 files)
Date: Tuesday, January 4, 2011 @ 13:49:02
Author: andyrtr
Revision: 104678
upgpkg: xfce4-session 4.7.3-1
new upstream release - part of Xfce 4.8pre3 release candidate
Added:
xfce4-session/trunk/org.freedesktop.consolekit.pkla
xfce4-session/trunk/org.freedesktop.upower.pkla
Modified:
xfce4-session/trunk/PKGBUILD
-+
PKGBUILD| 52 --
org.freedesktop.consolekit.pkla | 15 ++
org.freedesktop.upower.pkla | 15 ++
3 files changed, 69 insertions(+), 13 deletions(-)
Modified: PKGBUILD
===
--- PKGBUILD2011-01-04 18:43:45 UTC (rev 104677)
+++ PKGBUILD2011-01-04 18:49:02 UTC (rev 104678)
@@ -3,32 +3,58 @@
# Contributor: tobias tobias funnychar archlinux.org
pkgname=xfce4-session
-pkgver=4.6.2
-pkgrel=2
+pkgver=4.7.3
+pkgrel=1
pkgdesc=A session manager for Xfce
-arch=(i686 x86_64)
+arch=('i686' 'x86_64')
license=('GPL2')
url=http://www.xfce.org/;
groups=('xfce4')
-depends=(libxfcegui4=4.6.4 'libwnck' 'xorg-server-utils'
'hicolor-icon-theme' ) # keep xorg-server-utils for
https://bugs.archlinux.org/task/21096
-makedepends=('pkgconfig' 'intltool' )
+depends=('xfce4-panel' 'libwnck' 'xorg-iceauth' 'hicolor-icon-theme' ) # keep
xorg-server-utils for https://bugs.archlinux.org/task/21096 'xorg-server-utils'
+makedepends=('pkgconfig' 'intltool')
optdepends=('fortune-mod: for xfce4-tips')
replaces=('xfce4-toys')
+backup=(etc/polkit-1/localauthority/50-local.d/org.freedesktop.consolekit.pkla
+ etc/polkit-1/localauthority/50-local.d/org.freedesktop.upower.pkla)
options=('!libtool')
install=${pkgname}.install
-source=(http://archive.xfce.org/src/xfce/${pkgname}/4.6/${pkgname}-${pkgver}.tar.bz2)
-md5sums=('9d9890130e45e0e9476591ed9ba2c9d5')
+source=(http://archive.xfce.org/src/xfce/${pkgname}/4.7/${pkgname}-${pkgver}.tar.bz2
+ org.freedesktop.consolekit.pkla
+ org.freedesktop.upower.pkla)
+md5sums=('ae6c98b4419cc4b651a7e68c4afdf432'
+ '73e8925488386bbf38129ba3b960fce4'
+ '75ccbdb1271cb7ff21f8a65e548f409f')
build() {
cd ${srcdir}/${pkgname}-${pkgver}
- ./configure --prefix=/usr --sysconfdir=/etc --libexecdir=/usr/lib/xfce4 \
---localstatedir=/var --disable-static \
---enable-legacy-sm --disable-gnome --enable-session-screenshots \
---with-shutdown-style=auto || return 1
- make || return 1
+ # git fixes
+
+ ./configure --prefix=/usr \
+ --sysconfdir=/etc \
+ --libexecdir=/usr/lib/xfce4 \
+ --localstatedir=/var \
+ --disable-static \
+ --disable-hal \
+ --disable-gnome \
+ --disable-libgnome-keyring \
+ --disable-legacy-sm \
+ --enable-session-screenshots \
+ --enable-upower \
+ --enable-consolekit \
+ --enable-polkit \
+ --enable-panel-plugin \
+ --disable-debug
+ make
}
package() {
cd ${srcdir}/${pkgname}-${pkgver}
- make DESTDIR=${pkgdir} install || return 1
+ make DESTDIR=${pkgdir} install
+
+ # install polkit/consolekit permission file needed for usage without a
display manager
+ install -dm700 ${pkgdir}/etc/polkit-1/localauthority
+ install -dm755 ${pkgdir}/etc/polkit-1/localauthority/50-local.d
+ install -m644 ${srcdir}/org.freedesktop.consolekit.pkla
${pkgdir}/etc/polkit-1/localauthority/50-local.d/
+ install -m644 ${srcdir}/org.freedesktop.upower.pkla
${pkgdir}/etc/polkit-1/localauthority/50-local.d/
}
+
Added: org.freedesktop.consolekit.pkla
===
--- org.freedesktop.consolekit.pkla (rev 0)
+++ org.freedesktop.consolekit.pkla 2011-01-04 18:49:02 UTC (rev 104678)
@@ -0,0 +1,15 @@
+[Local restart]
+Identity=unix-user:
+#Identity=unix-group:
+Action=org.freedesktop.consolekit.system.restart
+ResultAny=yes
+ResultInactive=no
+ResultActive=yes
+
+[Local shutdown]
+Identity=unix-user:
+#Identity=unix-group:
+Action=org.freedesktop.consolekit.system.stop
+ResultAny=yes
+ResultInactive=no
+ResultActive=yes
Added: org.freedesktop.upower.pkla
===
--- org.freedesktop.upower.pkla (rev 0)
+++ org.freedesktop.upower.pkla 2011-01-04 18:49:02 UTC (rev 104678)
@@ -0,0 +1,15 @@
+[Local hibernate]
+Identity=unix-user:
+#Identity=unix-group:
+Action=org.freedesktop.upower.hibernate
+ResultAny=yes
+ResultInactive=no
+ResultActive=yes
+
+[Local suspend]
+Identity=unix-user:
+#Identity=unix-group:
+Action=org.freedesktop.upower.suspend
+ResultAny=yes
+ResultInactive=no
+ResultActive=yes
