forked from pool/lxsession
Accepting request 199131 from X11:lxde
fix bnc#839854, we have to update (forwarded request 199109 from MargueriteSu) OBS-URL: https://build.opensuse.org/request/show/199131 OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/lxsession?expand=0&rev=28
This commit is contained in:
Stephan Kulow
Git OBS Bridge
commit
cc8b049533
@ -1,28 +0,0 @@
|
|||||||
From 466982ce65e6d673c54ba7a0546d463da1fe5bfa Mon Sep 17 00:00:00 2001
|
|
||||||
From: =?utf8?q?Andrew=20Lee=20(=E6=9D=8E=E5=81=A5=E7=A7=8B)?= <ajqlee@debian.org>
|
|
||||||
Date: Fri, 29 Jul 2011 21:11:06 +0800
|
|
||||||
Subject: [PATCH] Support reboot and shutdown in LTST client. Thanks Vagrant Cascadian <vagrant@freegeek.org>.
|
|
||||||
|
|
||||||
---
|
|
||||||
lxsession-logout/lxsession-logout.c | 4 ++++
|
|
||||||
1 files changed, 4 insertions(+), 0 deletions(-)
|
|
||||||
|
|
||||||
diff --git a/lxsession-logout/lxsession-logout.c b/lxsession-logout/lxsession-logout.c
|
|
||||||
index a1c26f4..5bb8add 100644
|
|
||||||
--- a/lxsession-logout/lxsession-logout.c
|
|
||||||
+++ b/lxsession-logout/lxsession-logout.c
|
|
||||||
@@ -458,7 +458,11 @@ int main(int argc, char * argv[])
|
|
||||||
|
|
||||||
/* LTSP support */
|
|
||||||
if (g_getenv("LTSP_CLIENT"))
|
|
||||||
+ {
|
|
||||||
handler_context.ltsp = TRUE;
|
|
||||||
+ handler_context.shutdown_available = TRUE;
|
|
||||||
+ handler_context.reboot_available = TRUE;
|
|
||||||
+ }
|
|
||||||
|
|
||||||
/* Make the button images accessible. */
|
|
||||||
gtk_icon_theme_append_search_path(gtk_icon_theme_get_default(), PACKAGE_DATA_DIR "/lxsession/images");
|
|
||||||
--
|
|
||||||
1.7.0.1
|
|
||||||
|
|
||||||
@ -1,30 +0,0 @@
|
|||||||
From a872047b9b04707adb5e26b6e14cc7a1d740421f Mon Sep 17 00:00:00 2001
|
|
||||||
From: =?utf8?q?Andrew=20Lee=20(=E6=9D=8E=E5=81=A5=E7=A7=8B)?= <ajqlee@debian.org>
|
|
||||||
Date: Fri, 29 Jul 2011 21:09:33 +0800
|
|
||||||
Subject: [PATCH] Support user switch with gdm3 in lxsession-logout.
|
|
||||||
|
|
||||||
---
|
|
||||||
lxsession-logout/lxsession-logout.c | 7 +++++++
|
|
||||||
1 files changed, 7 insertions(+), 0 deletions(-)
|
|
||||||
|
|
||||||
diff --git a/lxsession-logout/lxsession-logout.c b/lxsession-logout/lxsession-logout.c
|
|
||||||
index 86f906a..a1c26f4 100644
|
|
||||||
--- a/lxsession-logout/lxsession-logout.c
|
|
||||||
+++ b/lxsession-logout/lxsession-logout.c
|
|
||||||
@@ -442,6 +442,13 @@ int main(int argc, char * argv[])
|
|
||||||
handler_context.switch_user_GDM = TRUE;
|
|
||||||
}
|
|
||||||
|
|
||||||
+ /* If we are under GDM3, its "Switch User" is available. */
|
|
||||||
+ if (verify_running("gdm3", "gdmflexiserver"))
|
|
||||||
+ {
|
|
||||||
+ handler_context.switch_user_available = TRUE;
|
|
||||||
+ handler_context.switch_user_GDM = TRUE;
|
|
||||||
+ }
|
|
||||||
+
|
|
||||||
/* If we are under KDM, its "Switch User" is available. */
|
|
||||||
if (verify_running("kdm", "kdmctl"))
|
|
||||||
{
|
|
||||||
--
|
|
||||||
1.7.0.1
|
|
||||||
|
|
||||||
@ -1,3 +0,0 @@
|
|||||||
version https://git-lfs.github.com/spec/v1
|
|
||||||
oid sha256:83be724bb3ae078caf138afbcb870361b9d643737f6b9e9dad10f36a000c54db
|
|
||||||
size 310754
|
|
||||||
34
lxsession-0.4.9.3-FileAttribute.Standard_Name.patch
Normal file
34
lxsession-0.4.9.3-FileAttribute.Standard_Name.patch
Normal file
@ -0,0 +1,34 @@
|
|||||||
|
Index: lxsession-0.4.9.3.git20130914/lxsession-db/desktop-files-backend.vala
|
||||||
|
===================================================================
|
||||||
|
--- lxsession-0.4.9.3.git20130914.orig/lxsession-db/desktop-files-backend.vala
|
||||||
|
+++ lxsession-0.4.9.3.git20130914/lxsession-db/desktop-files-backend.vala
|
||||||
|
@@ -182,7 +182,7 @@ namespace Lxsession
|
||||||
|
{
|
||||||
|
KeyFile kf = new KeyFile();
|
||||||
|
/* asynchronous call, to get directory entries */
|
||||||
|
- var e = yield dir.enumerate_children_async (FileAttribute.STANDARD_NAME,
|
||||||
|
+ var e = yield dir.enumerate_children_async (FILE_ATTRIBUTE_STANDARD_NAME,
|
||||||
|
0, Priority.DEFAULT);
|
||||||
|
while (true)
|
||||||
|
{
|
||||||
|
@@ -220,16 +220,16 @@ namespace Lxsession
|
||||||
|
{
|
||||||
|
/* No entry, just pass */;
|
||||||
|
}
|
||||||
|
- catch (FileError err)
|
||||||
|
+ catch (FileError err1)
|
||||||
|
{
|
||||||
|
- warning (err.message);
|
||||||
|
+ warning (err1.message);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
- catch (Error err)
|
||||||
|
+ catch (Error err2)
|
||||||
|
{
|
||||||
|
- stderr.printf ("Error: list_files failed: %s\n", err.message);
|
||||||
|
+ stderr.printf ("Error: list_files failed: %s\n", err2.message);
|
||||||
|
}
|
||||||
|
message ("Finishing scanning\n");
|
||||||
|
|
||||||
94
lxsession-0.4.9.3-gtk3-fix.patch
Normal file
94
lxsession-0.4.9.3-gtk3-fix.patch
Normal file
@ -0,0 +1,94 @@
|
|||||||
|
Index: lxsession-0.4.9.3.git20130914/configure.ac
|
||||||
|
===================================================================
|
||||||
|
--- lxsession-0.4.9.3.git20130914.orig/configure.ac
|
||||||
|
+++ lxsession-0.4.9.3.git20130914/configure.ac
|
||||||
|
@@ -53,12 +53,15 @@ AC_ARG_ENABLE([gtk3],
|
||||||
|
if test "x$enable_gtk3" = "xyes" ; then
|
||||||
|
CFLAGS="$CFLAGS -DENABLE_GTK3"
|
||||||
|
gtk_modules="gtk+-3.0 >= 3.0.0"
|
||||||
|
+ VALA_GTK_LIBS="gtk+-3.0"
|
||||||
|
else
|
||||||
|
gtk_modules="gtk+-2.0 >= 2.6.0"
|
||||||
|
+ VALA_GTK_LIBS="gtk+-2.0"
|
||||||
|
fi
|
||||||
|
PKG_CHECK_MODULES(GTK, [$gtk_modules])
|
||||||
|
AC_SUBST(GTK_CFLAGS)
|
||||||
|
AC_SUBST(GTK_LIBS)
|
||||||
|
+AC_SUBST(VALA_GTK_LIBS)
|
||||||
|
|
||||||
|
PKG_CHECK_MODULES(X11, [x11])
|
||||||
|
AC_SUBST(X11_CFLAGS)
|
||||||
|
Index: lxsession-0.4.9.3.git20130914/lxclipboard/Makefile.am
|
||||||
|
===================================================================
|
||||||
|
--- lxsession-0.4.9.3.git20130914.orig/lxclipboard/Makefile.am
|
||||||
|
+++ lxsession-0.4.9.3.git20130914/lxclipboard/Makefile.am
|
||||||
|
@@ -7,7 +7,7 @@ lxclipboard_SOURCES = \
|
||||||
|
|
||||||
|
lxclipboard_VALAFLAGS = \
|
||||||
|
--vapidir=$(srcdir)/../vapi \
|
||||||
|
- --pkg gtk+-2.0 \
|
||||||
|
+ --pkg @VALA_GTK_LIBS@ \
|
||||||
|
--pkg lxclipboard \
|
||||||
|
$(NULL)
|
||||||
|
|
||||||
|
Index: lxsession-0.4.9.3.git20130914/lxpolkit/Makefile.am
|
||||||
|
===================================================================
|
||||||
|
--- lxsession-0.4.9.3.git20130914.orig/lxpolkit/Makefile.am
|
||||||
|
+++ lxsession-0.4.9.3.git20130914/lxpolkit/Makefile.am
|
||||||
|
@@ -10,7 +10,7 @@ lxpolkit_SOURCES = \
|
||||||
|
|
||||||
|
lxpolkit_VALAFLAGS = \
|
||||||
|
--vapidir=$(srcdir)/../vapi \
|
||||||
|
- --pkg gtk+-2.0 \
|
||||||
|
+ --pkg @VALA_GTK_LIBS@ \
|
||||||
|
--pkg lxpolkit \
|
||||||
|
$(NULL)
|
||||||
|
|
||||||
|
Index: lxsession-0.4.9.3.git20130914/lxsession-db/Makefile.am
|
||||||
|
===================================================================
|
||||||
|
--- lxsession-0.4.9.3.git20130914.orig/lxsession-db/Makefile.am
|
||||||
|
+++ lxsession-0.4.9.3.git20130914/lxsession-db/Makefile.am
|
||||||
|
@@ -7,7 +7,7 @@ lxsession_db_SOURCES = \
|
||||||
|
|
||||||
|
lxsession_db_VALAFLAGS = \
|
||||||
|
--vapidir=$(srcdir)/../vapi \
|
||||||
|
- --pkg gtk+-2.0 \
|
||||||
|
+ --pkg @VALA_GTK_LIBS@ \
|
||||||
|
--pkg gee-0.8 \
|
||||||
|
$(NULL)
|
||||||
|
|
||||||
|
Index: lxsession-0.4.9.3.git20130914/lxsession-default-apps/Makefile.am
|
||||||
|
===================================================================
|
||||||
|
--- lxsession-0.4.9.3.git20130914.orig/lxsession-default-apps/Makefile.am
|
||||||
|
+++ lxsession-0.4.9.3.git20130914/lxsession-default-apps/Makefile.am
|
||||||
|
@@ -9,7 +9,7 @@ lxsession_default_apps_SOURCES = \
|
||||||
|
|
||||||
|
lxsession_default_apps_VALAFLAGS = \
|
||||||
|
--vapidir=$(srcdir)/../vapi \
|
||||||
|
- --pkg gtk+-2.0 \
|
||||||
|
+ --pkg @VALA_GTK_LIBS@ \
|
||||||
|
--pkg dbus-glib-1 \
|
||||||
|
--pkg gio-2.0 \
|
||||||
|
--pkg posix \
|
||||||
|
Index: lxsession-0.4.9.3.git20130914/lxsession/Makefile.am
|
||||||
|
===================================================================
|
||||||
|
--- lxsession-0.4.9.3.git20130914.orig/lxsession/Makefile.am
|
||||||
|
+++ lxsession-0.4.9.3.git20130914/lxsession/Makefile.am
|
||||||
|
@@ -7,7 +7,7 @@ buildinclip_SOURCES = \
|
||||||
|
|
||||||
|
buildinclip_VALAFLAGS = \
|
||||||
|
--pkg lxclipboard \
|
||||||
|
- --pkg gtk+-2.0 \
|
||||||
|
+ --pkg @VALA_GTK_LIBS@ \
|
||||||
|
-D BUILDIN_CLIPBOARD \
|
||||||
|
$(NULL)
|
||||||
|
|
||||||
|
@@ -28,7 +28,7 @@ buildinpolkit_SOURCES = \
|
||||||
|
|
||||||
|
buildinpolkit_VALAFLAGS = \
|
||||||
|
--pkg lxpolkit \
|
||||||
|
- --pkg gtk+-2.0 \
|
||||||
|
+ --pkg @VALA_GTK_LIBS@ \
|
||||||
|
-D BUILDIN_POLKIT \
|
||||||
|
$(NULL)
|
||||||
|
|
||||||
271
lxsession-0.4.9.3-gtk3-hide_all.patch
Normal file
271
lxsession-0.4.9.3-gtk3-hide_all.patch
Normal file
@ -0,0 +1,271 @@
|
|||||||
|
Index: lxsession-0.4.9.3.git20130914/lxsession-default-apps/combobox.vala
|
||||||
|
===================================================================
|
||||||
|
--- lxsession-0.4.9.3.git20130914.orig/lxsession-default-apps/combobox.vala
|
||||||
|
+++ lxsession-0.4.9.3.git20130914/lxsession-default-apps/combobox.vala
|
||||||
|
@@ -84,7 +84,7 @@ namespace LDefaultApps
|
||||||
|
if (entry_name != null)
|
||||||
|
{
|
||||||
|
var entry_default = builder.get_object (entry_name) as Entry;
|
||||||
|
- entry_default.hide_all();
|
||||||
|
+ entry_default.hide();
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
@@ -108,7 +108,7 @@ namespace LDefaultApps
|
||||||
|
}
|
||||||
|
else
|
||||||
|
{
|
||||||
|
- entry.hide_all();
|
||||||
|
+ entry.hide();
|
||||||
|
}
|
||||||
|
}
|
||||||
|
});
|
||||||
|
Index: lxsession-0.4.9.3.git20130914/lxsession-default-apps/main.vala
|
||||||
|
===================================================================
|
||||||
|
--- lxsession-0.4.9.3.git20130914.orig/lxsession-default-apps/main.vala
|
||||||
|
+++ lxsession-0.4.9.3.git20130914/lxsession-default-apps/main.vala
|
||||||
|
@@ -1222,8 +1222,8 @@ namespace LDefaultApps
|
||||||
|
|
||||||
|
if (return_combobox_text(disable_autostart_combobox) == "all")
|
||||||
|
{
|
||||||
|
- auto_vbox.hide_all();
|
||||||
|
- running_apps.hide_all();
|
||||||
|
+ auto_vbox.hide();
|
||||||
|
+ running_apps.hide();
|
||||||
|
}
|
||||||
|
else
|
||||||
|
{
|
||||||
|
@@ -1344,198 +1344,198 @@ namespace LDefaultApps
|
||||||
|
/* Panel hide */
|
||||||
|
if (return_combobox_position(panel_command_combobox) != 99)
|
||||||
|
{
|
||||||
|
- panel_command_entry.hide_all();
|
||||||
|
+ panel_command_entry.hide();
|
||||||
|
}
|
||||||
|
|
||||||
|
if (return_combobox_position(panel_session_combobox) != 99)
|
||||||
|
{
|
||||||
|
- panel_session_entry.hide_all();
|
||||||
|
+ panel_session_entry.hide();
|
||||||
|
}
|
||||||
|
|
||||||
|
/* Dock hide */
|
||||||
|
if (return_combobox_position(dock_command_combobox) != 99)
|
||||||
|
{
|
||||||
|
- dock_command_entry.hide_all();
|
||||||
|
+ dock_command_entry.hide();
|
||||||
|
}
|
||||||
|
|
||||||
|
if (return_combobox_position(dock_session_combobox) != 99)
|
||||||
|
{
|
||||||
|
- dock_session_entry.hide_all();
|
||||||
|
+ dock_session_entry.hide();
|
||||||
|
}
|
||||||
|
|
||||||
|
/* Window manager hide */
|
||||||
|
if (return_combobox_position(window_command_combobox) != 99)
|
||||||
|
{
|
||||||
|
- window_command_entry.hide_all();
|
||||||
|
+ window_command_entry.hide();
|
||||||
|
}
|
||||||
|
|
||||||
|
if (return_combobox_position(window_session_combobox) != 99)
|
||||||
|
{
|
||||||
|
- window_session_entry.hide_all();
|
||||||
|
+ window_session_entry.hide();
|
||||||
|
}
|
||||||
|
|
||||||
|
if (return_combobox_position(window_extras_combobox) != 99)
|
||||||
|
{
|
||||||
|
- window_extras_entry.hide_all();
|
||||||
|
+ window_extras_entry.hide();
|
||||||
|
}
|
||||||
|
|
||||||
|
/* Screensaver hide */
|
||||||
|
if (return_combobox_position(screensaver_command_combobox) != 99)
|
||||||
|
{
|
||||||
|
- screensaver_command_entry.hide_all();
|
||||||
|
+ screensaver_command_entry.hide();
|
||||||
|
}
|
||||||
|
|
||||||
|
/* Power Manager hide */
|
||||||
|
if (return_combobox_position(power_command_combobox) != 99)
|
||||||
|
{
|
||||||
|
- power_command_entry.hide_all();
|
||||||
|
+ power_command_entry.hide();
|
||||||
|
}
|
||||||
|
|
||||||
|
/* File manager hide */
|
||||||
|
if (return_combobox_position(file_command_combobox) != 99)
|
||||||
|
{
|
||||||
|
- file_command_entry.hide_all();
|
||||||
|
+ file_command_entry.hide();
|
||||||
|
}
|
||||||
|
|
||||||
|
if (return_combobox_position(file_session_combobox) != 99)
|
||||||
|
{
|
||||||
|
- file_session_entry.hide_all();
|
||||||
|
+ file_session_entry.hide();
|
||||||
|
}
|
||||||
|
|
||||||
|
if (return_combobox_position(file_extras_combobox) != 99)
|
||||||
|
{
|
||||||
|
- file_extras_entry.hide_all();
|
||||||
|
+ file_extras_entry.hide();
|
||||||
|
}
|
||||||
|
|
||||||
|
/* Desktop hide */
|
||||||
|
if (return_combobox_position(desktop_command_combobox) != 99)
|
||||||
|
{
|
||||||
|
- desktop_command_entry.hide_all();
|
||||||
|
+ desktop_command_entry.hide();
|
||||||
|
}
|
||||||
|
|
||||||
|
if (return_combobox_position(desktop_wallpaper_combobox) != 99)
|
||||||
|
{
|
||||||
|
- desktop_wallpaper_entry.hide_all();
|
||||||
|
+ desktop_wallpaper_entry.hide();
|
||||||
|
}
|
||||||
|
|
||||||
|
/* Composite hide */
|
||||||
|
if (return_combobox_position(composite_command_combobox) != 99)
|
||||||
|
{
|
||||||
|
- composite_command_entry.hide_all();
|
||||||
|
+ composite_command_entry.hide();
|
||||||
|
}
|
||||||
|
|
||||||
|
if (return_combobox_position(composite_autostart_combobox) != 99)
|
||||||
|
{
|
||||||
|
- composite_autostart_entry.hide_all();
|
||||||
|
+ composite_autostart_entry.hide();
|
||||||
|
}
|
||||||
|
|
||||||
|
/* IM1 hide */
|
||||||
|
if (return_combobox_position(im1_command_combobox) != 99)
|
||||||
|
{
|
||||||
|
- im1_command_entry.hide_all();
|
||||||
|
+ im1_command_entry.hide();
|
||||||
|
}
|
||||||
|
|
||||||
|
if (return_combobox_position(im1_autostart_combobox) != 99)
|
||||||
|
{
|
||||||
|
- im1_autostart_entry.hide_all();
|
||||||
|
+ im1_autostart_entry.hide();
|
||||||
|
}
|
||||||
|
|
||||||
|
/* IM2 hide */
|
||||||
|
if (return_combobox_position(im2_command_combobox) != 99)
|
||||||
|
{
|
||||||
|
- im2_command_entry.hide_all();
|
||||||
|
+ im2_command_entry.hide();
|
||||||
|
}
|
||||||
|
|
||||||
|
if (return_combobox_position(im2_autostart_combobox) != 99)
|
||||||
|
{
|
||||||
|
- im2_autostart_entry.hide_all();
|
||||||
|
+ im2_autostart_entry.hide();
|
||||||
|
}
|
||||||
|
|
||||||
|
/* Widget1 hide */
|
||||||
|
if (return_combobox_position(widget1_command_combobox) != 99)
|
||||||
|
{
|
||||||
|
- widget1_command_entry.hide_all();
|
||||||
|
+ widget1_command_entry.hide();
|
||||||
|
}
|
||||||
|
|
||||||
|
if (return_combobox_position(widget1_autostart_combobox) != 99)
|
||||||
|
{
|
||||||
|
- widget1_autostart_entry.hide_all();
|
||||||
|
+ widget1_autostart_entry.hide();
|
||||||
|
}
|
||||||
|
|
||||||
|
/* Polkit hide */
|
||||||
|
if (return_combobox_position(polkit_command_combobox) != 99)
|
||||||
|
{
|
||||||
|
- polkit_command_entry.hide_all();
|
||||||
|
+ polkit_command_entry.hide();
|
||||||
|
}
|
||||||
|
|
||||||
|
/* Network GUI hide */
|
||||||
|
if (return_combobox_position(network_command_combobox) != 99)
|
||||||
|
{
|
||||||
|
- network_command_entry.hide_all();
|
||||||
|
+ network_command_entry.hide();
|
||||||
|
}
|
||||||
|
|
||||||
|
/* Audio manager hide */
|
||||||
|
if (return_combobox_position(audio_command_combobox) != 99)
|
||||||
|
{
|
||||||
|
- audio_command_entry.hide_all();
|
||||||
|
+ audio_command_entry.hide();
|
||||||
|
}
|
||||||
|
|
||||||
|
/* Quit manager hide */
|
||||||
|
if (return_combobox_position(quit_command_combobox) != 99)
|
||||||
|
{
|
||||||
|
- quit_command_entry.hide_all();
|
||||||
|
+ quit_command_entry.hide();
|
||||||
|
}
|
||||||
|
|
||||||
|
if (return_combobox_position(quit_image_combobox) != 99)
|
||||||
|
{
|
||||||
|
- quit_image_entry.hide_all();
|
||||||
|
+ quit_image_entry.hide();
|
||||||
|
}
|
||||||
|
|
||||||
|
if (return_combobox_position(quit_layout_combobox) != 99)
|
||||||
|
{
|
||||||
|
- quit_layout_entry.hide_all();
|
||||||
|
+ quit_layout_entry.hide();
|
||||||
|
}
|
||||||
|
|
||||||
|
/* Workspace manager hide */
|
||||||
|
if (return_combobox_position(workspace_command_combobox) != 99)
|
||||||
|
{
|
||||||
|
- workspace_command_entry.hide_all();
|
||||||
|
+ workspace_command_entry.hide();
|
||||||
|
}
|
||||||
|
|
||||||
|
/* Launcher manager hide */
|
||||||
|
if (return_combobox_position(launcher_command_combobox) != 99)
|
||||||
|
{
|
||||||
|
- launcher_command_entry.hide_all();
|
||||||
|
+ launcher_command_entry.hide();
|
||||||
|
}
|
||||||
|
|
||||||
|
/* Terminal manager hide */
|
||||||
|
if (return_combobox_position(terminal_command_combobox) != 99)
|
||||||
|
{
|
||||||
|
- terminal_command_entry.hide_all();
|
||||||
|
+ terminal_command_entry.hide();
|
||||||
|
}
|
||||||
|
|
||||||
|
/* Screenshot manager hide */
|
||||||
|
if (return_combobox_position(screenshot_command_combobox) != 99)
|
||||||
|
{
|
||||||
|
- screenshot_command_entry.hide_all();
|
||||||
|
+ screenshot_command_entry.hide();
|
||||||
|
}
|
||||||
|
|
||||||
|
/* Lock manager hide */
|
||||||
|
if (return_combobox_position(lock_command_combobox) != 99)
|
||||||
|
{
|
||||||
|
- lock_command_entry.hide_all();
|
||||||
|
+ lock_command_entry.hide();
|
||||||
|
}
|
||||||
|
|
||||||
|
/* Upgrade manager hide */
|
||||||
|
if (return_combobox_position(upgrade_command_combobox) != 99)
|
||||||
|
{
|
||||||
|
- upgrade_command_entry.hide_all();
|
||||||
|
+ upgrade_command_entry.hide();
|
||||||
|
}
|
||||||
|
|
||||||
|
/* Clipboard manager hide */
|
||||||
|
if (return_combobox_position(clipboard_command_combobox) != 99)
|
||||||
|
{
|
||||||
|
- clipboard_command_entry.hide_all();
|
||||||
|
+ clipboard_command_entry.hide();
|
||||||
|
}
|
||||||
|
|
||||||
|
/* start main loop */
|
||||||
39
lxsession-0.4.9.3-lower-libgee.patch
Normal file
39
lxsession-0.4.9.3-lower-libgee.patch
Normal file
@ -0,0 +1,39 @@
|
|||||||
|
Index: lxsession-0.4.9.3.git20130914/configure.ac
|
||||||
|
===================================================================
|
||||||
|
--- lxsession-0.4.9.3.git20130914.orig/configure.ac
|
||||||
|
+++ lxsession-0.4.9.3.git20130914/configure.ac
|
||||||
|
@@ -75,7 +75,7 @@ PKG_CHECK_MODULES(GIO, [gio-unix-2.0])
|
||||||
|
AC_SUBST(GIO_CFLAGS)
|
||||||
|
AC_SUBST(GIO_LIBS)
|
||||||
|
|
||||||
|
-PKG_CHECK_MODULES(GEE, [gee-0.8])
|
||||||
|
+PKG_CHECK_MODULES(GEE, [gee-1.0])
|
||||||
|
AC_SUBST(GEE_CFLAGS)
|
||||||
|
AC_SUBST(GEE_LIBS)
|
||||||
|
|
||||||
|
Index: lxsession-0.4.9.3.git20130914/lxsession-db/Makefile.am
|
||||||
|
===================================================================
|
||||||
|
--- lxsession-0.4.9.3.git20130914.orig/lxsession-db/Makefile.am
|
||||||
|
+++ lxsession-0.4.9.3.git20130914/lxsession-db/Makefile.am
|
||||||
|
@@ -8,7 +8,7 @@ lxsession_db_SOURCES = \
|
||||||
|
lxsession_db_VALAFLAGS = \
|
||||||
|
--vapidir=$(srcdir)/../vapi \
|
||||||
|
--pkg @VALA_GTK_LIBS@ \
|
||||||
|
- --pkg gee-0.8 \
|
||||||
|
+ --pkg gee-1.0 \
|
||||||
|
$(NULL)
|
||||||
|
|
||||||
|
lxsession_db_CFLAGS = \
|
||||||
|
Index: lxsession-0.4.9.3.git20130914/lxsession/Makefile.am
|
||||||
|
===================================================================
|
||||||
|
--- lxsession-0.4.9.3.git20130914.orig/lxsession/Makefile.am
|
||||||
|
+++ lxsession-0.4.9.3.git20130914/lxsession/Makefile.am
|
||||||
|
@@ -70,7 +70,7 @@ lxsession_VALAFLAGS = \
|
||||||
|
--vapidir=$(srcdir)/../vapi \
|
||||||
|
--pkg dbus-glib-1 \
|
||||||
|
--pkg gio-2.0 \
|
||||||
|
- --pkg gee-0.8 \
|
||||||
|
+ --pkg gee-1.0 \
|
||||||
|
--pkg posix \
|
||||||
|
--pkg lxsettings-daemon \
|
||||||
|
--pkg xdg-autostart \
|
||||||
3
lxsession-0.4.9.3.git20130914.tar.gz
Normal file
3
lxsession-0.4.9.3.git20130914.tar.gz
Normal file
@ -0,0 +1,3 @@
|
|||||||
|
version https://git-lfs.github.com/spec/v1
|
||||||
|
oid sha256:e1380881ac5a275dc9e2e04e3dabab54a677b855c92f1761a2ed691007b67568
|
||||||
|
size 612599
|
||||||
@ -1,3 +1,38 @@
|
|||||||
|
-------------------------------------------------------------------
|
||||||
|
Sat Sep 14 03:52:04 UTC 2013 - i@marguerite.su
|
||||||
|
|
||||||
|
- update version 0.4.9.3.git20130914
|
||||||
|
* various bugfix release
|
||||||
|
* 0.4.9.2 has a bug, shutdown/reboot doesn't work
|
||||||
|
* upstream rewrite the dbus interface, so no way to find
|
||||||
|
a "fix" unless we update it. (bnc#839854)(sf#3614478)
|
||||||
|
- add patch: lxsession-0.4.9.3-lower-libgee.patch
|
||||||
|
* because it's no sense to update it
|
||||||
|
- add patch: lxsession-0.4.9.3-gtk3-fix.patch
|
||||||
|
* it used gtk2 to generate C files from vala, then build
|
||||||
|
with gtk3. that's shit
|
||||||
|
- add patch: lxsession-0.4.9.3-gtk3-hide_all.patch
|
||||||
|
* gtk_widget_hide_all() is no more in gtk3, replace with
|
||||||
|
hide()
|
||||||
|
- add patch: lxsession-0.4.9.3-FileAttribute.Standard_Name.patch
|
||||||
|
* FileAttribute.Standard_Name is still File_Attribute_Standard_Name
|
||||||
|
in vala 0.14
|
||||||
|
* can't use the same name for elements of the same type in a single
|
||||||
|
function in vala 0.14 (gnome#596861)
|
||||||
|
|
||||||
|
-------------------------------------------------------------------
|
||||||
|
Wed Sep 4 14:17:34 UTC 2013 - i@marguerite.su
|
||||||
|
|
||||||
|
- update version 0.4.9.2
|
||||||
|
* bugfix release
|
||||||
|
- removed all 0.4.6.1 patches, upstreamed
|
||||||
|
* lxsession-0.4.6.1-support-reboot-shutdown-ltst.patch
|
||||||
|
* lxsession-0.4.6.1-support-user-switch-gdm3.patch
|
||||||
|
- build with gtk3 on 12.3+ machines
|
||||||
|
- add patch: lxsession-0.4.9.2-gtk3-fix.patch
|
||||||
|
* gtkobject is no more in gtk3, fix with gobject.
|
||||||
|
* gtk_widget_hide_all is no more, fix with gtk_widget_hide
|
||||||
|
|
||||||
-------------------------------------------------------------------
|
-------------------------------------------------------------------
|
||||||
Fri Jul 29 22:35:40 UTC 2011 - andrea@opensuse.org
|
Fri Jul 29 22:35:40 UTC 2011 - andrea@opensuse.org
|
||||||
|
|
||||||
|
|||||||
@ -1,7 +1,7 @@
|
|||||||
#
|
#
|
||||||
# spec file for package lxsession
|
# spec file for package lxsession
|
||||||
#
|
#
|
||||||
# Copyright (c) 2011 SUSE LINUX Products GmbH, Nuernberg, Germany.
|
# Copyright (c) 2013 SUSE LINUX Products GmbH, Nuernberg, Germany.
|
||||||
#
|
#
|
||||||
# All modifications and additions to the file contributed by third parties
|
# All modifications and additions to the file contributed by third parties
|
||||||
# remain the property of their copyright owners, unless otherwise agreed
|
# remain the property of their copyright owners, unless otherwise agreed
|
||||||
@ -15,22 +15,40 @@
|
|||||||
# Please submit bugfixes or comments via http://bugs.opensuse.org/
|
# Please submit bugfixes or comments via http://bugs.opensuse.org/
|
||||||
#
|
#
|
||||||
|
|
||||||
# norootforbuild
|
|
||||||
|
|
||||||
|
|
||||||
Name: lxsession
|
Name: lxsession
|
||||||
Version: 0.4.6.1
|
Version: 0.4.9.3.git20130914
|
||||||
Release: 16
|
Release: 0
|
||||||
Summary: LXDE Session Manager, required for running the desktop environment
|
Summary: LXDE Session Manager, required for running the desktop environment
|
||||||
Group: System/GUI/LXDE
|
|
||||||
License: GPL-2.0
|
License: GPL-2.0
|
||||||
|
Group: System/GUI/LXDE
|
||||||
Url: http://www.lxde.org/
|
Url: http://www.lxde.org/
|
||||||
Source0: %{name}-%{version}.tar.bz2
|
Source: %{name}-%{version}.tar.gz
|
||||||
Patch0: %name-0.4.6.1-support-user-switch-gdm3.patch
|
# PATCH-FIX-UPSTREAM marguerite@opensuse.org - can't build gtk2 generated .c file with gtk3
|
||||||
Patch1: %name-0.4.6.1-support-reboot-shutdown-ltst.patch
|
Patch0: lxsession-0.4.9.3-gtk3-fix.patch
|
||||||
|
# PATCH-FIX-UPSTREAM marguerite@opensuse.org - don't bump libgee version, it's no sense
|
||||||
|
Patch1: lxsession-0.4.9.3-lower-libgee.patch
|
||||||
|
# PATCH-FIX-UPSTREAM marguerite@opensuse.org - hide_all() is no more in gtk3, replace with hide()
|
||||||
|
Patch2: lxsession-0.4.9.3-gtk3-hide_all.patch
|
||||||
|
# PATCH-FIX-UPSTREAM marguerite@opensuse.org - FileAttribute.Standard_Name doesn't exist in 0.14 vala
|
||||||
|
Patch3: lxsession-0.4.9.3-FileAttribute.Standard_Name.patch
|
||||||
|
BuildRequires: dbus-1-glib-devel
|
||||||
|
BuildRequires: docbook-utils
|
||||||
|
BuildRequires: docbook-xsl-stylesheets
|
||||||
|
BuildRequires: fdupes
|
||||||
|
%if 0%{?suse_version} <= 1220
|
||||||
|
BuildRequires: gtk2-devel
|
||||||
|
%else
|
||||||
|
BuildRequires: gtk3-devel
|
||||||
|
%endif
|
||||||
|
BuildRequires: intltool
|
||||||
|
BuildRequires: libgee-devel
|
||||||
|
BuildRequires: libtool
|
||||||
|
BuildRequires: libxslt
|
||||||
|
BuildRequires: pkg-config
|
||||||
|
BuildRequires: polkit-devel
|
||||||
|
BuildRequires: vala >= 0.14
|
||||||
BuildRoot: %{_tmppath}/%{name}-%{version}-build
|
BuildRoot: %{_tmppath}/%{name}-%{version}-build
|
||||||
BuildRequires: dbus-1-glib-devel fdupes gtk2-devel intltool pkg-config
|
|
||||||
BuildRequires: docbook-utils docbook-xsl-stylesheets libxslt
|
|
||||||
|
|
||||||
%description
|
%description
|
||||||
LXSession is the standard session manager used by LXDE. The LXSession manager
|
LXSession is the standard session manager used by LXDE. The LXSession manager
|
||||||
@ -38,36 +56,59 @@ is used to automatically start a set of applications and set up a working deskto
|
|||||||
environment. Moreover, the session manager is able to remember the applications in
|
environment. Moreover, the session manager is able to remember the applications in
|
||||||
use when a user logs out and to restart them the next time the user logs in.
|
use when a user logs out and to restart them the next time the user logs in.
|
||||||
|
|
||||||
Authors:
|
|
||||||
--------
|
|
||||||
Hong Jen Yee (aka PCMan) <pcman.tw@gmail.com>
|
|
||||||
|
|
||||||
%prep
|
%prep
|
||||||
%setup -q -n %name-%version
|
%setup -q
|
||||||
%patch0 -p1
|
%patch0 -p1
|
||||||
|
%if 0%{?suse_version} <= 1230
|
||||||
%patch1 -p1
|
%patch1 -p1
|
||||||
|
%endif
|
||||||
|
%if 0%{?suse_version} > 1220
|
||||||
|
%patch2 -p1
|
||||||
|
%endif
|
||||||
|
%if 0%{?suse_version} <= 1210
|
||||||
|
%patch3 -p1
|
||||||
|
%endif
|
||||||
|
|
||||||
%build
|
%build
|
||||||
%configure --enable-man
|
autoreconf -fi
|
||||||
%__make %{?jobs:-j%jobs} V=1
|
%configure \
|
||||||
|
%if 0%{?suse_version} > 1220
|
||||||
|
--enable-gtk3 \
|
||||||
|
%endif
|
||||||
|
--enable-man
|
||||||
|
make %{?_smp_mflags} V=1
|
||||||
|
|
||||||
%install
|
%install
|
||||||
%makeinstall
|
%make_install
|
||||||
%find_lang %{name}
|
%find_lang %{name}
|
||||||
%fdupes -s %buildroot
|
|
||||||
|
|
||||||
%clean
|
# fix icon problems
|
||||||
rm -rf $RPM_BUILD_ROOT
|
# no such icon lxsession-default-apps
|
||||||
|
sed -i "3d" %{buildroot}%{_datadir}/applications/lxsession-default-apps.desktop
|
||||||
|
# why lxde use xfwm4 icon ?
|
||||||
|
sed -i "3d" %{buildroot}%{_datadir}/applications/lxsession-edit.desktop
|
||||||
|
|
||||||
|
%fdupes %{buildroot}
|
||||||
|
|
||||||
%files -f %{name}.lang
|
%files -f %{name}.lang
|
||||||
%defattr(-,root,root,0755)
|
%defattr(-,root,root,0755)
|
||||||
%doc ChangeLog README COPYING
|
%doc AUTHORS ChangeLog README COPYING TODO
|
||||||
%{_bindir}/lxlock
|
%{_bindir}/lxlock
|
||||||
%{_bindir}/lxsession
|
%{_bindir}/lxsession
|
||||||
%{_bindir}/lxsession-logout
|
%{_bindir}/lxsession-logout
|
||||||
%dir %{_datadir}/lxsession
|
%{_bindir}/lxclipboard
|
||||||
%dir %{_datadir}/lxsession/images
|
%{_bindir}/lxpolkit
|
||||||
%{_datadir}/lxsession/images/*.png
|
%{_bindir}/lxsession-default
|
||||||
%_mandir/man1/*.1.gz
|
%{_bindir}/lxsession-default-apps
|
||||||
|
%{_bindir}/lxsession-default-terminal
|
||||||
|
%{_bindir}/lxsession-edit
|
||||||
|
%{_bindir}/lxsession-db
|
||||||
|
%{_bindir}/lxsession-message-gtk
|
||||||
|
%{_bindir}/lxsession-xsettings
|
||||||
|
%{_bindir}/lxsettings-daemon
|
||||||
|
%{_datadir}/lxsession/
|
||||||
|
%{_datadir}/applications/lxsession-default-apps.desktop
|
||||||
|
%{_datadir}/applications/lxsession-edit.desktop
|
||||||
|
%{_mandir}/man1/*.1.gz
|
||||||
|
|
||||||
%changelog
|
%changelog
|
||||||
|
|||||||
Loading…
Reference in New Issue
Block a user