Use Debian patchset to port from obsolete thunar-vfs layer to libgio-2.0.

(Portage version: 2.2.0_alpha77/cvs/Linux x86_64)

3 files changed, 105 insertions, 1 deletions

diff --git a/app-cdr/xfburn/ChangeLog b/app-cdr/xfburn/ChangeLog
index d6d67309b71f..0ca95666ac76 100644
--- a/app-cdr/xfburn/ChangeLog
+++ b/app-cdr/xfburn/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for app-cdr/xfburn
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-cdr/xfburn/ChangeLog,v 1.36 2011/10/29 17:06:28 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-cdr/xfburn/ChangeLog,v 1.37 2011/11/24 23:08:21 ssuominen Exp $
+
+*xfburn-0.4.3-r3 (24 Nov 2011)
+
+  24 Nov 2011; Samuli Suominen <ssuominen@gentoo.org> +xfburn-0.4.3-r3.ebuild,
+  +files/xfburn-0.4.3-empty_directory_segmentation_fault-2.patch:
+  Use Debian patchset to port from obsolete thunar-vfs layer to libgio-2.0.
 
   29 Oct 2011; Samuli Suominen <ssuominen@gentoo.org> xfburn-0.4.3-r2.ebuild,
   +files/xfburn-0.4.3-update_desktop_entry.patch:
diff --git a/app-cdr/xfburn/files/xfburn-0.4.3-empty_directory_segmentation_fault-2.patch b/app-cdr/xfburn/files/xfburn-0.4.3-empty_directory_segmentation_fault-2.patch
new file mode 100644
index 000000000000..86976f065562
--- /dev/null
+++ b/app-cdr/xfburn/files/xfburn-0.4.3-empty_directory_segmentation_fault-2.patch
@@ -0,0 +1,48 @@
+--- xfburn/xfburn-data-composition.c
++++ xfburn/xfburn-data-composition.c
+@@ -1852,26 +1852,29 @@
+           g_error ("Failed adding %s as a node to the image: code %X!", src, r);
+       }
+ 
+-      basename = g_path_get_basename (src);
++      /* Check names only for items not manually created (#613563) */
++      if (type != DATA_COMPOSITION_TYPE_DIRECTORY || src != NULL) {
++        basename = g_path_get_basename (src);
++
++        /* check if the file has been renamed */
++        if (strcmp (basename, name) != 0) {
++          /* rename the iso_node */
++          r = iso_node_set_name (node, name);
++
++          if (r == 0) {
++            /* The first string is the renamed name, the second one the original name */
++            xfce_dialog_show_warning(NULL, NULL, _("Duplicate filename '%s' for '%s'"), name, src);
++
++            g_free (basename);
++            g_free (name);
++            g_free (src);
+ 
+-      /* check if the file has been renamed */
+-      if (strcmp (basename, name) != 0) {
+-        /* rename the iso_node */
+-        r = iso_node_set_name (node, name);
+-
+-        if (r == 0) {
+-          /* The first string is the renamed name, the second one the original name */
+-	  xfce_dialog_show_warning(NULL, NULL, _("Duplicate filename '%s' for '%s'"), name, src);
+-
+-          g_free (basename);
+-          g_free (name);
+-          g_free (src);
+-
+-          continue;
++            continue;
++          }
+         }
++        g_free (basename);
+       }
+ 
+-      g_free (basename);
+       g_free (name);
+       g_free (src);
+ 
diff --git a/app-cdr/xfburn/xfburn-0.4.3-r3.ebuild b/app-cdr/xfburn/xfburn-0.4.3-r3.ebuild
new file mode 100644
index 000000000000..1850c8af582a
--- /dev/null
+++ b/app-cdr/xfburn/xfburn-0.4.3-r3.ebuild
@@ -0,0 +1,50 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-cdr/xfburn/xfburn-0.4.3-r3.ebuild,v 1.1 2011/11/24 23:08:21 ssuominen Exp $
+
+EAPI=4
+EAUTORECONF=yes
+inherit xfconf
+
+DESCRIPTION="GTK+ based CD and DVD burning application"
+HOMEPAGE="http://goodies.xfce.org/projects/applications/xfburn"
+SRC_URI="mirror://xfce/src/apps/${PN}/0.4/${P}.tar.bz2
+	mirror://debian/pool/main/x/${PN}/${PN}_${PV}-4.debian.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~x86"
+IUSE="debug gstreamer udev"
+
+RDEPEND=">=dev-libs/glib-2.22
+	>=dev-libs/libburn-0.4.2
+	>=dev-libs/libisofs-0.6.2
+	>=x11-libs/gtk+-2.10:2
+	>=xfce-base/exo-0.6
+	>=xfce-base/libxfce4ui-4.8
+	gstreamer? ( >=media-libs/gst-plugins-base-0.10.20:0.10 )
+	udev? ( || ( >=sys-fs/udev-171-r1[gudev] <sys-fs/udev-171-r1[extras] ) )"
+DEPEND="${RDEPEND}
+	dev-util/pkgconfig
+	dev-util/intltool
+	sys-devel/gettext"
+
+pkg_setup() {
+	PATCHES=(
+		"${FILESDIR}"/${P}-update_desktop_entry.patch
+		"${FILESDIR}"/${P}-empty_directory_segmentation_fault-2.patch
+		)
+
+	XFCONF=(
+		$(use_enable udev gudev)
+		$(use_enable gstreamer)
+		$(xfconf_use_debug)
+		)
+
+	DOCS=( AUTHORS ChangeLog NEWS README TODO )
+}
+
+src_prepare() {
+	EPATCH_FORCE=yes EPATCH_SUFFIX=patch EPATCH_SOURCE="${WORKDIR}"/debian/patches epatch
+	xfconf_src_prepare
+}