r30649 - in /packages/unstable/gnome-shell/debian: changelog patches/05_fix_glib_2.30_compat.patch patches/series

[sjoerd at users.alioth.debian.org]

Author: sjoerd
Date: Mon Oct 17 11:37:48 2011
New Revision: 30649

URL: http://svn.debian.org/wsvn/pkg-gnome/?sc=1&rev=30649
Log:
* debian/patches/05_fix_glib_2.30_compat.patch:
  + Added. Fix compatibility with glib 2.30, which broke some things due to
    GI annotation changes. (From upstream git)

Added:
    packages/unstable/gnome-shell/debian/patches/05_fix_glib_2.30_compat.patch
Modified:
    packages/unstable/gnome-shell/debian/changelog
    packages/unstable/gnome-shell/debian/patches/series

Modified: packages/unstable/gnome-shell/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-gnome/packages/unstable/gnome-shell/debian/changelog?rev=30649&op=diff
==============================================================================
--- packages/unstable/gnome-shell/debian/changelog [utf-8] (original)
+++ packages/unstable/gnome-shell/debian/changelog [utf-8] Mon Oct 17 11:37:48 2011
@@ -1,3 +1,11 @@
+gnome-shell (3.0.2-6) UNRELEASED; urgency=low
+
+  * debian/patches/05_fix_glib_2.30_compat.patch:
+    + Added. Fix compatibility with glib 2.30, which broke some things due to
+      GI annotation changes. (From upstream git)
+
+ -- Sjoerd Simons <sjoerd at debian.org>  Mon, 17 Oct 2011 12:33:28 +0100
+
 gnome-shell (3.0.2-5) unstable; urgency=low
 
   [ Michael Biebl ]

Added: packages/unstable/gnome-shell/debian/patches/05_fix_glib_2.30_compat.patch
URL: http://svn.debian.org/wsvn/pkg-gnome/packages/unstable/gnome-shell/debian/patches/05_fix_glib_2.30_compat.patch?rev=30649&op=file
==============================================================================
--- packages/unstable/gnome-shell/debian/patches/05_fix_glib_2.30_compat.patch (added)
+++ packages/unstable/gnome-shell/debian/patches/05_fix_glib_2.30_compat.patch [utf-8] Mon Oct 17 11:37:48 2011
@@ -1,0 +1,41 @@
+commit bfd344cdece5de6230ff611e3e1c66d90913dc47
+Author: Colin Walters <walters at verbum.org>
+Date:   Wed May 11 14:19:24 2011 -0400
+
+    Use Shell.get_file_contents_utf8_sync over GLib.file_get_contents
+    
+    We need to fix the latter to return a byte array, which gjs doesn't
+    deal with well right now.
+    
+    https://bugzilla.gnome.org/show_bug.cgi?id=649981
+
+diff --git a/js/ui/placeDisplay.js b/js/ui/placeDisplay.js
+index 59ca4a6..9354247 100644
+--- a/js/ui/placeDisplay.js
++++ b/js/ui/placeDisplay.js
+@@ -268,10 +268,7 @@ PlacesManager.prototype = {
+         if (!GLib.file_test(this._bookmarksPath, GLib.FileTest.EXISTS))
+             return;
+ 
+-        let [success, bookmarksContent, len] = GLib.file_get_contents(this._bookmarksPath);
+-
+-        if (!success)
+-            return;
++        let bookmarksContent = Shell.get_file_contents_utf8_sync(this._bookmarksPath);
+ 
+         let bookmarks = bookmarksContent.split('\n');
+ 
+diff --git a/js/ui/windowManager.js b/js/ui/windowManager.js
+index b113a1a..52a00da 100644
+--- a/js/ui/windowManager.js
++++ b/js/ui/windowManager.js
+@@ -22,8 +22,7 @@ function getDimShader() {
+     if (dimShader === null)
+         return null;
+     if (!dimShader) {
+-        let [success, source, length] = GLib.file_get_contents(global.datadir +
+-                                                               '/shaders/dim-window.glsl');
++        let source = Shell.get_file_contents_utf8_sync(global.datadir + '/shaders/dim-window.glsl');
+         try {
+             let shader = new Clutter.Shader();
+             shader.set_fragment_source(source, -1);

Modified: packages/unstable/gnome-shell/debian/patches/series
URL: http://svn.debian.org/wsvn/pkg-gnome/packages/unstable/gnome-shell/debian/patches/series?rev=30649&op=diff
==============================================================================
--- packages/unstable/gnome-shell/debian/patches/series [utf-8] (original)
+++ packages/unstable/gnome-shell/debian/patches/series [utf-8] Mon Oct 17 11:37:48 2011
@@ -2,3 +2,4 @@
 02_rpath-bluetooth-applet.patch
 03_hidden_applications.patch
 04_remove-glx-dependency-on-armel.patch
+05_fix_glib_2.30_compat.patch