From e2a92c2ea8f4eb07f4a7f5f596cc77c6ed2cba112ceb69366831e4dd27b3b46c Mon Sep 17 00:00:00 2001 From: Guido Berhoerster Date: Fri, 1 Apr 2011 19:39:09 +0000 Subject: [PATCH] - update to version 4.8.1 - added missing license information - bugfixes - translation updates - dropped obsolete xfce4-session-4.8.0-do-not-fall-back-to-system-icons.patch, xfce4-session-4.8.0-fix-error-popup-on-session-menu-item.patch, xfce4-session-4.8.0-fix-fast-cli-option.patch, and xfce4-session-4.7.1-fix-missing-include.patch OBS-URL: https://build.opensuse.org/package/show/X11:xfce/xfce4-session?expand=0&rev=55 --- xfce4-session-4.7.1-fix-missing-include.patch | 13 ---- ...8.0-do-not-fall-back-to-system-icons.patch | 60 ------------------- ...fix-error-popup-on-session-menu-item.patch | 21 ------- xfce4-session-4.8.0-fix-fast-cli-option.patch | 35 ----------- xfce4-session-4.8.0.tar.bz2 | 3 - xfce4-session-4.8.1.tar.bz2 | 3 + xfce4-session.changes | 13 ++++ xfce4-session.spec | 13 +--- 8 files changed, 17 insertions(+), 144 deletions(-) delete mode 100644 xfce4-session-4.7.1-fix-missing-include.patch delete mode 100644 xfce4-session-4.8.0-do-not-fall-back-to-system-icons.patch delete mode 100644 xfce4-session-4.8.0-fix-error-popup-on-session-menu-item.patch delete mode 100644 xfce4-session-4.8.0-fix-fast-cli-option.patch delete mode 100644 xfce4-session-4.8.0.tar.bz2 create mode 100644 xfce4-session-4.8.1.tar.bz2 diff --git a/xfce4-session-4.7.1-fix-missing-include.patch b/xfce4-session-4.7.1-fix-missing-include.patch deleted file mode 100644 index 51479ea..0000000 --- a/xfce4-session-4.7.1-fix-missing-include.patch +++ /dev/null @@ -1,13 +0,0 @@ -Index: xfce4-session-4.7.2/xfce4-session/xfsm-global.c -=================================================================== ---- xfce4-session-4.7.2.orig/xfce4-session/xfsm-global.c -+++ xfce4-session-4.7.2/xfce4-session/xfsm-global.c -@@ -45,6 +45,8 @@ - #include - #include - -+#include -+ - #include - #include - diff --git a/xfce4-session-4.8.0-do-not-fall-back-to-system-icons.patch b/xfce4-session-4.8.0-do-not-fall-back-to-system-icons.patch deleted file mode 100644 index 184beb3..0000000 --- a/xfce4-session-4.8.0-do-not-fall-back-to-system-icons.patch +++ /dev/null @@ -1,60 +0,0 @@ -From fd459002e75fc86b4284b1bf806719c1eb290025 Mon Sep 17 00:00:00 2001 -From: Lionel Le Folgoc -Date: Mon, 31 Jan 2011 18:23:26 +0000 -Subject: Don't fallback to "system" icon in the logout dialog (bug #7196). - -GTK_ICON_LOOKUP_GENERIC_FALLBACK caused gtk+ to look for "system" if -"system-*" was not found and "system" exists in most icon themes so the -"xfsm-*" fallback icons were never used. ---- -diff --git a/xfce4-session/shutdown.c b/xfce4-session/shutdown.c -index 6a97ef5..19fdfde 100644 ---- a/xfce4-session/shutdown.c -+++ b/xfce4-session/shutdown.c -@@ -405,7 +405,7 @@ shutdownDialog(const gchar *sessionName, XfsmShutdownType *shutdownType, gboolea - icon = gtk_icon_theme_load_icon (icon_theme, - "system-log-out", - 32, -- GTK_ICON_LOOKUP_GENERIC_FALLBACK, -+ 0, - NULL); - if (!icon) - icon = gtk_icon_theme_load_icon (icon_theme, -@@ -439,7 +439,7 @@ shutdownDialog(const gchar *sessionName, XfsmShutdownType *shutdownType, gboolea - icon = gtk_icon_theme_load_icon (icon_theme, - "system-reboot", - 32, -- GTK_ICON_LOOKUP_GENERIC_FALLBACK, -+ 0, - NULL); - - if (!icon) -@@ -481,7 +481,7 @@ shutdownDialog(const gchar *sessionName, XfsmShutdownType *shutdownType, gboolea - icon = gtk_icon_theme_load_icon (icon_theme, - "system-shutdown", - 32, -- GTK_ICON_LOOKUP_GENERIC_FALLBACK, -+ 0, - NULL); - - if (!icon) -@@ -543,7 +543,7 @@ shutdownDialog(const gchar *sessionName, XfsmShutdownType *shutdownType, gboolea - icon = gtk_icon_theme_load_icon (icon_theme, - "system-suspend", - 32, -- GTK_ICON_LOOKUP_GENERIC_FALLBACK, -+ 0, - NULL); - - if (!icon) -@@ -581,7 +581,7 @@ shutdownDialog(const gchar *sessionName, XfsmShutdownType *shutdownType, gboolea - icon = gtk_icon_theme_load_icon (icon_theme, - "system-hibernate", - 32, -- GTK_ICON_LOOKUP_GENERIC_FALLBACK, -+ 0, - NULL); - - if (!icon) --- -cgit v0.8.3.4 diff --git a/xfce4-session-4.8.0-fix-error-popup-on-session-menu-item.patch b/xfce4-session-4.8.0-fix-error-popup-on-session-menu-item.patch deleted file mode 100644 index 3fb391b..0000000 --- a/xfce4-session-4.8.0-fix-error-popup-on-session-menu-item.patch +++ /dev/null @@ -1,21 +0,0 @@ -From 09b7748d189468bebd5b48950b9d6ee4cac0f93d Mon Sep 17 00:00:00 2001 -From: Lionel Le Folgoc -Date: Wed, 02 Feb 2011 16:28:01 +0000 -Subject: Fix error pop up when clicking session menu item (bug #7123). - ---- -diff --git a/panel-plugin/xfsm-logout-plugin.c b/panel-plugin/xfsm-logout-plugin.c -index fe01709..5259684 100644 ---- a/panel-plugin/xfsm-logout-plugin.c -+++ b/panel-plugin/xfsm-logout-plugin.c -@@ -174,7 +174,7 @@ xfsm_logout_plugin_do_dbus_call(XfsmLogoutPlugin *logout_plugin, - ret = dbus_g_proxy_call(proxy, "Shutdown", error, - G_TYPE_UINT, type, - G_TYPE_BOOLEAN, logout_plugin->allow_save, -- G_TYPE_INVALID); -+ G_TYPE_INVALID, G_TYPE_INVALID); - g_object_unref(G_OBJECT(proxy)); - - return ret; --- -cgit v0.8.3.4 diff --git a/xfce4-session-4.8.0-fix-fast-cli-option.patch b/xfce4-session-4.8.0-fix-fast-cli-option.patch deleted file mode 100644 index 2ed0e15..0000000 --- a/xfce4-session-4.8.0-fix-fast-cli-option.patch +++ /dev/null @@ -1,35 +0,0 @@ -From 72f2c158740201b51365bdbb1965e28446e8c4af Mon Sep 17 00:00:00 2001 -From: Krzysiek -Date: Wed, 02 Feb 2011 16:33:21 +0000 -Subject: Fix --fast CLI option when used with another option (bug #7197). - ---- -diff --git a/xfce4-session-logout/main.c b/xfce4-session-logout/main.c -index d322995..2ea18f1 100644 ---- a/xfce4-session-logout/main.c -+++ b/xfce4-session-logout/main.c -@@ -154,10 +154,6 @@ main (int argc, char **argv) - { - shutdown_type = XFSM_SHUTDOWN_HIBERNATE; - } -- else if (opt_fast) -- { -- allow_save = FALSE; -- } - else if (opt_version) - { - printf ("%s (Xfce %s)\n\n" -@@ -170,6 +166,11 @@ main (int argc, char **argv) - return EXIT_SUCCESS; - } - -+ if (opt_fast) -+ { -+ allow_save = FALSE; -+ } -+ - dbus_error_init (&derror); - dbus_conn = dbus_bus_get (DBUS_BUS_SESSION, &derror); - if (G_UNLIKELY (dbus_conn == NULL)) --- -cgit v0.8.3.4 diff --git a/xfce4-session-4.8.0.tar.bz2 b/xfce4-session-4.8.0.tar.bz2 deleted file mode 100644 index e00a330..0000000 --- a/xfce4-session-4.8.0.tar.bz2 +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:b93b6e06e28c97c1968cf9283b82618f4a4fdbf2ba838e8303e38122867a25d3 -size 1462995 diff --git a/xfce4-session-4.8.1.tar.bz2 b/xfce4-session-4.8.1.tar.bz2 new file mode 100644 index 0000000..b272b4e --- /dev/null +++ b/xfce4-session-4.8.1.tar.bz2 @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:1df52a77d87ed4d27b4f40a2f03a0b6334422d64bdc4e31b9aac22e25e68b829 +size 1469105 diff --git a/xfce4-session.changes b/xfce4-session.changes index 71bb3f6..b4b8fe3 100644 --- a/xfce4-session.changes +++ b/xfce4-session.changes @@ -1,3 +1,16 @@ +------------------------------------------------------------------- +Fri Apr 1 19:20:50 UTC 2011 - gber@opensuse.org + +- update to version 4.8.1 + - added missing license information + - bugfixes + - translation updates +- dropped obsolete + xfce4-session-4.8.0-do-not-fall-back-to-system-icons.patch, + xfce4-session-4.8.0-fix-error-popup-on-session-menu-item.patch, + xfce4-session-4.8.0-fix-fast-cli-option.patch, and + xfce4-session-4.7.1-fix-missing-include.patch + ------------------------------------------------------------------- Fri Feb 18 00:16:17 UTC 2011 - gber@opensuse.org diff --git a/xfce4-session.spec b/xfce4-session.spec index 47d8da6..f05fb07 100644 --- a/xfce4-session.spec +++ b/xfce4-session.spec @@ -18,22 +18,15 @@ Name: xfce4-session -Version: 4.8.0 +Version: 4.8.1 Release: 9 License: GPLv2+ Summary: Xfce Session manager Url: http://www.xfce.org/projects/xfce4-session/ Group: System/GUI/XFCE Source: %{name}-%{version}.tar.bz2 -Patch0: xfce4-session-4.7.1-fix-missing-include.patch # PATCH-FEATURE-OPENSUSE xfce4-session-simple-splash-remove-shadows.patch gber@opensuse.org -- Improves readability of the simple splash engine text by removing the text shadows Patch1: xfce4-session-simple-splash-remove-shadows.patch -# PATCH-FIX-UPSTREAM xfce4-session-4.8.0-fix-fast-cli-option.patch gber@opensuse.org -- Fixes the use of the --fast cli option with other options (backported from upstream git) -Patch2: xfce4-session-4.8.0-fix-fast-cli-option.patch -# PATCH-FIX-UPSTREAM xfce4-session-4.8.0-fix-error-popup-on-session-menu-item.patch gber@opensuse.org -- Fixes the error popup when clicking a session menu item (backported from upstream git) -Patch3: xfce4-session-4.8.0-fix-error-popup-on-session-menu-item.patch -# PATCH-FIX-UPSTREAM xfce4-session-4.8.0-do-not-fall-back-to-system-icons.patch gber@opensuse.org -- Prevents the logout dialog from falling back to system-* rather than xfsm-* icons (backported from upstream git) -Patch4: xfce4-session-4.8.0-do-not-fall-back-to-system-icons.patch BuildRequires: intltool BuildRequires: perl-XML-Parser BuildRequires: pkgconfig(dbus-glib-1) @@ -93,11 +86,7 @@ This package provides the upstream look and feel for the Xfce Session Manager. %prep %setup -q -%patch0 -p1 %patch1 -p1 -%patch2 -p1 -%patch3 -p1 -%patch4 -p1 %build %configure \