Date: Thursday, February 20, 2014 @ 22:33:41 Author: eric Revision: 206175
archrelease: copy trunk to extra-i686, extra-x86_64 Added: xfburn/repos/extra-i686/PKGBUILD (from rev 206174, xfburn/trunk/PKGBUILD) xfburn/repos/extra-i686/xfburn.install (from rev 206174, xfburn/trunk/xfburn.install) xfburn/repos/extra-x86_64/PKGBUILD (from rev 206174, xfburn/trunk/PKGBUILD) xfburn/repos/extra-x86_64/xfburn.install (from rev 206174, xfburn/trunk/xfburn.install) Deleted: xfburn/repos/extra-i686/PKGBUILD xfburn/repos/extra-i686/fix_empty_dir_segfault.diff xfburn/repos/extra-i686/xfburn.install xfburn/repos/extra-x86_64/PKGBUILD xfburn/repos/extra-x86_64/fix_empty_dir_segfault.diff xfburn/repos/extra-x86_64/xfburn.install ------------------------------------------+ /PKGBUILD | 56 +++++++++++++++++++++++++++++ /xfburn.install | 28 ++++++++++++++ extra-i686/PKGBUILD | 46 ----------------------- extra-i686/fix_empty_dir_segfault.diff | 48 ------------------------ extra-i686/xfburn.install | 14 ------- extra-x86_64/PKGBUILD | 46 ----------------------- extra-x86_64/fix_empty_dir_segfault.diff | 48 ------------------------ extra-x86_64/xfburn.install | 14 ------- 8 files changed, 84 insertions(+), 216 deletions(-) Deleted: extra-i686/PKGBUILD =================================================================== --- extra-i686/PKGBUILD 2014-02-20 21:33:00 UTC (rev 206174) +++ extra-i686/PKGBUILD 2014-02-20 21:33:41 UTC (rev 206175) @@ -1,46 +0,0 @@ -# $Id$ -# Maintainer: Tobias Kieslich <tobias funnychar archlinux.org> -# Contributor: Alois Nespor alois.nes...@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/extra-i686/PKGBUILD (from rev 206174, xfburn/trunk/PKGBUILD) =================================================================== --- extra-i686/PKGBUILD (rev 0) +++ extra-i686/PKGBUILD 2014-02-20 21:33:41 UTC (rev 206175) @@ -0,0 +1,28 @@ +# $Id$ +# Maintainer: Tobias Kieslich <tobias funnychar archlinux.org> +# Contributor: Alois Nespor alois.nes...@gmail.com + +pkgname=xfburn +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=('GPL') +depends=('libburn' 'libisofs' 'exo' 'gstreamer0.10-base' 'desktop-file-utils') +makedepends=('intltool') +groups=('xfce4-goodies') +install=xfburn.install +source=(http://archive.xfce.org/src/apps/xfburn/${pkgver%.*}/$pkgname-$pkgver.tar.bz2) +sha1sums=('def2ced9a74b5112e992149ce901f3a5a73f20d9') + +build() { + cd $pkgname-$pkgver + ./configure --prefix=/usr --enable-gstreamer + make +} + +package() { + cd $pkgname-$pkgver + make DESTDIR="$pkgdir" install +} Deleted: extra-i686/fix_empty_dir_segfault.diff =================================================================== --- extra-i686/fix_empty_dir_segfault.diff 2014-02-20 21:33:00 UTC (rev 206174) +++ extra-i686/fix_empty_dir_segfault.diff 2014-02-20 21:33:41 UTC (rev 206175) @@ -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); - Deleted: extra-i686/xfburn.install =================================================================== --- extra-i686/xfburn.install 2014-02-20 21:33:00 UTC (rev 206174) +++ extra-i686/xfburn.install 2014-02-20 21:33:41 UTC (rev 206175) @@ -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() { - post_install $1 -} - -# vim:set ts=2 sw=2 et: Copied: xfburn/repos/extra-i686/xfburn.install (from rev 206174, xfburn/trunk/xfburn.install) =================================================================== --- extra-i686/xfburn.install (rev 0) +++ extra-i686/xfburn.install 2014-02-20 21:33:41 UTC (rev 206175) @@ -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: Deleted: extra-x86_64/PKGBUILD =================================================================== --- extra-x86_64/PKGBUILD 2014-02-20 21:33:00 UTC (rev 206174) +++ extra-x86_64/PKGBUILD 2014-02-20 21:33:41 UTC (rev 206175) @@ -1,46 +0,0 @@ -# $Id$ -# Maintainer: Tobias Kieslich <tobias funnychar archlinux.org> -# Contributor: Alois Nespor alois.nes...@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/extra-x86_64/PKGBUILD (from rev 206174, xfburn/trunk/PKGBUILD) =================================================================== --- extra-x86_64/PKGBUILD (rev 0) +++ extra-x86_64/PKGBUILD 2014-02-20 21:33:41 UTC (rev 206175) @@ -0,0 +1,28 @@ +# $Id$ +# Maintainer: Tobias Kieslich <tobias funnychar archlinux.org> +# Contributor: Alois Nespor alois.nes...@gmail.com + +pkgname=xfburn +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=('GPL') +depends=('libburn' 'libisofs' 'exo' 'gstreamer0.10-base' 'desktop-file-utils') +makedepends=('intltool') +groups=('xfce4-goodies') +install=xfburn.install +source=(http://archive.xfce.org/src/apps/xfburn/${pkgver%.*}/$pkgname-$pkgver.tar.bz2) +sha1sums=('def2ced9a74b5112e992149ce901f3a5a73f20d9') + +build() { + cd $pkgname-$pkgver + ./configure --prefix=/usr --enable-gstreamer + make +} + +package() { + cd $pkgname-$pkgver + make DESTDIR="$pkgdir" install +} Deleted: extra-x86_64/fix_empty_dir_segfault.diff =================================================================== --- extra-x86_64/fix_empty_dir_segfault.diff 2014-02-20 21:33:00 UTC (rev 206174) +++ extra-x86_64/fix_empty_dir_segfault.diff 2014-02-20 21:33:41 UTC (rev 206175) @@ -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); - Deleted: extra-x86_64/xfburn.install =================================================================== --- extra-x86_64/xfburn.install 2014-02-20 21:33:00 UTC (rev 206174) +++ extra-x86_64/xfburn.install 2014-02-20 21:33:41 UTC (rev 206175) @@ -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() { - post_install $1 -} - -# vim:set ts=2 sw=2 et: Copied: xfburn/repos/extra-x86_64/xfburn.install (from rev 206174, xfburn/trunk/xfburn.install) =================================================================== --- extra-x86_64/xfburn.install (rev 0) +++ extra-x86_64/xfburn.install 2014-02-20 21:33:41 UTC (rev 206175) @@ -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: