r41499 - in /desktop/unstable/mutter/debian: changelog patches/fix-build-with-g-i.patch patches/series

[sjoerd at users.alioth.debian.org]

Author: sjoerd
Date: Sat Apr 26 17:26:04 2014
New Revision: 41499

URL: http://svn.debian.org/wsvn/pkg-gnome/?sc=1&rev=41499
Log:
debian/patches/fix-build-with-g-i.patch:
Added. Fix mutter buid with recent gobject-introspection

Added:
    desktop/unstable/mutter/debian/patches/fix-build-with-g-i.patch
Modified:
    desktop/unstable/mutter/debian/changelog
    desktop/unstable/mutter/debian/patches/series

Modified: desktop/unstable/mutter/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/mutter/debian/changelog?rev=41499&op=diff
==============================================================================
--- desktop/unstable/mutter/debian/changelog	[utf-8] (original)
+++ desktop/unstable/mutter/debian/changelog	[utf-8] Sat Apr 26 17:26:04 2014
@@ -7,8 +7,10 @@
   [ Sjoerd Simons ]
   * Uglify the version number to override a mutter version that shouldn't have
     gone to unstable yet
-
- -- Sjoerd Simons <sjoerd at debian.org>  Sat, 26 Apr 2014 18:56:35 +0200
+  * debian/patches/fix-build-with-g-i.patch:
+    Added. Fix mutter buid with recent gobject-introspection
+
+ -- Sjoerd Simons <sjoerd at debian.org>  Sat, 26 Apr 2014 19:26:03 +0200
 
 mutter (3.8.4-3) unstable; urgency=medium
 

Added: desktop/unstable/mutter/debian/patches/fix-build-with-g-i.patch
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/mutter/debian/patches/fix-build-with-g-i.patch?rev=41499&op=file
==============================================================================
--- desktop/unstable/mutter/debian/patches/fix-build-with-g-i.patch	(added)
+++ desktop/unstable/mutter/debian/patches/fix-build-with-g-i.patch	[utf-8] Sat Apr 26 17:26:04 2014
@@ -0,0 +1,30 @@
+--- a/src/meta/prefs.h
++++ b/src/meta/prefs.h
+@@ -422,13 +422,13 @@
+    */
+   GSList *bindings;
+ 
+-  /** for keybindings that can have shift or not like Alt+Tab */
++  /* for keybindings that can have shift or not like Alt+Tab */
+   gboolean      add_shift:1;
+ 
+-  /** for keybindings that apply only to a window */
++  /* for keybindings that apply only to a window */
+   gboolean      per_window:1;
+ 
+-  /** for keybindings not added with meta_display_add_keybinding() */
++  /* for keybindings not added with meta_display_add_keybinding() */
+   gboolean      builtin:1;
+ } MetaKeyPref;
+ 
+--- a/src/ui/theme.c
++++ b/src/ui/theme.c
+@@ -1880,7 +1880,7 @@
+ /**
+  * pos_tokenize:
+  * @expr: The expression
+- * @tokens_p: (out) The resulting tokens
++ * @tokens_p: (out): The resulting tokens
+  * @n_tokens_p: (out): The number of resulting tokens
+  * @err: (out):  set to the problem if there was a problem
+  

Modified: desktop/unstable/mutter/debian/patches/series
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/mutter/debian/patches/series?rev=41499&op=diff
==============================================================================
--- desktop/unstable/mutter/debian/patches/series	[utf-8] (original)
+++ desktop/unstable/mutter/debian/patches/series	[utf-8] Sat Apr 26 17:26:04 2014
@@ -1,2 +1,3 @@
 01_Wcast-align.patch
 0001-Update-for-Cogl-API-breaks.patch
+fix-build-with-g-i.patch