update patches

This commit is contained in:
Matthias Clasen 2007-06-17 23:09:23 +00:00
parent 82ad921f30
commit 17b045b1a6
5 changed files with 28 additions and 21 deletions

View File

@ -1 +1 @@
gnome-session-2.19.3.tar.bz2 gnome-session-2.19.4.tar.bz2

View File

@ -1,16 +0,0 @@
--- gnome-session-2.17.91/gnome-session/gsm-at-startup.c.timeout 2007-02-23 14:08:58.000000000 -0500
+++ gnome-session-2.17.91/gnome-session/gsm-at-startup.c 2007-02-23 14:09:12.000000000 -0500
@@ -88,11 +88,11 @@
gdk_window_set_events (w, GDK_PROPERTY_CHANGE_MASK);
gsm_assistive_tech_exec (command);
gdk_window_add_filter (w, gsm_assistive_filter_watch, &tid);
- tid = g_timeout_add (5e3, gsm_assistive_filter_timeout, NULL);
+// tid = g_timeout_add (5e3, gsm_assistive_filter_timeout, NULL);
gtk_main ();
- gdk_window_remove_filter (w, gsm_assistive_filter_watch, &tid);
+// gdk_window_remove_filter (w, gsm_assistive_filter_watch, &tid);
g_free (command);
}

View File

@ -0,0 +1,20 @@
--- gnome-session-2.19.4/gnome-session/gsm-at-startup.c.timeout 2007-06-17 18:21:51.000000000 -0400
+++ gnome-session-2.19.4/gnome-session/gsm-at-startup.c 2007-06-17 19:00:54.000000000 -0400
@@ -65,13 +65,15 @@ gsm_assistive_registry_start (void)
gdk_window_set_events (w, GDK_PROPERTY_CHANGE_MASK);
gsm_exec_command_line_async (command, NULL);
+#if 0
gdk_window_add_filter (w, gsm_assistive_filter_watch, &tid);
tid = g_timeout_add_seconds (5, gsm_assistive_filter_timeout, NULL);
-
+#endif
gtk_main ();
+#if 0
gdk_window_remove_filter (w, gsm_assistive_filter_watch, &tid);
-
+#endif
g_free (command);
}

View File

@ -1,6 +1,6 @@
%define esound_version 0.2.26 %define esound_version 0.2.26
%define libgnomeui_version 2.3.0 %define libgnomeui_version 2.3.0
%define gtk2_version 2.3.1 %define gtk2_version 2.11.3
%define dbus_glib_version 0.70 %define dbus_glib_version 0.70
%define dbus_version 0.90 %define dbus_version 0.90
%define gnome_keyring_version 0.5.1 %define gnome_keyring_version 0.5.1
@ -11,7 +11,7 @@
Summary: GNOME session manager Summary: GNOME session manager
Name: gnome-session Name: gnome-session
Version: 2.19.3 Version: 2.19.4
Release: 1%{?dist} Release: 1%{?dist}
URL: http://www.gnome.org URL: http://www.gnome.org
Source0: http://download.gnome.org/sources/gnome-session/2.19/%{name}-%{version}.tar.bz2 Source0: http://download.gnome.org/sources/gnome-session/2.19/%{name}-%{version}.tar.bz2
@ -52,7 +52,7 @@ Patch9: gnome-session-2.13.4-no-crashes.patch
Patch13: gnome-session-2.17.5-window-manager.patch Patch13: gnome-session-2.17.5-window-manager.patch
# don't pop up the dialog as it can take longer than 5 seconds # don't pop up the dialog as it can take longer than 5 seconds
Patch20: gnome-session-2.17.91-atspi-timeout.patch Patch20: gnome-session-2.19.4-atspi-timeout.patch
# http://bugzilla.gnome.org/show_bug.cgi?id=411506 # http://bugzilla.gnome.org/show_bug.cgi?id=411506
#Patch21: gnome-session-2.17.91-use-gdm-at-hints-3.patch #Patch21: gnome-session-2.17.91-use-gdm-at-hints-3.patch
@ -190,6 +190,9 @@ fi
%{_datadir}/icons/hicolor/scalable/apps/session-properties.svg %{_datadir}/icons/hicolor/scalable/apps/session-properties.svg
%changelog %changelog
* Sun Jun 17 2007 Matthias Clasen <mclasen@redhat.com> - 2.19.4-1
- Update to 2.19.4
* Mon Jun 4 2007 Matthias Clasen <mclasen@redhat.com> - 2.19.3-1 * Mon Jun 4 2007 Matthias Clasen <mclasen@redhat.com> - 2.19.3-1
- Update to 2.19.3 - Update to 2.19.3
- Drop upstreamed patch - Drop upstreamed patch

View File

@ -1 +1 @@
20bdbfca2ef05b0ab93417ee617b0cb1 gnome-session-2.19.3.tar.bz2 3a70b7ee6bee47dbeb935b28c00a7205 gnome-session-2.19.4.tar.bz2