3 files changed, 6 insertions, 141 deletions

diff --git a/x11-fm/thunar/Makefile b/x11-fm/thunar/Makefile
index 3737d1ed2987..f91c96e3de9a 100644
--- a/x11-fm/thunar/Makefile
+++ b/x11-fm/thunar/Makefile
@@ -4,7 +4,7 @@
 
 PORTNAME=	Thunar
 PORTVERSION=	1.6.2
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	x11-fm xfce
 MASTER_SITES=	${MASTER_SITE_XFCE}
 MASTER_SITE_SUBDIR=	src/xfce/${PORTNAME:L}/${PORTVERSION:R}
@@ -34,11 +34,11 @@ OPTIONS_DEFAULT=	DBUS GVFS NOTIFY PLUG_APR PLUG_SBR PLUG_UCA PLUG_WALL STARTUP
 # Override NOTIFY_DESC
 NOTIFY_DESC=	Display notifications
 STARTUP_DESC=	Startup notification
-PLUG_APR_DESC=	Thunar Advanced Properties plugin
-PLUG_SBR_DESC=	Thunar Simple Builtin Renamers plugin
-PLUG_TPA_DESC=		Thunar Trash Panel Applet plugin
-PLUG_UCA_DESC=		Thunar User Customizable Actions plugin
-PLUG_WALL_DESC=		Thunar Wallpaper plugin
+PLUG_APR_DESC=	Advanced Properties plugin
+PLUG_SBR_DESC=	Simple Builtin Renamers plugin
+PLUG_TPA_DESC=	Trash Panel Applet plugin
+PLUG_UCA_DESC=	User Customizable Actions plugin
+PLUG_WALL_DESC=	Wallpaper plugin
 
 CONFIGURE_ARGS+=	--disable-gtk-doc-html \
 		--enable-gio-unix \
@@ -135,13 +135,6 @@ CONFIGURE_ARGS+=--disable-startup-notification
 USE_GNOME+=gvfs
 .endif
 
-post-patch:
-# Downgrade GLib to 2.28
-	@${REINPLACE_CMD} -e 's|2.30.|2.28.|g' ${WRKSRC}/configure
-	@${FIND} ${WRKSRC} -name '*.c' -type f \
-		| ${XARGS} ${REINPLACE_CMD} -e \
-		's|g_format_size (|g_format_size_for_display (|g'
-
 post-install:
 	@-update-desktop-database
 
diff --git a/x11-fm/thunar/files/patch-thunar__thunar-gio-extensions.c b/x11-fm/thunar/files/patch-thunar__thunar-gio-extensions.c
deleted file mode 100644
index b6094e5f5880..000000000000
--- a/x11-fm/thunar/files/patch-thunar__thunar-gio-extensions.c
+++ /dev/null
@@ -1,37 +0,0 @@
---- ./thunar/thunar-gio-extensions.c.orig	2012-12-09 17:28:23.000000000 +0000
-+++ ./thunar/thunar-gio-extensions.c	2012-12-10 21:43:55.000000000 +0000
-@@ -569,15 +569,34 @@
- thunar_g_app_info_should_show (GAppInfo *info)
- {
- #ifdef HAVE_GIO_UNIX
-+#if GLIB_CHECK_VERSION (2, 28, 0)
-+  const gchar *filename;
-+
-+  _thunar_return_val_if_fail (G_IS_APP_INFO (info), FALSE);
-+
-+  if (g_app_info_should_show (info))
-+      return TRUE;
-+#else
-   _thunar_return_val_if_fail (G_IS_APP_INFO (info), FALSE);
-+#endif
- 
-   if (G_IS_DESKTOP_APP_INFO (info))
-+    /* g_desktop_app_info_get_show_in() appears from GLib 2.30 */
-+#if GLIB_CHECK_VERSION (2, 28, 0)
-+    {
-+      filename = g_desktop_app_info_get_filename (G_DESKTOP_APP_INFO (info));
-+      if (filename != NULL 
-+	&& g_str_has_prefix (filename, g_get_user_data_dir ()))
-+          return TRUE;
-+    }
-+#else
-     {
-       /* NoDisplay=true files should be visible in the interface,
-        * because this key is intent to hide mime-helpers from the
-        * application menu. Hidden=true is never returned by GIO. */
-       return g_desktop_app_info_get_show_in (G_DESKTOP_APP_INFO (info), NULL);
-     }
-+#endif
- 
-   return TRUE;
- #else
diff --git a/x11-fm/thunar/files/patch-thunar__thunar-size-label.c b/x11-fm/thunar/files/patch-thunar__thunar-size-label.c
deleted file mode 100644
index 5cb57b7292e6..000000000000
--- a/x11-fm/thunar/files/patch-thunar__thunar-size-label.c
+++ /dev/null
@@ -1,91 +0,0 @@
---- ./thunar/thunar-size-label.c.orig	2012-10-14 13:01:38.000000000 +0000
-+++ ./thunar/thunar-size-label.c	2012-10-21 00:27:16.000000000 +0000
-@@ -259,6 +259,51 @@
-   return FALSE;
- }
- 
-+#if GLIB_CHECK_VERSION (2, 28, 0)
-+static gchar*
-+tsl_format_size_string (guint64 size)
-+{
-+  GString *result;
-+  gchar   *grouping;
-+  gchar   *thousep;
-+  gint     ndigits = 0;
-+
-+#ifdef HAVE_LOCALECONV
-+  grouping = localeconv ()->grouping;
-+  thousep = localeconv ()->thousands_sep;
-+#else
-+  grouping = "\3\0";
-+  thousep = ",";
-+#endif
-+
-+  result = g_string_sized_new (32);
-+  do
-+    {
-+      /* prepend the next digit to the string */
-+      g_string_prepend_c (result, '0' + (size % 10));
-+      ++ndigits;
-+      
-+      /* check if we should add the thousands separator */
-+      if (ndigits == *grouping && *grouping != CHAR_MAX && size > 9)
-+        {
-+          g_string_prepend (result, thousep);
-+          ndigits = 0;
-+
-+          /* if *(grouping+1) == '\0' then we have to use the
-+           * *grouping character (last grouping rule) for all
-+           * following cases.
-+           */
-+          if (*(grouping + 1) != '\0')
-+            ++grouping;
-+        }
-+
-+      size /= 10;
-+    }
-+  while (size > 0);
-+
-+  return g_string_free (result, FALSE);
-+}
-+#endif
- 
- 
- static void
-@@ -266,6 +311,10 @@
- {
-   gchar   *size_string;
-   guint64  size;
-+#if GLIB_CHECK_VERSION (2, 28, 0)
-+  gchar  *size_humanized;
-+  gchar  *text;
-+#endif
- 
-   _thunar_return_if_fail (THUNAR_IS_SIZE_LABEL (size_label));
-   _thunar_return_if_fail (size_label->files != NULL);
-@@ -308,7 +357,25 @@
-       size = thunar_file_get_size (THUNAR_FILE (size_label->files->data));
- 
-       /* setup the new label */
-+#if GLIB_CHECK_VERSION (2, 30, 0)
-       size_string = g_format_size_full (size, G_FORMAT_SIZE_LONG_FORMAT);
-+#else
-+      /* determine the size in bytes */
-+      text = tsl_format_size_string (size);
-+      size_string = g_strdup_printf (_("%s Bytes"), text);
-+      g_free (text);
-+
-+      /* check if the file is larger that 1kB */
-+      if (G_LIKELY (size > 1024ul))
-+        {
-+          /* prepend the humanized size */
-+          size_humanized = g_format_size_for_display (size);
-+          text = g_strdup_printf ("%s (%s)", size_humanized, size_string);
-+          g_free (size_humanized);
-+          g_free (size_string);
-+          size_string = text;
-+        }
-+#endif
-       gtk_label_set_text (GTK_LABEL (size_label->label), size_string);
-       g_free (size_string);
-     }