From ee64fe57f2fee41d5f0af229306879b4f1b0cee8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andr=C3=A9=20Fabian=20Silva=20Delgado?= Date: Tue, 26 Aug 2014 21:12:00 -0300 Subject: gloobus-preview-libre-0.4.5.290-2.1: remove unrar support from the source and patches --- .../gloobus-preview-usr-bsdtar-for-rar.patch | 64 ++++++---------------- 1 file changed, 18 insertions(+), 46 deletions(-) (limited to 'libre/gloobus-preview-libre/gloobus-preview-usr-bsdtar-for-rar.patch') 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 -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); } -- cgit v1.2.3-2-g168b