summaryrefslogtreecommitdiff
path: root/libre/gloobus-preview-libre
diff options
context:
space:
mode:
authorAndré Fabian Silva Delgado <emulatorman@parabola.nu>2014-08-26 21:12:00 -0300
committerAndré Fabian Silva Delgado <emulatorman@parabola.nu>2014-08-26 21:12:00 -0300
commitee64fe57f2fee41d5f0af229306879b4f1b0cee8 (patch)
treea02e27c1af80620c5c548d711d2192148408cdd6 /libre/gloobus-preview-libre
parentc1c3c73e24de354a1237ed4a3b23daf656db6797 (diff)
downloadabslibre-ee64fe57f2fee41d5f0af229306879b4f1b0cee8.tar.gz
abslibre-ee64fe57f2fee41d5f0af229306879b4f1b0cee8.tar.bz2
abslibre-ee64fe57f2fee41d5f0af229306879b4f1b0cee8.zip
gloobus-preview-libre-0.4.5.290-2.1: remove unrar support from the source and patches
Diffstat (limited to 'libre/gloobus-preview-libre')
-rw-r--r--libre/gloobus-preview-libre/PKGBUILD9
-rw-r--r--libre/gloobus-preview-libre/gloobus-preview-usr-bsdtar-for-rar.patch64
2 files changed, 23 insertions, 50 deletions
diff --git a/libre/gloobus-preview-libre/PKGBUILD b/libre/gloobus-preview-libre/PKGBUILD
index 1d2e51a15..8385ea8b1 100644
--- a/libre/gloobus-preview-libre/PKGBUILD
+++ b/libre/gloobus-preview-libre/PKGBUILD
@@ -1,11 +1,12 @@
# $Id: PKGBUILD 104564 2014-01-22 21:49:14Z bgyorgy $
# Maintainer (Arch): Balló György <ballogyor+arch at gmail dot com>
+# Maintainer: André Silva <emulatorman@parabola.nu>
_pkgname=gloobus-preview
pkgname=gloobus-preview-libre
pkgver=0.4.5.290
_pkgver=0.4.5-ubuntu11~ppa290
-pkgrel=2
+pkgrel=2.1
pkgdesc="Gnome application designed to enable a full screen preview of any kind of file, with libarchive support"
arch=('i686' 'x86_64' 'mips64el')
url="http://gloobus.net/"
@@ -41,7 +42,7 @@ md5sums=('27b3db2043ecaf47fa928940bbb4f32a'
'd6d9e2b3e001f0ea8440cccdf90480af'
'16e7a7d892dfde5fd40332fc41de97b0'
'7536f8fbbb2c6bbc0132a2fa25b296b7'
- 'eeab61846c861540bb16ca00fa14cdb6')
+ '25cda63ad406f00d3a7ba61ee8816b5c')
prepare() {
cd "$srcdir/$_pkgname-$_pkgver"
@@ -62,8 +63,8 @@ prepare() {
# Port gloobus-preview-configuration to pygobject3
patch -Np1 -i "$srcdir/gloobus-preview-configuration-pygobject3-port.patch"
- # Use bsdtar (libarchive) if unrar is not found.
- patch -Np0 -i "$srcdir/gloobus-preview-usr-bsdtar-for-rar.patch"
+ # Use bsdtar (libarchive) for RAR.
+ patch -Np1 -i "$srcdir/gloobus-preview-usr-bsdtar-for-rar.patch"
### Prepare gloobus-sushi
cd "$srcdir/gloobus-sushi"
diff --git a/libre/gloobus-preview-libre/gloobus-preview-usr-bsdtar-for-rar.patch b/libre/gloobus-preview-libre/gloobus-preview-usr-bsdtar-for-rar.patch
index f5b7c8e00..3db748114 100644
--- a/libre/gloobus-preview-libre/gloobus-preview-usr-bsdtar-for-rar.patch
+++ b/libre/gloobus-preview-libre/gloobus-preview-usr-bsdtar-for-rar.patch
@@ -1,57 +1,29 @@
-------------------------------------------------------------
-revno: 291
-committer: Michał Masłowski <mtjm@mtjm.eu>
-branch nick: gloobus-preview
-timestamp: Sun 2013-06-23 14:43:35 +0200
-message:
- Use bsdtar to open RAR archives if unrar is not available.
-
- Needs bsdtar from libarchive 3.0 or newer, not tested with older
- versions nor checking for them.
-diff:
-=== modified file 'src/plugin-compressed/plugin-compressed.cpp'
---- src/plugin-compressed/plugin-compressed.cpp 2012-04-06 11:25:47 +0000
-+++ src/plugin-compressed/plugin-compressed.cpp 2013-06-23 12:43:35 +0000
-@@ -52,8 +52,9 @@
- cmd_args.push_back("--");
- line_parser = &iCompressed::parse_line_7z;
- }
-- else if ( type == GP_COMPRESSED_RAR
-- || type == GP_COMPRESSED_RAR_X )
-+ else if ( (type == GP_COMPRESSED_RAR
-+ || type == GP_COMPRESSED_RAR_X)
-+ && interface::is_program_available("unrar") )
- {
- cmd_args.push_back("unrar");
- cmd_args.push_back("vb");
-@@ -70,9 +71,15 @@
- || type == GP_COMPRESSED_TAR_LZOP
- || type == GP_COMPRESSED_TAR_X
- || type == GP_COMPRESSED_TAR_XZ
-- || type == GP_COMPRESSED_TAR_Z )
-+ || type == GP_COMPRESSED_TAR_Z
-+ || type == GP_COMPRESSED_RAR
-+ || type == GP_COMPRESSED_RAR_X )
+diff -Nur gloobus-preview-0.4.5-ubuntu11~ppa290.orig/src/plugin-compressed/plugin-compressed.cpp gloobus-preview-0.4.5-ubuntu11~ppa290/src/plugin-compressed/plugin-compressed.cpp
+--- gloobus-preview-0.4.5-ubuntu11~ppa290.orig/src/plugin-compressed/plugin-compressed.cpp 2012-04-06 10:07:29.000000000 -0300
++++ gloobus-preview-0.4.5-ubuntu11~ppa290/src/plugin-compressed/plugin-compressed.cpp 2014-08-26 16:55:39.534735733 -0300
+@@ -55,11 +55,8 @@
+ else if ( type == GP_COMPRESSED_RAR
+ || type == GP_COMPRESSED_RAR_X )
{
-- cmd_args.push_back("tar");
-+ if ( type == GP_COMPRESSED_RAR
-+ || type == GP_COMPRESSED_RAR_X )
-+ cmd_args.push_back("bsdtar");
-+ else
-+ cmd_args.push_back("tar");
- cmd_args.push_back("-tf");
+- cmd_args.push_back("unrar");
+- cmd_args.push_back("vb");
+- cmd_args.push_back("-c-");
+- cmd_args.push_back("-p-"); // do not query for password
+- cmd_args.push_back("--");
++ cmd_args.push_back("bsdtar");
++ cmd_args.push_back("-tf");
line_parser = &iCompressed::parse_line_rar;
}
-
-=== modified file 'src/plugin-compressed/plugin-compressed.h'
---- src/plugin-compressed/plugin-compressed.h 2010-03-27 15:55:08 +0000
-+++ src/plugin-compressed/plugin-compressed.h 2013-06-23 12:43:35 +0000
+ else if ( type == GP_COMPRESSED_TAR
+diff -Nur gloobus-preview-0.4.5-ubuntu11~ppa290.orig/src/plugin-compressed/plugin-compressed.h gloobus-preview-0.4.5-ubuntu11~ppa290/src/plugin-compressed/plugin-compressed.h
+--- gloobus-preview-0.4.5-ubuntu11~ppa290.orig/src/plugin-compressed/plugin-compressed.h 2012-04-06 10:07:29.000000000 -0300
++++ gloobus-preview-0.4.5-ubuntu11~ppa290/src/plugin-compressed/plugin-compressed.h 2014-08-26 16:52:58.903694500 -0300
@@ -102,7 +102,7 @@
PluginManager::register_filetype(GP_COMPRESSED_7Z, 1);
}
-if(interface::is_program_available("unrar")) {
-+if(interface::is_program_available("unrar") || interface::is_program_available("bsdtar")) {
++if(interface::is_program_available("bsdtar")) {
PluginManager::register_filetype(GP_COMPRESSED_RAR, 1);
PluginManager::register_filetype(GP_COMPRESSED_RAR_X, 1);
}