r41743 - in /desktop/experimental/gnome-documents/debian: changelog control.in patches/gnome-documents-xdg-fail.patch patches/series

[ah at users.alioth.debian.org]

Author: ah
Date: Sat May 17 11:12:24 2014
New Revision: 41743

URL: http://svn.debian.org/wsvn/pkg-gnome/?sc=1&rev=41743
Log:
* Bump libgjs-dev to (>= 1.40) to build against experimental gjs.
* Add dependency on gnome-online-miners (Closes: #747563)
* New upstream release.
* Add debian/patches/gnome-documents-xdg-fail.patch
  - avoid crashing when not all XDG User Special directories
    are set up properly.

Added:
    desktop/experimental/gnome-documents/debian/patches/gnome-documents-xdg-fail.patch
Modified:
    desktop/experimental/gnome-documents/debian/changelog
    desktop/experimental/gnome-documents/debian/control.in
    desktop/experimental/gnome-documents/debian/patches/series

Modified: desktop/experimental/gnome-documents/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/gnome-documents/debian/changelog?rev=41743&op=diff
==============================================================================
--- desktop/experimental/gnome-documents/debian/changelog	[utf-8] (original)
+++ desktop/experimental/gnome-documents/debian/changelog	[utf-8] Sat May 17 11:12:24 2014
@@ -1,3 +1,14 @@
+gnome-documents (3.12.1-1) experimental; urgency=medium
+
+  * Bump libgjs-dev to (>= 1.40) to build against experimental gjs.
+  * Add dependency on gnome-online-miners (Closes: #747563)
+  * New upstream release.
+  * Add debian/patches/gnome-documents-xdg-fail.patch
+    - avoid crashing when not all XDG User Special directories
+      are set up properly.
+
+ -- Andreas Henriksson <andreas at fatal.se>  Sat, 17 May 2014 10:01:17 +0200
+
 gnome-documents (3.12.0-1) experimental; urgency=medium
 
   [ Dmitry Shachnev ]

Modified: desktop/experimental/gnome-documents/debian/control.in
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/gnome-documents/debian/control.in?rev=41743&op=diff
==============================================================================
--- desktop/experimental/gnome-documents/debian/control.in	[utf-8] (original)
+++ desktop/experimental/gnome-documents/debian/control.in	[utf-8] Sat May 17 11:12:24 2014
@@ -14,7 +14,7 @@
                libevince-dev (>= 3.7.4),
                libgdata-dev (>= 0.13.3),
                libgirepository1.0-dev (>= 1.31.6),
-               libgjs-dev,
+               libgjs-dev (>= 1.40),
                libglib2.0-dev (>= 2.37.0),
                libgnome-desktop-3-dev (>= 3.10),
                libgoa-1.0-dev (>= 3.10),
@@ -37,6 +37,7 @@
 Depends: ${shlibs:Depends},
          ${misc:Depends},
          ${gir:Depends},
+         gnome-online-miners,
          gir1.2-evince-3.0,
          gir1.2-gdata-0.0,
          gir1.2-gnomedesktop-3.0,

Added: desktop/experimental/gnome-documents/debian/patches/gnome-documents-xdg-fail.patch
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/gnome-documents/debian/patches/gnome-documents-xdg-fail.patch?rev=41743&op=file
==============================================================================
--- desktop/experimental/gnome-documents/debian/patches/gnome-documents-xdg-fail.patch	(added)
+++ desktop/experimental/gnome-documents/debian/patches/gnome-documents-xdg-fail.patch	[utf-8] Sat May 17 11:12:24 2014
@@ -0,0 +1,28 @@
+From: Andreas Henriksson <andreas at fatal.se>
+Subject: gnome-documents: avoid crashing when xdg user dirs is not available
+
+On initial startup gnome-documents loops over (XDG) User Special Directories and crashes if
+the call to get the full paths returns null, eg:
+
+org.gnome.Documents[1585]: (gnome-documents:1975): Gjs-WARNING **: JS ERROR: Error: Argument 'path' (type utf8) may not be null
+org.gnome.Documents[1585]: Source<._getTrackerLocations/<@/usr/share/gnome-documents/js/search.js:334
+org.gnome.Documents[1585]: Source<._getTrackerLocations@/usr/share/gnome-documents/js/search.js:325
+
+On second attempt to start, gnome-documents starts but is not functional....
+
+This patch catches non-existant XDG User Special dirs and just ignores them.
+
+--- a/src/search.js	2014-03-20 15:24:23.000000000 +0100
++++ b/src/search.js	2014-05-17 11:19:56.930951778 +0200
+@@ -331,7 +331,10 @@
+ 
+                 // also ignore XDG locations if they are present with their full path
+                 for (let idx = 0; idx < GLib.UserDirectory.N_DIRECTORIES; idx++) {
+-                    let file = Gio.file_new_for_path(GLib.get_user_special_dir(idx));
++                    let path = GLib.get_user_special_dir(idx);
++                    if (path == null)
++                        continue;
++                    let file = Gio.file_new_for_path(path);
+                     if (trackerFile.equal(file))
+                         return;
+                 }

Modified: desktop/experimental/gnome-documents/debian/patches/series
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/gnome-documents/debian/patches/series?rev=41743&op=diff
==============================================================================
--- desktop/experimental/gnome-documents/debian/patches/series	[utf-8] (original)
+++ desktop/experimental/gnome-documents/debian/patches/series	[utf-8] Sat May 17 11:12:24 2014
@@ -1 +1,2 @@
 90_drop-onlyshowin.patch
+gnome-documents-xdg-fail.patch