r39214 - in /desktop/unstable/gnome-shell/debian: changelog patches/avoid-gluint.patch patches/series

[ah at users.alioth.debian.org]

Author: ah
Date: Wed Aug 21 12:10:01 2013
New Revision: 39214

URL: http://svn.debian.org/wsvn/pkg-gnome/?sc=1&rev=39214
Log:
* debian/patches/avoid-gluint.patch:
  - using GLuint causes build failures on armel and armhf as it's
    not defined. Use a regular guint instead.

Added:
    desktop/unstable/gnome-shell/debian/patches/avoid-gluint.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=39214&op=diff
==============================================================================
--- desktop/unstable/gnome-shell/debian/changelog	[utf-8] (original)
+++ desktop/unstable/gnome-shell/debian/changelog	[utf-8] Wed Aug 21 12:10:01 2013
@@ -1,3 +1,11 @@
+gnome-shell (3.4.2-14) unstable; urgency=low
+
+  * debian/patches/avoid-gluint.patch:
+    - using GLuint causes build failures on armel and armhf as it's
+      not defined. Use a regular guint instead.
+
+ -- Andreas Henriksson <andreas at fatal.se>  Wed, 21 Aug 2013 13:50:52 +0200
+
 gnome-shell (3.4.2-13) unstable; urgency=low
 
   * debian/patches/disable-clutter-xinput.patch:

Added: desktop/unstable/gnome-shell/debian/patches/avoid-gluint.patch
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/gnome-shell/debian/patches/avoid-gluint.patch?rev=39214&op=file
==============================================================================
--- desktop/unstable/gnome-shell/debian/patches/avoid-gluint.patch	(added)
+++ desktop/unstable/gnome-shell/debian/patches/avoid-gluint.patch	[utf-8] Wed Aug 21 12:10:01 2013
@@ -0,0 +1,21 @@
+Description: Avoid using GLuint as it's not defined everywhere
+Author: Andreas Henriksson <andreas at fatal.se>
+
+See build failures on armel and armhf.
+
+The affected code has been removed in newer upstream releases.
+
+
+Forwarded: not-needed
+
+--- gnome-shell-3.4.2.orig/src/shell-screen-grabber.c
++++ gnome-shell-3.4.2/src/shell-screen-grabber.c
+@@ -35,7 +35,7 @@ struct _ShellScreenGrabber
+   int have_pixel_buffers;
+   int have_pack_invert;
+   int width, height;
+-  GLuint pixel_buffer;
++  guint pixel_buffer;
+ };
+ 
+ G_DEFINE_TYPE(ShellScreenGrabber, shell_screen_grabber, G_TYPE_OBJECT);

Modified: desktop/unstable/gnome-shell/debian/patches/series
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/gnome-shell/debian/patches/series?rev=39214&op=diff
==============================================================================
--- desktop/unstable/gnome-shell/debian/patches/series	[utf-8] (original)
+++ desktop/unstable/gnome-shell/debian/patches/series	[utf-8] Wed Aug 21 12:10:01 2013
@@ -20,3 +20,4 @@
 0001-st-theme-node-drawing-Don-t-use-GL-types.patch
 62-remove-leftover-dbus-import.patch
 disable-clutter-xinput.patch
+avoid-gluint.patch