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

Evangelos Foutras foutrelis at archlinux.org
Mon Apr 30 00:19:57 EDT 2012


    Date: Monday, April 30, 2012 @ 00:19:56
  Author: foutrelis
Revision: 157834

db-move: moved xfburn from [testing] to [extra] (i686)

Added:
  xfburn/repos/extra-i686/PKGBUILD
    (from rev 157813, xfburn/repos/testing-i686/PKGBUILD)
  xfburn/repos/extra-i686/fix_empty_dir_segfault.diff
    (from rev 157813, xfburn/repos/testing-i686/fix_empty_dir_segfault.diff)
  xfburn/repos/extra-i686/xfburn.install
    (from rev 157813, xfburn/repos/testing-i686/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/testing-i686/

-----------------------------+
 PKGBUILD                    |   84 ++++++++++++++++++++----------------
 fix_empty_dir_segfault.diff |   96 +++++++++++++++++++++---------------------
 xfburn.install              |   28 ++++++------
 3 files changed, 108 insertions(+), 100 deletions(-)

Deleted: extra-i686/PKGBUILD
===================================================================
--- extra-i686/PKGBUILD	2012-04-30 04:19:55 UTC (rev 157833)
+++ extra-i686/PKGBUILD	2012-04-30 04:19:56 UTC (rev 157834)
@@ -1,38 +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=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/PKGBUILD (from rev 157813, xfburn/repos/testing-i686/PKGBUILD)
===================================================================
--- extra-i686/PKGBUILD	                        (rev 0)
+++ extra-i686/PKGBUILD	2012-04-30 04:19:56 UTC (rev 157834)
@@ -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:

Deleted: extra-i686/fix_empty_dir_segfault.diff
===================================================================
--- extra-i686/fix_empty_dir_segfault.diff	2012-04-30 04:19:55 UTC (rev 157833)
+++ extra-i686/fix_empty_dir_segfault.diff	2012-04-30 04:19:56 UTC (rev 157834)
@@ -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);
-

Copied: xfburn/repos/extra-i686/fix_empty_dir_segfault.diff (from rev 157813, xfburn/repos/testing-i686/fix_empty_dir_segfault.diff)
===================================================================
--- extra-i686/fix_empty_dir_segfault.diff	                        (rev 0)
+++ extra-i686/fix_empty_dir_segfault.diff	2012-04-30 04:19:56 UTC (rev 157834)
@@ -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	2012-04-30 04:19:55 UTC (rev 157833)
+++ extra-i686/xfburn.install	2012-04-30 04:19:56 UTC (rev 157834)
@@ -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 157813, xfburn/repos/testing-i686/xfburn.install)
===================================================================
--- extra-i686/xfburn.install	                        (rev 0)
+++ extra-i686/xfburn.install	2012-04-30 04:19:56 UTC (rev 157834)
@@ -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