[arch-commits] Commit in lxsession/repos (12 files)
Balló György
bgyorgy at archlinux.org
Tue Oct 7 20:56:29 UTC 2014
Date: Tuesday, October 7, 2014 @ 22:56:28
Author: bgyorgy
Revision: 120374
archrelease: copy trunk to community-testing-i686, community-testing-x86_64
Added:
lxsession/repos/community-testing-i686/
lxsession/repos/community-testing-i686/PKGBUILD
(from rev 120373, lxsession/trunk/PKGBUILD)
lxsession/repos/community-testing-i686/fix-lxpolkit.patch
(from rev 120373, lxsession/trunk/fix-lxpolkit.patch)
lxsession/repos/community-testing-i686/fix-lxsession-db.patch
(from rev 120373, lxsession/trunk/fix-lxsession-db.patch)
lxsession/repos/community-testing-i686/fix-lxsession-edit.patch
(from rev 120373, lxsession/trunk/fix-lxsession-edit.patch)
lxsession/repos/community-testing-i686/fix-userswitch.patch
(from rev 120373, lxsession/trunk/fix-userswitch.patch)
lxsession/repos/community-testing-x86_64/
lxsession/repos/community-testing-x86_64/PKGBUILD
(from rev 120373, lxsession/trunk/PKGBUILD)
lxsession/repos/community-testing-x86_64/fix-lxpolkit.patch
(from rev 120373, lxsession/trunk/fix-lxpolkit.patch)
lxsession/repos/community-testing-x86_64/fix-lxsession-db.patch
(from rev 120373, lxsession/trunk/fix-lxsession-db.patch)
lxsession/repos/community-testing-x86_64/fix-lxsession-edit.patch
(from rev 120373, lxsession/trunk/fix-lxsession-edit.patch)
lxsession/repos/community-testing-x86_64/fix-userswitch.patch
(from rev 120373, lxsession/trunk/fix-userswitch.patch)
---------------------------------------------------+
community-testing-i686/PKGBUILD | 59 ++++++++++++++++++++
community-testing-i686/fix-lxpolkit.patch | 18 ++++++
community-testing-i686/fix-lxsession-db.patch | 42 ++++++++++++++
community-testing-i686/fix-lxsession-edit.patch | 24 ++++++++
community-testing-i686/fix-userswitch.patch | 35 +++++++++++
community-testing-x86_64/PKGBUILD | 59 ++++++++++++++++++++
community-testing-x86_64/fix-lxpolkit.patch | 18 ++++++
community-testing-x86_64/fix-lxsession-db.patch | 42 ++++++++++++++
community-testing-x86_64/fix-lxsession-edit.patch | 24 ++++++++
community-testing-x86_64/fix-userswitch.patch | 35 +++++++++++
10 files changed, 356 insertions(+)
Copied: lxsession/repos/community-testing-i686/PKGBUILD (from rev 120373, lxsession/trunk/PKGBUILD)
===================================================================
--- community-testing-i686/PKGBUILD (rev 0)
+++ community-testing-i686/PKGBUILD 2014-10-07 20:56:28 UTC (rev 120374)
@@ -0,0 +1,59 @@
+# $Id$
+# Contributor: Bartłomiej Piotrowski <bpiotrowski at archlinux.org>
+# Contributor: Angel Velasquez <angvp at archlinux.org>
+# Contributor: Juergen Hoetzel <juergen at archlinux.org>
+
+pkgname=lxsession
+pkgver=0.5.0
+pkgrel=1
+epoch=1
+pkgdesc='Lightweight X11 session manager'
+arch=('i686' 'x86_64')
+url="http://lxde.org/"
+license=('GPL2')
+groups=('lxde')
+depends=('gtk2' 'dbus-glib' 'polkit')
+makedepends=('intltool' 'docbook-xsl' 'vala')
+replaces=('lxpolkit' 'lxsession-lite' 'lxde-settings-daemon')
+conflicts=('lxpolkit' 'lxsession-lite' 'lxde-settings-daemon')
+source=(http://downloads.sourceforge.net/lxde/$pkgname-$pkgver.tar.xz
+ fix-lxsession-db.patch
+ fix-lxsession-edit.patch
+ fix-userswitch.patch
+ fix-lxpolkit.patch)
+md5sums=('6ef8b1487e60376e2381b2dec9c94734'
+ '289040c2789f429e73af946295e4d3f5'
+ '3dd128815be533b406353af0fec6081c'
+ 'f2d40d5c9ff1ea740463a2cecc6bd9a0'
+ '71adf77e5b9ba82a29ba448a4f5aa1d6')
+
+prepare() {
+ cd $pkgname-$pkgver
+
+ # lxsession-db: Don't hang when MIME folders are not available.
+ # https://sourceforge.net/p/lxde/patches/479/
+ patch -Np1 -i ../fix-lxsession-db.patch
+
+ # lxsession-edit: Fix segfault on exit when kf is not set.
+ # https://sourceforge.net/p/lxde/patches/480/
+ patch -Np1 -i ../fix-lxsession-edit.patch
+
+ # lxsession-logout: Fix user switch with LightDM when GDM is installed.
+ # https://sourceforge.net/p/lxde/patches/481/
+ patch -Np1 -i ../fix-userswitch.patch
+
+ # Set lxpolkit by default, so lxsession will autostart it on login.
+ # https://sourceforge.net/p/lxde/patches/478/
+ patch -Np1 -i ../fix-lxpolkit.patch
+}
+
+build() {
+ cd $pkgname-$pkgver
+ ./configure --sysconfdir=/etc --prefix=/usr
+ make
+}
+
+package() {
+ cd $pkgname-$pkgver
+ make DESTDIR="$pkgdir" install
+}
Copied: lxsession/repos/community-testing-i686/fix-lxpolkit.patch (from rev 120373, lxsession/trunk/fix-lxpolkit.patch)
===================================================================
--- community-testing-i686/fix-lxpolkit.patch (rev 0)
+++ community-testing-i686/fix-lxpolkit.patch 2014-10-07 20:56:28 UTC (rev 120374)
@@ -0,0 +1,18 @@
+commit a9f032312f8c1254b00840dd084e241c964897ea
+Author: Balló György <ballogyor at gmail.com>
+Date: Tue Oct 7 21:19:52 2014 +0200
+
+ Set lxpolkit by default, so lxsession will autostart it on login.
+
+diff --git a/lxsession/settings.vala b/lxsession/settings.vala
+index 399deb2..c31f49d 100644
+--- a/lxsession/settings.vala
++++ b/lxsession/settings.vala
+@@ -252,6 +252,7 @@ namespace Lxsession
+ /* Keep old behavior for autostarted application if this option is not specify */
+ set_generic_default("Session", "disable_autostart", null, "string", "no");
+
++ set_generic_default("Session", "polkit", "command", "string", "lxpolkit");
+ set_generic_default("Session", "clipboard", "command", "string", "lxclipboard");
+ set_generic_default("Session", "xsettings_manager", "command", "string", "build-in");
+ set_generic_default("Session", "proxy_manager", "command", "string", "build-in");
Copied: lxsession/repos/community-testing-i686/fix-lxsession-db.patch (from rev 120373, lxsession/trunk/fix-lxsession-db.patch)
===================================================================
--- community-testing-i686/fix-lxsession-db.patch (rev 0)
+++ community-testing-i686/fix-lxsession-db.patch 2014-10-07 20:56:28 UTC (rev 120374)
@@ -0,0 +1,42 @@
+commit 5f37ab207ac330ac1cc2b3136793e2bcd4fbb2b4
+Author: Balló György <ballogyor at gmail.com>
+Date: Tue Oct 7 21:23:13 2014 +0200
+
+ lxsession-db: Don't hang when MIME folders are not available.
+
+diff --git a/lxsession-db/desktop-files-backend.vala b/lxsession-db/desktop-files-backend.vala
+index d68644d..a9a52e8 100644
+--- a/lxsession-db/desktop-files-backend.vala
++++ b/lxsession-db/desktop-files-backend.vala
+@@ -315,21 +315,21 @@ namespace Lxsession
+ }
+ }
+ }
+-
+- if (mode == "installed")
+- {
+- finish_scanning_installed();
+- }
+- else if (mode == "available")
+- {
+- finish_scanning_available();
+- }
+-
+ }
+ catch (Error err)
+ {
+ stderr.printf ("Error: list_files failed: %s\n", err.message);
+ }
++
++ if (mode == "installed")
++ {
++ finish_scanning_installed();
++ }
++ else if (mode == "available")
++ {
++ finish_scanning_available();
++ }
++
+ message ("Finishing scanning\n");
+ }
+
Copied: lxsession/repos/community-testing-i686/fix-lxsession-edit.patch (from rev 120373, lxsession/trunk/fix-lxsession-edit.patch)
===================================================================
--- community-testing-i686/fix-lxsession-edit.patch (rev 0)
+++ community-testing-i686/fix-lxsession-edit.patch 2014-10-07 20:56:28 UTC (rev 120374)
@@ -0,0 +1,24 @@
+commit a742cb3dd6d2e30bc3792d0d1741ee5fca887b1d
+Author: Balló György <ballogyor at gmail.com>
+Date: Tue Oct 7 22:18:22 2014 +0200
+
+ lxsession-edit: Fix segfault on exit when kf is not set.
+
+diff --git a/lxsession-edit/lxsession-edit.c b/lxsession-edit/lxsession-edit.c
+index 7e2a4c1..88fe9d1 100644
+--- a/lxsession-edit/lxsession-edit.c
++++ b/lxsession-edit/lxsession-edit.c
+@@ -82,11 +82,12 @@ int main(int argc, char** argv)
+ load_autostart(session_name);
+ gtk_tree_view_set_model( (GtkTreeView*)autostarts, (GtkTreeModel*)get_autostart_list() );
+
++ kf = g_key_file_new();
++
+ /* if we are running under LXSession */
+ if( g_getenv("_LXSESSION_PID") )
+ {
+ /* wm settings (only show this when we are under lxsession) */
+- kf = g_key_file_new();
+ cfg = g_build_filename( g_get_user_config_dir(), "lxsession", session_name, CONFIG_FILE_NAME, NULL );
+ loaded = g_key_file_load_from_file(kf, cfg, 0, NULL);
+ if( !loaded )
Copied: lxsession/repos/community-testing-i686/fix-userswitch.patch (from rev 120373, lxsession/trunk/fix-userswitch.patch)
===================================================================
--- community-testing-i686/fix-userswitch.patch (rev 0)
+++ community-testing-i686/fix-userswitch.patch 2014-10-07 20:56:28 UTC (rev 120374)
@@ -0,0 +1,35 @@
+commit ec869453ecbb4a71611392b077b6c3f5fc093712
+Author: Balló György <ballogyor at gmail.com>
+Date: Tue Oct 7 21:28:55 2014 +0200
+
+ lxsession-logout: Fix user switch with LightDM when GDM is installed.
+
+ We can't rely on gdmflexiserver, because GDM's version is incompatible with LightDM.
+
+diff --git a/lxsession-logout/lxsession-logout.c b/lxsession-logout/lxsession-logout.c
+index 9ace78d..a928118 100644
+--- a/lxsession-logout/lxsession-logout.c
++++ b/lxsession-logout/lxsession-logout.c
+@@ -530,21 +530,7 @@ int main(int argc, char * argv[])
+ handler_context.switch_user_GDM = TRUE;
+ }
+
+- /* lightdm also use gdmflexiserver */
+- if (verify_running("lightdm", "gdmflexiserver"))
+- {
+- handler_context.switch_user_available = TRUE;
+- handler_context.switch_user_GDM = TRUE;
+- }
+-
+- /* lightdm also use gdmflexiserver */
+- if (verify_running("lightdm", "gdmflexiserver"))
+- {
+- handler_context.switch_user_available = TRUE;
+- handler_context.switch_user_GDM = TRUE;
+- }
+-
+- /* lightdm can also be find by the env */
++ /* lightdm can be find by the env */
+ if (g_getenv("XDG_SEAT_PATH"))
+ {
+ handler_context.switch_user_available = TRUE;
Copied: lxsession/repos/community-testing-x86_64/PKGBUILD (from rev 120373, lxsession/trunk/PKGBUILD)
===================================================================
--- community-testing-x86_64/PKGBUILD (rev 0)
+++ community-testing-x86_64/PKGBUILD 2014-10-07 20:56:28 UTC (rev 120374)
@@ -0,0 +1,59 @@
+# $Id$
+# Contributor: Bartłomiej Piotrowski <bpiotrowski at archlinux.org>
+# Contributor: Angel Velasquez <angvp at archlinux.org>
+# Contributor: Juergen Hoetzel <juergen at archlinux.org>
+
+pkgname=lxsession
+pkgver=0.5.0
+pkgrel=1
+epoch=1
+pkgdesc='Lightweight X11 session manager'
+arch=('i686' 'x86_64')
+url="http://lxde.org/"
+license=('GPL2')
+groups=('lxde')
+depends=('gtk2' 'dbus-glib' 'polkit')
+makedepends=('intltool' 'docbook-xsl' 'vala')
+replaces=('lxpolkit' 'lxsession-lite' 'lxde-settings-daemon')
+conflicts=('lxpolkit' 'lxsession-lite' 'lxde-settings-daemon')
+source=(http://downloads.sourceforge.net/lxde/$pkgname-$pkgver.tar.xz
+ fix-lxsession-db.patch
+ fix-lxsession-edit.patch
+ fix-userswitch.patch
+ fix-lxpolkit.patch)
+md5sums=('6ef8b1487e60376e2381b2dec9c94734'
+ '289040c2789f429e73af946295e4d3f5'
+ '3dd128815be533b406353af0fec6081c'
+ 'f2d40d5c9ff1ea740463a2cecc6bd9a0'
+ '71adf77e5b9ba82a29ba448a4f5aa1d6')
+
+prepare() {
+ cd $pkgname-$pkgver
+
+ # lxsession-db: Don't hang when MIME folders are not available.
+ # https://sourceforge.net/p/lxde/patches/479/
+ patch -Np1 -i ../fix-lxsession-db.patch
+
+ # lxsession-edit: Fix segfault on exit when kf is not set.
+ # https://sourceforge.net/p/lxde/patches/480/
+ patch -Np1 -i ../fix-lxsession-edit.patch
+
+ # lxsession-logout: Fix user switch with LightDM when GDM is installed.
+ # https://sourceforge.net/p/lxde/patches/481/
+ patch -Np1 -i ../fix-userswitch.patch
+
+ # Set lxpolkit by default, so lxsession will autostart it on login.
+ # https://sourceforge.net/p/lxde/patches/478/
+ patch -Np1 -i ../fix-lxpolkit.patch
+}
+
+build() {
+ cd $pkgname-$pkgver
+ ./configure --sysconfdir=/etc --prefix=/usr
+ make
+}
+
+package() {
+ cd $pkgname-$pkgver
+ make DESTDIR="$pkgdir" install
+}
Copied: lxsession/repos/community-testing-x86_64/fix-lxpolkit.patch (from rev 120373, lxsession/trunk/fix-lxpolkit.patch)
===================================================================
--- community-testing-x86_64/fix-lxpolkit.patch (rev 0)
+++ community-testing-x86_64/fix-lxpolkit.patch 2014-10-07 20:56:28 UTC (rev 120374)
@@ -0,0 +1,18 @@
+commit a9f032312f8c1254b00840dd084e241c964897ea
+Author: Balló György <ballogyor at gmail.com>
+Date: Tue Oct 7 21:19:52 2014 +0200
+
+ Set lxpolkit by default, so lxsession will autostart it on login.
+
+diff --git a/lxsession/settings.vala b/lxsession/settings.vala
+index 399deb2..c31f49d 100644
+--- a/lxsession/settings.vala
++++ b/lxsession/settings.vala
+@@ -252,6 +252,7 @@ namespace Lxsession
+ /* Keep old behavior for autostarted application if this option is not specify */
+ set_generic_default("Session", "disable_autostart", null, "string", "no");
+
++ set_generic_default("Session", "polkit", "command", "string", "lxpolkit");
+ set_generic_default("Session", "clipboard", "command", "string", "lxclipboard");
+ set_generic_default("Session", "xsettings_manager", "command", "string", "build-in");
+ set_generic_default("Session", "proxy_manager", "command", "string", "build-in");
Copied: lxsession/repos/community-testing-x86_64/fix-lxsession-db.patch (from rev 120373, lxsession/trunk/fix-lxsession-db.patch)
===================================================================
--- community-testing-x86_64/fix-lxsession-db.patch (rev 0)
+++ community-testing-x86_64/fix-lxsession-db.patch 2014-10-07 20:56:28 UTC (rev 120374)
@@ -0,0 +1,42 @@
+commit 5f37ab207ac330ac1cc2b3136793e2bcd4fbb2b4
+Author: Balló György <ballogyor at gmail.com>
+Date: Tue Oct 7 21:23:13 2014 +0200
+
+ lxsession-db: Don't hang when MIME folders are not available.
+
+diff --git a/lxsession-db/desktop-files-backend.vala b/lxsession-db/desktop-files-backend.vala
+index d68644d..a9a52e8 100644
+--- a/lxsession-db/desktop-files-backend.vala
++++ b/lxsession-db/desktop-files-backend.vala
+@@ -315,21 +315,21 @@ namespace Lxsession
+ }
+ }
+ }
+-
+- if (mode == "installed")
+- {
+- finish_scanning_installed();
+- }
+- else if (mode == "available")
+- {
+- finish_scanning_available();
+- }
+-
+ }
+ catch (Error err)
+ {
+ stderr.printf ("Error: list_files failed: %s\n", err.message);
+ }
++
++ if (mode == "installed")
++ {
++ finish_scanning_installed();
++ }
++ else if (mode == "available")
++ {
++ finish_scanning_available();
++ }
++
+ message ("Finishing scanning\n");
+ }
+
Copied: lxsession/repos/community-testing-x86_64/fix-lxsession-edit.patch (from rev 120373, lxsession/trunk/fix-lxsession-edit.patch)
===================================================================
--- community-testing-x86_64/fix-lxsession-edit.patch (rev 0)
+++ community-testing-x86_64/fix-lxsession-edit.patch 2014-10-07 20:56:28 UTC (rev 120374)
@@ -0,0 +1,24 @@
+commit a742cb3dd6d2e30bc3792d0d1741ee5fca887b1d
+Author: Balló György <ballogyor at gmail.com>
+Date: Tue Oct 7 22:18:22 2014 +0200
+
+ lxsession-edit: Fix segfault on exit when kf is not set.
+
+diff --git a/lxsession-edit/lxsession-edit.c b/lxsession-edit/lxsession-edit.c
+index 7e2a4c1..88fe9d1 100644
+--- a/lxsession-edit/lxsession-edit.c
++++ b/lxsession-edit/lxsession-edit.c
+@@ -82,11 +82,12 @@ int main(int argc, char** argv)
+ load_autostart(session_name);
+ gtk_tree_view_set_model( (GtkTreeView*)autostarts, (GtkTreeModel*)get_autostart_list() );
+
++ kf = g_key_file_new();
++
+ /* if we are running under LXSession */
+ if( g_getenv("_LXSESSION_PID") )
+ {
+ /* wm settings (only show this when we are under lxsession) */
+- kf = g_key_file_new();
+ cfg = g_build_filename( g_get_user_config_dir(), "lxsession", session_name, CONFIG_FILE_NAME, NULL );
+ loaded = g_key_file_load_from_file(kf, cfg, 0, NULL);
+ if( !loaded )
Copied: lxsession/repos/community-testing-x86_64/fix-userswitch.patch (from rev 120373, lxsession/trunk/fix-userswitch.patch)
===================================================================
--- community-testing-x86_64/fix-userswitch.patch (rev 0)
+++ community-testing-x86_64/fix-userswitch.patch 2014-10-07 20:56:28 UTC (rev 120374)
@@ -0,0 +1,35 @@
+commit ec869453ecbb4a71611392b077b6c3f5fc093712
+Author: Balló György <ballogyor at gmail.com>
+Date: Tue Oct 7 21:28:55 2014 +0200
+
+ lxsession-logout: Fix user switch with LightDM when GDM is installed.
+
+ We can't rely on gdmflexiserver, because GDM's version is incompatible with LightDM.
+
+diff --git a/lxsession-logout/lxsession-logout.c b/lxsession-logout/lxsession-logout.c
+index 9ace78d..a928118 100644
+--- a/lxsession-logout/lxsession-logout.c
++++ b/lxsession-logout/lxsession-logout.c
+@@ -530,21 +530,7 @@ int main(int argc, char * argv[])
+ handler_context.switch_user_GDM = TRUE;
+ }
+
+- /* lightdm also use gdmflexiserver */
+- if (verify_running("lightdm", "gdmflexiserver"))
+- {
+- handler_context.switch_user_available = TRUE;
+- handler_context.switch_user_GDM = TRUE;
+- }
+-
+- /* lightdm also use gdmflexiserver */
+- if (verify_running("lightdm", "gdmflexiserver"))
+- {
+- handler_context.switch_user_available = TRUE;
+- handler_context.switch_user_GDM = TRUE;
+- }
+-
+- /* lightdm can also be find by the env */
++ /* lightdm can be find by the env */
+ if (g_getenv("XDG_SEAT_PATH"))
+ {
+ handler_context.switch_user_available = TRUE;
More information about the arch-commits
mailing list