summaryrefslogtreecommitdiff
path: root/libre/xarchiver-libre
diff options
context:
space:
mode:
authorNicolás Reynolds <fauno@kiwwwi.com.ar>2012-04-13 11:58:27 -0300
committerNicolás Reynolds <fauno@kiwwwi.com.ar>2012-04-13 11:58:27 -0300
commit8e5c27c1b5d01d353df2542166d50f9f456b2597 (patch)
tree227eed66652cffc0e872b75e7fe601cb23214cdb /libre/xarchiver-libre
parent394988e4c3a3ab21e5d79481ac3f3295045af987 (diff)
parent7ff5465d0386f06bea97ef956397c305d6f7e07f (diff)
Merge branch 'master' of ssh://vparabola/home/parabola/abslibre-pre-mips64el
Conflicts: community/smalltalk/PKGBUILD extra/crypto++/PKGBUILD extra/libpciaccess/PKGBUILD extra/postfix/PKGBUILD extra/samba/PKGBUILD extra/xorg-server/PKGBUILD libre/gstreamer0.10-bad-libre/PKGBUILD multilib/gcc-multilib/PKGBUILD multilib/lib32-libpciaccess/PKGBUILD
Diffstat (limited to 'libre/xarchiver-libre')
-rw-r--r--libre/xarchiver-libre/PKGBUILD7
-rw-r--r--libre/xarchiver-libre/xarchiver-0.5.2-fix_7z_support.patch1
-rw-r--r--libre/xarchiver-libre/xarchiver-0.5.2-rpm2cpio.patch1
-rw-r--r--libre/xarchiver-libre/xarchiver-0.5.2-segfault-open-with.patch1
4 files changed, 4 insertions, 6 deletions
diff --git a/libre/xarchiver-libre/PKGBUILD b/libre/xarchiver-libre/PKGBUILD
index 70a105323..5241ea5e8 100644
--- a/libre/xarchiver-libre/PKGBUILD
+++ b/libre/xarchiver-libre/PKGBUILD
@@ -1,11 +1,11 @@
-# $Id: PKGBUILD 121261 2011-04-29 22:06:13Z andyrtr $
+# $Id: PKGBUILD 154769 2012-03-30 16:45:24Z pierre $
# Maintainer: Alexander Fehr <pizzapunk gmail com>
# Contributor: Andrew Simmons <andrew.simmons@gmail.com>
_pkgname=xarchiver
pkgname=xarchiver-libre
pkgver=0.5.2
-pkgrel=4
+pkgrel=5
pkgdesc="GTK+ frontend to various command line archivers"
arch=('i686' 'x86_64' 'mips64el')
url="http://xarchiver.sourceforge.net"
@@ -21,10 +21,11 @@ optdepends=('tar: TAR support'
'bzip2: BZIP2 support'
'zip: ZIP support'
'unzip: ZIP support'
+ 'ununrar: RAR support'
'p7zip: 7z support'
'arj: ARJ support'
'lha: LHA support'
- 'lzma-utils: LZMA support'
+ 'xz: LZMA support'
'lzop: LZOP support')
options=('!libtool')
install=xarchiver.install
diff --git a/libre/xarchiver-libre/xarchiver-0.5.2-fix_7z_support.patch b/libre/xarchiver-libre/xarchiver-0.5.2-fix_7z_support.patch
index ad5b51b59..f7ff098c0 100644
--- a/libre/xarchiver-libre/xarchiver-0.5.2-fix_7z_support.patch
+++ b/libre/xarchiver-libre/xarchiver-0.5.2-fix_7z_support.patch
@@ -108,4 +108,3 @@ diff -Nur xarchiver-0.5.2.orig/src/7zip.c xarchiver-0.5.2/src/7zip.c
entry = xa_set_archive_entries_for_each_row (archive,filename,item);
g_free(filename);
}
-
diff --git a/libre/xarchiver-libre/xarchiver-0.5.2-rpm2cpio.patch b/libre/xarchiver-libre/xarchiver-0.5.2-rpm2cpio.patch
index bd6df9731..d962a44af 100644
--- a/libre/xarchiver-libre/xarchiver-0.5.2-rpm2cpio.patch
+++ b/libre/xarchiver-libre/xarchiver-0.5.2-rpm2cpio.patch
@@ -82,4 +82,3 @@ diff -up ./src/rpm.c.rpm2cpio ./src/rpm.c
list = NULL;
list = g_slist_append(list,command);
result = xa_run_command (archive,list);
-
diff --git a/libre/xarchiver-libre/xarchiver-0.5.2-segfault-open-with.patch b/libre/xarchiver-libre/xarchiver-0.5.2-segfault-open-with.patch
index ab907419d..e29d40c41 100644
--- a/libre/xarchiver-libre/xarchiver-0.5.2-segfault-open-with.patch
+++ b/libre/xarchiver-libre/xarchiver-0.5.2-segfault-open-with.patch
@@ -13,4 +13,3 @@ diff -pur xarchiver-0.5.2/src/open-with-dlg.c xarchiver-0.5.2.new/src/open-with-
gtk_tree_model_get(model,&iter,2,&exec,-1);
gtk_entry_set_text(GTK_ENTRY(data->custom_command_entry),exec);
-