Fri Feb 21 03:31:53 UTC 2014

2 files changed, 13 insertions, 79 deletions

diff --git a/extra/xfburn/PKGBUILD b/extra/xfburn/PKGBUILD
index ec80b00ac..b7ae00193 100755
--- a/extra/xfburn/PKGBUILD
+++ b/extra/xfburn/PKGBUILD
@@ -1,46 +1,28 @@
-# $Id: PKGBUILD 157835 2012-04-30 04:19:58Z foutrelis $
+# $Id: PKGBUILD 206175 2014-02-20 21:33:41Z eric $
 # Maintainer: Tobias Kieslich <tobias funnychar archlinux.org>
 # Contributor: Alois Nespor alois.nespor@gmail.com
 
 pkgname=xfburn
-pkgver=0.4.3
-pkgrel=6
-arch=('i686' 'x86_64')
+pkgver=0.5.0
+pkgrel=1
 pkgdesc="A simple CD/DVD burning tool based on libburnia libraries"
+arch=('i686' 'x86_64')
 url="http://goodies.xfce.org/projects/applications/xfburn"
-license=('GPL2')
-groups=('xfce4-goodies')
-install=${pkgname}.install
-depends=('libburn' 'libisofs' 'libxfcegui4' 'exo' 'gstreamer0.10-base'
-         'hicolor-icon-theme' 'desktop-file-utils' 'librsvg')
+license=('GPL')
+depends=('libburn' 'libisofs' 'exo' 'gstreamer0.10-base' 'desktop-file-utils')
 makedepends=('intltool')
-source=(http://archive.xfce.org/src/apps/xfburn/0.4/$pkgname-$pkgver.tar.bz2
-        fix_empty_dir_segfault.diff)
-sha1sums=('52d33e56b7ce9774fba680f50723eaf1a7215091'
-          'e374dd4942a49b52166fa9f2aa40e9aefb3aa3ec')
+groups=('xfce4-goodies')
+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:
diff --git a/extra/xfburn/fix_empty_dir_segfault.diff b/extra/xfburn/fix_empty_dir_segfault.diff
deleted file mode 100644
index af3fe07c8..000000000
--- a/extra/xfburn/fix_empty_dir_segfault.diff
+++ /dev/null
@@ -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);
-