diff options
Diffstat (limited to 'lxde-base/lxsession/files')
3 files changed, 137 insertions, 0 deletions
diff --git a/lxde-base/lxsession/files/lxsession-0.4.9.2-configure.patch b/lxde-base/lxsession/files/lxsession-0.4.9.2-configure.patch new file mode 100644 index 000000000000..36c7c5fabe4e --- /dev/null +++ b/lxde-base/lxsession/files/lxsession-0.4.9.2-configure.patch @@ -0,0 +1,13 @@ +diff --git a/configure.ac b/configure.ac +index 66d041c..4d8a370 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -2,7 +2,7 @@ + AC_INIT([lxsession],[0.4.9.2],[],[lxsession]) + + # Autotols programs +-AM_INIT_AUTOMAKE([1.11.1 -Wall -Werror foreign]) ++AM_INIT_AUTOMAKE([1.11.1 -Wall -Werror foreign subdir-objects]) + AC_PREREQ([2.69]) + IT_PROG_INTLTOOL([0.40.0],[no-xml]) + diff --git a/lxde-base/lxsession/files/lxsession-0.4.9.2-fix-logind-dbus-calls.patch b/lxde-base/lxsession/files/lxsession-0.4.9.2-fix-logind-dbus-calls.patch new file mode 100644 index 000000000000..91d15836241a --- /dev/null +++ b/lxde-base/lxsession/files/lxsession-0.4.9.2-fix-logind-dbus-calls.patch @@ -0,0 +1,111 @@ +Taken from: +http://svnweb.mageia.org/packages/cauldron/lxsession/current/SOURCES/lxsession-0.4.9.2-fix-logind-dbus-calls.patch?revision=549605&view=co&pathrev=549606 + +--- lxsession-0.4.9.2/lxsession-logout/dbus-interface.c.0000 2013-04-12 22:02:19.000000000 +0100 ++++ lxsession-0.4.9.2/lxsession-logout/dbus-interface.c 2013-11-05 11:00:34.038965063 +0000 +@@ -244,10 +244,11 @@ + return function_result; + } + +-static void +-logind_call_function (const gchar *function, gboolean value, GError **error) ++static char * ++logind_call_function (const gchar *function) + { + GVariant *result; ++ GError *err = NULL; + + if (!logind_proxy) + { +@@ -258,20 +259,28 @@ + "/org/freedesktop/login1", + "org.freedesktop.login1.Manager", + NULL, +- error); ++ &err); ++ if (err != NULL) ++ g_error_free(err); + if (!logind_proxy) +- return; ++ return NULL; + } + + result = g_dbus_proxy_call_sync (logind_proxy, + function, +- g_variant_new ("(b)", value), ++ g_variant_new ("(b)", TRUE), + G_DBUS_CALL_FLAGS_NONE, + -1, + NULL, +- error); +- g_variant_unref (result); +- return; ++ &err); ++ if (result) ++ g_variant_unref (result); ++ if (err != NULL) { ++ char *r = strdup(err->message); ++ g_error_free(err); ++ return r; ++ } ++ return NULL; + } + + gboolean +@@ -280,10 +289,10 @@ + return logind_query ("CanPowerOff", FALSE, NULL); + } + +-void +-dbus_logind_PowerOff (GError **error) ++char * ++dbus_logind_PowerOff (void) + { +- logind_call_function ("PowerOff", TRUE, error); ++ return logind_call_function ("PowerOff"); + } + + gboolean +@@ -292,10 +301,10 @@ + return logind_query ("CanReboot", FALSE, NULL); + } + +-void +-dbus_logind_Reboot (GError **error) ++char * ++dbus_logind_Reboot (void) + { +- logind_call_function ("Reboot", TRUE, error); ++ return logind_call_function ("Reboot"); + } + + gboolean +@@ -304,10 +313,10 @@ + return logind_query ("CanSuspend", FALSE, NULL); + } + +-void +-dbus_logind_Suspend (GError **error) ++char * ++dbus_logind_Suspend (void) + { +- logind_call_function ("Suspend", TRUE, error); ++ return logind_call_function ("Suspend"); + } + + gboolean +@@ -316,10 +325,10 @@ + return logind_query ("CanHibernate", FALSE, NULL); + } + +-void +-dbus_logind_Hibernate (GError **error) ++char * ++dbus_logind_Hibernate (void) + { +- logind_call_function ("Hibernate", TRUE, error); ++ return logind_call_function ("Hibernate"); + } + + /*** ConsoleKit mechanism ***/ + diff --git a/lxde-base/lxsession/files/lxsession-0.4.9.2-makefile.patch b/lxde-base/lxsession/files/lxsession-0.4.9.2-makefile.patch new file mode 100644 index 000000000000..8a51f0300be5 --- /dev/null +++ b/lxde-base/lxsession/files/lxsession-0.4.9.2-makefile.patch @@ -0,0 +1,13 @@ +# upstream issue: https://sourceforge.net/tracker/?func=detail&aid=3615092&group_id=180858&atid=894869 + +--- a/lxsession-edit/Makefile.am 2012-10-25 14:20:04.000000000 -0400 ++++ b/lxsession-edit/Makefile.am 2013-10-14 21:30:56.627684026 -0400 +@@ -5,7 +5,7 @@ + bin_PROGRAMS = lxsession-edit + + lxsession_edit_CFLAGS = \ +- -I$(topsrcdir) \ ++ -I$(top_srcdir) \ + $(GTK_CFLAGS) \ + $(ADDITIONAL_FLAGS) \ + -DPACKAGE_LOCALE_DIR=\""$(prefix)/$(DATADIRNAME)/locale"\" \ |