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

Package-Manager: portage-2.2.0_alpha77/cvs/Linux x86_64

4 files changed, 116 insertions, 9 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/Manifest b/app-cdr/xfburn/Manifest
index 457c4dcb4dd7..4749e37642dd 100644
--- a/app-cdr/xfburn/Manifest
+++ b/app-cdr/xfburn/Manifest
@@ -1,21 +1,24 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
+AUX xfburn-0.4.3-empty_directory_segmentation_fault-2.patch 1552 RMD160 7be46a0babba8fb482c0f1f537e8ccbe938de085 SHA1 ff74a755efa17b7bb104dc240564c1bf8aea7bf3 SHA256 b652dcab849b6d0036321980499a63dfc763c9486ac719546b67b0021275efec
 AUX xfburn-0.4.3-empty_directory_segmentation_fault.patch 1600 RMD160 77de719551a90a3c6c5b0396ef588e56aed8ece2 SHA1 6456f186567aede44acdb573119b33df4083bf68 SHA256 bf89abd6499f784b30dc33b1ef05911a6a6c15aae1517824563f0b00aba027c1
 AUX xfburn-0.4.3-update_desktop_entry.patch 548 RMD160 6b421fc8c21d48964eaa4fd62ef33a98437f780c SHA1 86ca21c9c286dc874f2d8073b06454dce22993c7 SHA256 d4951a830908551089ea1c7aca4e8151697b27a487dbec4f38af6218659ddf18
 DIST xfburn-0.4.3.tar.bz2 652080 RMD160 01dff258d42d05812cf0697304ebe0062291b185 SHA1 52d33e56b7ce9774fba680f50723eaf1a7215091 SHA256 c9993226f0f4e3dea3326ad320a01c165a7e1a485f07fa4a2583475a4e6eaafe
+DIST xfburn_0.4.3-4.debian.tar.gz 25747 RMD160 e5eb2cc78aad447e194ef0f30521ec32c3b1fd3e SHA1 31aca5d1b08a1ff3ecd6315cbb86c765685140b7 SHA256 d5d2de1bccf7e5e4083beada69385a3e5a1d0636534b87fbd0af84cf1a8e53e5
 EBUILD xfburn-0.4.3-r1.ebuild 1109 RMD160 55cd3f38d32cbf1452e66e6f3f8eb47d8c7fdf49 SHA1 ea78c6fe06474e48da6c372a70d7a7e17e1639df SHA256 58da13a4f52c93cb7ebfa25744aac73a203717be7437d3e6e7403f153e710b03
 EBUILD xfburn-0.4.3-r2.ebuild 1238 RMD160 a3c3bd074463c92624e19a2be5496b4cadf39d61 SHA1 b339c4d3680cd8f28173c47727b6836a3915bc41 SHA256 d4c1294834266be5112735b6b5d6ba831b5554980093793d1303783b504ad78b
-MISC ChangeLog 6801 RMD160 20b72087091e5f4d310a9dc60250badd69d144fe SHA1 b056817dd0b52233fd5e199d282544b11093759c SHA256 8c7b30dbbe1183cb5c309fd812ae1ba02a94715091da3ad80d0ac092038f9e6c
+EBUILD xfburn-0.4.3-r3.ebuild 1358 RMD160 97f4ee5c55392c229be977bf41d5e11df31b8225 SHA1 76be5b7aaa369c19a4cc41feb1a5943b45db06cc SHA256 2c42416ae79e3af358fba1c69a6e82743abf4af0680a5c2d25c551bb15739d33
+MISC ChangeLog 7055 RMD160 80f64b81eed7b0d4daedd768548a6e6cf9346ee3 SHA1 fd02622247bd7e12562bcfe232268141572dcd9c SHA256 69dd19635c7cc1b2484d52cd8e504127db3e83238823eef7c10fd54d0ef83b9d
 MISC metadata.xml 569 RMD160 7924d2fa97fc89007c4f2fd5d0a100b99eced706 SHA1 b55b51a5adbe95b51cee59960d0a439eb38db395 SHA256 b77cc26004978479303a4b0159aa70a4d07dfaae2d474089ac1390965c409979
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.18 (GNU/Linux)
 
-iQEcBAEBAgAGBQJOrDJIAAoJEEdUh39IaPFNyOsH/iI2dzuCpNwjleJ721K930El
-Wd7SK3PBxOVjInjjsjroUfJTgiBJ094Ee7gvi2Yoh9oZDuECuvr+XZ/WPZRDiZ8x
-PHRCRvv6wL7/Vgec/5Cl33JfUWRIeoJJ26pGjBaNz1jreK8/qlAC58vdU9py0XqJ
-Lj7T1Ogr56SZ9kX2IJH26Y6SbuQvUrObMn1m6lT3VSsHrvJL61l6UQ/03Hx6gv9A
-JgXnBogCSysEsEoYKC33Ia9RHqjAT3SqPinfxcK3tuasUf3aULc8KcHEbWS0G3y5
-viqv1W0BqIhJHP1Kd3DVJinLUCC1j9r2blsCo/2wAk6wtwdnaQnWHTnm5wEK0Mk=
-=BILd
+iQEcBAEBAgAGBQJOzs3oAAoJEEdUh39IaPFNVe0H/j/a/IeQv7lf2Y4SrnCtet0g
+Vz9puo1Jv4DsxJ7dbf75vbUXtmkDshrAxP1Ij626ktVBGHY2pBsEBIbm4gZtI93d
+6YeaXe74nc6krx5nQHfrjypI8mKsBcozNeHO+ccNzUcM/nGqRZ31h8PJWFYRI8gE
+7CT/m29acqyDi30np5X8iMqMfrHe8kruEYp6cDzpX1R74ELbM2kkEJboG68KPOwe
+n/6xHO4FNX7p4BB86tQxpo+vj28KLD7naxn7ml1ATNBI2KqxXLM035Dl3axTSqGh
+HRasAhfiLt+n+JIdK3FTjOMzlQn8QdqndmDOOIZdET6XZGwvBB/kVL/7S8NL2bw=
+=LoWh
 -----END PGP SIGNATURE-----
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
+}