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

andyrtr at archlinux.org andyrtr at archlinux.org
Sun Oct 23 05:32:55 EDT 2011


    Date: Sunday, October 23, 2011 @ 05:32:55
  Author: andyrtr
Revision: 141077

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

Added:
  xfburn/repos/extra-i686/PKGBUILD
    (from rev 141076, xfburn/trunk/PKGBUILD)
  xfburn/repos/extra-i686/fix_empty_dir_segfault.diff
    (from rev 141076, xfburn/trunk/fix_empty_dir_segfault.diff)
  xfburn/repos/extra-i686/xfburn.install
    (from rev 141076, xfburn/trunk/xfburn.install)
  xfburn/repos/extra-x86_64/PKGBUILD
    (from rev 141076, xfburn/trunk/PKGBUILD)
  xfburn/repos/extra-x86_64/fix_empty_dir_segfault.diff
    (from rev 141076, xfburn/trunk/fix_empty_dir_segfault.diff)
  xfburn/repos/extra-x86_64/xfburn.install
    (from rev 141076, xfburn/trunk/xfburn.install)
Deleted:
  xfburn/repos/extra-i686/PKGBUILD
  xfburn/repos/extra-i686/xfburn.install
  xfburn/repos/extra-x86_64/PKGBUILD
  xfburn/repos/extra-x86_64/xfburn.install

------------------------------------------+
 extra-i686/PKGBUILD                      |   70 +++++++++++++++--------------
 extra-i686/fix_empty_dir_segfault.diff   |   48 +++++++++++++++++++
 extra-i686/xfburn.install                |   28 +++++------
 extra-x86_64/PKGBUILD                    |   70 +++++++++++++++--------------
 extra-x86_64/fix_empty_dir_segfault.diff |   48 +++++++++++++++++++
 extra-x86_64/xfburn.install              |   28 +++++------
 6 files changed, 200 insertions(+), 92 deletions(-)

Deleted: extra-i686/PKGBUILD
===================================================================
--- extra-i686/PKGBUILD	2011-10-23 09:32:09 UTC (rev 141076)
+++ extra-i686/PKGBUILD	2011-10-23 09:32:55 UTC (rev 141077)
@@ -1,32 +0,0 @@
-# $Id$
-# Maintainer: Tobias Kieslich <tobias funnychar archlinux.org>
-# Contributor: Alois Nespor alois.nespor at gmail.com
-
-pkgname=xfburn
-pkgver=0.4.3
-pkgrel=4
-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>=1.0.6.pl00' 'libisofs>=1.0.6' 'libxfcegui4>=4.8.1' 'exo>=0.6.0' 'gstreamer0.10-base>=0.10.26'
-         'hicolor-icon-theme' 'desktop-file-utils' 'librsvg')
-makedepends=('intltool')
-source=(http://www.xfce.org/archive/src/apps/xfburn/0.4/$pkgname-$pkgver.tar.bz2)
-md5sums=('147cdc2d909e751125be16103b8dc81f')
-
-build() { 
-  cd ${srcdir}/$pkgname-$pkgver
-  ./configure --prefix=/usr \
-	--enable-gstreamer \
-	--enable-dbus \
-	--disable-hal
-  make
-}
-
-package() {
-  cd ${srcdir}/$pkgname-$pkgver
-  make DESTDIR=${pkgdir} install
-} 

Copied: xfburn/repos/extra-i686/PKGBUILD (from rev 141076, xfburn/trunk/PKGBUILD)
===================================================================
--- extra-i686/PKGBUILD	                        (rev 0)
+++ extra-i686/PKGBUILD	2011-10-23 09:32:55 UTC (rev 141077)
@@ -0,0 +1,38 @@
+# $Id$
+# Maintainer: Tobias Kieslich <tobias funnychar archlinux.org>
+# Contributor: Alois Nespor alois.nespor at gmail.com
+
+pkgname=xfburn
+pkgver=0.4.3
+pkgrel=5
+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>=1.0.6.pl00' 'libisofs>=1.0.6' 'libxfcegui4>=4.8.1' 'exo>=0.6.0' 'gstreamer0.10-base>=0.10.26'
+         'hicolor-icon-theme' 'desktop-file-utils' 'librsvg')
+makedepends=('intltool')
+source=(http://www.xfce.org/archive/src/apps/xfburn/0.4/$pkgname-$pkgver.tar.bz2
+	fix_empty_dir_segfault.diff)
+md5sums=('147cdc2d909e751125be16103b8dc81f'
+         '82a85be2442c42ab93de95e21c6c11b0')
+
+build() { 
+  cd ${srcdir}/$pkgname-$pkgver
+
+  # fix https://bugs.archlinux.org/task/26121
+  patch -Np0 -i ${srcdir}/fix_empty_dir_segfault.diff
+  
+  ./configure --prefix=/usr \
+	--enable-gstreamer \
+	--enable-dbus \
+	--disable-hal
+  make
+}
+
+package() {
+  cd ${srcdir}/$pkgname-$pkgver
+  make DESTDIR=${pkgdir} install
+} 

Copied: xfburn/repos/extra-i686/fix_empty_dir_segfault.diff (from rev 141076, xfburn/trunk/fix_empty_dir_segfault.diff)
===================================================================
--- extra-i686/fix_empty_dir_segfault.diff	                        (rev 0)
+++ extra-i686/fix_empty_dir_segfault.diff	2011-10-23 09:32:55 UTC (rev 141077)
@@ -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);
+

Deleted: extra-i686/xfburn.install
===================================================================
--- extra-i686/xfburn.install	2011-10-23 09:32:09 UTC (rev 141076)
+++ extra-i686/xfburn.install	2011-10-23 09:32:55 UTC (rev 141077)
@@ -1,14 +0,0 @@
-post_install() {
-  update-desktop-database -q
-  gtk-update-icon-cache -q -t -f usr/share/icons/hicolor
-}
-
-post_upgrade() {
-  post_install $1
-}
-
-post_remove() {
-  update-desktop-database -q
-  gtk-update-icon-cache -q -t -f usr/share/icons/hicolor
-}
-

Copied: xfburn/repos/extra-i686/xfburn.install (from rev 141076, xfburn/trunk/xfburn.install)
===================================================================
--- extra-i686/xfburn.install	                        (rev 0)
+++ extra-i686/xfburn.install	2011-10-23 09:32:55 UTC (rev 141077)
@@ -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() {
+  update-desktop-database -q
+  gtk-update-icon-cache -q -t -f usr/share/icons/hicolor
+}
+

Deleted: extra-x86_64/PKGBUILD
===================================================================
--- extra-x86_64/PKGBUILD	2011-10-23 09:32:09 UTC (rev 141076)
+++ extra-x86_64/PKGBUILD	2011-10-23 09:32:55 UTC (rev 141077)
@@ -1,32 +0,0 @@
-# $Id$
-# Maintainer: Tobias Kieslich <tobias funnychar archlinux.org>
-# Contributor: Alois Nespor alois.nespor at gmail.com
-
-pkgname=xfburn
-pkgver=0.4.3
-pkgrel=4
-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>=1.0.6.pl00' 'libisofs>=1.0.6' 'libxfcegui4>=4.8.1' 'exo>=0.6.0' 'gstreamer0.10-base>=0.10.26'
-         'hicolor-icon-theme' 'desktop-file-utils' 'librsvg')
-makedepends=('intltool')
-source=(http://www.xfce.org/archive/src/apps/xfburn/0.4/$pkgname-$pkgver.tar.bz2)
-md5sums=('147cdc2d909e751125be16103b8dc81f')
-
-build() { 
-  cd ${srcdir}/$pkgname-$pkgver
-  ./configure --prefix=/usr \
-	--enable-gstreamer \
-	--enable-dbus \
-	--disable-hal
-  make
-}
-
-package() {
-  cd ${srcdir}/$pkgname-$pkgver
-  make DESTDIR=${pkgdir} install
-} 

Copied: xfburn/repos/extra-x86_64/PKGBUILD (from rev 141076, xfburn/trunk/PKGBUILD)
===================================================================
--- extra-x86_64/PKGBUILD	                        (rev 0)
+++ extra-x86_64/PKGBUILD	2011-10-23 09:32:55 UTC (rev 141077)
@@ -0,0 +1,38 @@
+# $Id$
+# Maintainer: Tobias Kieslich <tobias funnychar archlinux.org>
+# Contributor: Alois Nespor alois.nespor at gmail.com
+
+pkgname=xfburn
+pkgver=0.4.3
+pkgrel=5
+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>=1.0.6.pl00' 'libisofs>=1.0.6' 'libxfcegui4>=4.8.1' 'exo>=0.6.0' 'gstreamer0.10-base>=0.10.26'
+         'hicolor-icon-theme' 'desktop-file-utils' 'librsvg')
+makedepends=('intltool')
+source=(http://www.xfce.org/archive/src/apps/xfburn/0.4/$pkgname-$pkgver.tar.bz2
+	fix_empty_dir_segfault.diff)
+md5sums=('147cdc2d909e751125be16103b8dc81f'
+         '82a85be2442c42ab93de95e21c6c11b0')
+
+build() { 
+  cd ${srcdir}/$pkgname-$pkgver
+
+  # fix https://bugs.archlinux.org/task/26121
+  patch -Np0 -i ${srcdir}/fix_empty_dir_segfault.diff
+  
+  ./configure --prefix=/usr \
+	--enable-gstreamer \
+	--enable-dbus \
+	--disable-hal
+  make
+}
+
+package() {
+  cd ${srcdir}/$pkgname-$pkgver
+  make DESTDIR=${pkgdir} install
+} 

Copied: xfburn/repos/extra-x86_64/fix_empty_dir_segfault.diff (from rev 141076, xfburn/trunk/fix_empty_dir_segfault.diff)
===================================================================
--- extra-x86_64/fix_empty_dir_segfault.diff	                        (rev 0)
+++ extra-x86_64/fix_empty_dir_segfault.diff	2011-10-23 09:32:55 UTC (rev 141077)
@@ -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);
+

Deleted: extra-x86_64/xfburn.install
===================================================================
--- extra-x86_64/xfburn.install	2011-10-23 09:32:09 UTC (rev 141076)
+++ extra-x86_64/xfburn.install	2011-10-23 09:32:55 UTC (rev 141077)
@@ -1,14 +0,0 @@
-post_install() {
-  update-desktop-database -q
-  gtk-update-icon-cache -q -t -f usr/share/icons/hicolor
-}
-
-post_upgrade() {
-  post_install $1
-}
-
-post_remove() {
-  update-desktop-database -q
-  gtk-update-icon-cache -q -t -f usr/share/icons/hicolor
-}
-

Copied: xfburn/repos/extra-x86_64/xfburn.install (from rev 141076, xfburn/trunk/xfburn.install)
===================================================================
--- extra-x86_64/xfburn.install	                        (rev 0)
+++ extra-x86_64/xfburn.install	2011-10-23 09:32:55 UTC (rev 141077)
@@ -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() {
+  update-desktop-database -q
+  gtk-update-icon-cache -q -t -f usr/share/icons/hicolor
+}
+



More information about the arch-commits mailing list