r37763 - in /desktop/unstable/gnome-desktop3/debian: changelog control control.in patches/0001-Move-thumbnails-into-XDG_CACHE_HOME.patch patches/series

smcv at users.alioth.debian.org smcv at users.alioth.debian.org
Wed May 15 07:55:18 UTC 2013


Author: smcv
Date: Wed May 15 07:55:18 2013
New Revision: 37763

URL: http://svn.debian.org/wsvn/pkg-gnome/?sc=1&rev=37763
Log:
* Add patch from upstream 3.5.3 to sync thumbnail location with GLib
  2.34+ (~/.cache/thumbnails instead of ~/.thumbnails), preventing
  infinite loops in which Nautilus will generate thumbnails of thumbnails.
  Closes: #708185.
  + Explicitly (build-)depend on GLib 2.34+ to make sure the system is
    consistent
  + Thumbnails are now in a well-known cache directory (Closes: #637049)

Added:
    desktop/unstable/gnome-desktop3/debian/patches/0001-Move-thumbnails-into-XDG_CACHE_HOME.patch
Modified:
    desktop/unstable/gnome-desktop3/debian/changelog
    desktop/unstable/gnome-desktop3/debian/control
    desktop/unstable/gnome-desktop3/debian/control.in
    desktop/unstable/gnome-desktop3/debian/patches/series

Modified: desktop/unstable/gnome-desktop3/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/gnome-desktop3/debian/changelog?rev=37763&op=diff
==============================================================================
--- desktop/unstable/gnome-desktop3/debian/changelog [utf-8] (original)
+++ desktop/unstable/gnome-desktop3/debian/changelog [utf-8] Wed May 15 07:55:18 2013
@@ -8,6 +8,15 @@
     + Loosen libgnome-desktop-3-2 dependency on gnome-desktop3-data
       so that the former can be coinstalled with other sonames of
       the library. Closes: #704177.
+
+  [ Simon McVittie ]
+  * Add patch from upstream 3.5.3 to sync thumbnail location with GLib
+    2.34+ (~/.cache/thumbnails instead of ~/.thumbnails), preventing
+    infinite loops in which Nautilus will generate thumbnails of thumbnails.
+    Closes: #708185.
+    + Explicitly (build-)depend on GLib 2.34+ to make sure the system is
+      consistent
+    + Thumbnails are now in a well-known cache directory (Closes: #637049)
 
  -- Josselin Mouette <joss at debian.org>  Fri, 06 Jul 2012 11:45:51 +0200
 

Modified: desktop/unstable/gnome-desktop3/debian/control
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/gnome-desktop3/debian/control?rev=37763&op=diff
==============================================================================
--- desktop/unstable/gnome-desktop3/debian/control [utf-8] (original)
+++ desktop/unstable/gnome-desktop3/debian/control [utf-8] Wed May 15 07:55:18 2013
@@ -14,7 +14,7 @@
 Build-Depends: debhelper (>= 8),
                dpkg-dev (>= 1.15.1),
                dh-autoreconf,
-               libglib2.0-dev (>= 2.27.3),
+               libglib2.0-dev (>= 2.34),
                intltool (>= 0.40.6),
                scrollkeeper,
                cdbs (>= 0.4.41),
@@ -48,6 +48,7 @@
 Architecture: any
 Depends: ${misc:Depends},
          ${shlibs:Depends},
+         libglib2.0-0 (>= 2.34),
          gsettings-desktop-schemas (>= 2.91.92),
          gnome-desktop3-data (>= ${source:Version})
 Recommends: hwdata (>= 0.227-1)

Modified: desktop/unstable/gnome-desktop3/debian/control.in
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/gnome-desktop3/debian/control.in?rev=37763&op=diff
==============================================================================
--- desktop/unstable/gnome-desktop3/debian/control.in [utf-8] (original)
+++ desktop/unstable/gnome-desktop3/debian/control.in [utf-8] Wed May 15 07:55:18 2013
@@ -9,7 +9,7 @@
 Build-Depends: debhelper (>= 8),
                dpkg-dev (>= 1.15.1),
                dh-autoreconf,
-               libglib2.0-dev (>= 2.27.3),
+               libglib2.0-dev (>= 2.34),
                intltool (>= 0.40.6),
                scrollkeeper,
                cdbs (>= 0.4.41),
@@ -43,6 +43,7 @@
 Architecture: any
 Depends: ${misc:Depends},
          ${shlibs:Depends},
+         libglib2.0-0 (>= 2.34),
          gsettings-desktop-schemas (>= 2.91.92),
          gnome-desktop3-data (>= ${source:Version})
 Recommends: hwdata (>= 0.227-1)

Added: desktop/unstable/gnome-desktop3/debian/patches/0001-Move-thumbnails-into-XDG_CACHE_HOME.patch
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/gnome-desktop3/debian/patches/0001-Move-thumbnails-into-XDG_CACHE_HOME.patch?rev=37763&op=file
==============================================================================
--- desktop/unstable/gnome-desktop3/debian/patches/0001-Move-thumbnails-into-XDG_CACHE_HOME.patch (added)
+++ desktop/unstable/gnome-desktop3/debian/patches/0001-Move-thumbnails-into-XDG_CACHE_HOME.patch [utf-8] Wed May 15 07:55:18 2013
@@ -1,0 +1,101 @@
+From: William Jon McCann <jmccann at redhat.com>
+Date: Mon, 30 Apr 2012 12:43:22 -0400
+Subject: Move thumbnails into XDG_CACHE_HOME
+
+Bug: https://bugzilla.gnome.org/show_bug.cgi?id=646508
+Bug-Debian: http://bugs.debian.org/708185
+Origin: upstream, 3.5.3, commit:f6184616f5ae20a5d1120e010a834ac92fb2de99
+---
+ libgnome-desktop/gnome-desktop-thumbnail.c |   30 ++++++++++++++--------------
+ 1 file changed, 15 insertions(+), 15 deletions(-)
+
+diff --git a/libgnome-desktop/gnome-desktop-thumbnail.c b/libgnome-desktop/gnome-desktop-thumbnail.c
+index 2b2fda9..351dd43 100644
+--- a/libgnome-desktop/gnome-desktop-thumbnail.c
++++ b/libgnome-desktop/gnome-desktop-thumbnail.c
+@@ -841,8 +841,8 @@ gnome_desktop_thumbnail_factory_lookup (GnomeDesktopThumbnailFactory *factory,
+ 
+   file = g_strconcat (g_checksum_get_string (checksum), ".png", NULL);
+   
+-  path = g_build_filename (g_get_home_dir (),
+-			   ".thumbnails",
++  path = g_build_filename (g_get_user_cache_dir (),
++			   "thumbnails",
+ 			   (priv->size == GNOME_DESKTOP_THUMBNAIL_SIZE_NORMAL)?"normal":"large",
+ 			   file,
+ 			   NULL);
+@@ -902,8 +902,8 @@ gnome_desktop_thumbnail_factory_has_valid_failed_thumbnail (GnomeDesktopThumbnai
+ 
+   file = g_strconcat (g_checksum_get_string (checksum), ".png", NULL);
+ 
+-  path = g_build_filename (g_get_home_dir (),
+-			   ".thumbnails/fail",
++  path = g_build_filename (g_get_user_cache_dir (),
++			   "thumbnails/fail",
+ 			   appname,
+ 			   file,
+ 			   NULL);
+@@ -998,7 +998,7 @@ gnome_desktop_thumbnail_factory_can_thumbnail (GnomeDesktopThumbnailFactory *fac
+   /* Don't thumbnail thumbnails */
+   if (uri &&
+       strncmp (uri, "file:/", 6) == 0 &&
+-      strstr (uri, "/.thumbnails/") != NULL)
++      strstr (uri, "/thumbnails/") != NULL)
+     return FALSE;
+   
+   if (!mime_type)
+@@ -1244,8 +1244,8 @@ make_thumbnail_dirs (GnomeDesktopThumbnailFactory *factory)
+ 
+   res = FALSE;
+ 
+-  thumbnail_dir = g_build_filename (g_get_home_dir (),
+-				    ".thumbnails",
++  thumbnail_dir = g_build_filename (g_get_user_cache_dir (),
++				    "thumbnails",
+ 				    NULL);
+   if (!g_file_test (thumbnail_dir, G_FILE_TEST_IS_DIR))
+     {
+@@ -1278,8 +1278,8 @@ make_thumbnail_fail_dirs (GnomeDesktopThumbnailFactory *factory)
+ 
+   res = FALSE;
+ 
+-  thumbnail_dir = g_build_filename (g_get_home_dir (),
+-				    ".thumbnails",
++  thumbnail_dir = g_build_filename (g_get_user_cache_dir (),
++				    "thumbnails",
+ 				    NULL);
+   if (!g_file_test (thumbnail_dir, G_FILE_TEST_IS_DIR))
+     {
+@@ -1352,8 +1352,8 @@ gnome_desktop_thumbnail_factory_save_thumbnail (GnomeDesktopThumbnailFactory *fa
+ 
+   file = g_strconcat (g_checksum_get_string (checksum), ".png", NULL);
+ 
+-  path = g_build_filename (g_get_home_dir (),
+-			   ".thumbnails",
++  path = g_build_filename (g_get_user_cache_dir (),
++			   "thumbnails",
+ 			   (priv->size == GNOME_DESKTOP_THUMBNAIL_SIZE_NORMAL)?"normal":"large",
+ 			   file,
+ 			   NULL);
+@@ -1456,8 +1456,8 @@ gnome_desktop_thumbnail_factory_create_failed_thumbnail (GnomeDesktopThumbnailFa
+ 
+   file = g_strconcat (g_checksum_get_string (checksum), ".png", NULL);
+ 
+-  path = g_build_filename (g_get_home_dir (),
+-			   ".thumbnails/fail",
++  path = g_build_filename (g_get_user_cache_dir (),
++			   "thumbnails/fail",
+ 			   appname,
+ 			   file,
+ 			   NULL);
+@@ -1547,8 +1547,8 @@ gnome_desktop_thumbnail_path_for_uri (const char         *uri,
+   file = g_strconcat (md5, ".png", NULL);
+   g_free (md5);
+   
+-  path = g_build_filename (g_get_home_dir (),
+-			   ".thumbnails",
++  path = g_build_filename (g_get_user_cache_dir (),
++			   "thumbnails",
+ 			   (size == GNOME_DESKTOP_THUMBNAIL_SIZE_NORMAL)?"normal":"large",
+ 			   file,
+ 			   NULL);

Modified: desktop/unstable/gnome-desktop3/debian/patches/series
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/gnome-desktop3/debian/patches/series?rev=37763&op=diff
==============================================================================
--- desktop/unstable/gnome-desktop3/debian/patches/series [utf-8] (original)
+++ desktop/unstable/gnome-desktop3/debian/patches/series [utf-8] Wed May 15 07:55:18 2013
@@ -1,1 +1,2 @@
+0001-Move-thumbnails-into-XDG_CACHE_HOME.patch
 #99_ltmain_as-needed.patch




More information about the pkg-gnome-commits mailing list