pool/gnome-shell
SHA256
2
0
Fork 1
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Accepting request 61730 from home:vuntz:branches:GNOME:Factory

Browse Source 
OBS-URL: https://build.opensuse.org/request/show/61730
OBS-URL: https://build.opensuse.org/package/show/GNOME:Factory/gnome-shell?expand=0&rev=51
This commit is contained in:
Dominique Leuenberger 2011-02-18 07:09:54 +00:00 committed by Git OBS Bridge
parent 1a2bc14bac
commit e18cfd23c2
3 changed files with 24 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
gnome-shell-handle-broken-glxinfo.patch Normal file
View File

@ -0,0 +1,15 @@
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):

6
gnome-shell.changes
View File

@ -1,3 +1,9 @@
-------------------------------------------------------------------
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

3
gnome-shell.spec
View File

@ -32,6 +32,8 @@ Source1: gnome-shell-session
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
@ -84,6 +86,7 @@ translation-update-upstream
%if ! 0%{?BUILD_AGAINST_GNOME3}
%patch0 -p1
%endif
%patch1 -p1
%build
%configure \