r38154 - in /desktop/unstable/gnome-shell/debian: changelog patches/0001-st-theme-node-drawing-Don-t-use-GL-types.patch patches/series

[pochu at users.alioth.debian.org]

Author: pochu
Date: Sun May 26 15:53:46 2013
New Revision: 38154

URL: http://svn.debian.org/wsvn/pkg-gnome/?sc=1&rev=38154
Log:
* debian/patches/0001-st-theme-node-drawing-Don-t-use-GL-types.patch:
  + Patch from upstream git, don't use GL types as cogl doesn't expose
    GL headers in newer releases. This will ease the cogl transition.

Added:
    desktop/unstable/gnome-shell/debian/patches/0001-st-theme-node-drawing-Don-t-use-GL-types.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=38154&op=diff
==============================================================================
--- desktop/unstable/gnome-shell/debian/changelog [utf-8] (original)
+++ desktop/unstable/gnome-shell/debian/changelog [utf-8] Sun May 26 15:53:46 2013
@@ -1,3 +1,11 @@
+gnome-shell (3.4.2-8) UNRELEASED; urgency=low
+
+  * debian/patches/0001-st-theme-node-drawing-Don-t-use-GL-types.patch:
+    + Patch from upstream git, don't use GL types as cogl doesn't expose
+      GL headers in newer releases. This will ease the cogl transition.
+
+ -- Emilio Pozuelo Monfort <pochu at debian.org>  Sun, 26 May 2013 15:31:22 +0200
+
 gnome-shell (3.4.2-7) unstable; urgency=low
 
   [ Michael Biebl ]

Added: desktop/unstable/gnome-shell/debian/patches/0001-st-theme-node-drawing-Don-t-use-GL-types.patch
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/gnome-shell/debian/patches/0001-st-theme-node-drawing-Don-t-use-GL-types.patch?rev=38154&op=file
==============================================================================
--- desktop/unstable/gnome-shell/debian/patches/0001-st-theme-node-drawing-Don-t-use-GL-types.patch (added)
+++ desktop/unstable/gnome-shell/debian/patches/0001-st-theme-node-drawing-Don-t-use-GL-types.patch [utf-8] Sun May 26 15:53:46 2013
@@ -1,0 +1,30 @@
+From 5d98e2bf04891f3d6144cceb1e26f58e72d1fc02 Mon Sep 17 00:00:00 2001
+From: Neil Roberts <neil at linux.intel.com>
+Date: Fri, 23 Mar 2012 19:14:29 +0000
+Subject: [PATCH] st-theme-node-drawing: Don't use GL types
+
+This swaps a use of GLfloat for a regular float. Cogl might stop
+including a GL header in its public headers soon so this would fix a
+compilation error.
+
+https://bugzilla.gnome.org/show_bug.cgi?id=672711
+---
+ src/st/st-theme-node-drawing.c | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/src/st/st-theme-node-drawing.c b/src/st/st-theme-node-drawing.c
+index cab2542..1ac3e39 100644
+--- a/src/st/st-theme-node-drawing.c
++++ b/src/st/st-theme-node-drawing.c
+@@ -1782,7 +1782,7 @@ st_theme_node_paint_sliced_border_image (StThemeNode           *node,
+   cogl_set_source (material);
+ 
+   {
+-    GLfloat rectangles[] =
++    float rectangles[] =
+     {
+       /* top left corner */
+       0, 0, border_left, border_top,
+-- 
+1.8.3.rc3
+

Modified: desktop/unstable/gnome-shell/debian/patches/series
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/gnome-shell/debian/patches/series?rev=38154&op=diff
==============================================================================
--- desktop/unstable/gnome-shell/debian/patches/series [utf-8] (original)
+++ desktop/unstable/gnome-shell/debian/patches/series [utf-8] Sun May 26 15:53:46 2013
@@ -15,3 +15,4 @@
 33-screen-reader-l10n.patch
 40-force-online.patch
 50-remove-folks-integration.patch
+0001-st-theme-node-drawing-Don-t-use-GL-types.patch