Date: Thursday, February 20, 2014 @ 22:33:00 Author: eric Revision: 206174
upgpkg: xfburn 0.5.0-1 Upstream update, Fix license, Clean up PKGBUILD, Remove old patch Modified: xfburn/trunk/PKGBUILD (contents, properties) Deleted: xfburn/trunk/fix_empty_dir_segfault.diff -----------------------------+ PKGBUILD | 42 ++++++++++-------------------------- fix_empty_dir_segfault.diff | 48 ------------------------------------------ 2 files changed, 12 insertions(+), 78 deletions(-) Modified: PKGBUILD =================================================================== --- PKGBUILD 2014-02-20 18:21:43 UTC (rev 206173) +++ PKGBUILD 2014-02-20 21:33:00 UTC (rev 206174) @@ -3,44 +3,26 @@ # Contributor: Alois Nespor alois.nes...@gmail.com pkgname=xfburn -pkgver=0.4.3 -pkgrel=6 +pkgver=0.5.0 +pkgrel=1 +pkgdesc="A simple CD/DVD burning tool based on libburnia libraries" arch=('i686' 'x86_64') -pkgdesc="A simple CD/DVD burning tool based on libburnia libraries" url="http://goodies.xfce.org/projects/applications/xfburn" -license=('GPL2') +license=('GPL') +depends=('libburn' 'libisofs' 'exo' 'gstreamer0.10-base' 'desktop-file-utils') +makedepends=('intltool') groups=('xfce4-goodies') -install=${pkgname}.install -depends=('libburn' 'libisofs' 'libxfcegui4' 'exo' 'gstreamer0.10-base' - 'hicolor-icon-theme' 'desktop-file-utils' 'librsvg') -makedepends=('intltool') -source=(http://archive.xfce.org/src/apps/xfburn/0.4/$pkgname-$pkgver.tar.bz2 - fix_empty_dir_segfault.diff) -sha1sums=('52d33e56b7ce9774fba680f50723eaf1a7215091' - 'e374dd4942a49b52166fa9f2aa40e9aefb3aa3ec') +install=xfburn.install +source=(http://archive.xfce.org/src/apps/xfburn/${pkgver%.*}/$pkgname-$pkgver.tar.bz2) +sha1sums=('def2ced9a74b5112e992149ce901f3a5a73f20d9') build() { - cd "$srcdir/$pkgname-$pkgver" - - # fix https://bugs.archlinux.org/task/26121 - patch -Np0 -i "$srcdir/fix_empty_dir_segfault.diff" - - # fix build issue - sed -i '1 i\ - #include <glib-object.h>' \ - xfburn/xfburn-settings.h - - ./configure \ - --prefix=/usr \ - --enable-gstreamer \ - --enable-dbus \ - --disable-hal + cd $pkgname-$pkgver + ./configure --prefix=/usr --enable-gstreamer make } package() { - cd "$srcdir/$pkgname-$pkgver" + cd $pkgname-$pkgver make DESTDIR="$pkgdir" install } - -# vim:set ts=2 sw=2 et: Property changes on: xfburn/trunk/PKGBUILD ___________________________________________________________________ Deleted: svn:executable ## -1 +0,0 ## -* \ No newline at end of property Deleted: fix_empty_dir_segfault.diff =================================================================== --- fix_empty_dir_segfault.diff 2014-02-20 18:21:43 UTC (rev 206173) +++ fix_empty_dir_segfault.diff 2014-02-20 21:33:00 UTC (rev 206174) @@ -1,48 +0,0 @@ ---- 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); -