Date: Sunday, October 19, 2014 @ 21:34:52 Author: bgyorgy Revision: 120983
upgpkg: lxsession 1:0.5.1-1 Update to version 0.5.1 Modified: lxsession/trunk/PKGBUILD lxsession/trunk/fix-lxsession-db.patch Deleted: lxsession/trunk/fix-lxpolkit.patch lxsession/trunk/fix-lxsession-edit.patch lxsession/trunk/fix-userswitch.patch --------------------------+ PKGBUILD | 29 +++++++---------------------- fix-lxpolkit.patch | 18 ------------------ fix-lxsession-db.patch | 34 +++++++++++++++++++++++----------- fix-lxsession-edit.patch | 24 ------------------------ fix-userswitch.patch | 35 ----------------------------------- 5 files changed, 30 insertions(+), 110 deletions(-) Modified: PKGBUILD =================================================================== --- PKGBUILD 2014-10-19 19:26:20 UTC (rev 120982) +++ PKGBUILD 2014-10-19 19:34:52 UTC (rev 120983) @@ -4,7 +4,7 @@ # Contributor: Juergen Hoetzel <[email protected]> pkgname=lxsession -pkgver=0.5.0 +pkgver=0.5.1 pkgrel=1 epoch=1 pkgdesc='Lightweight X11 session manager' @@ -17,15 +17,9 @@ 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') + fix-lxsession-db.patch) +md5sums=('39bf77d637fbe40318f91d0d888127fc' + 'b6508ab44282f56c91d89a8c2c245438') prepare() { cd $pkgname-$pkgver @@ -33,18 +27,6 @@ # 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() { @@ -56,4 +38,7 @@ package() { cd $pkgname-$pkgver make DESTDIR="$pkgdir" install + + # Remove lxpolkit autostart file as we already launch it by lxsession + rm -r "$pkgdir/etc" } Deleted: fix-lxpolkit.patch =================================================================== --- fix-lxpolkit.patch 2014-10-19 19:26:20 UTC (rev 120982) +++ fix-lxpolkit.patch 2014-10-19 19:34:52 UTC (rev 120983) @@ -1,18 +0,0 @@ -commit a9f032312f8c1254b00840dd084e241c964897ea -Author: Balló György <[email protected]> -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"); Modified: fix-lxsession-db.patch =================================================================== --- fix-lxsession-db.patch 2014-10-19 19:26:20 UTC (rev 120982) +++ fix-lxsession-db.patch 2014-10-19 19:34:52 UTC (rev 120983) @@ -1,14 +1,26 @@ -commit 5f37ab207ac330ac1cc2b3136793e2bcd4fbb2b4 -Author: Balló György <[email protected]> -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 +diff -Naur lxsession-0.5.1.orig/lxsession-db/desktop-files-backend.vala lxsession-0.5.1/lxsession-db/desktop-files-backend.vala +--- lxsession-0.5.1.orig/lxsession-db/desktop-files-backend.vala 2014-10-17 18:54:57.000000000 +0200 ++++ lxsession-0.5.1/lxsession-db/desktop-files-backend.vala 2014-10-19 20:50:49.587801950 +0200 +@@ -254,16 +254,8 @@ + { + foreach (string folder in default_available) + { +- var dir_log = File.new_for_path (folder); +- if (dir_log.query_exists ()) +- { +- message ("Scanning folder: %s", folder); +- list_desktop_files.begin (folder, "available"); +- } +- else +- { +- message ("%s doesn't exist. Pass", folder); +- } ++ message ("Scanning folder: %s", folder); ++ list_desktop_files.begin (folder, "available"); + } + } + else +@@ -323,21 +315,21 @@ } } } Deleted: fix-lxsession-edit.patch =================================================================== --- fix-lxsession-edit.patch 2014-10-19 19:26:20 UTC (rev 120982) +++ fix-lxsession-edit.patch 2014-10-19 19:34:52 UTC (rev 120983) @@ -1,24 +0,0 @@ -commit a742cb3dd6d2e30bc3792d0d1741ee5fca887b1d -Author: Balló György <[email protected]> -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 ) Deleted: fix-userswitch.patch =================================================================== --- fix-userswitch.patch 2014-10-19 19:26:20 UTC (rev 120982) +++ fix-userswitch.patch 2014-10-19 19:34:52 UTC (rev 120983) @@ -1,35 +0,0 @@ -commit ec869453ecbb4a71611392b077b6c3f5fc093712 -Author: Balló György <[email protected]> -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;
