diff --git a/lxsession-0.5.1-duplicate-lxpolkit-invocation-fix.patch b/lxsession-0.5.1-duplicate-lxpolkit-invocation-fix.patch new file mode 100644 index 0000000..598ec25 --- /dev/null +++ b/lxsession-0.5.1-duplicate-lxpolkit-invocation-fix.patch @@ -0,0 +1,25 @@ +From 486e8b5221d214a491ac41e8b0ee1adba8f0a8d6 Mon Sep 17 00:00:00 2001 +From: Andriy Grytsenko +Date: Mon, 20 Oct 2014 15:34:20 +0300 +Subject: [PATCH] Fix duplicate lxpolkit invocation by setting Hidden=true in + lxpolkit.desktop. + +It supposed to be autostarted if set to, but lxsession even without +built-in one handles that differently. So let it be hidden always. +--- + data/lxpolkit.desktop.in.in | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/data/lxpolkit.desktop.in.in b/data/lxpolkit.desktop.in.in +index 40c1269..b86b1df 100644 +--- a/data/lxpolkit.desktop.in.in ++++ b/data/lxpolkit.desktop.in.in +@@ -6,4 +6,4 @@ Exec=lxpolkit + TryExec=lxpolkit + Icon=gtk-dialog-authentication + NotShowIn=GNOME;KDE; +-Hidden=@HIDE_LXPOLKIT_AUTOSTART@ ++Hidden=true +-- +1.7.10.4 + diff --git a/lxsession-0.5.1-lxsession-db-SF692-fix.patch b/lxsession-0.5.1-lxsession-db-SF692-fix.patch new file mode 100644 index 0000000..9c3385b --- /dev/null +++ b/lxsession-0.5.1-lxsession-db-SF692-fix.patch @@ -0,0 +1,57 @@ +From 04a5a75ba10adeee261dc46a78314a08cfe093f3 Mon Sep 17 00:00:00 2001 +From: Julien Lavergne +Date: Mon, 20 Oct 2014 00:17:36 +0200 +Subject: [PATCH] Correctly connect and emit signals for lxsession-db (sould + really fix #692) + +--- + lxsession-db/desktop-files-backend.vala | 9 +++++---- + 1 file changed, 5 insertions(+), 4 deletions(-) + +diff --git a/lxsession-db/desktop-files-backend.vala b/lxsession-db/desktop-files-backend.vala +index be9622b..1e538e4 100644 +--- a/lxsession-db/desktop-files-backend.vala ++++ b/lxsession-db/desktop-files-backend.vala +@@ -186,7 +186,7 @@ namespace Lxsession + + public void on_finish_scanning_installed() + { +- message("Signal finish scanning with mode: %s",this.mode); ++ message("Signal finish scanning installed with mode: %s",this.mode); + if (this.mode == "display") + { + print_values_installed (); +@@ -206,7 +206,7 @@ namespace Lxsession + + public void on_finish_scanning_available() + { +- message("Signal finish scanning with mode: %s",this.mode); ++ message("Signal finish scanning available with mode: %s",this.mode); + if (this.mode == "display") + { + global_db.print_values_available (); +@@ -263,6 +263,7 @@ namespace Lxsession + else + { + message ("%s doesn't exist. Pass", folder); ++ finish_scanning_available(); + } + } + } +@@ -274,11 +275,11 @@ namespace Lxsession + + public void update () + { +- update_installed(); + finish_scanning_installed.connect(on_finish_scanning_installed); ++ finish_scanning_available.connect(on_finish_scanning_available); + ++ update_installed(); + update_available(); +- finish_scanning_available.connect(on_finish_scanning_available); + } + + private async void list_desktop_files (string path, string mode) +-- +1.7.10.4 + diff --git a/lxsession.changes b/lxsession.changes index 5dec6cb..20fdac5 100644 --- a/lxsession.changes +++ b/lxsession.changes @@ -1,3 +1,10 @@ +------------------------------------------------------------------- +Thu Oct 23 18:39:34 UTC 2014 - trcs@gmx.com + +- added + * lxsession-0.5.1-duplicate-lxpolkit-invocation-fix.patch + * lxsession-0.5.1-lxsession-db-SF692-fix.patch + ------------------------------------------------------------------- Tue Oct 21 07:49:16 UTC 2014 - andrea@opensuse.org diff --git a/lxsession.spec b/lxsession.spec index 10c1b18..8d502a8 100644 --- a/lxsession.spec +++ b/lxsession.spec @@ -24,6 +24,8 @@ License: GPL-2.0 Group: System/GUI/LXDE Url: http://www.lxde.org/ Source: %{name}-%{version}.tar.xz +Patch0: lxsession-0.5.1-duplicate-lxpolkit-invocation-fix.patch +Patch1: lxsession-0.5.1-lxsession-db-SF692-fix.patch BuildRequires: dbus-1-glib-devel BuildRequires: docbook-utils BuildRequires: docbook-xsl-stylesheets @@ -50,7 +52,8 @@ use when a user logs out and to restart them the next time the user logs in. %prep %setup -q - +%patch0 -p1 +%patch1 -p1 %build %configure \