Accepting request 257844 from X11:lxde

new upstream version

OBS-URL: https://build.opensuse.org/request/show/257844
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/lxsession?expand=0&rev=32
This commit is contained in:
Stephan Kulow 2014-10-22 14:23:01 +00:00 committed by Git OBS Bridge
commit a5df81495e
7 changed files with 27 additions and 424 deletions

View File

@ -1,94 +0,0 @@
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)

View File

@ -1,271 +0,0 @@
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 */

View File

@ -1,39 +0,0 @@
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 \

View File

@ -1,3 +0,0 @@
version https://git-lfs.github.com/spec/v1
oid sha256:e1380881ac5a275dc9e2e04e3dabab54a677b855c92f1761a2ed691007b67568
size 612599

3
lxsession-0.5.1.tar.xz Normal file
View File

@ -0,0 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:7a9c58a0d9cecc943441c0e8c4cde06516d14b7e370f9aeacebafd9f386badc7
size 345568

View File

@ -1,3 +1,22 @@
-------------------------------------------------------------------
Tue Oct 21 07:49:16 UTC 2014 - andrea@opensuse.org
- New upstream version 0.5.1
* patches removed since now in upstream code
- lxsession-0.4.9.3-gtk3-hide_all.patch
- lxsession-0.4.9.3-gtk3-fix.patch
- lxsession-0.4.9.3-lower-libgee.patch
* Translations updates.
* Added support for reboot and shutdown in LTST client.
* Added support for user switch.
* Added clipboard support, based on Xfce one.
* Added options to launch default applications.
* Rewritten whole lxsession in Vala.
* Implemented a connection to session bus.
* Added ability to change settings by Dbus call,
example by keymap configuration.
* full changelog : http://blog.lxde.org/?p=1283
------------------------------------------------------------------- -------------------------------------------------------------------
Tue Mar 25 11:00:00 UTC 2014 - andrea@opensuse.org Tue Mar 25 11:00:00 UTC 2014 - andrea@opensuse.org

View File

@ -17,19 +17,13 @@
Name: lxsession Name: lxsession
Version: 0.4.9.3.git20130914 Version: 0.5.1
Release: 0 Release: 0
Summary: LXDE Session Manager, required for running the desktop environment Summary: LXDE Session Manager, required for running the desktop environment
License: GPL-2.0 License: GPL-2.0
Group: System/GUI/LXDE Group: System/GUI/LXDE
Url: http://www.lxde.org/ Url: http://www.lxde.org/
Source: %{name}-%{version}.tar.gz Source: %{name}-%{version}.tar.xz
# PATCH-FIX-UPSTREAM marguerite@opensuse.org - can't build gtk2 generated .c file with gtk3
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
BuildRequires: dbus-1-glib-devel BuildRequires: dbus-1-glib-devel
BuildRequires: docbook-utils BuildRequires: docbook-utils
BuildRequires: docbook-xsl-stylesheets BuildRequires: docbook-xsl-stylesheets
@ -56,16 +50,9 @@ use when a user logs out and to restart them the next time the user logs in.
%prep %prep
%setup -q %setup -q
%patch0 -p1
%if 0%{?suse_version} <= 1230
%patch1 -p1
%endif
%if 0%{?suse_version} > 1220
%patch2 -p1
%endif
%build %build
autoreconf -fi
%configure \ %configure \
--enable-man --enable-man
make %{?_smp_mflags} V=1 make %{?_smp_mflags} V=1
@ -93,14 +80,15 @@ sed -i "3d" %{buildroot}%{_datadir}/applications/lxsession-edit.desktop
%{_bindir}/lxsession-default %{_bindir}/lxsession-default
%{_bindir}/lxsession-default-apps %{_bindir}/lxsession-default-apps
%{_bindir}/lxsession-default-terminal %{_bindir}/lxsession-default-terminal
%{_bindir}/lxsession-xdg-autostart
%{_bindir}/lxsession-edit %{_bindir}/lxsession-edit
%{_bindir}/lxsession-db %{_bindir}/lxsession-db
%{_bindir}/lxsession-message-gtk
%{_bindir}/lxsession-xsettings %{_bindir}/lxsession-xsettings
%{_bindir}/lxsettings-daemon %{_bindir}/lxsettings-daemon
%{_datadir}/lxsession/ %{_datadir}/lxsession/
%{_datadir}/applications/lxsession-default-apps.desktop %{_datadir}/applications/lxsession-default-apps.desktop
%{_datadir}/applications/lxsession-edit.desktop %{_datadir}/applications/lxsession-edit.desktop
%{_mandir}/man1/*.1.gz %{_mandir}/man1/*.1.gz
%{_sysconfdir}/xdg/autostart/lxpolkit.desktop
%changelog %changelog