Upstream patch to fix audio cd support with thunar-volman.

Package-Manager: portage-2.1.4_rc4

5 files changed, 197 insertions, 5 deletions

diff --git a/xfce-base/thunar/ChangeLog b/xfce-base/thunar/ChangeLog
index 0ec1eecbc0b9..9ae6869472ae 100644
--- a/xfce-base/thunar/ChangeLog
+++ b/xfce-base/thunar/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for xfce-base/thunar
 # Copyright 2000-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/xfce-base/thunar/ChangeLog,v 1.40 2007/12/02 16:28:48 drac Exp $
+# $Header: /var/cvsroot/gentoo-x86/xfce-base/thunar/ChangeLog,v 1.41 2007/12/03 16:57:39 drac Exp $
+
+*thunar-0.9.0-r1 (03 Dec 2007)
+
+  03 Dec 2007; Samuli Suominen <drac@gentoo.org>
+  +files/thunar-0.9.0-missing-audio-cds-for-volman.patch,
+  +thunar-0.9.0-r1.ebuild:
+  Upstream patch to fix audio cd support with thunar-volman.
 
 *thunar-0.9.0 (02 Dec 2007)
 
diff --git a/xfce-base/thunar/Manifest b/xfce-base/thunar/Manifest
index 5a549329b2bc..83c83a5c48ce 100644
--- a/xfce-base/thunar/Manifest
+++ b/xfce-base/thunar/Manifest
@@ -6,20 +6,28 @@ AUX thunar-0.8.0-uca.patch 823 RMD160 81234758fd29477e83b14bd6bb4758d64612f08d S
 MD5 996b82b502cc39fd2a247b218c7dbea5 files/thunar-0.8.0-uca.patch 823
 RMD160 81234758fd29477e83b14bd6bb4758d64612f08d files/thunar-0.8.0-uca.patch 823
 SHA256 134c39d89efdc9a2bc61fbd9821815542d0796a2bc59a300c3b541dcf23b1f4b files/thunar-0.8.0-uca.patch 823
+AUX thunar-0.9.0-missing-audio-cds-for-volman.patch 4220 RMD160 5fa9ff9156fca9df5d3a2908a8d60ddbc31a319d SHA1 678127d7f7ef14a08cf8390b43fac1db72b5e1cb SHA256 4d3696a3a7e06e34d7e8ec040ca4cc58d76d6575e4a01a8877cce1094caad989
+MD5 ce5b642c696e3f43e3fdbd6487d0486d files/thunar-0.9.0-missing-audio-cds-for-volman.patch 4220
+RMD160 5fa9ff9156fca9df5d3a2908a8d60ddbc31a319d files/thunar-0.9.0-missing-audio-cds-for-volman.patch 4220
+SHA256 4d3696a3a7e06e34d7e8ec040ca4cc58d76d6575e4a01a8877cce1094caad989 files/thunar-0.9.0-missing-audio-cds-for-volman.patch 4220
 DIST Thunar-0.8.0.tar.bz2 6205993 RMD160 95d29cca64c102b7d8bdcc0592f6fcab7198148b SHA1 1adcba7b86d9219b0bd7eb8c16d5719aa8393d98 SHA256 460484f8397a0e0e4115d1629d2ae027b5052dc2c564d4a4629a3557e4a055f9
 DIST Thunar-0.9.0.tar.bz2 6403785 RMD160 ebb744aa107d4def06c8c805ee6936d1acf2d4d7 SHA1 fd4625d58e28006087d5a35004483a953184e4fe SHA256 26c833b0bdf3281c61e03f1fb985feced88cf4a5cebce7bd055f05e025460037
 EBUILD thunar-0.8.0-r3.ebuild 2195 RMD160 18c91d934217463f3d30743704add745f8aa41cd SHA1 4bdbc4fc33b1322afd9c0553dc10834d7b049cea SHA256 3f8376ba86e437db54b961656a4af280771fa660318930cbc83d92576c9f649b
 MD5 efb534dd4106585474e89dd65e916cc0 thunar-0.8.0-r3.ebuild 2195
 RMD160 18c91d934217463f3d30743704add745f8aa41cd thunar-0.8.0-r3.ebuild 2195
 SHA256 3f8376ba86e437db54b961656a4af280771fa660318930cbc83d92576c9f649b thunar-0.8.0-r3.ebuild 2195
+EBUILD thunar-0.9.0-r1.ebuild 2268 RMD160 5bc5aafa391ffa3fc73d31a0788cd8435017b229 SHA1 37bc9a76f3274d386675cd95a9148d4578b2705c SHA256 c2fd4f3638f22d8682cd3956efb4109b89d498af7914c3dac2e68f60ccd6a825
+MD5 0ebd22f8f5d7a9e81b9378c171bff369 thunar-0.9.0-r1.ebuild 2268
+RMD160 5bc5aafa391ffa3fc73d31a0788cd8435017b229 thunar-0.9.0-r1.ebuild 2268
+SHA256 c2fd4f3638f22d8682cd3956efb4109b89d498af7914c3dac2e68f60ccd6a825 thunar-0.9.0-r1.ebuild 2268
 EBUILD thunar-0.9.0.ebuild 2161 RMD160 1a1c76dbdd56af250a93a17102aed010607f1627 SHA1 a3fc801a0ddda23a19f2545a9ed5f22865d7914a SHA256 5ccf7a5ce0d9264efccbb4ce9b6cea8ebd279c613193311aedd96b214d15f27f
 MD5 94ecd566290d6fe59b35aac2cc7869fd thunar-0.9.0.ebuild 2161
 RMD160 1a1c76dbdd56af250a93a17102aed010607f1627 thunar-0.9.0.ebuild 2161
 SHA256 5ccf7a5ce0d9264efccbb4ce9b6cea8ebd279c613193311aedd96b214d15f27f thunar-0.9.0.ebuild 2161
-MISC ChangeLog 6012 RMD160 bc56a7d15ea6e4778aaf197140f6e5b6387bcda9 SHA1 a720c469bcf6d6055a0e0e83f83e87f4f8062f8b SHA256 047fc2f6cf7746c1f73493e2a4504bb9800172e155eb101dd18e3a5843da743e
-MD5 6f72e971146fd8c2dbd6c2b4310940db ChangeLog 6012
-RMD160 bc56a7d15ea6e4778aaf197140f6e5b6387bcda9 ChangeLog 6012
-SHA256 047fc2f6cf7746c1f73493e2a4504bb9800172e155eb101dd18e3a5843da743e ChangeLog 6012
+MISC ChangeLog 6240 RMD160 eabefe46d393cbb5acd536c79e6e034011bba9f7 SHA1 1f45968a9030fb757761281cd34fdf882dda6862 SHA256 efe7fe109f5f1dede858a0d9799454d5d39c5ad2d636dd5457fd773b7fc2fa8a
+MD5 3d57dbd8402b1d786427deefddcc339a ChangeLog 6240
+RMD160 eabefe46d393cbb5acd536c79e6e034011bba9f7 ChangeLog 6240
+SHA256 efe7fe109f5f1dede858a0d9799454d5d39c5ad2d636dd5457fd773b7fc2fa8a ChangeLog 6240
 MISC metadata.xml 157 RMD160 d7470fe88d1b96f3a7f1ef26fb7dc646b4a1b907 SHA1 7eae91f2588bdae8667d37a98fb3090d539eeca1 SHA256 44350daa7594842894d676413708d8ea77ccb0017bed24711af5b256281f5e61
 MD5 c390804e060ffd11a5bbb143434b2b2d metadata.xml 157
 RMD160 d7470fe88d1b96f3a7f1ef26fb7dc646b4a1b907 metadata.xml 157
@@ -30,3 +38,6 @@ SHA256 002305cb4a3dcc120b84a79088f3fb013fcd2cf5262fa6e5c1fb80a40d1583f2 files/di
 MD5 59175162657794784bedb14c0517e7e8 files/digest-thunar-0.9.0 244
 RMD160 8f82fa21a4637c11639a3148e3be410fbf43eb41 files/digest-thunar-0.9.0 244
 SHA256 dd7536b826eabe42de73ef3553aee170d344595393c380576849f5110f79e438 files/digest-thunar-0.9.0 244
+MD5 59175162657794784bedb14c0517e7e8 files/digest-thunar-0.9.0-r1 244
+RMD160 8f82fa21a4637c11639a3148e3be410fbf43eb41 files/digest-thunar-0.9.0-r1 244
+SHA256 dd7536b826eabe42de73ef3553aee170d344595393c380576849f5110f79e438 files/digest-thunar-0.9.0-r1 244
diff --git a/xfce-base/thunar/files/digest-thunar-0.9.0-r1 b/xfce-base/thunar/files/digest-thunar-0.9.0-r1
new file mode 100644
index 000000000000..089803d3630e
--- /dev/null
+++ b/xfce-base/thunar/files/digest-thunar-0.9.0-r1
@@ -0,0 +1,3 @@
+MD5 0fc5008858661c0abd0399acbe30ef28 Thunar-0.9.0.tar.bz2 6403785
+RMD160 ebb744aa107d4def06c8c805ee6936d1acf2d4d7 Thunar-0.9.0.tar.bz2 6403785
+SHA256 26c833b0bdf3281c61e03f1fb985feced88cf4a5cebce7bd055f05e025460037 Thunar-0.9.0.tar.bz2 6403785
diff --git a/xfce-base/thunar/files/thunar-0.9.0-missing-audio-cds-for-volman.patch b/xfce-base/thunar/files/thunar-0.9.0-missing-audio-cds-for-volman.patch
new file mode 100644
index 000000000000..d2fa9e7ffbe4
--- /dev/null
+++ b/xfce-base/thunar/files/thunar-0.9.0-missing-audio-cds-for-volman.patch
@@ -0,0 +1,84 @@
+diff -ur Thunar-0.9.0.orig/thunar-vfs/thunar-vfs-volume-hal.c Thunar-0.9.0/thunar-vfs/thunar-vfs-volume-hal.c
+--- Thunar-0.9.0.orig/thunar-vfs/thunar-vfs-volume-hal.c	2007-12-02 15:46:33.000000000 +0200
++++ Thunar-0.9.0/thunar-vfs/thunar-vfs-volume-hal.c	2007-12-03 18:45:48.000000000 +0200
+@@ -1007,9 +1007,7 @@
+   hv = libhal_volume_from_udi (context, udi);
+ 
+   /* HAL might want us to ignore this volume for some reason */
+-  if (G_UNLIKELY (hv != NULL
+-        && (libhal_volume_should_ignore (hv)
+-          || libhal_volume_get_fsusage (hv) != LIBHAL_VOLUME_USAGE_MOUNTABLE_FILESYSTEM)))
++  if (G_UNLIKELY (hv != NULL && libhal_volume_should_ignore (hv)))
+     {
+       libhal_volume_free (hv);
+       return;
+@@ -1020,38 +1018,42 @@
+ 
+   if (G_LIKELY (hv != NULL))
+     {
+-      /* determine the UDI of the drive to which this volume belongs */
+-      drive_udi = libhal_volume_get_storage_device_udi (hv);
+-      if (G_LIKELY (drive_udi != NULL))
++      /* check if we have a mountable file system here */
++      if (libhal_volume_get_fsusage (hv) == LIBHAL_VOLUME_USAGE_MOUNTABLE_FILESYSTEM)
+         {
+-          /* determine the drive for the volume */
+-          hd = libhal_drive_from_udi (context, drive_udi);
+-          if (G_LIKELY (hd != NULL))
++          /* determine the UDI of the drive to which this volume belongs */
++          drive_udi = libhal_volume_get_storage_device_udi (hv);
++          if (G_LIKELY (drive_udi != NULL))
+             {
+-              /* check if we already have a volume object for the UDI */
+-              volume_hal = thunar_vfs_volume_manager_hal_get_volume_by_udi (manager_hal, udi);
+-              if (G_LIKELY (volume_hal == NULL))
++              /* determine the drive for the volume */
++              hd = libhal_drive_from_udi (context, drive_udi);
++              if (G_LIKELY (hd != NULL))
+                 {
+-                  /* otherwise, we allocate a new volume object */
+-                  volume_hal = g_object_new (THUNAR_VFS_TYPE_VOLUME_HAL, NULL);
+-                  volume_hal->udi = g_strdup (udi);
+-                }
+-
+-              /* update the volume object with the new data from the HAL volume/drive */
+-              thunar_vfs_volume_hal_update (volume_hal, context, hv, hd);
++                  /* check if we already have a volume object for the UDI */
++                  volume_hal = thunar_vfs_volume_manager_hal_get_volume_by_udi (manager_hal, udi);
++                  if (G_LIKELY (volume_hal == NULL))
++                    {
++                      /* otherwise, we allocate a new volume object */
++                      volume_hal = g_object_new (THUNAR_VFS_TYPE_VOLUME_HAL, NULL);
++                      volume_hal->udi = g_strdup (udi);
++                    }
++
++                  /* update the volume object with the new data from the HAL volume/drive */
++                  thunar_vfs_volume_hal_update (volume_hal, context, hv, hd);
++
++                  /* add the volume object to our list if we allocated a new one */
++                  if (g_list_find (THUNAR_VFS_VOLUME_MANAGER (manager_hal)->volumes, volume_hal) == NULL)
++                    {
++                      /* add the volume to the volume manager */
++                      thunar_vfs_volume_manager_add (THUNAR_VFS_VOLUME_MANAGER (manager_hal), THUNAR_VFS_VOLUME (volume_hal));
++
++                      /* release the reference on the volume */
++                      g_object_unref (G_OBJECT (volume_hal));
++                    }
+ 
+-              /* add the volume object to our list if we allocated a new one */
+-              if (g_list_find (THUNAR_VFS_VOLUME_MANAGER (manager_hal)->volumes, volume_hal) == NULL)
+-                {
+-                  /* add the volume to the volume manager */
+-                  thunar_vfs_volume_manager_add (THUNAR_VFS_VOLUME_MANAGER (manager_hal), THUNAR_VFS_VOLUME (volume_hal));
+-
+-                  /* release the reference on the volume */
+-                  g_object_unref (G_OBJECT (volume_hal));
++                  /* release the HAL drive */
++                  libhal_drive_free (hd);
+                 }
+-
+-              /* release the HAL drive */
+-              libhal_drive_free (hd);
+             }
+         }
+ 
diff --git a/xfce-base/thunar/thunar-0.9.0-r1.ebuild b/xfce-base/thunar/thunar-0.9.0-r1.ebuild
new file mode 100644
index 000000000000..2fb95fa64bc5
--- /dev/null
+++ b/xfce-base/thunar/thunar-0.9.0-r1.ebuild
@@ -0,0 +1,87 @@
+# Copyright 1999-2007 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/xfce-base/thunar/thunar-0.9.0-r1.ebuild,v 1.1 2007/12/03 16:57:39 drac Exp $
+
+EAPI=1
+
+inherit eutils virtualx xfce44
+
+MY_P=${P/t/T}
+S=${WORKDIR}/${MY_P}
+
+XFCE_VERSION=4.4.2
+xfce44
+
+DESCRIPTION="File manager"
+HOMEPAGE="http://thunar.xfce.org"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
+IUSE="doc dbus debug exif gnome hal pcre startup-notification +trash-plugin"
+
+RDEPEND=">=dev-lang/perl-5.6
+	x11-libs/libSM
+	>=x11-libs/gtk+-2.6
+	>=dev-libs/glib-2.6
+	>=xfce-extra/exo-0.3.4
+	>=x11-misc/shared-mime-info-0.20
+	>=dev-util/desktop-file-utils-0.14
+	>=xfce-base/libxfce4util-${XFCE_MASTER_VERSION}
+	virtual/fam
+	dbus? ( dev-libs/dbus-glib )
+	hal? ( dev-libs/dbus-glib
+		sys-apps/hal )
+	>=media-libs/freetype-2
+	gnome? ( gnome-base/gconf )
+	exif? ( >=media-libs/libexif-0.6 )
+	>=media-libs/jpeg-6b
+	startup-notification? ( x11-libs/startup-notification )
+	pcre? ( >=dev-libs/libpcre-6 )
+	trash-plugin? ( dev-libs/dbus-glib
+		>=xfce-base/xfce4-panel-${XFCE_MASTER_VERSION} )
+	gnome-base/librsvg"
+DEPEND="${RDEPEND}
+	dev-util/pkgconfig
+	dev-util/intltool
+	doc? ( dev-util/gtk-doc )"
+
+XFCE_CONFIG="${XFCE_CONFIG} $(use_enable exif) $(use_enable gnome gnome-thumbnailers) \
+	$(use_enable dbus) $(use_enable pcre)"
+
+pkg_setup() {
+	local fail="Re-emerge xfce-extra/exo with USE hal."
+
+	if use hal; then
+		XFCE_CONFIG="${XFCE_CONFIG} --enable-dbus --with-volume-manager=hal"
+	else
+		XFCE_CONFIG="${XFCE_CONFIG} --with-volume-manager=none"
+	fi
+
+	if use trash-plugin && ! use dbus; then
+		XFCE_CONFIG="${XFCE_CONFIG} --enable-dbus"
+		ewarn "USE trash-plugin detected, enabling dbus for you."
+	fi
+
+	use trash-plugin || XFCE_CONFIG="${XFCE_CONFIG} --disable-tpa-plugin"
+
+	if use hal && ! use dbus; then
+		ewarn "USE hal detected, enabling dbus for you."
+	fi
+
+	if use hal && ! built_with_use xfce-extra/exo hal; then
+		eerror "${fail}"
+		die "${fail}"
+	fi
+}
+
+src_unpack() {
+	unpack ${A}
+	cd "${S}"
+	epatch "${FILESDIR}"/${P}-missing-audio-cds-for-volman.patch
+}
+
+src_test() {
+	Xemake check || die "emake check failed."
+}
+
+DOCS="AUTHORS ChangeLog HACKING FAQ THANKS TODO README NEWS"
+
+xfce44_extra_package