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

Add patch to link to libGL

OBS-URL: https://build.opensuse.org/request/show/100550
OBS-URL: https://build.opensuse.org/package/show/GNOME:Factory/gnome-shell?expand=0&rev=95

gnome-shell-link-gl.patch

@@ -0,0 +1,28 @@
+From 235cb9c505a9c24934dcb4d307edc8facf82da6b Mon Sep 17 00:00:00 2001
+From: Emmanuele Bassi <ebassi@gnome.org>
+Date: Sat, 14 Jan 2012 23:58:53 +0000
+Subject: build: Add the 'gl' pkg-config
+
+Cogl does not explicitly link against GL or GLES any more, and Clutter
+master dropped the 'gl' pkg-config requirement because it introduced
+unneeded and conflicting dependencies.
+
+GNOME Shell still uses glXQuery* API, so it needs to explicitly link
+against libGL.
+
+https://bugzilla.gnome.org/show_bug.cgi?id=667864
+---
+diff --git a/configure.ac b/configure.ac
+index d0c99dd..b4d5afe 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -84,6 +84,7 @@ PKG_CHECK_MODULES(GNOME_SHELL, gio-unix-2.0 >= $GIO_MIN_VERSION
+                                gjs-internals-1.0 >= $GJS_MIN_VERSION
+ 			       libgnome-menu-3.0 $recorder_modules
+                                gdk-x11-3.0 libsoup-2.4
++                               gl
+ 			       clutter-x11-1.0 >= $CLUTTER_MIN_VERSION
+ 			       clutter-glx-1.0 >= $CLUTTER_MIN_VERSION
+                                libstartup-notification-1.0 >= $STARTUP_NOTIFICATION_MIN_VERSION
+--
+cgit v0.9.0.2

gnome-shell.changes

@@ -1,3 +1,12 @@
+-------------------------------------------------------------------
+Wed Jan 18 12:08:24 UTC 2012 - vuntz@opensuse.org
+
+- Add gnome-shell-link-gl.patch: explicitly link to GL as cogl
+  doesn't do that anymore.
+- Add gnome-common BuildRequires and call to gnome-autogen.sh,
+  needed for above patch.
+- Add pkgconfig(gl) BuildRequires: new dependency.
+
 -------------------------------------------------------------------
 Thu Jan  5 07:37:51 UTC 2012 - vuntz@opensuse.org
 

gnome-shell.spec

@@ -23,6 +23,10 @@ License:        GPL-2.0+
 Group:          System/GUI/GNOME
 Url:            http://live.gnome.org/GnomeShell
 Source:         http://download.gnome.org/sources/gnome-shell/3.3/%{name}-%{version}.tar.xz
+# PATCH-FIX-UPSTREAM gnome-shell-link-gl.patch vuntz@opensuse.org -- Explicitly link to GL, taken from git
+Patch0:         gnome-shell-link-gl.patch
+# needed for patch0
+BuildRequires:  gnome-common
 BuildRequires:  intltool
 BuildRequires:  translation-update-upstream
 BuildRequires:  update-desktop-files
@@ -35,6 +39,7 @@ BuildRequires:  pkgconfig(folks) >= 0.5.2
 BuildRequires:  pkgconfig(gdk-pixbuf-2.0)
 BuildRequires:  pkgconfig(gio-2.0) >= 2.31.0
 BuildRequires:  pkgconfig(gjs-1.0) >= 1.29.18
+BuildRequires:  pkgconfig(gl)
 BuildRequires:  pkgconfig(gnome-bluetooth-1.0) >= 3.1.0
 BuildRequires:  pkgconfig(gnome-desktop-3.0)
 BuildRequires:  pkgconfig(gnome-keyring-1)
@@ -120,8 +125,11 @@ to enable, disable and install them.
 %prep
 %setup -q
 translation-update-upstream
+%patch0 -p1
 
 %build
+# needed for patch0
+NOCONFIGURE=1 gnome-autogen.sh
 export BROWSER_PLUGIN_DIR=%{_libdir}/browser-plugins
 %configure \
         --disable-static \