Git-Url: 
http://git.frugalware.org/gitweb/gitweb.cgi?p=gnometesting.git;a=commitdiff;h=4adcedc44c4a8d38f6e0a0a075bcc7ec266d63a4

commit 4adcedc44c4a8d38f6e0a0a075bcc7ec266d63a4
Author: bouleetbil <bouleet...@frogdev.info>
Date:   Sun Aug 7 00:21:56 2011 +0200

gdm-3.1.2-3-x86_64
*added patch
*disable crash with warning

diff --git a/source/gnome/gdm/FrugalBuild b/source/gnome/gdm/FrugalBuild
index b036a2d..d741924 100644
--- a/source/gnome/gdm/FrugalBuild
+++ b/source/gnome/gdm/FrugalBuild
@@ -3,36 +3,47 @@

pkgname=gdm
pkgver=3.1.2
-pkgrel=2
+pkgrel=3
pkgdesc="GNOME Display Manager"
url="http://www.gnome.org/";
backup=(etc/gdm/custom.conf etc/pam.d/gdm etc/pam.d/gdm-autologin)
depends=('libxml2>=2.7.8' 'zenity>=3.0.0'  'libxi' 'fontconfig' 
'libxrandr>=1.2.2' \
'librsvg>=2.26.0-2' 'gnome-keyring>=3.0.3' 'consolekit-x11>=0.4.5' 
'libcanberra-gtk' \
'libxinerama' 'libxcursor' 'libxevie' 'xorg-server>=1.10.2' \
-       'pam' 'accountsservice' 'upower' 'nss' 'hwdata')
+       'pam' 'accountsservice' 'upower' 'nss' 'hwdata' 'dbus-x11')
rodepends=('xsm' 'sessreg' 'xmessage' 'gnome-session')
makedepends=('intltool' 'gnome-doc-utils')
groups=('gnome')
archs=('i686' 'x86_64' 'ppc')
+_F_gnome_git="n"
Finclude gnome
source=(${source[@]} \
polkit-gnome-authentication-agent-1.desktop \
forcevt12.diff 27_save_root_window.patch \
-       28_plymouth_transition.patch)
+       28_plymouth_transition.patch disable-fatal-criticals.patch)
sha1sums=('794737e18a7fbd23ca227402a60a71b73f0ca5c0' \
'93d1f9a7d068dd8e70c930abea9acf5b770a3485' \
'3851826e77967313f508949b55392bec258cbf0e' \
'21b5e62f5ebc5cf8d3ebd97bf6f4414470298b7f' \
-          'b0b78e870665bc0e8fc3525f9502dac7170dd6fc')
+          'b0b78e870665bc0e8fc3525f9502dac7170dd6fc' \
+          'eca48d46c223e92ae4505b97cc672a4dc97ecdae')
+if [ "$_F_gnome_git" != "n" ]; then
+       unset sha1sums
+fi

conflicts=('fast-user-switch-applet')
provides=('fast-user-switch-applet' 'gdm-themes' 'somatic-gdm-themes' 
'arc-colors-gdm-themes')
replaces=('fast-user-switch-applet' 'gdm-themes' 'somatic-gdm-themes' 
'arc-colors-gdm-themes')

build() {
-       Fcd
-       Fpatchall
+       if [ "$_F_gnome_git" != "n" ]; then
+               Funpack_scm
+               Fcd $pkgname
+               sh ./autogen.sh
+       else
+               Fcd
+               Fpatchall
+       fi
Fmake --enable-authentication-scheme=pam \
--enable-console-helper \
--disable-scrollkeeper \
diff --git a/source/gnome/gdm/disable-fatal-criticals.patch 
b/source/gnome/gdm/disable-fatal-criticals.patch
new file mode 100644
index 0000000..8af6636
--- /dev/null
+++ b/source/gnome/gdm/disable-fatal-criticals.patch
@@ -0,0 +1,182 @@
+From fc6ee4aa6d71d2c448a9b62aca24ba318163c590 Mon Sep 17 00:00:00 2001
+From: Ray Strode <rstr...@redhat.com>
+Date: Tue, 28 Jun 2011 12:51:51 -0400
+Subject: [PATCH] common: don't tank on criticals
+
+Tiny (or not so tiny) bugs in components below GDM in the stack
+can lead to critical warnings.
+
+In development releases, GDM by default will crash when encountering
+a critical warning.
+
+Losing the login screen is a big deal.  We shouldn't automatically subject
+our users to "can't log in" in order to highlight bugs in development
+releases.
+
+This commit removes fatal criticals by default.
+---
+ common/gdm-common.c                   |    9 ---------
+ common/gdm-common.h                   |    1 -
+ daemon/factory-slave-main.c           |    2 --
+ daemon/main.c                         |    2 --
+ daemon/product-slave-main.c           |    2 --
+ daemon/session-worker-main.c          |    2 --
+ daemon/simple-slave-main.c            |    2 --
+ daemon/xdmcp-chooser-slave-main.c     |    2 --
+ gui/simple-chooser/chooser-main.c     |    2 --
+ gui/simple-chooser/gdm-host-chooser.c |    2 --
+ gui/simple-greeter/greeter-main.c     |    2 --
+ 11 files changed, 0 insertions(+), 28 deletions(-)
+
+diff --git a/common/gdm-common.c b/common/gdm-common.c
+index 7a4e26d..865341a 100644
+--- a/common/gdm-common.c
++++ b/common/gdm-common.c
+@@ -65,15 +65,6 @@ gdm_is_version_unstable (void)
+         return unstable;
+ }
+
+-void
+-gdm_set_fatal_warnings_if_unstable (void)
+-{
+-        if (gdm_is_version_unstable ()) {
+-                g_setenv ("G_DEBUG", "fatal_criticals", FALSE);
+-                g_log_set_always_fatal (G_LOG_LEVEL_CRITICAL);
+-        }
+-}
+-
+ gboolean
+ gdm_get_pwent_for_name (const char     *name,
+                         struct passwd **pwentp)
+diff --git a/common/gdm-common.h b/common/gdm-common.h
+index 06300c8..41ddf1c 100644
+--- a/common/gdm-common.h
++++ b/common/gdm-common.h
+@@ -31,7 +31,6 @@
+ G_BEGIN_DECLS
+
+ gboolean       gdm_is_version_unstable            (void);
+-void           gdm_set_fatal_warnings_if_unstable (void);
+
+ int            gdm_wait_on_pid           (int pid);
+ int            gdm_wait_on_and_kill_pid  (int pid,
+diff --git a/daemon/factory-slave-main.c b/daemon/factory-slave-main.c
+index 9caab1c..2441260 100644
+--- a/daemon/factory-slave-main.c
++++ b/daemon/factory-slave-main.c
+@@ -183,8 +183,6 @@ main (int    argc,
+         textdomain (GETTEXT_PACKAGE);
+         setlocale (LC_ALL, "");
+
+-        gdm_set_fatal_warnings_if_unstable ();
+-
+         g_type_init ();
+
+         context = g_option_context_new (_("GNOME Display Manager Slave"));
+diff --git a/daemon/main.c b/daemon/main.c
+index 5b8d66b..2ffb779 100644
+--- a/daemon/main.c
++++ b/daemon/main.c
+@@ -543,8 +543,6 @@ main (int    argc,
+
+         ret = 1;
+
+-        gdm_set_fatal_warnings_if_unstable ();
+-
+         g_type_init ();
+
+         context = g_option_context_new (_("GNOME Display Manager"));
+diff --git a/daemon/product-slave-main.c b/daemon/product-slave-main.c
+index b0ab03f..b8e4755 100644
+--- a/daemon/product-slave-main.c
++++ b/daemon/product-slave-main.c
+@@ -187,8 +187,6 @@ main (int    argc,
+         textdomain (GETTEXT_PACKAGE);
+         setlocale (LC_ALL, "");
+
+-        gdm_set_fatal_warnings_if_unstable ();
+-
+         g_type_init ();
+
+         context = g_option_context_new (_("GNOME Display Manager Slave"));
+diff --git a/daemon/session-worker-main.c b/daemon/session-worker-main.c
+index 35b4463..9d40b8d 100644
+--- a/daemon/session-worker-main.c
++++ b/daemon/session-worker-main.c
+@@ -151,8 +151,6 @@ main (int    argc,
+
+         g_type_init ();
+
+-        gdm_set_fatal_warnings_if_unstable ();
+-
+         /* Translators: worker is a helper process that does the work
+            of starting up a session */
+         context = g_option_context_new (_("GNOME Display Manager Session 
Worker"));
+diff --git a/daemon/simple-slave-main.c b/daemon/simple-slave-main.c
+index 7751b61..057492b 100644
+--- a/daemon/simple-slave-main.c
++++ b/daemon/simple-slave-main.c
+@@ -187,8 +187,6 @@ main (int    argc,
+         textdomain (GETTEXT_PACKAGE);
+         setlocale (LC_ALL, "");
+
+-        gdm_set_fatal_warnings_if_unstable ();
+-
+         g_type_init ();
+
+         context = g_option_context_new (_("GNOME Display Manager Slave"));
+diff --git a/daemon/xdmcp-chooser-slave-main.c 
b/daemon/xdmcp-chooser-slave-main.c
+index f86ea89..ea54210 100644
+--- a/daemon/xdmcp-chooser-slave-main.c
++++ b/daemon/xdmcp-chooser-slave-main.c
+@@ -189,8 +189,6 @@ main (int    argc,
+         textdomain (GETTEXT_PACKAGE);
+         setlocale (LC_ALL, "");
+
+-        gdm_set_fatal_warnings_if_unstable ();
+-
+         g_type_init ();
+
+         context = g_option_context_new (_("GNOME Display Manager Slave"));
+diff --git a/gui/simple-chooser/chooser-main.c 
b/gui/simple-chooser/chooser-main.c
+index ac1edd6..2978a23 100644
+--- a/gui/simple-chooser/chooser-main.c
++++ b/gui/simple-chooser/chooser-main.c
+@@ -233,8 +233,6 @@ main (int argc, char *argv[])
+
+         setlocale (LC_ALL, "");
+
+-        gdm_set_fatal_warnings_if_unstable ();
+-
+         g_type_init ();
+
+         gdm_log_init ();
+diff --git a/gui/simple-chooser/gdm-host-chooser.c 
b/gui/simple-chooser/gdm-host-chooser.c
+index 371ba28..1f5f9c6 100644
+--- a/gui/simple-chooser/gdm-host-chooser.c
++++ b/gui/simple-chooser/gdm-host-chooser.c
+@@ -232,8 +232,6 @@ main (int argc, char *argv[])
+
+         setlocale (LC_ALL, "");
+
+-        gdm_set_fatal_warnings_if_unstable ();
+-
+         g_type_init ();
+
+         gdm_log_init ();
+diff --git a/gui/simple-greeter/greeter-main.c 
b/gui/simple-greeter/greeter-main.c
+index aa165fa..a2c533e 100644
+--- a/gui/simple-greeter/greeter-main.c
++++ b/gui/simple-greeter/greeter-main.c
+@@ -252,8 +252,6 @@ main (int argc, char *argv[])
+
+         setlocale (LC_ALL, "");
+
+-        gdm_set_fatal_warnings_if_unstable ();
+-
+         g_type_init ();
+
+         gdm_profile_start ("Initializing settings client");
+--
+1.7.5.4
+
_______________________________________________
Frugalware-git mailing list
Frugalware-git@frugalware.org
http://frugalware.org/mailman/listinfo/frugalware-git

Reply via email to