[arch-commits] Commit in xfburn/repos (8 files)

Evangelos Foutras foutrelis at archlinux.org
Sat Apr 28 21:10:02 EDT 2012


    Date: Saturday, April 28, 2012 @ 21:10:02
  Author: foutrelis
Revision: 157578

archrelease: copy trunk to staging-i686, staging-x86_64

Added:
  xfburn/repos/staging-i686/
  xfburn/repos/staging-i686/PKGBUILD
    (from rev 157576, xfburn/trunk/PKGBUILD)
  xfburn/repos/staging-i686/fix_empty_dir_segfault.diff
    (from rev 157576, xfburn/trunk/fix_empty_dir_segfault.diff)
  xfburn/repos/staging-i686/xfburn.install
    (from rev 157576, xfburn/trunk/xfburn.install)
  xfburn/repos/staging-x86_64/
  xfburn/repos/staging-x86_64/PKGBUILD
    (from rev 157577, xfburn/trunk/PKGBUILD)
  xfburn/repos/staging-x86_64/fix_empty_dir_segfault.diff
    (from rev 157577, xfburn/trunk/fix_empty_dir_segfault.diff)
  xfburn/repos/staging-x86_64/xfburn.install
    (from rev 157577, xfburn/trunk/xfburn.install)

--------------------------------------------+
 staging-i686/PKGBUILD                      |   46 +++++++++++++++++++++++++
 staging-i686/fix_empty_dir_segfault.diff   |   48 +++++++++++++++++++++++++++
 staging-i686/xfburn.install                |   14 +++++++
 staging-x86_64/PKGBUILD                    |   46 +++++++++++++++++++++++++
 staging-x86_64/fix_empty_dir_segfault.diff |   48 +++++++++++++++++++++++++++
 staging-x86_64/xfburn.install              |   14 +++++++
 6 files changed, 216 insertions(+)

Copied: xfburn/repos/staging-i686/PKGBUILD (from rev 157576, xfburn/trunk/PKGBUILD)
===================================================================
--- staging-i686/PKGBUILD	                        (rev 0)
+++ staging-i686/PKGBUILD	2012-04-29 01:10:02 UTC (rev 157578)
@@ -0,0 +1,46 @@
+# $Id$
+# Maintainer: Tobias Kieslich <tobias funnychar archlinux.org>
+# Contributor: Alois Nespor alois.nespor at gmail.com
+
+pkgname=xfburn
+pkgver=0.4.3
+pkgrel=6
+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')
+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')
+
+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
+  make
+}
+
+package() {
+  cd "$srcdir/$pkgname-$pkgver"
+  make DESTDIR="$pkgdir" install
+}
+
+# vim:set ts=2 sw=2 et:

Copied: xfburn/repos/staging-i686/fix_empty_dir_segfault.diff (from rev 157576, xfburn/trunk/fix_empty_dir_segfault.diff)
===================================================================
--- staging-i686/fix_empty_dir_segfault.diff	                        (rev 0)
+++ staging-i686/fix_empty_dir_segfault.diff	2012-04-29 01:10:02 UTC (rev 157578)
@@ -0,0 +1,48 @@
+--- 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);
+

Copied: xfburn/repos/staging-i686/xfburn.install (from rev 157576, xfburn/trunk/xfburn.install)
===================================================================
--- staging-i686/xfburn.install	                        (rev 0)
+++ staging-i686/xfburn.install	2012-04-29 01:10:02 UTC (rev 157578)
@@ -0,0 +1,14 @@
+post_install() {
+  update-desktop-database -q
+  gtk-update-icon-cache -q -t -f usr/share/icons/hicolor
+}
+
+post_upgrade() {
+  post_install $1
+}
+
+post_remove() {
+  post_install $1
+}
+
+# vim:set ts=2 sw=2 et:

Copied: xfburn/repos/staging-x86_64/PKGBUILD (from rev 157577, xfburn/trunk/PKGBUILD)
===================================================================
--- staging-x86_64/PKGBUILD	                        (rev 0)
+++ staging-x86_64/PKGBUILD	2012-04-29 01:10:02 UTC (rev 157578)
@@ -0,0 +1,46 @@
+# $Id$
+# Maintainer: Tobias Kieslich <tobias funnychar archlinux.org>
+# Contributor: Alois Nespor alois.nespor at gmail.com
+
+pkgname=xfburn
+pkgver=0.4.3
+pkgrel=6
+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')
+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')
+
+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
+  make
+}
+
+package() {
+  cd "$srcdir/$pkgname-$pkgver"
+  make DESTDIR="$pkgdir" install
+}
+
+# vim:set ts=2 sw=2 et:

Copied: xfburn/repos/staging-x86_64/fix_empty_dir_segfault.diff (from rev 157577, xfburn/trunk/fix_empty_dir_segfault.diff)
===================================================================
--- staging-x86_64/fix_empty_dir_segfault.diff	                        (rev 0)
+++ staging-x86_64/fix_empty_dir_segfault.diff	2012-04-29 01:10:02 UTC (rev 157578)
@@ -0,0 +1,48 @@
+--- 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);
+

Copied: xfburn/repos/staging-x86_64/xfburn.install (from rev 157577, xfburn/trunk/xfburn.install)
===================================================================
--- staging-x86_64/xfburn.install	                        (rev 0)
+++ staging-x86_64/xfburn.install	2012-04-29 01:10:02 UTC (rev 157578)
@@ -0,0 +1,14 @@
+post_install() {
+  update-desktop-database -q
+  gtk-update-icon-cache -q -t -f usr/share/icons/hicolor
+}
+
+post_upgrade() {
+  post_install $1
+}
+
+post_remove() {
+  post_install $1
+}
+
+# vim:set ts=2 sw=2 et:



More information about the arch-commits mailing list