From ec630e77b639af37a86f0e1fb86f9ca60f32fd93 Mon Sep 17 00:00:00 2001 From: Juan RP Date: Sat, 24 May 2014 09:14:50 +0200 Subject: [PATCH] xfburn: update to 0.5.2. --- .../patches/fix_empty_dir_segfault.diff | 50 ------------------- srcpkgs/xfburn/template | 17 +++---- 2 files changed, 6 insertions(+), 61 deletions(-) delete mode 100644 srcpkgs/xfburn/patches/fix_empty_dir_segfault.diff diff --git a/srcpkgs/xfburn/patches/fix_empty_dir_segfault.diff b/srcpkgs/xfburn/patches/fix_empty_dir_segfault.diff deleted file mode 100644 index 48e4a73405..0000000000 --- a/srcpkgs/xfburn/patches/fix_empty_dir_segfault.diff +++ /dev/null @@ -1,50 +0,0 @@ -http://bugs.gentoo.org/331135 -http://bugzilla.xfce.org/show_bug.cgi?id=6805 - ---- xfburn/xfburn-data-composition.c 2011-02-17 16:37:03.000000000 +0100 -+++ xfburn/xfburn-data-composition_patched.c 2011-02-17 16:40:40.000000000 +0100 -@@ -1874,26 +1874,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_warn (_("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_warn (_("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/srcpkgs/xfburn/template b/srcpkgs/xfburn/template index d2597f3384..5e0013db9e 100644 --- a/srcpkgs/xfburn/template +++ b/srcpkgs/xfburn/template @@ -1,20 +1,15 @@ # Template file for 'xfburn' pkgname=xfburn -version=0.4.3 -revision=2 +version=0.5.2 +revision=1 build_style=gnu-configure -configure_args="--enable-gstreamer --enable-dbus --disable-hal" +configure_args="--enable-gstreamer" hostmakedepends="intltool pkg-config" -makedepends="libburn-devel libisofs-devel gtk+-devel - libxfcegui4-devel>=4.10.0_2 exo-devel gst-plugins-base-devel" +makedepends="libburn-devel libisofs-devel exo-devel libxfce4ui-devel gst-plugins-base-devel" depends="desktop-file-utils hicolor-icon-theme" short_desc="CD-burner application for the Xfce Desktop Environment" maintainer="Juan RP " homepage="http://goodies.xfce.org/projects/applications/xfburn" license="GPL-2" -distfiles="http://archive.se.xfce.org/src/apps/xfburn/0.4/xfburn-${version}.tar.bz2" -checksum=c9993226f0f4e3dea3326ad320a01c165a7e1a485f07fa4a2583475a4e6eaafe - -pre_configure() { - sed -i '1 i#include ' xfburn/xfburn-settings.h -} +distfiles="http://archive.xfce.org/src/apps/xfburn/${version%.*}/xfburn-${version}.tar.bz2" +checksum=63682aab3c30c77e464b2b3b84606d1e1dcefc98e7042072fa09b729d6f84412