r33955 - in /desktop/unstable/gnome-shell/debian: changelog patches/14_require_gl_directly.patch patches/series

[sjoerd at users.alioth.debian.org]

Author: sjoerd
Date: Sun Apr  1 13:43:35 2012
New Revision: 33955

URL: http://svn.debian.org/wsvn/pkg-gnome/?sc=1&rev=33955
Log:
* d/p/14_require_gl_directly.patch
  + Added. gnome-shell uses glXQuery* API so it needs a direct link against
    libGL. Causes build failure with upcoming clutter/cogl as they don't
    expose a directly link to libGL anymore

Added:
    desktop/unstable/gnome-shell/debian/patches/14_require_gl_directly.patch
Modified:
    desktop/unstable/gnome-shell/debian/changelog
    desktop/unstable/gnome-shell/debian/patches/series

Modified: desktop/unstable/gnome-shell/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/gnome-shell/debian/changelog?rev=33955&op=diff
==============================================================================
--- desktop/unstable/gnome-shell/debian/changelog [utf-8] (original)
+++ desktop/unstable/gnome-shell/debian/changelog [utf-8] Sun Apr  1 13:43:35 2012
@@ -1,3 +1,12 @@
+gnome-shell (3.2.2.1-3) UNRELEASED; urgency=low
+
+  * d/p/14_require_gl_directly.patch
+    + Added. gnome-shell uses glXQuery* API so it needs a direct link against
+      libGL. Causes build failure with upcoming clutter/cogl as they don't
+      expose a directly link to libGL anymore
+
+ -- Sjoerd Simons <sjoerd at debian.org>  Sun, 01 Apr 2012 15:26:39 +0200
+
 gnome-shell (3.2.2.1-2) unstable; urgency=low
 
   * debian/patches/12_Replace-shell_util_icon_from_string.patch

Added: desktop/unstable/gnome-shell/debian/patches/14_require_gl_directly.patch
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/gnome-shell/debian/patches/14_require_gl_directly.patch?rev=33955&op=file
==============================================================================
--- desktop/unstable/gnome-shell/debian/patches/14_require_gl_directly.patch (added)
+++ desktop/unstable/gnome-shell/debian/patches/14_require_gl_directly.patch [utf-8] Sun Apr  1 13:43:35 2012
@@ -1,0 +1,13 @@
+diff --git a/configure.ac b/configure.ac
+index d8f80de..b0a0960 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -84,7 +84,7 @@ PKG_CHECK_MODULES(GNOME_SHELL, gio-2.0 >= $GIO_MIN_VERSION
+                                libmutter >= $MUTTER_MIN_VERSION
+                                gjs-internals-1.0 >= $GJS_MIN_VERSION
+ 			       libgnome-menu-3.0 $recorder_modules gconf-2.0
+-                               gdk-x11-3.0 libsoup-2.4
++                               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

Modified: desktop/unstable/gnome-shell/debian/patches/series
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/gnome-shell/debian/patches/series?rev=33955&op=diff
==============================================================================
--- desktop/unstable/gnome-shell/debian/patches/series [utf-8] (original)
+++ desktop/unstable/gnome-shell/debian/patches/series [utf-8] Sun Apr  1 13:43:35 2012
@@ -7,3 +7,4 @@
 11-no-gettext.patch
 12_Replace-shell_util_icon_from_string.patch
 13_bluetooth_fix_undefined_variable.patch
+14_require_gl_directly.patch