Backport upstream patch for >= exo 0.5.1.

Package-Manager: portage-2.2_rc61/cvs/Linux x86_64

4 files changed, 132 insertions, 2 deletions

diff --git a/xfce-extra/thunar-media-tags-plugin/ChangeLog b/xfce-extra/thunar-media-tags-plugin/ChangeLog
index 09a2ff09a4b3..d0c85ca28a68 100644
--- a/xfce-extra/thunar-media-tags-plugin/ChangeLog
+++ b/xfce-extra/thunar-media-tags-plugin/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for xfce-extra/thunar-media-tags-plugin
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/xfce-extra/thunar-media-tags-plugin/ChangeLog,v 1.4 2010/01/15 03:00:54 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/xfce-extra/thunar-media-tags-plugin/ChangeLog,v 1.5 2010/01/15 04:42:58 ssuominen Exp $
+
+*thunar-media-tags-plugin-0.1.2-r1 (15 Jan 2010)
+
+  15 Jan 2010; Samuli Suominen <ssuominen@gentoo.org>
+  +thunar-media-tags-plugin-0.1.2-r1.ebuild,
+  +files/thunar-media-tags-plugin-0.1.2-exo_and_thunarx.patch:
+  Backport upstream patch for >= exo 0.5.1.
 
   15 Jan 2010; Samuli Suominen <ssuominen@gentoo.org>
   thunar-media-tags-plugin-0.1.2.ebuild:
diff --git a/xfce-extra/thunar-media-tags-plugin/Manifest b/xfce-extra/thunar-media-tags-plugin/Manifest
index 2f424ea4770d..a872b727bcb7 100644
--- a/xfce-extra/thunar-media-tags-plugin/Manifest
+++ b/xfce-extra/thunar-media-tags-plugin/Manifest
@@ -1,5 +1,7 @@
 AUX thunar-media-tags-plugin-0.1.2-exo.patch 740 RMD160 b58eda730fb523adec96323898a6fa07633ec3cf SHA1 e32921420097deba9fafb51ddabf5a80ad5ebdec SHA256 8e88320678f622906e5e489d5b3768b67fa6343885b4937c9b77acd4e96daf88
+AUX thunar-media-tags-plugin-0.1.2-exo_and_thunarx.patch 3336 RMD160 532ae346670d1c03d87dbe9a5f06602aba41bd0e SHA1 d73b0f9583a31a27796c08afeb2e900ec1537dcb SHA256 1bf0dee0297396488e02ff5d936b8910213795a98d88c71877012ba617a768c7
 DIST thunar-media-tags-plugin-0.1.2.tar.bz2 282877 RMD160 31b3e1719be7983d33541fb62bb8e9920341ad32 SHA1 5f7fab5e647a2678629cc297a367611715ad8a57 SHA256 41305171a3f2a0962b1324fa402bc97e3e1e93595dd3168f6fe778f079bb0240
+EBUILD thunar-media-tags-plugin-0.1.2-r1.ebuild 897 RMD160 5e3bc3e8ee8fbe65697a68089cf6f2812cd46815 SHA1 90c258c5f776d81a6559cbfbff3ab953fa30ac58 SHA256 cc806b80586884b6058aded1bd1581482e56bd9ac6d78068bdb0df4933a05863
 EBUILD thunar-media-tags-plugin-0.1.2.ebuild 869 RMD160 e0da8e128aaeb67265ea9af7d1a1151655681f7c SHA1 1046f83cd2466d6f781b6412aedef90855d360ca SHA256 2587cb91dba8212c8e7d86fa73f1bf4014af41bab1c7b27879dc4d619505dd91
-MISC ChangeLog 913 RMD160 b26d1c83708073c5eca61b654d496e11ceb8e984 SHA1 2328d0595c27ea0df0a2704b3e8f6535b80088d9 SHA256 69c5a871f2ef95bcfb1b626af11ec67500470a081237ecdfbf5b565e4c5d80d2
+MISC ChangeLog 1170 RMD160 69c285646e699b5cb2c9c826e4b63d0948ff2652 SHA1 698b214ee577c2e6b3642a9ee1e362ba9efc616a SHA256 310dd7cd5549db1159b84777a2f1caae17e062dddcfef97f868cbbecb1012609
 MISC metadata.xml 159 RMD160 43722935bd7b4db7fe8db681054f2e53c4a5f7ce SHA1 15958ad72e234ba572c9534533c21532eb6bc0fd SHA256 900ea49b6703fce452e205b85226bf1f994725963e5840da501182e7487d0e63
diff --git a/xfce-extra/thunar-media-tags-plugin/files/thunar-media-tags-plugin-0.1.2-exo_and_thunarx.patch b/xfce-extra/thunar-media-tags-plugin/files/thunar-media-tags-plugin-0.1.2-exo_and_thunarx.patch
new file mode 100644
index 000000000000..72430d915449
--- /dev/null
+++ b/xfce-extra/thunar-media-tags-plugin/files/thunar-media-tags-plugin-0.1.2-exo_and_thunarx.patch
@@ -0,0 +1,92 @@
+diff -ur thunar-media-tags-plugin-0.1.2.orig/configure.in thunar-media-tags-plugin-0.1.2/configure.in
+--- thunar-media-tags-plugin-0.1.2.orig/configure.in	2007-01-20 17:29:39.000000000 +0200
++++ thunar-media-tags-plugin-0.1.2/configure.in	2010-01-15 06:33:45.000000000 +0200
+@@ -64,9 +64,8 @@
+ dnl ***********************************
+ dnl *** Check for required packages ***
+ dnl ***********************************
+-XDT_CHECK_PACKAGE([EXO], [exo-0.3], [0.3.1.3])
+-XDT_CHECK_PACKAGE([THUNARX], [thunarx-1], [0.2.3svn-r20526])
+-XDT_CHECK_PACKAGE([THUNARVFS], [thunar-vfs-1], [0.2.3svn-r20526])
++XDT_CHECK_PACKAGE([EXO], [exo-1], [0.5.1])
++XDT_CHECK_PACKAGE([THUNARX], [thunarx-2], [1.1.0])
+ XDT_CHECK_PACKAGE([TAGLIB], [taglib], [1.4])
+ 
+ dnl ***********************************
+Only in thunar-media-tags-plugin-0.1.2: foo.diff
+Only in thunar-media-tags-plugin-0.1.2: foo.patch
+diff -ur thunar-media-tags-plugin-0.1.2.orig/thunar-plugin/audio-tags-page.c thunar-media-tags-plugin-0.1.2/thunar-plugin/audio-tags-page.c
+--- thunar-media-tags-plugin-0.1.2.orig/thunar-plugin/audio-tags-page.c	2006-09-11 12:40:56.000000000 +0300
++++ thunar-media-tags-plugin-0.1.2/thunar-plugin/audio-tags-page.c	2010-01-15 06:36:58.000000000 +0200
+@@ -32,7 +32,6 @@
+ #include <taglib/tag_c.h>
+ 
+ #include <exo/exo.h>
+-#include <thunar-vfs/thunar-vfs.h>
+ 
+ #include <audio-tags-page.h>
+ 
+@@ -977,8 +976,8 @@
+ 
+   gchar         *mimetype;
+ 
+-  ThunarVfsInfo *vfs_info;
+-  gchar         *filename;
++  GFileInfo     *fileinfo;
++  const char    *filename;
+   gchar         *filesize;
+   
+   g_return_val_if_fail (page != NULL || IS_AUDIO_TAGS_PAGE (page), FALSE);
+@@ -1007,9 +1006,9 @@
+   
+   /* Additional information */
+   mimetype = thunarx_file_info_get_mime_type (page->file);
+-  vfs_info = thunarx_file_info_get_vfs_info (page->file);
+-  filename = vfs_info->display_name;
+-  filesize = thunar_vfs_humanize_size (vfs_info->size, NULL, 0);
++  fileinfo = thunarx_file_info_get_file_info (page->file);
++  filename = g_file_info_get_display_name (fileinfo);
++  filesize = g_format_size_for_display (g_file_info_get_size (fileinfo));
+ 
+   /* Create layout table */
+   table = gtk_table_new (7, 2, FALSE);
+@@ -1121,8 +1120,8 @@
+   g_free (filesize);
+   g_free (mimetype);
+ 
+-  thunar_vfs_info_unref (vfs_info);
+-  
++  g_object_unref (fileinfo);
++ 
+   return TRUE;
+ }
+ 
+Only in thunar-media-tags-plugin-0.1.2/thunar-plugin: audio-tags-page.c.orig
+diff -ur thunar-media-tags-plugin-0.1.2.orig/thunar-plugin/Makefile.am thunar-media-tags-plugin-0.1.2/thunar-plugin/Makefile.am
+--- thunar-media-tags-plugin-0.1.2.orig/thunar-plugin/Makefile.am	2006-06-08 16:04:45.000000000 +0300
++++ thunar-media-tags-plugin-0.1.2/thunar-plugin/Makefile.am	2010-01-15 06:34:48.000000000 +0200
+@@ -8,7 +8,7 @@
+ 	-DPACKAGE_LOCALE_DIR=\"$(localedir)\"				\
+ 	$(PLATFORM_CPPFLAGS)
+ 
+-extensionsdir = $(libdir)/thunarx-1
++extensionsdir = $(libdir)/thunarx-2
+ extensions_LTLIBRARIES =						\
+ 	thunar-media-tags-plugin.la
+ 
+@@ -25,7 +25,6 @@
+ 	$(EXO_CFLAGS)							\
+ 	$(PLATFORM_CFLAGS)						\
+ 	$(THUNARX_CFLAGS)						\
+-	$(THUNARVFS_CFLAGS)						\
+ 	$(TAGLIB_CFLAGS)						\
+ 	$(TAGLIBC_CFLAGS)
+ 
+@@ -34,7 +33,6 @@
+ 	-export-dynamic							\
+ 	-module								\
+ 	$(THUNARX_LIBS)							\
+-	$(THUNARVFS_LIBS)						\
+ 	$(TAGLIB_LIBS)							\
+ 	$(TAGLIBC_LIBS)							\
+ 	$(PLATFORM_LDFLAGS)
diff --git a/xfce-extra/thunar-media-tags-plugin/thunar-media-tags-plugin-0.1.2-r1.ebuild b/xfce-extra/thunar-media-tags-plugin/thunar-media-tags-plugin-0.1.2-r1.ebuild
new file mode 100644
index 000000000000..3cc8269488b5
--- /dev/null
+++ b/xfce-extra/thunar-media-tags-plugin/thunar-media-tags-plugin-0.1.2-r1.ebuild
@@ -0,0 +1,29 @@
+# Copyright 1999-2010 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/xfce-extra/thunar-media-tags-plugin/thunar-media-tags-plugin-0.1.2-r1.ebuild,v 1.1 2010/01/15 04:42:58 ssuominen Exp $
+
+EAPI=2
+EAUTORECONF=yes
+inherit xfconf
+
+DESCRIPTION="Thunar media tags plugin"
+HOMEPAGE="http://www.xfce.org/"
+SRC_URI="mirror://xfce/src/thunar-plugins/${PN}/0.1/${P}.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~ia64-linux ~x86-linux"
+IUSE="debug"
+
+RDEPEND=">=xfce-base/exo-0.5.1
+	>=xfce-base/thunar-1.1.0
+	>=media-libs/taglib-1.4"
+DEPEND="${RDEPEND}
+	dev-util/pkgconfig"
+
+pkg_setup() {
+	DOCS="AUTHORS ChangeLog README TODO"
+	XFCONF="--disable-dependency-tracking
+		$(use_enable debug)"
+	PATCHES=( "${FILESDIR}/${P}-exo_and_thunarx.patch" )
+}