OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/gdm?expand=0&rev=46

gdm-XKeepsCrashing-desktop-effects.patch

@@ -0,0 +1,14 @@
+--- config/XKeepsCrashing	2007-12-15 17:31:14.000000000 -0500
++++ config/XKeepsCrashing	2008-04-02 16:21:39.000000000 -0400
+@@ -134,6 +135,11 @@
+   exit $?
+ fi
+ 
++if test `grep "DISPLAYMANAGER_XSERVER=" /etc/sysconfig/displaymanager | grep Xgl | wc -l` = "1" && test -x /usr/bin/gnome-xgl-switch; then
++  /usr/bin/gnome-xgl-switch --disable-xgl
++  MSG7=`gettextfunc "Desktop effects have been disabled."`  
++fi
++
+ clear
+ 
+ # Note, dialog required, though this script could be fixed to not require it

gdm.changes

@@ -1,3 +1,8 @@
+-------------------------------------------------------------------
+Fri Apr  4 19:32:36 CEST 2008 - dreveman@suse.de
+
+- Add gdm-XKeepsCrashing-desktop-effects.patch. (bnc #359460).
+
 -------------------------------------------------------------------
 Wed Mar 19 18:13:26 CET 2008 - vuntz@suse.de
 

gdm.spec

@@ -23,7 +23,7 @@ PreReq:         %insserv_prereq
 License:        GPL v2 or later
 Group:          System/GUI/GNOME
 Version:        2.20.4
-Release:        1
+Release:        6
 Summary:        The GNOME 2.x Display Manager
 Source:         %{name}-%{version}.tar.bz2
 Source1:        gdm.pamd
@@ -56,6 +56,7 @@ Patch37:        gdm-2.19.3-token-login.patch
 # don't ask.
 Patch38:        gdm-2.19.3-token-login2.patch
 Patch40:        gdm-XKeepsCrashing-SaX2.patch
+Patch41:        gdm-XKeepsCrashing-desktop-effects.patch
 #Patch42:        fix-desktop-files.diff
 Patch43:        gdm-language-hang.patch
 Patch45:        gdm-2.20.0-wait-for-restart.patch
@@ -115,6 +116,7 @@ gnome-patch-translation-prepare
 %patch37 -p1
 %patch38 -p0
 %patch40
+%patch41
 #%patch42 - dont think this patch is needed with suse_udpate_desktop_file -g working.
 %patch43
 %patch45 -p1
@@ -261,6 +263,8 @@ sed -i s:DISPLAYMANAGER=/opt/gnome/sbin/gdm:DISPLAYMANAGER=/usr/sbin/gdm:g etc/i
 %files lang -f %{name}.lang
 
 %changelog
+* Fri Apr 04 2008 dreveman@suse.de
+- Add gdm-XKeepsCrashing-desktop-effects.patch. (bnc #359460).
 * Wed Mar 19 2008 vuntz@suse.de
 - Add gdm-bnc343858-buggy-intel-xinerama.patch to use gdk instead
   of direct xinerama functions. This will fix bnc343858 once we get
@@ -486,7 +490,7 @@ sed -i s:DISPLAYMANAGER=/opt/gnome/sbin/gdm:DISPLAYMANAGER=/usr/sbin/gdm:g etc/i
 * Tue Jul 24 2007 jpr@suse.de
 - Add xorg-x11-server-extras for Xnest/Xephyr so that the defaults
   are set correctly (not an installation dep)
-* Thu Jul 19 2007 maw@suse.de
+* Fri Jul 20 2007 maw@suse.de
 - Reenable gdm-conf.patch (#292837).
 * Tue Jul 17 2007 coolo@suse.de
 - fix pointer arithmetic
@@ -600,7 +604,7 @@ sed -i s:DISPLAYMANAGER=/opt/gnome/sbin/gdm:DISPLAYMANAGER=/usr/sbin/gdm:g etc/i
 * Fri Oct 27 2006 jhargadon@suse.de
 - changed TryExec to be the same as Exec in gdmsetup.desktop to
   resolve bug #210943
-* Mon Oct 23 2006 jhargadon@suse.de
+* Tue Oct 24 2006 jhargadon@suse.de
 - mkdir /var/log/gdm (#213737)
 * Thu Oct 12 2006 danw@suse.de
 - Remove some dead patches. Rename a few for consistency
@@ -622,7 +626,7 @@ sed -i s:DISPLAYMANAGER=/opt/gnome/sbin/gdm:DISPLAYMANAGER=/usr/sbin/gdm:g etc/i
 * Tue Sep 26 2006 jhargadon@suse.de
 - removed am_devperm.so from gdm.pamd and gdm-autologin.pamd
   to resolve bug #206963
-* Wed Sep 20 2006 jhargadon@suse.de
+* Thu Sep 21 2006 jhargadon@suse.de
 - modified SuSEconfig.gdm to reflect the name change of gdm.conf
   to custom.conf.  bug #206904
 * Thu Sep 14 2006 jhargadon@suse.de
@@ -779,7 +783,7 @@ sed -i s:DISPLAYMANAGER=/opt/gnome/sbin/gdm:DISPLAYMANAGER=/usr/sbin/gdm:g etc/i
 - Use kdelibs3-doc in BuildRequires for meinproc (#153635#c14).
 * Sat Feb 25 2006 hpj@suse.de
 - Add patch to fix tab keynav.
-* Fri Feb 17 2006 sreeves@suse.de
+* Sat Feb 18 2006 sreeves@suse.de
 - Update .desktop file (Name, GenericName, Comment, DocPath)
 * Fri Feb 17 2006 gekker@suse.de
 - Fix background color in GDM, it should be black
@@ -839,7 +843,7 @@ sed -i s:DISPLAYMANAGER=/opt/gnome/sbin/gdm:DISPLAYMANAGER=/usr/sbin/gdm:g etc/i
 - Fix background colors to be consistent on startup
 * Tue Sep 20 2005 sbrabec@suse.cz
 - Removed references to build directory in installed .la files.
-* Thu Sep 15 2005 gekker@suse.de
+* Fri Sep 16 2005 gekker@suse.de
 - Make Industrial the default Gtk+ theme (114173)
 * Tue Sep 06 2005 sbrabec@suse.cz
 - Updated to version 2.8.0.4.
@@ -855,7 +859,7 @@ sed -i s:DISPLAYMANAGER=/opt/gnome/sbin/gdm:DISPLAYMANAGER=/usr/sbin/gdm:g etc/i
 - Made gdm-autologin.pam not require a password.
 * Fri Aug 12 2005 jpr@suse.de
 - require xorg-x11-xnest for the gdmflexiserver -n option
-* Thu Aug 11 2005 gekker@suse.de
+* Fri Aug 12 2005 gekker@suse.de
 - Update to version 2.8.0.2
 - Make 64bit clean
 * Sun Jul 31 2005 jpr@suse.de
@@ -907,7 +911,7 @@ sed -i s:DISPLAYMANAGER=/opt/gnome/sbin/gdm:DISPLAYMANAGER=/usr/sbin/gdm:g etc/i
 - add X-KDE-RootOnly to gdmsetup.desktop (#45807)
 * Mon Nov 15 2004 kukuk@suse.de
 - Use common-* PAM config files for gdm and gdm-autologin
-* Tue Oct 26 2004 mmj@suse.de
+* Wed Oct 27 2004 mmj@suse.de
 - Locale rename no to nb
 * Fri Oct 15 2004 sbrabec@suse.cz
 - Implemented sysconfig displaymanager support.
@@ -947,7 +951,7 @@ sed -i s:DISPLAYMANAGER=/opt/gnome/sbin/gdm:DISPLAYMANAGER=/usr/sbin/gdm:g etc/i
 - honor xdm scripts (#37852)
 * Tue Mar 23 2004 sbrabec@suse.cz
 - Non-UTF-8 locales removed from language menu.
-* Mon Mar 22 2004 hhetter@suse.de
+* Tue Mar 23 2004 hhetter@suse.de
 - remove SuSEconfig.gdm; it's no longer needed to manage
   the available sessions for gdm, as it is now using desktop
   files to define it's sessions (#36267)