From dfcc92a98d9aa0b1c6b9e6e32dc83e076349e476 Mon Sep 17 00:00:00 2001 From: Juan RP Date: Thu, 9 Aug 2012 10:48:03 +0200 Subject: [PATCH] xfburn: update to 0.4.3. --- .../patches/fix_empty_dir_segfault.diff | 50 +++++++++++++++++++ srcpkgs/xfburn/template | 22 +++++--- srcpkgs/xfburn/xfburn.rshlibs | 16 ++++++ 3 files changed, 80 insertions(+), 8 deletions(-) create mode 100644 srcpkgs/xfburn/patches/fix_empty_dir_segfault.diff create mode 100644 srcpkgs/xfburn/xfburn.rshlibs diff --git a/srcpkgs/xfburn/patches/fix_empty_dir_segfault.diff b/srcpkgs/xfburn/patches/fix_empty_dir_segfault.diff new file mode 100644 index 00000000000..48e4a73405e --- /dev/null +++ b/srcpkgs/xfburn/patches/fix_empty_dir_segfault.diff @@ -0,0 +1,50 @@ +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 07d67b8623c..f193c16798f 100644 --- a/srcpkgs/xfburn/template +++ b/srcpkgs/xfburn/template @@ -1,14 +1,19 @@ # Template file for 'xfburn' pkgname=xfburn -version=0.4.2 -distfiles="http://www.xfce.org/archive/src/apps/xfburn/0.4/$pkgname-$version.tar.bz2" -build_style=gnu-configure -makedepends="intltool" -fulldepends="libburn libisofs libxfcegui4 Thunar gst-plugins-base desktop-file-utils hicolor-icon-theme" +version=0.4.3 revision=1 +build_style=gnu-configure +configure_args="--enable-gstreamer --enable-dbus --disable-hal" +depends="desktop-file-utils hicolor-icon-theme" +makedepends="intltool pkg-config libburn-devel libisofs-devel gtk+-devel +libxfcegui4-devel>=4.10.0_2 exo-devel gst-plugins-base-devel" +gtk_iconcache_dirs="/usr/share/icons/hicolor" short_desc="CD-burner application for Xfce Desktop Environment" maintainer="Juan RP " -checksum=b2b00665f8ed98c9df996ba2d0d73b3182c3b421f3927c9ab76c3424758f71b5 +homepage="http://goodies.xfce.org/projects/applications/xfburn" +license="" +distfiles="http://archive.xfce.org/src/apps/xfburn/0.4/xfburn-${version}.tar.bz2" +checksum=c9993226f0f4e3dea3326ad320a01c165a7e1a485f07fa4a2583475a4e6eaafe long_desc=" Xfburn is a tool to help burning CDs and DVDs. It fits well in the Xfce Desktop Environment but can be used anywhere. @@ -16,5 +21,6 @@ long_desc=" It is currently in development so some features may be missing, but it is already able to burn data." -gtk_iconcache_dirs="/usr/share/icons/hicolor" - +pre_configure() { + sed -i '1 i#include ' xfburn/xfburn-settings.h +} diff --git a/srcpkgs/xfburn/xfburn.rshlibs b/srcpkgs/xfburn/xfburn.rshlibs new file mode 100644 index 00000000000..d1dbab814e4 --- /dev/null +++ b/srcpkgs/xfburn/xfburn.rshlibs @@ -0,0 +1,16 @@ +libm.so.6 +libburn.so.4 +libisofs.so.6 +libxfcegui4.so.4 +libexo-1.so.0 +libgtk-x11-2.0.so.0 +libxfce4util.so.6 +libgdk-x11-2.0.so.0 +libgdk_pixbuf-2.0.so.0 +libgstpbutils-0.10.so.0 +libgstreamer-0.10.so.0 +libgobject-2.0.so.0 +libgthread-2.0.so.0 +libglib-2.0.so.0 +libpthread.so.0 +libc.so.6