[gentoo-commits] repo/gentoo:master commit in: xfce-base/xfce4-session/files/, xfce-base/xfce4-session/
commit: 737abb404f372b9ad7c28e3e8b6ec261f7df4f56
Author: Michał Górny gentoo org>
AuthorDate: Fri Mar 17 10:47:32 2023 +
Commit: Michał Górny gentoo org>
CommitDate: Fri Mar 17 10:50:16 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=737abb40
xfce-base/xfce4-session: Remove old
Signed-off-by: Michał Górny gentoo.org>
xfce-base/xfce4-session/Manifest | 2 -
...4-session-4.10.1-alock_support_to_xflock4.patch | 15 -
.../xfce4-session/xfce4-session-4.16.0.ebuild | 76 -
.../xfce4-session/xfce4-session-4.17.2.ebuild | 77 --
4 files changed, 170 deletions(-)
diff --git a/xfce-base/xfce4-session/Manifest b/xfce-base/xfce4-session/Manifest
index 778a263eb7dc..ff7fea36668d 100644
--- a/xfce-base/xfce4-session/Manifest
+++ b/xfce-base/xfce4-session/Manifest
@@ -1,4 +1,2 @@
-DIST xfce4-session-4.16.0.tar.bz2 875504 BLAKE2B
8e06e1ff378593b90c3c600bd5aabb3ea9ba9e58854ed615d39009595be4b71c5f77359e4249a93f44aa67795e2d4bf658b83d9c1d445304764eee655ed1f9e9
SHA512
fd74b24d0c2762b5a99883b62ca9447c3683e42e9e39193d0f60e02b8c1ad77a3dfff4df6f3b3c345d8ea3d4c4ef93485e9b5586862bab85d4b37110d3400fad
-DIST xfce4-session-4.17.2.tar.bz2 852648 BLAKE2B
be74ee215d687b2f01c39e73ece464544cfa7acfb687c1d6cf1d585f53be3cbc96f22271d5b6d35e572667370fc9a6f928878d5cb98c6b7dad53845e54a55ca2
SHA512
dab9b155f1e0368680a2e8429394baef2e2f4890cf7aa0cc4d7d0a01df8cee4605848b9aaae5073d9fa13df8f9a08a5f2311c834590f9d3c3909d17d446b123c
DIST xfce4-session-4.18.0.tar.bz2 853627 BLAKE2B
e2a4d2dfcdab677b738d2fc3857bb7db07a0918af5bd4977e0f04210d52d4fc94551187b0ff2e3b5289823aeba0e12dc00344043da0fed2b3b2207afda423731
SHA512
00fcae02004675a26e6d73998403cf0e3a36dfd3596315ee98567d302a10c344cc1b64dac782e02416f11f6db3c730792e8de7d2d0ea1a6e0f2b2b7dbee74f4c
DIST xfce4-session-4.18.1.tar.bz2 872771 BLAKE2B
e9c0b972e1dc2b324d15c17dd317f151d7d4d16953375f8347be36c1d070f888993be8ef8f590fda5632f66c5a6c973ed91dd95afe06418656c8ec129d54
SHA512
6e6a55138380b6e7ce98508f4d3a52a596882b2f244a1ebd0d1a4b7dd1814c93e6e27453b500cb9178889790f067e28c7c4479b39963511d8e579831a44ef973
diff --git
a/xfce-base/xfce4-session/files/xfce4-session-4.10.1-alock_support_to_xflock4.patch
b/xfce-base/xfce4-session/files/xfce4-session-4.10.1-alock_support_to_xflock4.patch
deleted file mode 100644
index 0582ecd020a3..
---
a/xfce-base/xfce4-session/files/xfce4-session-4.10.1-alock_support_to_xflock4.patch
+++ /dev/null
@@ -1,15 +0,0 @@
-http://bugs.gentoo.org/501370
-http://bugzilla.xfce.org/show_bug.cgi?id=10679
-
a/scripts/xflock4
-+++ b/scripts/xflock4
-@@ -35,7 +35,8 @@
- # else run another access locking utility, if installed
- for lock_cmd in \
- "xlock -mode blank" \
-- "slock"
-+ "slock" \
-+ "alock -bg blank -auth pam"
- do
- set -- $lock_cmd
- if command -v -- $1 >/dev/null 2>&1; then
diff --git a/xfce-base/xfce4-session/xfce4-session-4.16.0.ebuild
b/xfce-base/xfce4-session/xfce4-session-4.16.0.ebuild
deleted file mode 100644
index 81dfb2da9544..
--- a/xfce-base/xfce4-session/xfce4-session-4.16.0.ebuild
+++ /dev/null
@@ -1,76 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit xdg-utils
-
-DESCRIPTION="A session manager for the Xfce desktop environment"
-HOMEPAGE="https://docs.xfce.org/xfce/xfce4-session/start";
-SRC_URI="https://archive.xfce.org/src/xfce/${PN}/${PV%.*}/${P}.tar.bz2";
-
-LICENSE="GPL-2+"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~mips ppc ppc64 ~riscv
~sparc x86 ~amd64-linux ~x86-linux"
-IUSE="nls policykit +xscreensaver"
-
-DEPEND=">=dev-libs/glib-2.50
- >=x11-libs/gtk+-3.22:3
- x11-libs/libSM
- x11-libs/libwnck:3
- x11-libs/libX11
- >=xfce-base/libxfce4util-4.15.2:=
- >=xfce-base/libxfce4ui-4.15.1:=
- >=xfce-base/xfconf-4.12:=
- policykit? ( >=sys-auth/polkit-0.102 )"
-RDEPEND="${DEPEND}
- x11-apps/iceauth
- x11-apps/xrdb
- nls? ( x11-misc/xdg-user-dirs )
- xscreensaver? ( || (
- xfce-extra/xfce4-screensaver
- >=x11-misc/xscreensaver-5.26
- >=x11-misc/xlockmore-5.43
- x11-misc/slock
- x11-misc/alock[pam]
- ) )"
-BDEPEND="
- dev-util/intltool
- sys-devel/gettext
- virtual/pkgconfig"
-
-PATCHES=(
- "${FILESDIR}"/${PN}-4.10.1-alock_support_to_xflock4.patch
-# TODO: this patch needs updating for the new version, and finding
-# upstream bug.
-# "${FILESDIR}"/${PN}-4.12.1-light-locker_support_to_xflock4.patch
-)
-
-src_configure() {
- local myconf=(
- $(use_enable policykit polkit)
- --with-xsession-prefix="${EPREFIX}"/usr
- ICEAUTH="${EPREFIX}"/usr/bin/iceauth
- )
-
- econf "${myconf[@]}"
-}
-
-src_install() {
- default
- find "${ED}" -name '*.la'
[gentoo-commits] repo/gentoo:master commit in: xfce-base/xfce4-session/files/, xfce-base/xfce4-session/
commit: d83168fcab3aaf6ef9041135a1d24ae50b707e8e
Author: Michał Górny gentoo org>
AuthorDate: Fri Dec 6 12:34:10 2019 +
Commit: Michał Górny gentoo org>
CommitDate: Fri Dec 6 14:19:48 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d83168fc
xfce-base/xfce4-session: Remove redundant version
Signed-off-by: Michał Górny gentoo.org>
xfce-base/xfce4-session/Manifest | 1 -
...on-4.12.1-light-locker_support_to_xflock4.patch | 17 -
.../xfce4-session/xfce4-session-4.12.1-r2.ebuild | 78 --
3 files changed, 96 deletions(-)
diff --git a/xfce-base/xfce4-session/Manifest b/xfce-base/xfce4-session/Manifest
index 95f0da8a358..3fd800cd30a 100644
--- a/xfce-base/xfce4-session/Manifest
+++ b/xfce-base/xfce4-session/Manifest
@@ -1,2 +1 @@
-DIST xfce4-session-4.12.1.tar.bz2 1289284 BLAKE2B
00af274ac1160a413c9e2c8b308dfc84248f0078e8c294528614bb642988468f9dadaae906b4a8e2179d2beef0a48ebf5e2eedcb2ed3ad7ea73a8f7a9b90e224
SHA512
d7f37dbff59acb316965ab2224674ac3b5b7cfd7262acd4426b582001cee313945acb8883be21553dd6d7a046934bbbe116f451e6d5fd35b6fa5444da94605df
DIST xfce4-session-4.14.0.tar.bz2 826950 BLAKE2B
164fd9f61f03a61e705abf1f7ab82e81eccbd5269d28d66f6da7234ba073d38a1b38d1be0ddb5f3c055e829adf12673611a2b0ea0585f9fd1d2806b17cf0e761
SHA512
fba79ef9727d47514c5e4223376c49057b714f9be9bda6031a1220f4840abb257d31517252180c0af2e7cd6969bbc4e6f525b00cac594e1a3b80f09f3f2335cb
diff --git
a/xfce-base/xfce4-session/files/xfce4-session-4.12.1-light-locker_support_to_xflock4.patch
b/xfce-base/xfce4-session/files/xfce4-session-4.12.1-light-locker_support_to_xflock4.patch
deleted file mode 100644
index aac01cfbe9b..000
---
a/xfce-base/xfce4-session/files/xfce4-session-4.12.1-light-locker_support_to_xflock4.patch
+++ /dev/null
@@ -1,17 +0,0 @@
a/scripts/xflock4 2016-02-02 10:40:15.726495183 -0700
-+++ b/scripts/xflock4 2016-02-02 10:43:17.548061336 -0700
-@@ -24,10 +24,12 @@
- PATH=/bin:/usr/bin
- export PATH
-
--# Lock by xscreensaver or gnome-screensaver, if a respective daemon is running
-+# Lock by xscreensaver, gnome-screensaver or light-locker, if a respective
-+# daemon is running
- for lock_cmd in \
- "xscreensaver-command -lock" \
--"gnome-screensaver-command --lock"
-+"gnome-screensaver-command --lock" \
-+"light-locker-command --lock"
- do
- $lock_cmd >/dev/null 2>&1 && exit
- done
diff --git a/xfce-base/xfce4-session/xfce4-session-4.12.1-r2.ebuild
b/xfce-base/xfce4-session/xfce4-session-4.12.1-r2.ebuild
deleted file mode 100644
index 5c7c886d64e..000
--- a/xfce-base/xfce4-session/xfce4-session-4.12.1-r2.ebuild
+++ /dev/null
@@ -1,78 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit gnome2-utils
-
-DESCRIPTION="A session manager for the Xfce desktop environment"
-HOMEPAGE="https://docs.xfce.org/xfce/xfce4-session/start";
-SRC_URI="https://archive.xfce.org/src/xfce/${PN}/${PV%.*}/${P}.tar.bz2";
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="alpha amd64 arm ~arm64 ~hppa ia64 ~mips ppc ppc64 ~sparc x86
~amd64-linux ~x86-linux ~x86-solaris"
-IUSE="elogind nls policykit systemd upower +xscreensaver"
-
-COMMON_DEPEND=">=dev-libs/dbus-glib-0.100:=
- x11-apps/iceauth
- x11-libs/libSM:=
- >=x11-libs/libwnck-2.30:1=
- x11-libs/libX11:=
- >=xfce-base/libxfce4util-4.11:=
- >=xfce-base/libxfce4ui-4.12.1:=
- >=xfce-base/xfconf-4.10:=
- policykit? ( >=sys-auth/polkit-0.102:= )
- upower? ( >=sys-power/upower-0.9.23 )"
-RDEPEND="${COMMON_DEPEND}
- x11-apps/xrdb
- nls? ( x11-misc/xdg-user-dirs )
- !systemd? ( upower? ( sys-power/pm-utils ) )
- xscreensaver? ( || (
- >=x11-misc/xscreensaver-5.26
- x11-misc/light-locker
- >=x11-misc/xlockmore-5.43
- x11-misc/slock
- x11-misc/alock[pam]
- ) )"
-DEPEND="${COMMON_DEPEND}
- dev-util/intltool
- sys-devel/gettext
- virtual/pkgconfig"
-
-REQUIRED_USE="elogind? ( policykit )
- systemd? ( policykit )"
-
-PATCHES=(
- "${FILESDIR}"/${PN}-4.10.1-alock_support_to_xflock4.patch
- "${FILESDIR}"/${PN}-4.12.1-light-locker_support_to_xflock4.patch
-)
-
-src_configure() {
- local myconf=(
- $(use_enable policykit polkit)
- --with-xsession-prefix="${EPREFIX}"/usr
- )
- use upower && myconf+=( --enable-upower )
-
- econf "${myconf[@]}"
-}
-
-src_install() {
- default
- find "${ED}" -name '*.la' -delete || die
-
- local sessiondir=/etc/X11/Sessions
- echo startxfce4 > "${T}"/Xfce4 || die
- exeinto ${sessiondir}
- doexe "${T}"/Xfce4
- dosym Xfce4 ${sessiondir}/Xfce
-}
-
-pkg_postinst() {
- gnome2_icon_cache_update
-}
-
-pkg_postrm() {
- gnome2_icon_cache_update
-}
[gentoo-commits] repo/gentoo:master commit in: xfce-base/xfce4-session/files/
commit: c90faff75f9c20b4710e8c6cbe206d88c5ed654f Author: Michael Mair-Keimberger gmail com> AuthorDate: Mon Jun 3 17:52:48 2019 + Commit: Aaron Bauman gentoo org> CommitDate: Tue Jun 18 00:34:57 2019 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c90faff7 xfce-base/xfce4-session: remove unused patch Signed-off-by: Michael Mair-Keimberger gmail.com> Closes: https://github.com/gentoo/gentoo/pull/12183 Signed-off-by: Aaron Bauman gentoo.org> .../xfce4-session-4.13.1-kill-dbus-includes.patch | 43 -- 1 file changed, 43 deletions(-) diff --git a/xfce-base/xfce4-session/files/xfce4-session-4.13.1-kill-dbus-includes.patch b/xfce-base/xfce4-session/files/xfce4-session-4.13.1-kill-dbus-includes.patch deleted file mode 100644 index cc5bb9d653e..000 --- a/xfce-base/xfce4-session/files/xfce4-session-4.13.1-kill-dbus-includes.patch +++ /dev/null @@ -1,43 +0,0 @@ -From 3bddf152b902d8a1e0f674b792577b2cca635c4b Mon Sep 17 00:00:00 2001 -From: Brandon Bergren -Date: Sun, 26 Aug 2018 10:28:05 -0400 -Subject: [PATCH] fix build failure when dbus is not in the system include path - (Bug #14386) - -The d-bus direct depenencies were taken out in 91860af3a38080, -but the #include in xfce4-session/xfsm-global.h -and the #include line in xfsm-error.c got left -in accidentally. - xfce4-session/xfsm-error.c | 2 -- - xfce4-session/xfsm-global.h | 1 - - 2 files changed, 3 deletions(-) - -diff --git a/xfce4-session/xfsm-error.c b/xfce4-session/xfsm-error.c -index 2b7f6c04..f0766f5f 100644 a/xfce4-session/xfsm-error.c -+++ b/xfce4-session/xfsm-error.c -@@ -20,8 +20,6 @@ - #include - #endif - --#include -- - #include - - #define XFSM_DBUS_NAME "org.xfce.SessionManager" -diff --git a/xfce4-session/xfsm-global.h b/xfce4-session/xfsm-global.h -index d4587123..610d5bf7 100644 a/xfce4-session/xfsm-global.h -+++ b/xfce4-session/xfsm-global.h -@@ -27,7 +27,6 @@ - #include - - #include --#include - - typedef struct _FailsafeClient FailsafeClient; - struct _FailsafeClient --- -2.19.0 -
[gentoo-commits] repo/gentoo:master commit in: xfce-base/xfce4-session/files/
commit: 54c3c73a922eb66b13e44ea2aac4251065b51dc2 Author: Michael Mair-Keimberger gmail com> AuthorDate: Fri Mar 1 17:36:40 2019 + Commit: Aaron Bauman gentoo org> CommitDate: Mon Mar 4 03:12:46 2019 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=54c3c73a xfce-base/xfce4-session: remove unused patch Signed-off-by: Michael Mair-Keimberger gmail.com> Closes: https://github.com/gentoo/gentoo/pull/11196 Signed-off-by: Aaron Bauman gentoo.org> ...e4-session-4.13.0-add-edit-autostart-segv.patch | 57 -- 1 file changed, 57 deletions(-) diff --git a/xfce-base/xfce4-session/files/xfce4-session-4.13.0-add-edit-autostart-segv.patch b/xfce-base/xfce4-session/files/xfce4-session-4.13.0-add-edit-autostart-segv.patch deleted file mode 100644 index ff5b805d322..000 --- a/xfce-base/xfce4-session/files/xfce4-session-4.13.0-add-edit-autostart-segv.patch +++ /dev/null @@ -1,57 +0,0 @@ -From 193b09a9c159d1d16ad69e4298f48c2b531e9392 Mon Sep 17 00:00:00 2001 -From: Eric Koegel -Date: Mon, 1 May 2017 06:55:05 +0300 -Subject: Add/Edit Application Autostart Entries (Bug #13271) - -With xfce4-session built from git (after the gtk3 -migration work), trying to add or edit an application -autostart entry results in a segmentation fault after a -"(xfce4-session-settings:9094): Gtk-CRITICAL **: -gtk_entry_get_text: assertion 'GTK_IS_ENTRY (entry)' -failed" message. - -It appears that when the "notify::text" signal callbacks -for the "command_entry" and "name_entry" GtkEntry objects -are created, they are called immediately, before the second -GtkEntry object is created resulting in a failure in the -xfae_dialog_update() function to properly process the objects. -Thanks to ToZ for reporting and providing the fix. - settings/xfae-dialog.c | 11 +++ - 1 file changed, 7 insertions(+), 4 deletions(-) - -diff --git a/settings/xfae-dialog.c b/settings/xfae-dialog.c -index af860b9..7442634 100644 a/settings/xfae-dialog.c -+++ b/settings/xfae-dialog.c -@@ -98,8 +98,7 @@ xfae_dialog_init (XfaeDialog *dialog) - dialog->name_entry = g_object_new (GTK_TYPE_ENTRY, - "activates-default", TRUE, - NULL); -- g_signal_connect_swapped (G_OBJECT (dialog->name_entry), "notify::text", --G_CALLBACK (xfae_dialog_update), dialog); -+ - gtk_grid_attach (GTK_GRID (grid), dialog->name_entry, 1, 0, 1, 1); - gtk_widget_show (dialog->name_entry); - -@@ -132,11 +131,15 @@ xfae_dialog_init (XfaeDialog *dialog) - dialog->command_entry = g_object_new (GTK_TYPE_ENTRY, - "activates-default", TRUE, - NULL); -- g_signal_connect_swapped (G_OBJECT (dialog->command_entry), "notify::text", --G_CALLBACK (xfae_dialog_update), dialog); -+ - gtk_box_pack_start (GTK_BOX (hbox), dialog->command_entry, TRUE, TRUE, 0); - gtk_widget_show (dialog->command_entry); - -+ g_signal_connect_swapped (G_OBJECT (dialog->name_entry), "notify::text", -+G_CALLBACK (xfae_dialog_update), dialog); -+ g_signal_connect_swapped (G_OBJECT (dialog->command_entry), "notify::text", -+G_CALLBACK (xfae_dialog_update), dialog); -+ - button = g_object_new (GTK_TYPE_BUTTON, - "can-default", FALSE, - NULL); --- -cgit v1.1 -
[gentoo-commits] repo/gentoo:master commit in: xfce-base/xfce4-session/files/
commit: 1c8846cbd7b136395ac5193e84b3cacf23ccb951 Author: Michał Górny gentoo org> AuthorDate: Sun Apr 16 22:13:37 2017 + Commit: Michał Górny gentoo org> CommitDate: Sun Apr 16 22:25:35 2017 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1c8846cb xfce-base/xfce4-session: Convert patches to -p1 .../files/xfce4-session-4.10.1-alock_support_to_xflock4.patch | 4 ++-- .../files/xfce4-session-4.12.1-light-locker_support_to_xflock4.patch | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/xfce-base/xfce4-session/files/xfce4-session-4.10.1-alock_support_to_xflock4.patch b/xfce-base/xfce4-session/files/xfce4-session-4.10.1-alock_support_to_xflock4.patch index feb020aaff0..0582ecd020a 100644 --- a/xfce-base/xfce4-session/files/xfce4-session-4.10.1-alock_support_to_xflock4.patch +++ b/xfce-base/xfce4-session/files/xfce4-session-4.10.1-alock_support_to_xflock4.patch @@ -1,8 +1,8 @@ http://bugs.gentoo.org/501370 http://bugzilla.xfce.org/show_bug.cgi?id=10679 scripts/xflock4 -+++ scripts/xflock4 +--- a/scripts/xflock4 b/scripts/xflock4 @@ -35,7 +35,8 @@ # else run another access locking utility, if installed for lock_cmd in \ diff --git a/xfce-base/xfce4-session/files/xfce4-session-4.12.1-light-locker_support_to_xflock4.patch b/xfce-base/xfce4-session/files/xfce4-session-4.12.1-light-locker_support_to_xflock4.patch index cb472edfe5d..aac01cfbe9b 100644 --- a/xfce-base/xfce4-session/files/xfce4-session-4.12.1-light-locker_support_to_xflock4.patch +++ b/xfce-base/xfce4-session/files/xfce4-session-4.12.1-light-locker_support_to_xflock4.patch @@ -1,5 +1,5 @@ scripts/xflock4.orig 2016-02-02 10:40:15.726495183 -0700 -+++ scripts/xflock42016-02-02 10:43:17.548061336 -0700 +--- a/scripts/xflock4 2016-02-02 10:40:15.726495183 -0700 b/scripts/xflock4 2016-02-02 10:43:17.548061336 -0700 @@ -24,10 +24,12 @@ PATH=/bin:/usr/bin export PATH
[gentoo-commits] repo/gentoo:master commit in: xfce-base/xfce4-session/files/
commit: 9d7a6656b5ebd4511aa9f9f277908999d0c56dfa
Author: Michael Mair-Keimberger (asterix) gmail
com>
AuthorDate: Sun Feb 12 17:27:19 2017 +
Commit: David Seifert gentoo org>
CommitDate: Tue Feb 14 21:34:55 2017 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9d7a6656
xfce-base/xfce4-session: remove unused patch
Closes: https://github.com/gentoo/gentoo/pull/3931
.../files/xfce4-session-4.11.0-upower-0.99.0.patch | 448 -
1 file changed, 448 deletions(-)
diff --git
a/xfce-base/xfce4-session/files/xfce4-session-4.11.0-upower-0.99.0.patch
b/xfce-base/xfce4-session/files/xfce4-session-4.11.0-upower-0.99.0.patch
deleted file mode 100644
index a5e59f47f1..00
--- a/xfce-base/xfce4-session/files/xfce4-session-4.11.0-upower-0.99.0.patch
+++ /dev/null
@@ -1,448 +0,0 @@
-Patch from http://bugzilla.xfce.org/show_bug.cgi?id=9952 with modification
-to edit configure.ac (release tarball) instead of configure.ac.in (git)
-
-From 38afe446cdc889266f1e553952397cc4a876ecf8 Mon Sep 17 00:00:00 2001
-From: Eric Koegel
-Date: Mon, 7 Jul 2014 11:30:06 +0300
-Subject: [PATCH] Add suspend/hibernate to shutdown-helper
-
-Upower 0.99 dropped support for suspend/hibernate as an obsolete
-feature in this commit:
-http://cgit.freedesktop.org/upower/commit/?id=1ee642e705a63f5ad56a6b55e4bf5c4a64c959b8
-Add that functionality into the shutdown-helper so these features
-will work again. Additionally Upower is an optional build dependency
-and the minimum required is 0.9.7 to support FreeBSD 9 and 10.
- configure.ac.in | 30
- xfce4-session/Makefile.am | 4 +-
- xfce4-session/xfsm-shutdown.c | 167 +-
- xfce4-session/xfsm-upower.c | 8 +-
- xfce4-session/xfsm-upower.h | 4 +
- xfsm-shutdown-helper/main.c | 26 +++
- 6 files changed, 234 insertions(+), 5 deletions(-)
-
-diff --git a/configure.ac b/configure.ac
-index 910fd35..b9c9a90 100644
a/configure.ac
-+++ b/configure.ac
-@@ -96,6 +96,10 @@ XDT_CHECK_PACKAGE([DBUS], [dbus-1], [1.1.0])
- XDT_CHECK_PACKAGE([DBUS_GLIB], [dbus-glib-1], [0.84])
- XDT_CHECK_PACKAGE([XFCONF], [libxfconf-0], [4.9.0])
-
-+dnl Check for Upower
-+XDT_CHECK_OPTIONAL_PACKAGE([UPOWER],[upower-glib], [0.9.7],
-+ [upower],[Upower support])
-+
- dnl Check for polkit / systemd integration
- XDT_CHECK_OPTIONAL_PACKAGE([SYSTEMD], [polkit-gobject-1], [0.100],
-[systemd], [Systemd support (through polit)])
-@@ -157,6 +161,31 @@ if test "x$linux_ioprio_works" = "xyes"; then
- [Defined if linux/ioprio.h not only exists, but works properly])
- fi
-
-+dnl Compile time default choice of backend
-+AC_ARG_WITH([backend],
-+ AS_HELP_STRING([--with-backend=],
-+ [Default backend to use linux, freebsd, openbsd]))
-+# default to a sane option
-+AC_CANONICAL_HOST
-+if test x$with_backend = x; then
-+ AS_CASE([$host],
-+ [*-linux*], [with_backend=linux],
-+ [*-*freebsd*], [with_backend=freebsd],
-+ [*-openbsd*], [with_backend=openbsd])
-+fi
-+AC_DEFINE_UNQUOTED(BACKEND, "$with_backend", [backend])
-+AC_SUBST(BACKEND, "$with_backend")
-+
-+if test x$with_backend = xlinux; then
-+AC_DEFINE(BACKEND_TYPE_LINUX, 1, [Linux suspend/hibernate backend])
-+fi
-+if test x$with_backend = xfreebsd; then
-+AC_DEFINE(BACKEND_TYPE_FREEBSD, 1, [FreeBSD suspend/hibernate backend])
-+fi
-+if test x$with_backend = xopenbsd; then
-+AC_DEFINE(BACKEND_TYPE_OPENBSD, 1, [OpenBSD suspend/hibernate backend])
-+fi
-+
- dnl check for location Xfce glade files were installed to
- XFCE_GLADE_CATALOG_PATH="`pkg-config --variable glade_catalogdir
libxfce4ui-1`"
- XFCE_GLADE_PIXMAP_PATH="`pkg-config --variable glade_pixmapdir libxfce4ui-1`"
-@@ -207,5 +236,6 @@ echo " * Gnome Keyring support: yes"
- else
- echo " * Gnome Keyring support: no"
- fi
-+echo " * Backend:${with_backend}"
-
- echo
-diff --git a/xfce4-session/Makefile.am b/xfce4-session/Makefile.am
-index 5472b33..6b5968e 100644
a/xfce4-session/Makefile.am
-+++ b/xfce4-session/Makefile.am
-@@ -83,7 +83,8 @@ xfce4_session_CFLAGS =
\
- $(SYSTEMD_CFLAGS) \
- $(XFCONF_CFLAGS)\
- $(GMODULE_CFLAGS) \
-- $(PLATFORM_CFLAGS)
-+ $(PLATFORM_CFLAGS) \
-+ $(UPOWER_CFLAGS)
-
- xfce4_session_LDFLAGS =
\
- -no-undefined \
-@@ -102,6 +103,7 @@ xfce4_session_LDADD =
\
- $(LIBWNCK_LIBS)
