From 456a13b97ed80253ddc2d4ec2056014a203f0318 Mon Sep 17 00:00:00 2001
From: Automaton <nobody@home.ok>
Date: Sun, 31 Mar 2013 03:12:08 +0200
Subject: [PATCH] Update x11/gnome-desktop to version 2.32.1_3

---
 x11/gnome-desktop/Makefile             |   5 +-
 x11/gnome-desktop/files/patch-glib2_34 | 114 +++++++++++++++++++++++++
 2 files changed, 116 insertions(+), 3 deletions(-)
 create mode 100644 x11/gnome-desktop/files/patch-glib2_34

diff --git a/x11/gnome-desktop/Makefile b/x11/gnome-desktop/Makefile
index 715c5ffe8dd..c12e13c76ed 100644
--- a/x11/gnome-desktop/Makefile
+++ b/x11/gnome-desktop/Makefile
@@ -1,10 +1,10 @@
 # Created by: Joe Marcus Clarke <marcus@FreeBSD.org>
-# $FreeBSD: x11/gnome-desktop/Makefile 313635 2013-03-08 11:32:11Z bapt $
+# $FreeBSD: x11/gnome-desktop/Makefile 314763 2013-03-20 21:18:27Z mezz $
 #   $MCom: ports/x11/gnome-desktop/Makefile,v 1.190 2010/11/17 12:03:52 kwm Exp $
 
 PORTNAME=	gnome-desktop
 PORTVERSION=	2.32.1
-PORTREVISION?=	2
+PORTREVISION?=	3
 CATEGORIES=	x11 gnome
 MASTER_SITES=	GNOME
 DIST_SUBDIR=	gnome2
@@ -22,7 +22,6 @@ USE_XORG=	xpm
 USES=		bison pathfix
 USE_GNOME=	gnomeprefix intlhack gnomedocutils gconf2 pygtk2 \
 		ltverhack referencehack
-GNOME_DESKTOP_VERSION=2
 USE_GETTEXT=	yes
 USE_GMAKE=	yes
 USE_PYTHON=	yes
diff --git a/x11/gnome-desktop/files/patch-glib2_34 b/x11/gnome-desktop/files/patch-glib2_34
new file mode 100644
index 00000000000..26e9b425da5
--- /dev/null
+++ b/x11/gnome-desktop/files/patch-glib2_34
@@ -0,0 +1,114 @@
+--- libgnome-desktop/gnome-desktop-thumbnail.c.orig	2013-03-20 11:15:01.000000000 -0500
++++ libgnome-desktop/gnome-desktop-thumbnail.c	2013-03-20 11:30:58.000000000 -0500
+@@ -525,9 +525,14 @@
+   g_assert (digest_len == 16);
+ 
+   file = g_strconcat (g_checksum_get_string (checksum), ".png", NULL);
+-  
++
++#if GLIB_CHECK_VERSION (2, 34, 0)
++  path = g_build_filename (g_get_user_cache_dir (),
++			   "thumbnails",
++#else
+   path = g_build_filename (g_get_home_dir (),
+ 			   ".thumbnails",
++#endif
+ 			   (priv->size == GNOME_DESKTOP_THUMBNAIL_SIZE_NORMAL)?"normal":"large",
+ 			   file,
+ 			   NULL);
+@@ -587,8 +592,13 @@
+ 
+   file = g_strconcat (g_checksum_get_string (checksum), ".png", NULL);
+ 
++#if GLIB_CHECK_VERSION (2, 34, 0)
++  path = g_build_filename (g_get_user_cache_dir (),
++			   "thumbnails/fail",
++#else
+   path = g_build_filename (g_get_home_dir (),
+ 			   ".thumbnails/fail",
++#endif
+ 			   appname,
+ 			   file,
+ 			   NULL);
+@@ -678,7 +688,8 @@
+   /* Don't thumbnail thumbnails */
+   if (uri &&
+       strncmp (uri, "file:/", 6) == 0 &&
+-      strstr (uri, "/.thumbnails/") != NULL)
++      (strstr (uri, "/.thumbnails/") != NULL ||
++      strstr (uri, "/.cache/thumbnails/") != NULL))
+     return FALSE;
+   
+   if (!mime_type)
+@@ -917,8 +928,13 @@
+ 
+   res = FALSE;
+ 
++#if GLIB_CHECK_VERSION (2, 34, 0)
++  thumbnail_dir = g_build_filename (g_get_user_cache_dir (),
++				    "thumbnails",
++#else
+   thumbnail_dir = g_build_filename (g_get_home_dir (),
+ 				    ".thumbnails",
++#endif
+ 				    NULL);
+   if (!g_file_test (thumbnail_dir, G_FILE_TEST_IS_DIR))
+     {
+@@ -951,8 +967,13 @@
+ 
+   res = FALSE;
+ 
++#if GLIB_CHECK_VERSION (2, 34, 0)
++  thumbnail_dir = g_build_filename (g_get_user_cache_dir (),
++				    "thumbnails",
++#else
+   thumbnail_dir = g_build_filename (g_get_home_dir (),
+ 				    ".thumbnails",
++#endif
+ 				    NULL);
+   if (!g_file_test (thumbnail_dir, G_FILE_TEST_IS_DIR))
+     {
+@@ -1025,8 +1046,13 @@
+ 
+   file = g_strconcat (g_checksum_get_string (checksum), ".png", NULL);
+ 
++#if GLIB_CHECK_VERSION (2, 34, 0)
++  path = g_build_filename (g_get_user_cache_dir (),
++			   "thumbnails",
++#else
+   path = g_build_filename (g_get_home_dir (),
+ 			   ".thumbnails",
++#endif
+ 			   (priv->size == GNOME_DESKTOP_THUMBNAIL_SIZE_NORMAL)?"normal":"large",
+ 			   file,
+ 			   NULL);
+@@ -1129,8 +1155,13 @@
+ 
+   file = g_strconcat (g_checksum_get_string (checksum), ".png", NULL);
+ 
++#if GLIB_CHECK_VERSION (2, 34, 0)
++  path = g_build_filename (g_get_user_cache_dir (),
++			   "thumbnails/fail",
++#else
+   path = g_build_filename (g_get_home_dir (),
+ 			   ".thumbnails/fail",
++#endif
+ 			   appname,
+ 			   file,
+ 			   NULL);
+@@ -1220,9 +1251,14 @@
+   md5 = gnome_desktop_thumbnail_md5 (uri);
+   file = g_strconcat (md5, ".png", NULL);
+   g_free (md5);
+-  
++
++#if GLIB_CHECK_VERSION (2, 34, 0)
++  path = g_build_filename (g_get_user_cache_dir (),
++			   "thumbnails",
++#else
+   path = g_build_filename (g_get_home_dir (),
+ 			   ".thumbnails",
++#endif
+ 			   (size == GNOME_DESKTOP_THUMBNAIL_SIZE_NORMAL)?"normal":"large",
+ 			   file,
+ 			   NULL);
-- 
2.41.0