[arch-commits] Commit in file-roller/repos/extra-i686 (5 files)

[Evangelos Foutras]

    Date: Tuesday, November 13, 2012 @ 20:39:18
  Author: foutrelis
Revision: 170953

archrelease: copy trunk to extra-i686

Added:
  file-roller/repos/extra-i686/PKGBUILD
    (from rev 170952, file-roller/trunk/PKGBUILD)
  file-roller/repos/extra-i686/extract-to-fix.patch
    (from rev 170952, file-roller/trunk/extract-to-fix.patch)
  file-roller/repos/extra-i686/file-roller.install
    (from rev 170952, file-roller/trunk/file-roller.install)
Deleted:
  file-roller/repos/extra-i686/PKGBUILD
  file-roller/repos/extra-i686/file-roller.install

----------------------+
 PKGBUILD             |   80 ++++++++++++++++++++++++++-----------------------
 extract-to-fix.patch |   13 +++++++
 file-roller.install  |   26 +++++++--------
 3 files changed, 69 insertions(+), 50 deletions(-)

Deleted: PKGBUILD
===================================================================
--- PKGBUILD	2012-11-14 01:36:15 UTC (rev 170952)
+++ PKGBUILD	2012-11-14 01:39:18 UTC (rev 170953)
@@ -1,37 +0,0 @@
-# $Id$
-# Maintainer: Jan Alexander Steffens (heftig) <jan.steffens at gmail.com>
-# Contributor: Jan de Groot <jgc at archlinux.org>
-
-pkgname=file-roller
-pkgver=3.6.2
-pkgrel=1
-pkgdesc="Archive manipulator for GNOME"
-arch=('i686' 'x86_64')
-license=('GPL')
-depends=('desktop-file-utils' 'gtk3' 'hicolor-icon-theme' 'dconf' 'libarchive' 'file' 'json-glib')
-makedepends=('intltool' 'gnome-doc-utils' 'pkg-config' 'nautilus' 'itstool' 'docbook-xsl')
-optdepends=('unrar: the RAR uncompression program'
-            'zip: creates PKZIP-compatible .zip files'
-            'p7zip: 7zip compression utility'
-            'arj: ARJ archiver'
-            'unace: extraction tool for the proprietary ace archive format')
-groups=('gnome-extra')
-options=('!libtool' '!emptydirs')
-install=file-roller.install
-url="http://www.gnome.org"
-source=(http://ftp.gnome.org/pub/gnome/sources/$pkgname/${pkgver::3}/$pkgname-$pkgver.tar.xz)
-sha256sums=('47b026c827fcb0db4df51bf81c1e90f829f287fe2c9b9e65f167a2ef5bfec5f1')
-
-build() {
-  cd $pkgname-$pkgver
-  ./configure --prefix=/usr --sysconfdir=/etc \
-      --libexecdir=/usr/lib/file-roller \
-      --localstatedir=/var --disable-static \
-      --disable-schemas-compile
-  make
-}
-
-package() {
-  cd $pkgname-$pkgver
-  make DESTDIR="$pkgdir" install
-}

Copied: file-roller/repos/extra-i686/PKGBUILD (from rev 170952, file-roller/trunk/PKGBUILD)
===================================================================
--- PKGBUILD	                        (rev 0)
+++ PKGBUILD	2012-11-14 01:39:18 UTC (rev 170953)
@@ -0,0 +1,43 @@
+# $Id$
+# Maintainer: Jan Alexander Steffens (heftig) <jan.steffens at gmail.com>
+# Contributor: Jan de Groot <jgc at archlinux.org>
+
+pkgname=file-roller
+pkgver=3.6.2
+pkgrel=2
+pkgdesc="Archive manipulator for GNOME"
+arch=('i686' 'x86_64')
+license=('GPL')
+depends=('desktop-file-utils' 'gtk3' 'hicolor-icon-theme' 'dconf' 'libarchive' 'file' 'json-glib')
+makedepends=('intltool' 'gnome-doc-utils' 'pkg-config' 'nautilus' 'itstool' 'docbook-xsl')
+optdepends=('unrar: the RAR uncompression program'
+            'zip: creates PKZIP-compatible .zip files'
+            'p7zip: 7zip compression utility'
+            'arj: ARJ archiver'
+            'unace: extraction tool for the proprietary ace archive format')
+groups=('gnome-extra')
+options=('!libtool' '!emptydirs')
+install=file-roller.install
+url="http://www.gnome.org"
+source=(http://ftp.gnome.org/pub/gnome/sources/$pkgname/${pkgver::3}/$pkgname-$pkgver.tar.xz
+        extract-to-fix.patch)
+sha256sums=('47b026c827fcb0db4df51bf81c1e90f829f287fe2c9b9e65f167a2ef5bfec5f1'
+            'fc23e122b2d95df9eafe5bdf2a55beb1339a2b1b077973a1b45f881d9bb8427e')
+
+build() {
+  cd $pkgname-$pkgver
+
+  # https://bugzilla.gnome.org/show_bug.cgi?id=686321
+  patch -Np1 -i "$srcdir/extract-to-fix.patch"
+
+  ./configure --prefix=/usr --sysconfdir=/etc \
+      --libexecdir=/usr/lib/file-roller \
+      --localstatedir=/var --disable-static \
+      --disable-schemas-compile
+  make
+}
+
+package() {
+  cd $pkgname-$pkgver
+  make DESTDIR="$pkgdir" install
+}

Copied: file-roller/repos/extra-i686/extract-to-fix.patch (from rev 170952, file-roller/trunk/extract-to-fix.patch)
===================================================================
--- extract-to-fix.patch	                        (rev 0)
+++ extract-to-fix.patch	2012-11-14 01:39:18 UTC (rev 170953)
@@ -0,0 +1,13 @@
+diff --git a/src/main.c~ b/src/main.c
+index 1eb2e65..539ddfa 100644
+--- a/src/main.c~
++++ b/src/main.c
+@@ -850,7 +850,7 @@ fr_application_command_line (GApplication            *application,
+ 
+ 	_g_object_unref (default_directory);
+ 	_g_object_unref (add_to_archive);
+-	g_free (extraction_destination);
++	_g_object_unref (extraction_destination);
+ 
+ 	return fr_application_command_line_finished (application, EXIT_SUCCESS);
+ }

Deleted: file-roller.install
===================================================================
--- file-roller.install	2012-11-14 01:36:15 UTC (rev 170952)
+++ file-roller.install	2012-11-14 01:39:18 UTC (rev 170953)
@@ -1,13 +0,0 @@
-post_install() {
-    glib-compile-schemas /usr/share/glib-2.0/schemas
-    update-desktop-database -q
-    gtk-update-icon-cache -q -t -f /usr/share/icons/hicolor
-}
-
-post_upgrade() {
-    post_install
-}
-
-post_remove() {
-    post_install
-}

Copied: file-roller/repos/extra-i686/file-roller.install (from rev 170952, file-roller/trunk/file-roller.install)
===================================================================
--- file-roller.install	                        (rev 0)
+++ file-roller.install	2012-11-14 01:39:18 UTC (rev 170953)
@@ -0,0 +1,13 @@
+post_install() {
+    glib-compile-schemas /usr/share/glib-2.0/schemas
+    update-desktop-database -q
+    gtk-update-icon-cache -q -t -f /usr/share/icons/hicolor
+}
+
+post_upgrade() {
+    post_install
+}
+
+post_remove() {
+    post_install
+}