This commit is contained in:
parent
699fbdf1c1
commit
3d33b00139
2
gnome
2
gnome
@ -77,6 +77,8 @@ fi
|
||||
if [ -e /usr/share/applications/YaST2/live-installer.desktop ] ; then
|
||||
mkdir -p ~/Desktop
|
||||
cp -u /usr/share/applications/YaST2/live-installer.desktop ~/Desktop
|
||||
# Workaround for gio not knowing about X-KDE-SubstituteUID -- see bnc#379332
|
||||
sed -i "s/^Exec=/Exec=gnomesu -- /g" ~/Desktop/live-installer.desktop
|
||||
|
||||
# setup live install to not start beagled
|
||||
if [ -e /etc/xdg/autostart/beagled-autostart.desktop ] ; then
|
||||
|
53
gnome-session-bnc385150-performance-hostname.patch
Normal file
53
gnome-session-bnc385150-performance-hostname.patch
Normal file
@ -0,0 +1,53 @@
|
||||
--- pristine-gnome-session-2.22.1.1/gnome-session/manager.c 2008-04-10 15:32:20.000000000 +0100
|
||||
+++ gnome-session-2.22.1.1/gnome-session/manager.c 2008-04-30 10:53:27.000000000 +0100
|
||||
@@ -825,7 +825,6 @@
|
||||
return retval;
|
||||
}
|
||||
|
||||
-
|
||||
static Status
|
||||
register_client (SmsConn connection, SmPointer data, char *previous_id)
|
||||
{
|
||||
@@ -882,33 +881,20 @@
|
||||
}
|
||||
else
|
||||
{
|
||||
- char *id = SmsGenerateClientID (connection);
|
||||
-
|
||||
- if (id != NULL)
|
||||
- {
|
||||
- client->id = g_strdup (id);
|
||||
- free (id);
|
||||
- }
|
||||
- else
|
||||
+ /* If your network is mis-configured, it takes 15+ seconds for
|
||||
+ SmsGenerateClientID to fail each time it is called - and since
|
||||
+ the X method (libSM/src/sm_genid.c) does little of any value -
|
||||
+ beyond creating a unique identifier - we do that ourselves
|
||||
+ here instead rather more quickly. */
|
||||
{
|
||||
static long int sequence = 0;
|
||||
- static char* address = NULL;
|
||||
-
|
||||
- if (! address)
|
||||
- {
|
||||
- g_warning ("Host name lookup failure on localhost.");
|
||||
-
|
||||
- address = g_new (char, 10);
|
||||
- srand (time (NULL) + (getpid () <<16));
|
||||
- g_snprintf (address, 10, "0%.8x", rand());
|
||||
- };
|
||||
|
||||
/* The typecast there is for 64-bit machines */
|
||||
- client->id = g_malloc (43);
|
||||
- g_snprintf (client->id, 43, "1%s%.13ld%.10ld%.4ld", address,
|
||||
- (long) time(NULL), (long) getpid (), sequence);
|
||||
+ client->id = g_strdup_printf ("10%.8x%.13ld%.10ld%.4ld",
|
||||
+ g_str_hash (g_get_host_name()),
|
||||
+ (long) time(NULL), (long) getpid (),
|
||||
+ sequence);
|
||||
sequence++;
|
||||
-
|
||||
sequence %= 10000;
|
||||
}
|
||||
}
|
@ -1,3 +1,17 @@
|
||||
-------------------------------------------------------------------
|
||||
Thu May 1 13:03:46 CEST 2008 - vuntz@suse.de
|
||||
|
||||
- Work around bnc#379332 for the live installer desktop file in the
|
||||
gnome script by changing the Exec key to use gnomesu.
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Wed Apr 30 12:12:55 CEST 2008 - vuntz@suse.de
|
||||
|
||||
- Add gnome-session-bnc385150-performance-hostname.patch to fix
|
||||
performance issue when launching new apps in GNOME on a default
|
||||
beta1 install -- extreme slowness can happen depending on the
|
||||
network setup. Fix bnc#385150, patch by Michael Meeks.
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Tue Apr 29 23:20:05 CEST 2008 - vuntz@suse.de
|
||||
|
||||
|
@ -16,7 +16,7 @@ BuildRequires: control-center2-devel fdupes gnome-common gnome-desktop-devel gn
|
||||
License: GPL v2 or later; LGPL v2.1 or later
|
||||
Group: System/GUI/GNOME
|
||||
Version: 2.22.1.1
|
||||
Release: 17
|
||||
Release: 19
|
||||
Summary: Session Tools for the GNOME 2.x Desktop
|
||||
Source: %{name}-%{version}.tar.bz2
|
||||
Source1: gnome
|
||||
@ -50,6 +50,8 @@ Url: http://www.gnome.org
|
||||
Patch18: gnome-session-parse-autostart-command-line.patch
|
||||
# PATCH-FIX-UPSTREAM gnome-session-include-unistd.patch maw@novell.com -- Vincent says he'll accept this soon
|
||||
Patch19: gnome-session-include-unistd.patch
|
||||
# PATCH-FIX-UPSTREAM gnome-session-bnc385150-performance-hostname.patch bnc385150 vuntz@novell.com -- Extreme slowness on some network setup
|
||||
Patch20: gnome-session-bnc385150-performance-hostname.patch
|
||||
BuildRoot: %{_tmppath}/%{name}-%{version}-build
|
||||
Recommends: control-center2
|
||||
Obsoletes: gnome-core
|
||||
@ -122,6 +124,7 @@ gnome-patch-translation-prepare
|
||||
%patch17 -p1
|
||||
%patch18
|
||||
%patch19 -p0
|
||||
%patch20 -p1
|
||||
gnome-patch-translation-update
|
||||
|
||||
%build
|
||||
@ -176,6 +179,14 @@ rm -rf $RPM_BUILD_ROOT
|
||||
%files lang -f %{name}-2.0.lang
|
||||
|
||||
%changelog
|
||||
* Thu May 01 2008 vuntz@suse.de
|
||||
- Work around bnc#379332 for the live installer desktop file in the
|
||||
gnome script by changing the Exec key to use gnomesu.
|
||||
* Wed Apr 30 2008 vuntz@suse.de
|
||||
- Add gnome-session-bnc385150-performance-hostname.patch to fix
|
||||
performance issue when launching new apps in GNOME on a default
|
||||
beta1 install -- extreme slowness can happen depending on the
|
||||
network setup. Fix bnc#385150, patch by Michael Meeks.
|
||||
* Wed Apr 30 2008 vuntz@suse.de
|
||||
- Actually copy the right live-installer.desktop (instead of a
|
||||
non-existing file) in gnome script so the installer icon appears
|
||||
|
Loading…
Reference in New Issue
Block a user