1
0
forked from pool/xfce4-session

Accepting request 84068 from X11:xfce

- update to version 4.8.2
  - drop usage of G_CONST_RETURN macro
  - don't exit the session on dbus restarts
  - start KDE4 services instead of KDE3
  - reduce size of splash engines
  - remove the nopreview image
  - add Greek manual screenshots
  - on installation create relative paths in symlinks to images
  - only perform hostname checks when TCP connections are enabled
  - bugfixes
  - translation updates
- dropped obsolete xfce4-session-4.8.1-fix-gdm_lang-usage.patch,
  xfce4-session-4.8.1-disable-hostname-check.patch

OBS-URL: https://build.opensuse.org/request/show/84068
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/xfce4-session?expand=0&rev=42
This commit is contained in:
Sascha Peilicke 2011-09-21 15:29:08 +00:00 committed by Git OBS Bridge
commit e4d375b462
6 changed files with 21 additions and 54 deletions

View File

@ -1,31 +0,0 @@
commit ba231e2eee82c321f473687e425d455fb36205d9
Author: Benedikt Meurer <benedikt.meurer@googlemail.com>
Date: Tue Jul 26 08:19:09 2011 +0200
Only perform hostname checks when TCP connections are enabled.
Based on a patch from Guido Berhoerster <gber@opensuse.org>.
xfce4-session/main.c | 9 ++++++---
1 files changed, 6 insertions(+), 3 deletions(-)
diff --git a/xfce4-session/main.c b/xfce4-session/main.c
index 0466f48..8f7c003 100644
--- a/xfce4-session/main.c
+++ b/xfce4-session/main.c
@@ -247,9 +247,12 @@ main (int argc, char **argv)
dpy = gdk_display_get_default ();
init_display (manager, dpy, channel, opt_disable_tcp);
- /* verify that the DNS settings are ok */
- xfsm_splash_screen_next (splash_screen, _("Verifying DNS settings"));
- xfsm_dns_check ();
+ if (!opt_disable_tcp && xfconf_channel_get_bool (channel, "/security/EnableTcp", FALSE))
+ {
+ /* verify that the DNS settings are ok */
+ xfsm_splash_screen_next (splash_screen, _("Verifying DNS settings"));
+ xfsm_dns_check ();
+ }
xfsm_splash_screen_next (splash_screen, _("Loading session data"));

View File

@ -1,13 +0,0 @@
diff --git a/xfce4-session/main.c b/xfce4-session/main.c
index ff6e324..fcf69f8 100644
--- a/xfce4-session/main.c
+++ b/xfce4-session/main.c
@@ -103,7 +103,7 @@ setup_environment (void)
/* this is for compatibility with the GNOME Display Manager */
lang = g_getenv ("GDM_LANG");
- if (lang != NULL)
+ if (lang != NULL && strlen (lang) > 0)
{
xfce_setenv ("LANG", lang, TRUE);
xfce_unsetenv ("GDM_LANG");

View File

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

View File

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

View File

@ -1,3 +1,20 @@
-------------------------------------------------------------------
Mon Sep 19 13:38:57 UTC 2011 - gber@opensuse.org
- update to version 4.8.2
- drop usage of G_CONST_RETURN macro
- don't exit the session on dbus restarts
- start KDE4 services instead of KDE3
- reduce size of splash engines
- remove the nopreview image
- add Greek manual screenshots
- on installation create relative paths in symlinks to images
- only perform hostname checks when TCP connections are enabled
- bugfixes
- translation updates
- dropped obsolete xfce4-session-4.8.1-fix-gdm_lang-usage.patch,
xfce4-session-4.8.1-disable-hostname-check.patch
-------------------------------------------------------------------
Tue Jul 26 07:19:25 UTC 2011 - gber@opensuse.org

View File

@ -18,7 +18,7 @@
Name: xfce4-session
Version: 4.8.1
Version: 4.8.2
Release: 13
License: GPLv2+
Summary: Xfce Session manager
@ -27,10 +27,6 @@ Group: System/GUI/XFCE
Source: %{name}-%{version}.tar.bz2
# 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
Patch0: xfce4-session-simple-splash-remove-shadows.patch
# PATCH-FIX-UPSTREAM xfce4-session-4.8.1-fix-gdm_lang-usage.patch bnc#694203 bxo#7400 gber@opensuse.org -- Fixes GDM_LANG usage to be compatible with GDM3 (backported from upstream git)
Patch1: xfce4-session-4.8.1-fix-gdm_lang-usage.patch
# PATCH-FIX-UPSTREAM xfce4-session-4.8.1-disable-hostname-check.patch gber@opensuse.org -- Only perform hostname checks when TCP connections are enabled (backported from upstream git)
Patch2: xfce4-session-4.8.1-disable-hostname-check.patch
BuildRequires: intltool
BuildRequires: perl-XML-Parser
BuildRequires: pkgconfig(dbus-glib-1)
@ -91,8 +87,6 @@ This package provides the upstream look and feel for the Xfce Session Manager.
%prep
%setup -q
%patch0 -p1
%patch1 -p1
%patch2 -p1
%build
%configure \