From a5d855164336d81a0c3004027f98da50c54c53ee3f42660f81934d91ad8f2a59 Mon Sep 17 00:00:00 2001 From: andrea florio Date: Sun, 15 Sep 2013 14:09:25 +0000 Subject: [PATCH] Accepting request 199109 from home:MargueriteSu:branches:X11:lxde fix bnc#839854, we have to update OBS-URL: https://build.opensuse.org/request/show/199109 OBS-URL: https://build.opensuse.org/package/show/X11:lxde/lxsession?expand=0&rev=55 --- lxsession-0.4.9.2-gtk3-fix.patch | 338 ------------------ lxsession-0.4.9.2.tar.gz | 3 - ...-0.4.9.3-FileAttribute.Standard_Name.patch | 34 ++ lxsession-0.4.9.3-gtk3-fix.patch | 94 +++++ lxsession-0.4.9.3-gtk3-hide_all.patch | 271 ++++++++++++++ lxsession-0.4.9.3-lower-libgee.patch | 39 ++ lxsession-0.4.9.3.git20130914.tar.gz | 3 + lxsession.changes | 22 ++ lxsession.spec | 33 +- 9 files changed, 487 insertions(+), 350 deletions(-) delete mode 100644 lxsession-0.4.9.2-gtk3-fix.patch delete mode 100644 lxsession-0.4.9.2.tar.gz create mode 100644 lxsession-0.4.9.3-FileAttribute.Standard_Name.patch create mode 100644 lxsession-0.4.9.3-gtk3-fix.patch create mode 100644 lxsession-0.4.9.3-gtk3-hide_all.patch create mode 100644 lxsession-0.4.9.3-lower-libgee.patch create mode 100644 lxsession-0.4.9.3.git20130914.tar.gz diff --git a/lxsession-0.4.9.2-gtk3-fix.patch b/lxsession-0.4.9.2-gtk3-fix.patch deleted file mode 100644 index b91ba43..0000000 --- a/lxsession-0.4.9.2-gtk3-fix.patch +++ /dev/null @@ -1,338 +0,0 @@ -Index: lxsession-0.4.9.2/lxsession-default-apps/combobox.c -=================================================================== ---- lxsession-0.4.9.2.orig/lxsession-default-apps/combobox.c -+++ lxsession-0.4.9.2/lxsession-default-apps/combobox.c -@@ -123,7 +123,7 @@ static void __lambda5_ (Block4Data* _dat - } else { - GtkEntry* _tmp17_; - _tmp17_ = entry; -- gtk_widget_hide_all ((GtkWidget*) _tmp17_); -+ gtk_widget_hide ((GtkWidget*) _tmp17_); - } - _g_object_unref0 (entry); - } -@@ -375,7 +375,7 @@ GtkComboBox* ldefault_apps_ui_combobox_i - _tmp65_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_TYPE (_tmp64_, GTK_TYPE_ENTRY) ? ((GtkEntry*) _tmp64_) : NULL); - entry_default = _tmp65_; - _tmp66_ = entry_default; -- gtk_widget_hide_all ((GtkWidget*) _tmp66_); -+ gtk_widget_hide ((GtkWidget*) _tmp66_); - _g_object_unref0 (entry_default); - } - } -Index: lxsession-0.4.9.2/lxsession-default-apps/main.c -=================================================================== ---- lxsession-0.4.9.2.orig/lxsession-default-apps/main.c -+++ lxsession-0.4.9.2/lxsession-default-apps/main.c -@@ -143,7 +143,7 @@ gint ldefault_apps_main (gchar** args, i - GType ldefault_apps_dbus_backend_get_type (void) G_GNUC_CONST; - static Block3Data* block3_data_ref (Block3Data* _data3_); - static void block3_data_unref (void * _userdata_); --static void _gtk_main_quit_gtk_object_destroy (GtkObject* _sender, gpointer self); -+static void _gtk_main_quit_gtk_object_destroy (GObject* _sender, gpointer self); - void ldefault_apps_manual_autostart_init (GtkBuilder* builder); - LDefaultAppsDbusBackend* ldefault_apps_dbus_backend_new (void); - LDefaultAppsDbusBackend* ldefault_apps_dbus_backend_construct (GType object_type); -@@ -515,7 +515,7 @@ static gpointer _g_object_ref0 (gpointer - } - - --static void _gtk_main_quit_gtk_object_destroy (GtkObject* _sender, gpointer self) { -+static void _gtk_main_quit_gtk_object_destroy (GObject* _sender, gpointer self) { - gtk_main_quit (); - } - -@@ -2056,9 +2056,9 @@ static void __lambda59_ (Block3Data* _da - GtkVBox* _tmp14_; - GtkVBox* _tmp15_; - _tmp14_ = auto_vbox; -- gtk_widget_hide_all ((GtkWidget*) _tmp14_); -+ gtk_widget_hide ((GtkWidget*) _tmp14_); - _tmp15_ = running_apps; -- gtk_widget_hide_all ((GtkWidget*) _tmp15_); -+ gtk_widget_hide ((GtkWidget*) _tmp15_); - } else { - GtkVBox* _tmp16_; - GtkVBox* _tmp17_; -@@ -3551,7 +3551,7 @@ gint ldefault_apps_main (gchar** args, i - _tmp35_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_TYPE (_tmp34_, GTK_TYPE_WINDOW) ? ((GtkWindow*) _tmp34_) : NULL); - window = _tmp35_; - _tmp36_ = window; -- g_signal_connect ((GtkObject*) _tmp36_, "destroy", (GCallback) _gtk_main_quit_gtk_object_destroy, NULL); -+ g_signal_connect ((GObject*) _tmp36_, "destroy", (GCallback) _gtk_main_quit_gtk_object_destroy, NULL); - _tmp37_ = _data3_->builder; - ldefault_apps_manual_autostart_init (_tmp37_); - _tmp38_ = ldefault_apps_dbus_backend_new (); -@@ -5088,238 +5088,238 @@ gint ldefault_apps_main (gchar** args, i - if (_tmp878_ != 99) { - GtkEntry* _tmp879_; - _tmp879_ = _data3_->panel_command_entry; -- gtk_widget_hide_all ((GtkWidget*) _tmp879_); -+ gtk_widget_hide ((GtkWidget*) _tmp879_); - } - _tmp880_ = _data3_->panel_session_combobox; - _tmp881_ = ldefault_apps_return_combobox_position (_tmp880_); - if (_tmp881_ != 99) { - GtkEntry* _tmp882_; - _tmp882_ = _data3_->panel_session_entry; -- gtk_widget_hide_all ((GtkWidget*) _tmp882_); -+ gtk_widget_hide ((GtkWidget*) _tmp882_); - } - _tmp883_ = _data3_->dock_command_combobox; - _tmp884_ = ldefault_apps_return_combobox_position (_tmp883_); - if (_tmp884_ != 99) { - GtkEntry* _tmp885_; - _tmp885_ = _data3_->dock_command_entry; -- gtk_widget_hide_all ((GtkWidget*) _tmp885_); -+ gtk_widget_hide ((GtkWidget*) _tmp885_); - } - _tmp886_ = _data3_->dock_session_combobox; - _tmp887_ = ldefault_apps_return_combobox_position (_tmp886_); - if (_tmp887_ != 99) { - GtkEntry* _tmp888_; - _tmp888_ = _data3_->dock_session_entry; -- gtk_widget_hide_all ((GtkWidget*) _tmp888_); -+ gtk_widget_hide ((GtkWidget*) _tmp888_); - } - _tmp889_ = _data3_->window_command_combobox; - _tmp890_ = ldefault_apps_return_combobox_position (_tmp889_); - if (_tmp890_ != 99) { - GtkEntry* _tmp891_; - _tmp891_ = _data3_->window_command_entry; -- gtk_widget_hide_all ((GtkWidget*) _tmp891_); -+ gtk_widget_hide ((GtkWidget*) _tmp891_); - } - _tmp892_ = _data3_->window_session_combobox; - _tmp893_ = ldefault_apps_return_combobox_position (_tmp892_); - if (_tmp893_ != 99) { - GtkEntry* _tmp894_; - _tmp894_ = _data3_->window_session_entry; -- gtk_widget_hide_all ((GtkWidget*) _tmp894_); -+ gtk_widget_hide ((GtkWidget*) _tmp894_); - } - _tmp895_ = _data3_->window_extras_combobox; - _tmp896_ = ldefault_apps_return_combobox_position (_tmp895_); - if (_tmp896_ != 99) { - GtkEntry* _tmp897_; - _tmp897_ = _data3_->window_extras_entry; -- gtk_widget_hide_all ((GtkWidget*) _tmp897_); -+ gtk_widget_hide ((GtkWidget*) _tmp897_); - } - _tmp898_ = _data3_->screensaver_command_combobox; - _tmp899_ = ldefault_apps_return_combobox_position (_tmp898_); - if (_tmp899_ != 99) { - GtkEntry* _tmp900_; - _tmp900_ = _data3_->screensaver_command_entry; -- gtk_widget_hide_all ((GtkWidget*) _tmp900_); -+ gtk_widget_hide ((GtkWidget*) _tmp900_); - } - _tmp901_ = _data3_->power_command_combobox; - _tmp902_ = ldefault_apps_return_combobox_position (_tmp901_); - if (_tmp902_ != 99) { - GtkEntry* _tmp903_; - _tmp903_ = _data3_->power_command_entry; -- gtk_widget_hide_all ((GtkWidget*) _tmp903_); -+ gtk_widget_hide ((GtkWidget*) _tmp903_); - } - _tmp904_ = _data3_->file_command_combobox; - _tmp905_ = ldefault_apps_return_combobox_position (_tmp904_); - if (_tmp905_ != 99) { - GtkEntry* _tmp906_; - _tmp906_ = _data3_->file_command_entry; -- gtk_widget_hide_all ((GtkWidget*) _tmp906_); -+ gtk_widget_hide ((GtkWidget*) _tmp906_); - } - _tmp907_ = _data3_->file_session_combobox; - _tmp908_ = ldefault_apps_return_combobox_position (_tmp907_); - if (_tmp908_ != 99) { - GtkEntry* _tmp909_; - _tmp909_ = _data3_->file_session_entry; -- gtk_widget_hide_all ((GtkWidget*) _tmp909_); -+ gtk_widget_hide ((GtkWidget*) _tmp909_); - } - _tmp910_ = _data3_->file_extras_combobox; - _tmp911_ = ldefault_apps_return_combobox_position (_tmp910_); - if (_tmp911_ != 99) { - GtkEntry* _tmp912_; - _tmp912_ = _data3_->file_extras_entry; -- gtk_widget_hide_all ((GtkWidget*) _tmp912_); -+ gtk_widget_hide ((GtkWidget*) _tmp912_); - } - _tmp913_ = _data3_->desktop_command_combobox; - _tmp914_ = ldefault_apps_return_combobox_position (_tmp913_); - if (_tmp914_ != 99) { - GtkEntry* _tmp915_; - _tmp915_ = _data3_->desktop_command_entry; -- gtk_widget_hide_all ((GtkWidget*) _tmp915_); -+ gtk_widget_hide ((GtkWidget*) _tmp915_); - } - _tmp916_ = _data3_->desktop_wallpaper_combobox; - _tmp917_ = ldefault_apps_return_combobox_position (_tmp916_); - if (_tmp917_ != 99) { - GtkEntry* _tmp918_; - _tmp918_ = _data3_->desktop_wallpaper_entry; -- gtk_widget_hide_all ((GtkWidget*) _tmp918_); -+ gtk_widget_hide ((GtkWidget*) _tmp918_); - } - _tmp919_ = _data3_->composite_command_combobox; - _tmp920_ = ldefault_apps_return_combobox_position (_tmp919_); - if (_tmp920_ != 99) { - GtkEntry* _tmp921_; - _tmp921_ = _data3_->composite_command_entry; -- gtk_widget_hide_all ((GtkWidget*) _tmp921_); -+ gtk_widget_hide ((GtkWidget*) _tmp921_); - } - _tmp922_ = _data3_->composite_autostart_combobox; - _tmp923_ = ldefault_apps_return_combobox_position (_tmp922_); - if (_tmp923_ != 99) { - GtkEntry* _tmp924_; - _tmp924_ = _data3_->composite_autostart_entry; -- gtk_widget_hide_all ((GtkWidget*) _tmp924_); -+ gtk_widget_hide ((GtkWidget*) _tmp924_); - } - _tmp925_ = _data3_->im1_command_combobox; - _tmp926_ = ldefault_apps_return_combobox_position (_tmp925_); - if (_tmp926_ != 99) { - GtkEntry* _tmp927_; - _tmp927_ = _data3_->im1_command_entry; -- gtk_widget_hide_all ((GtkWidget*) _tmp927_); -+ gtk_widget_hide ((GtkWidget*) _tmp927_); - } - _tmp928_ = _data3_->im1_autostart_combobox; - _tmp929_ = ldefault_apps_return_combobox_position (_tmp928_); - if (_tmp929_ != 99) { - GtkEntry* _tmp930_; - _tmp930_ = _data3_->im1_autostart_entry; -- gtk_widget_hide_all ((GtkWidget*) _tmp930_); -+ gtk_widget_hide ((GtkWidget*) _tmp930_); - } - _tmp931_ = _data3_->im2_command_combobox; - _tmp932_ = ldefault_apps_return_combobox_position (_tmp931_); - if (_tmp932_ != 99) { - GtkEntry* _tmp933_; - _tmp933_ = _data3_->im2_command_entry; -- gtk_widget_hide_all ((GtkWidget*) _tmp933_); -+ gtk_widget_hide ((GtkWidget*) _tmp933_); - } - _tmp934_ = _data3_->im2_autostart_combobox; - _tmp935_ = ldefault_apps_return_combobox_position (_tmp934_); - if (_tmp935_ != 99) { - GtkEntry* _tmp936_; - _tmp936_ = _data3_->im2_autostart_entry; -- gtk_widget_hide_all ((GtkWidget*) _tmp936_); -+ gtk_widget_hide ((GtkWidget*) _tmp936_); - } - _tmp937_ = _data3_->widget1_command_combobox; - _tmp938_ = ldefault_apps_return_combobox_position (_tmp937_); - if (_tmp938_ != 99) { - GtkEntry* _tmp939_; - _tmp939_ = _data3_->widget1_command_entry; -- gtk_widget_hide_all ((GtkWidget*) _tmp939_); -+ gtk_widget_hide ((GtkWidget*) _tmp939_); - } - _tmp940_ = _data3_->widget1_autostart_combobox; - _tmp941_ = ldefault_apps_return_combobox_position (_tmp940_); - if (_tmp941_ != 99) { - GtkEntry* _tmp942_; - _tmp942_ = _data3_->widget1_autostart_entry; -- gtk_widget_hide_all ((GtkWidget*) _tmp942_); -+ gtk_widget_hide ((GtkWidget*) _tmp942_); - } - _tmp943_ = _data3_->polkit_command_combobox; - _tmp944_ = ldefault_apps_return_combobox_position (_tmp943_); - if (_tmp944_ != 99) { - GtkEntry* _tmp945_; - _tmp945_ = _data3_->polkit_command_entry; -- gtk_widget_hide_all ((GtkWidget*) _tmp945_); -+ gtk_widget_hide ((GtkWidget*) _tmp945_); - } - _tmp946_ = _data3_->network_command_combobox; - _tmp947_ = ldefault_apps_return_combobox_position (_tmp946_); - if (_tmp947_ != 99) { - GtkEntry* _tmp948_; - _tmp948_ = _data3_->network_command_entry; -- gtk_widget_hide_all ((GtkWidget*) _tmp948_); -+ gtk_widget_hide ((GtkWidget*) _tmp948_); - } - _tmp949_ = _data3_->audio_command_combobox; - _tmp950_ = ldefault_apps_return_combobox_position (_tmp949_); - if (_tmp950_ != 99) { - GtkEntry* _tmp951_; - _tmp951_ = _data3_->audio_command_entry; -- gtk_widget_hide_all ((GtkWidget*) _tmp951_); -+ gtk_widget_hide ((GtkWidget*) _tmp951_); - } - _tmp952_ = _data3_->quit_command_combobox; - _tmp953_ = ldefault_apps_return_combobox_position (_tmp952_); - if (_tmp953_ != 99) { - GtkEntry* _tmp954_; - _tmp954_ = _data3_->quit_command_entry; -- gtk_widget_hide_all ((GtkWidget*) _tmp954_); -+ gtk_widget_hide ((GtkWidget*) _tmp954_); - } - _tmp955_ = _data3_->quit_image_combobox; - _tmp956_ = ldefault_apps_return_combobox_position (_tmp955_); - if (_tmp956_ != 99) { - GtkEntry* _tmp957_; - _tmp957_ = _data3_->quit_image_entry; -- gtk_widget_hide_all ((GtkWidget*) _tmp957_); -+ gtk_widget_hide ((GtkWidget*) _tmp957_); - } - _tmp958_ = _data3_->quit_layout_combobox; - _tmp959_ = ldefault_apps_return_combobox_position (_tmp958_); - if (_tmp959_ != 99) { - GtkEntry* _tmp960_; - _tmp960_ = _data3_->quit_layout_entry; -- gtk_widget_hide_all ((GtkWidget*) _tmp960_); -+ gtk_widget_hide ((GtkWidget*) _tmp960_); - } - _tmp961_ = _data3_->workspace_command_combobox; - _tmp962_ = ldefault_apps_return_combobox_position (_tmp961_); - if (_tmp962_ != 99) { - GtkEntry* _tmp963_; - _tmp963_ = _data3_->workspace_command_entry; -- gtk_widget_hide_all ((GtkWidget*) _tmp963_); -+ gtk_widget_hide ((GtkWidget*) _tmp963_); - } - _tmp964_ = _data3_->launcher_command_combobox; - _tmp965_ = ldefault_apps_return_combobox_position (_tmp964_); - if (_tmp965_ != 99) { - GtkEntry* _tmp966_; - _tmp966_ = _data3_->launcher_command_entry; -- gtk_widget_hide_all ((GtkWidget*) _tmp966_); -+ gtk_widget_hide ((GtkWidget*) _tmp966_); - } - _tmp967_ = _data3_->terminal_command_combobox; - _tmp968_ = ldefault_apps_return_combobox_position (_tmp967_); - if (_tmp968_ != 99) { - GtkEntry* _tmp969_; - _tmp969_ = _data3_->terminal_command_entry; -- gtk_widget_hide_all ((GtkWidget*) _tmp969_); -+ gtk_widget_hide ((GtkWidget*) _tmp969_); - } - _tmp970_ = _data3_->screenshot_command_combobox; - _tmp971_ = ldefault_apps_return_combobox_position (_tmp970_); - if (_tmp971_ != 99) { - GtkEntry* _tmp972_; - _tmp972_ = _data3_->screenshot_command_entry; -- gtk_widget_hide_all ((GtkWidget*) _tmp972_); -+ gtk_widget_hide ((GtkWidget*) _tmp972_); - } - _tmp973_ = _data3_->upgrade_command_combobox; - _tmp974_ = ldefault_apps_return_combobox_position (_tmp973_); - if (_tmp974_ != 99) { - GtkEntry* _tmp975_; - _tmp975_ = _data3_->upgrade_command_entry; -- gtk_widget_hide_all ((GtkWidget*) _tmp975_); -+ gtk_widget_hide ((GtkWidget*) _tmp975_); - } - _tmp976_ = _data3_->clipboard_command_combobox; - _tmp977_ = ldefault_apps_return_combobox_position (_tmp976_); - if (_tmp977_ != 99) { - GtkEntry* _tmp978_; - _tmp978_ = _data3_->clipboard_command_entry; -- gtk_widget_hide_all ((GtkWidget*) _tmp978_); -+ gtk_widget_hide ((GtkWidget*) _tmp978_); - } - gtk_main (); - _tmp979_ = g_main_loop_new (NULL, FALSE); diff --git a/lxsession-0.4.9.2.tar.gz b/lxsession-0.4.9.2.tar.gz deleted file mode 100644 index ab9e693..0000000 --- a/lxsession-0.4.9.2.tar.gz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:eff03e573b561cabe81c5d015d825e3d998e98d6621040113d7df471c8b9cfb4 -size 745637 diff --git a/lxsession-0.4.9.3-FileAttribute.Standard_Name.patch b/lxsession-0.4.9.3-FileAttribute.Standard_Name.patch new file mode 100644 index 0000000..e34967d --- /dev/null +++ b/lxsession-0.4.9.3-FileAttribute.Standard_Name.patch @@ -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"); + diff --git a/lxsession-0.4.9.3-gtk3-fix.patch b/lxsession-0.4.9.3-gtk3-fix.patch new file mode 100644 index 0000000..bfe2291 --- /dev/null +++ b/lxsession-0.4.9.3-gtk3-fix.patch @@ -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) + diff --git a/lxsession-0.4.9.3-gtk3-hide_all.patch b/lxsession-0.4.9.3-gtk3-hide_all.patch new file mode 100644 index 0000000..6b44b7b --- /dev/null +++ b/lxsession-0.4.9.3-gtk3-hide_all.patch @@ -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 */ diff --git a/lxsession-0.4.9.3-lower-libgee.patch b/lxsession-0.4.9.3-lower-libgee.patch new file mode 100644 index 0000000..a32bd86 --- /dev/null +++ b/lxsession-0.4.9.3-lower-libgee.patch @@ -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 \ diff --git a/lxsession-0.4.9.3.git20130914.tar.gz b/lxsession-0.4.9.3.git20130914.tar.gz new file mode 100644 index 0000000..7aca69f --- /dev/null +++ b/lxsession-0.4.9.3.git20130914.tar.gz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:e1380881ac5a275dc9e2e04e3dabab54a677b855c92f1761a2ed691007b67568 +size 612599 diff --git a/lxsession.changes b/lxsession.changes index 51440c2..1e7dc10 100644 --- a/lxsession.changes +++ b/lxsession.changes @@ -1,3 +1,25 @@ +------------------------------------------------------------------- +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 diff --git a/lxsession.spec b/lxsession.spec index 96e27f5..41dd71c 100644 --- a/lxsession.spec +++ b/lxsession.spec @@ -17,15 +17,21 @@ Name: lxsession -Version: 0.4.9.2 +Version: 0.4.9.3.git20130914 Release: 0 Summary: LXDE Session Manager, required for running the desktop environment License: GPL-2.0 Group: System/GUI/LXDE Url: http://www.lxde.org/ Source: %{name}-%{version}.tar.gz -# PATCH-FIX-UPSTREAM marguerite@opensuse.org -gtkobject is no more in gtk3, replace with gobject -Patch: lxsession-0.4.9.2-gtk3-fix.patch +# 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 +# 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 @@ -36,12 +42,9 @@ BuildRequires: gtk2-devel BuildRequires: gtk3-devel %endif BuildRequires: intltool -BuildRequires: libxslt -%if 0%{?suse_version} <= 1230 BuildRequires: libgee-devel -%else -BuildRequires: libgee06-devel -%endif +BuildRequires: libtool +BuildRequires: libxslt BuildRequires: pkg-config BuildRequires: polkit-devel BuildRequires: vala >= 0.14 @@ -55,11 +58,19 @@ use when a user logs out and to restart them the next time the user logs in. %prep %setup -q +%patch0 -p1 +%if 0%{?suse_version} <= 1230 +%patch1 -p1 +%endif %if 0%{?suse_version} > 1220 -%patch -p1 +%patch2 -p1 +%endif +%if 0%{?suse_version} <= 1210 +%patch3 -p1 %endif %build +autoreconf -fi %configure \ %if 0%{?suse_version} > 1220 --enable-gtk3 \ @@ -91,6 +102,10 @@ sed -i "3d" %{buildroot}%{_datadir}/applications/lxsession-edit.desktop %{_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