summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--libre/xarchiver/PKGBUILD31
-rw-r--r--libre/xarchiver/add-mime-types.patch (renamed from libre/xarchiver/xarchiver-0.5.3-add-mime-types.patch)0
-rw-r--r--libre/xarchiver/fix-password-protected.patch (renamed from libre/xarchiver/xarchiver-0.5.3-fix-password-protected.patch)0
-rw-r--r--libre/xarchiver/fix-rpm-support.patch (renamed from libre/xarchiver/xarchiver-0.5.3-fix-rpm-support.patch)0
-rw-r--r--libre/xarchiver/remove-nonfree-unrar-support.patch (renamed from libre/xarchiver/xarchiver-0.5.3-remove-nonfree-unrar-support.patch)36
-rw-r--r--libre/xarchiver/xarchiver-0.5.3-fix-double-escaping.patch32
6 files changed, 31 insertions, 68 deletions
diff --git a/libre/xarchiver/PKGBUILD b/libre/xarchiver/PKGBUILD
index 35728b96a..c50f53572 100644
--- a/libre/xarchiver/PKGBUILD
+++ b/libre/xarchiver/PKGBUILD
@@ -1,12 +1,12 @@
-# $Id: PKGBUILD 111012 2014-05-12 01:13:40Z bgyorgy $
+# $Id: PKGBUILD 119883 2014-09-30 14:21:21Z bgyorgy $
# Maintainer (Arch): Balló György <ballogyor+arch at gmail dot com>
# Contributor (Arch): Alexander Fehr <pizzapunk gmail com>
# Contributor (Arch): Andrew Simmons <andrew.simmons@gmail.com>
# Maintainer: André Silva <emulatorman@parabola.nu>
pkgname=xarchiver
-pkgver=0.5.3
-pkgrel=4.parabola1
+pkgver=0.5.4
+pkgrel=1.parabola1
pkgdesc="GTK+ frontend to various command line archivers, without nonfree unrar support"
arch=('i686' 'x86_64' 'mips64el')
url="http://xarchiver.sourceforge.net/"
@@ -23,35 +23,30 @@ optdepends=('zip: ZIP support'
'cpio: RPM support')
install=xarchiver.install
source=(http://downloads.sourceforge.net/xarchiver/xarchiver-$pkgver.tar.bz2
- xarchiver-0.5.3-fix-rpm-support.patch
- xarchiver-0.5.3-fix-double-escaping.patch
- xarchiver-0.5.3-fix-password-protected.patch
- xarchiver-0.5.3-add-mime-types.patch
- xarchiver-0.5.3-remove-nonfree-unrar-support.patch)
-md5sums=('fd390bbd2df76a5f8a007bdeae82d4aa'
+ fix-rpm-support.patch
+ fix-password-protected.patch
+ add-mime-types.patch
+ remove-nonfree-unrar-support.patch)
+md5sums=('1b4cd37a6af03afc957a8e307417e8d0'
'812b93339f5e3332621f3c5abebfe277'
- '6178d7ab679b761469c880a8db991907'
'35ab96d98521a0a36f3e9e9ec0969107'
'0cee887b3c989ba2cdce9154813843fb'
- 'cf1788c180145adc3bc5d3572f8a883b')
+ '064ec8984be6e0e7bbf20c435a9f4ef0')
prepare() {
cd $pkgname-$pkgver
# Fix RPM support
- patch -Np1 -i ../xarchiver-0.5.3-fix-rpm-support.patch
-
- # Fix error when trying to create archives with spaces
- patch -Np1 -i ../xarchiver-0.5.3-fix-double-escaping.patch
+ patch -Np1 -i ../fix-rpm-support.patch
# Fix segfault when handling password protected files
- patch -Np1 -i ../xarchiver-0.5.3-fix-password-protected.patch
+ patch -Np1 -i ../fix-password-protected.patch
# Add more MIME types in the desktop file
- patch -Np1 -i ../xarchiver-0.5.3-add-mime-types.patch
+ patch -Np1 -i ../add-mime-types.patch
# Remove nonfree unRAR support
- patch -Np1 -i ../xarchiver-0.5.3-remove-nonfree-unrar-support.patch
+ patch -Np1 -i ../remove-nonfree-unrar-support.patch
rm -v src/rar.{c,h}
# Fix po files
diff --git a/libre/xarchiver/xarchiver-0.5.3-add-mime-types.patch b/libre/xarchiver/add-mime-types.patch
index ec427b99a..ec427b99a 100644
--- a/libre/xarchiver/xarchiver-0.5.3-add-mime-types.patch
+++ b/libre/xarchiver/add-mime-types.patch
diff --git a/libre/xarchiver/xarchiver-0.5.3-fix-password-protected.patch b/libre/xarchiver/fix-password-protected.patch
index 00969349d..00969349d 100644
--- a/libre/xarchiver/xarchiver-0.5.3-fix-password-protected.patch
+++ b/libre/xarchiver/fix-password-protected.patch
diff --git a/libre/xarchiver/xarchiver-0.5.3-fix-rpm-support.patch b/libre/xarchiver/fix-rpm-support.patch
index cf17ff738..cf17ff738 100644
--- a/libre/xarchiver/xarchiver-0.5.3-fix-rpm-support.patch
+++ b/libre/xarchiver/fix-rpm-support.patch
diff --git a/libre/xarchiver/xarchiver-0.5.3-remove-nonfree-unrar-support.patch b/libre/xarchiver/remove-nonfree-unrar-support.patch
index e8ba41d59..5473cf3b3 100644
--- a/libre/xarchiver/xarchiver-0.5.3-remove-nonfree-unrar-support.patch
+++ b/libre/xarchiver/remove-nonfree-unrar-support.patch
@@ -214,9 +214,9 @@ diff -Nur xarchiver-0.5.3.orig/src/interface.c xarchiver-0.5.3/src/interface.c
{
gtk_widget_set_sensitive (delete_menu,FALSE);
gtk_widget_set_sensitive (rename_menu,FALSE);
-diff -Nur xarchiver-0.5.3.orig/src/main.c xarchiver-0.5.3/src/main.c
---- xarchiver-0.5.3.orig/src/main.c 2014-02-09 13:30:28.000000000 -0200
-+++ xarchiver-0.5.3/src/main.c 2014-05-05 16:23:04.132223201 -0300
+diff -Nur xarchiver-0.5.4.orig/src/main.c xarchiver-0.5.4/src/main.c
+--- xarchiver-0.5.4.orig/src/main.c 2014-09-28 17:12:13.000000000 -0300
++++ xarchiver-0.5.4/src/main.c 2014-09-30 16:34:33.820381950 -0300
@@ -33,13 +33,11 @@
gchar *add_files;
gboolean error_output, file_to_open, ask_and_extract, ask_and_add, multi_extract;
@@ -231,7 +231,7 @@ diff -Nur xarchiver-0.5.3.orig/src/main.c xarchiver-0.5.3/src/main.c
extern Progress_bar_data *pb;
Prefs_dialog_data *prefs_window = NULL;
-@@ -315,7 +313,6 @@
+@@ -320,7 +318,6 @@
open_archive[XARCHIVETYPE_GZIP] = &xa_open_gzip;
open_archive[XARCHIVETYPE_LZMA] = &xa_open_bzip2_lzma;
open_archive[XARCHIVETYPE_XZ] = &xa_open_bzip2_lzma;
@@ -239,15 +239,15 @@ diff -Nur xarchiver-0.5.3.orig/src/main.c xarchiver-0.5.3/src/main.c
open_archive[XARCHIVETYPE_RPM] = &xa_open_rpm;
open_archive[XARCHIVETYPE_TAR] = open_archive[XARCHIVETYPE_TAR_BZ2] = open_archive[XARCHIVETYPE_TAR_GZ] = open_archive[XARCHIVETYPE_TAR_LZMA] = open_archive[XARCHIVETYPE_TAR_XZ] = open_archive[XARCHIVETYPE_TAR_LZOP] = &xa_open_tar;
open_archive[XARCHIVETYPE_ZIP] = &xa_open_zip;
-@@ -330,7 +327,6 @@
- delete[XARCHIVETYPE_GZIP] = 0;
- delete[XARCHIVETYPE_LZMA] = 0;
- delete[XARCHIVETYPE_XZ] = 0;
-- delete[XARCHIVETYPE_RAR] = delete[XARCHIVETYPE_RAR5] = &xa_rar_delete;
+@@ -332,7 +329,6 @@
+ delete[XARCHIVETYPE_ARJ] = &xa_arj_delete;
+ delete[XARCHIVETYPE_DEB] = 0;
+ delete[XARCHIVETYPE_BZIP2] = delete[XARCHIVETYPE_GZIP] = delete[XARCHIVETYPE_LZMA] = delete[XARCHIVETYPE_XZ] = delete[XARCHIVETYPE_LZOP] = &xa_tar_delete;
+- delete[XARCHIVETYPE_RAR] = delete[XARCHIVETYPE_RAR5] = &xa_rar_delete;
delete[XARCHIVETYPE_RPM] = 0;
delete[XARCHIVETYPE_TAR] = delete[XARCHIVETYPE_TAR_BZ2] = delete[XARCHIVETYPE_TAR_GZ] = delete[XARCHIVETYPE_TAR_LZMA] = delete[XARCHIVETYPE_TAR_XZ] = delete[XARCHIVETYPE_TAR_LZOP] = &xa_tar_delete;
delete[XARCHIVETYPE_ZIP] = &xa_zip_delete;
-@@ -343,7 +339,6 @@
+@@ -344,7 +340,6 @@
add[XARCHIVETYPE_ARJ] = &xa_arj_add;
add[XARCHIVETYPE_DEB] = 0;
add[XARCHIVETYPE_BZIP2] = add[XARCHIVETYPE_GZIP] = add[XARCHIVETYPE_LZMA] = add[XARCHIVETYPE_XZ] = add[XARCHIVETYPE_LZOP] = &xa_tar_add;
@@ -255,7 +255,7 @@ diff -Nur xarchiver-0.5.3.orig/src/main.c xarchiver-0.5.3/src/main.c
add[XARCHIVETYPE_RPM] = 0;
add[XARCHIVETYPE_TAR] = add[XARCHIVETYPE_TAR_BZ2] = add[XARCHIVETYPE_TAR_GZ] = add[XARCHIVETYPE_TAR_LZMA] = add[XARCHIVETYPE_TAR_XZ] = add[XARCHIVETYPE_TAR_LZOP] = &xa_tar_add;
add[XARCHIVETYPE_ZIP] = &xa_zip_add;
-@@ -354,7 +349,6 @@
+@@ -355,7 +350,6 @@
extract[XARCHIVETYPE_ARJ] = &xa_arj_extract;
extract[XARCHIVETYPE_DEB] = &xa_deb_extract;;
extract[XARCHIVETYPE_BZIP2] = extract[XARCHIVETYPE_GZIP] = extract[XARCHIVETYPE_LZMA] = extract[XARCHIVETYPE_XZ] = extract[XARCHIVETYPE_LZOP] = &xa_tar_extract;
@@ -263,7 +263,7 @@ diff -Nur xarchiver-0.5.3.orig/src/main.c xarchiver-0.5.3/src/main.c
extract[XARCHIVETYPE_RPM] = &xa_rpm_extract;
extract[XARCHIVETYPE_TAR] = extract[XARCHIVETYPE_TAR_BZ2] = extract[XARCHIVETYPE_TAR_GZ] = extract[XARCHIVETYPE_TAR_LZMA] = extract[XARCHIVETYPE_TAR_XZ] = extract[XARCHIVETYPE_TAR_LZOP] = &xa_tar_extract;
extract[XARCHIVETYPE_ZIP] = &xa_zip_extract;
-@@ -364,7 +358,6 @@
+@@ -365,7 +359,6 @@
test[XARCHIVETYPE_7ZIP] = &xa_7zip_test;
test[XARCHIVETYPE_ARJ] = &xa_arj_test;
test[XARCHIVETYPE_DEB] = test[XARCHIVETYPE_BZIP2] = test[XARCHIVETYPE_GZIP] = test[XARCHIVETYPE_LZMA] = test[XARCHIVETYPE_XZ] = test[XARCHIVETYPE_LZOP] = &xa_tar_test;
@@ -271,7 +271,7 @@ diff -Nur xarchiver-0.5.3.orig/src/main.c xarchiver-0.5.3/src/main.c
test[XARCHIVETYPE_RPM] = 0;
test[XARCHIVETYPE_TAR] = test[XARCHIVETYPE_TAR_BZ2] = test[XARCHIVETYPE_TAR_GZ] = test[XARCHIVETYPE_TAR_LZMA] = test[XARCHIVETYPE_TAR_XZ] = test[XARCHIVETYPE_TAR_LZOP] = &xa_tar_test;
test[XARCHIVETYPE_ZIP] = &xa_zip_test;
-@@ -435,39 +428,6 @@
+@@ -436,39 +429,6 @@
//ArchiveSuffix = g_list_append(ArchiveSuffix, "");
}
@@ -385,9 +385,9 @@ diff -Nur xarchiver-0.5.3.orig/src/pref_dialog.c xarchiver-0.5.3/src/pref_dialog
else
gtk_combo_box_append_text (GTK_COMBO_BOX (prefs_data->combo_prefered_format),archive_type->data );
next:
-diff -Nur xarchiver-0.5.3.orig/src/window.c xarchiver-0.5.3/src/window.c
---- xarchiver-0.5.3.orig/src/window.c 2014-02-09 13:49:07.000000000 -0200
-+++ xarchiver-0.5.3/src/window.c 2014-05-05 17:19:54.769288791 -0300
+diff -Nur xarchiver-0.5.4.orig/src/window.c xarchiver-0.5.4/src/window.c
+--- xarchiver-0.5.4.orig/src/window.c 2014-09-30 16:21:18.428751931 -0300
++++ xarchiver-0.5.4/src/window.c 2014-09-30 16:36:11.114336732 -0300
@@ -26,7 +26,6 @@
extern GList *ArchiveType;
@@ -436,8 +436,8 @@ diff -Nur xarchiver-0.5.3.orig/src/window.c xarchiver-0.5.3/src/window.c
void xa_about (GtkMenuItem *menuitem,gpointer user_data)
{
static GtkWidget *about = NULL;
-- const char *authors[] = {"Main developer:\nGiuseppe Torelli <colossus73@gmail.com>\n\nArchive navigation code:\nJohn Berthels\n\nCode fixing:\nEnrico Tröger\n\nLHA and DEB support:\nŁukasz Zemczak <sil2100@vexillium.org>\n\nLZMA support:\nThomas Dy <dysprosium66@gmail.com>\n\nLZOP support:\nKevin Day\n\nRAR5, XZ, TAR.XZ support:\nFrederick GUERIN <fguerin01@gmail.com>\n",NULL};
-+ const char *authors[] = {"Main developer:\nGiuseppe Torelli <colossus73@gmail.com>\n\nArchive navigation code:\nJohn Berthels\n\nCode fixing:\nEnrico Tröger\n\nLHA and DEB support:\nŁukasz Zemczak <sil2100@vexillium.org>\n\nLZMA support:\nThomas Dy <dysprosium66@gmail.com>\n\nLZOP support:\nKevin Day\n\nXZ, TAR.XZ support:\nFrederick GUERIN <fguerin01@gmail.com>\n",NULL};
+- const char *authors[] = {"Main developer:\nGiuseppe Torelli <colossus73@gmail.com>\n\nArchive navigation code:\nJohn Berthels\n\nLHA and DEB support:\nŁukasz Zemczak <sil2100@vexillium.org>\n\nLZMA support:\nThomas Dy <dysprosium66@gmail.com>\n\nLZOP support:\nKevin Day\n\nRAR5, XZ, TAR.XZ support:\nFrederick GUERIN <fguerin01@gmail.com>\n",NULL};
++ const char *authors[] = {"Main developer:\nGiuseppe Torelli <colossus73@gmail.com>\n\nArchive navigation code:\nJohn Berthels\n\nLHA and DEB support:\nŁukasz Zemczak <sil2100@vexillium.org>\n\nLZMA support:\nThomas Dy <dysprosium66@gmail.com>\n\nLZOP support:\nKevin Day\n\nXZ, TAR.XZ support:\nFrederick GUERIN <fguerin01@gmail.com>\n",NULL};
const char *documenters[] = {"Special thanks to Bjoern Martensen for\nbugs hunting and Xarchiver Tango logo.\n\nThanks to:\nBenedikt Meurer\nStephan Arts\nBruno Jesus <00cpxxx@gmail.com>\nUracile for the stunning logo\n",NULL};
if (about == NULL)
diff --git a/libre/xarchiver/xarchiver-0.5.3-fix-double-escaping.patch b/libre/xarchiver/xarchiver-0.5.3-fix-double-escaping.patch
deleted file mode 100644
index 8b44d91a0..000000000
--- a/libre/xarchiver/xarchiver-0.5.3-fix-double-escaping.patch
+++ /dev/null
@@ -1,32 +0,0 @@
-From: =?UTF-8?q?Guido=20Berh=C3=B6rster?= <gber@opensuse.org>
-Date: Sat, 19 Jan 2013 09:27:36 +0100
-Subject: fix-double-escaping
-
-Do not escape file names twice. Fixes an error when trying to create archives
-with spaces.
-
-Bug: http://bugs.debian.org/697493.
----
- src/main.c | 4 ++--
- 1 file changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/src/main.c b/src/main.c
-index a13d737..a6a7f93 100644
---- a/src/main.c
-+++ b/src/main.c
-@@ -208,13 +208,13 @@ int main (int argc, char **argv)
- g_free(_current_dir);
- GSList *files = NULL;
- _current_dir = g_path_get_basename(add_files);
-- files = g_slist_append(files,xa_escape_filename(_current_dir,"$'`\"\\!?* ()[]&|:;<>#"));
-+ files = g_slist_append(files,g_strdup(_current_dir));
- g_free(_current_dir);
- g_free(add_files);
- for (x = 1; x< argc; x++)
- {
- _current_dir = g_path_get_basename(argv[x]);
-- files = g_slist_append(files,xa_escape_filename(_current_dir,"$'`\"\\!?* ()[]&|:;<>#"));
-+ files = g_slist_append(files,g_strdup(_current_dir));
- g_free (_current_dir);
- }
- xa_execute_add_commands(archive,files,NULL);
generated by cgit v1.2.3 (git 2.39.1) at 2024-11-22 06:57:54 +0000