[gnome-shell] fix build

Matthias Clasen mclasen at fedoraproject.org
Fri Jan 20 03:00:58 UTC 2012


commit ff9232bff05f54ee7be931969efb5d36de9b8a2e
Author: Matthias Clasen <mclasen at redhat.com>
Date:   Thu Jan 19 22:00:58 2012 -0500

    fix build

 gnome-shell-gl.patch |   11 +++++++++++
 gnome-shell.spec     |    6 ++++++
 2 files changed, 17 insertions(+), 0 deletions(-)
---
diff --git a/gnome-shell-gl.patch b/gnome-shell-gl.patch
new file mode 100644
index 0000000..a15aab4
--- /dev/null
+++ b/gnome-shell-gl.patch
@@ -0,0 +1,11 @@
+diff -up gnome-shell-3.3.3/configure.ac.gl gnome-shell-3.3.3/configure.ac
+--- gnome-shell-3.3.3/configure.ac.gl	2012-01-19 21:58:03.637964155 -0500
++++ gnome-shell-3.3.3/configure.ac	2012-01-19 21:59:19.634969153 -0500
+@@ -84,6 +84,7 @@ PKG_CHECK_MODULES(GNOME_SHELL, gio-unix-
+                                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
diff --git a/gnome-shell.spec b/gnome-shell.spec
index 027cd38..819eed6 100644
--- a/gnome-shell.spec
+++ b/gnome-shell.spec
@@ -13,6 +13,9 @@ Patch0: gnome-shell-avoid-redhat-menus.patch
 # Replace Epiphany with Firefox in the default favourite apps list
 Patch1: gnome-shell-favourite-apps-firefox.patch
 
+# upstream fix
+Patch2: gnome-shell-gl.patch
+
 %define clutter_version 1.7.5
 %define gobject_introspection_version 0.10.1
 %define mutter_version 3.3.3
@@ -84,6 +87,9 @@ easy to use experience.
 %setup -q
 %patch0 -p1 -b .avoid-redhat-menus
 %patch1 -p1 -b .firefox
+%patch2 -p1 -b .gl
+
+rm configure
 
 %build
 export CFLAGS="$RPM_OPT_FLAGS -Wno-error=deprecated-declarations"


More information about the scm-commits mailing list