Hello community, here is the log from the commit of package gnome-shell for openSUSE:11.4 checked in at Fri Feb 18 14:03:02 CET 2011. -------- --- old-versions/11.4/all/gnome-shell/gnome-shell.changes 2011-02-15 10:00:10.000000000 +0100 +++ /mounts/work_src_done/11.4/gnome-shell/gnome-shell.changes 2011-02-18 02:51:45.000000000 +0100 @@ -1,0 +2,11 @@ +Fri Feb 18 02:49:38 CET 2011 - vuntz@opensuse.org + +- Add gnome-shell-handle-broken-glxinfo.patch to not crash if + glxinfo doesn't work. Fix bnc#672953. + +------------------------------------------------------------------- +Tue Feb 15 17:35:14 CET 2011 - sbrabec@suse.cz + +- Added support for translation-update-upstream. + +------------------------------------------------------------------- calling whatdependson for 11.4-i586 New: ---- gnome-shell-handle-broken-glxinfo.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ gnome-shell.spec ++++++ --- /var/tmp/diff_new_pack.9u6cSf/_old 2011-02-18 14:02:55.000000000 +0100 +++ /var/tmp/diff_new_pack.9u6cSf/_new 2011-02-18 14:02:55.000000000 +0100 @@ -19,7 +19,7 @@ Name: gnome-shell Version: 2.91.6 -Release: 2 +Release: 6.<RELEASE2> # FIXME: whenever we have GNOME3 as default desktop, remove BUILD_AGAINST_GNOME3 stuff, and gnome-shell-old-gsd.patch License: GPLv2+ Summary: GNOME Shell @@ -32,7 +32,10 @@ Source2: gnome3.desktop # PATCH-FIX-OPENSUSE gnome-shell-integrate_114.patch vuntz@opensuse.org -- Fix integration with underlying packages available in openSUSE 11.4. Patch0: gnome-shell-integrate_114.patch +# PATCH-FIX-UPSTREAM gnome-shell-handle-broken-glxinfo.patch bnc#672953 bgo#640680 vuntz@opensuse.org -- Fix crash on startup if glxinfo fails with a weird error +Patch1: gnome-shell-handle-broken-glxinfo.patch BuildRequires: intltool +BuildRequires: translation-update-upstream BuildRequires: update-desktop-files BuildRequires: pkgconfig(clutter-1.0) BuildRequires: pkgconfig(dbus-glib-1) @@ -79,9 +82,11 @@ %lang_package %prep %setup -q +translation-update-upstream %if ! 0%{?BUILD_AGAINST_GNOME3} %patch0 -p1 %endif +%patch1 -p1 %build %configure \ ++++++ gnome-shell-handle-broken-glxinfo.patch ++++++ Index: gnome-shell-2.91.6/src/gnome-shell.in =================================================================== --- gnome-shell-2.91.6.orig/src/gnome-shell.in +++ gnome-shell-2.91.6/src/gnome-shell.in @@ -192,7 +192,9 @@ def _get_glx_extensions(): glxinfo = subprocess.Popen(["glxinfo"], stdout=subprocess.PIPE) glxinfo_output = glxinfo.communicate()[0] - glxinfo.wait() + ret = glxinfo.wait() + if ret != 0: + return (set(), set(), set()) glxinfo_map = {} for m in GLXINFO_RE.finditer(glxinfo_output): ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... -- To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org For additional commands, e-mail: opensuse-commit+help@opensuse.org