[arch-commits] Commit in file-roller/trunk (PKGBUILD rar1.patch rar2.patch)

Jan de Groot jgc at archlinux.org
Fri Jul 3 10:15:03 UTC 2015


    Date: Friday, July 3, 2015 @ 12:15:03
  Author: jgc
Revision: 241740

upgpkg: file-roller 3.16.3-1

Modified:
  file-roller/trunk/PKGBUILD
Deleted:
  file-roller/trunk/rar1.patch
  file-roller/trunk/rar2.patch

------------+
 PKGBUILD   |   23 +++++++----------------
 rar1.patch |   47 -----------------------------------------------
 rar2.patch |   22 ----------------------
 3 files changed, 7 insertions(+), 85 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2015-07-03 09:02:11 UTC (rev 241739)
+++ PKGBUILD	2015-07-03 10:15:03 UTC (rev 241740)
@@ -3,15 +3,15 @@
 # Contributor: Jan de Groot <jgc at archlinux.org>
 
 pkgname=file-roller
-pkgver=3.16.2
-pkgrel=2
+pkgver=3.16.3
+pkgrel=1
 pkgdesc="Create and modify archives"
 arch=('i686' 'x86_64')
 license=('GPL')
-depends=('desktop-file-utils' 'gtk3' 'hicolor-icon-theme' 'dconf' 'libarchive' 'file' 'json-glib' 'libnotify' 'p7zip'
-         'zip' 'unzip')
+depends=('desktop-file-utils' 'gtk3' 'hicolor-icon-theme' 'dconf' 'libarchive' 'file' 'json-glib' 'libnotify' 'zip' 'unzip')
 makedepends=('intltool' 'pkg-config' 'libnautilus-extension' 'itstool' 'docbook-xsl')
-optdepends=('unrar: better RAR archive support'
+optdepends=('p7zip: 7z, arj, exe and encrypted zip files support'
+            'unrar: better RAR archive support'
             'unace: ACE archive support'
             'lrzip: lrzip archive support'
             'cdrkit: ISO image support')
@@ -19,18 +19,9 @@
 options=('!emptydirs')
 install=file-roller.install
 url="http://www.gnome.org"
-source=(http://ftp.gnome.org/pub/gnome/sources/$pkgname/${pkgver:0:4}/$pkgname-$pkgver.tar.xz
-        rar1.patch rar2.patch)
-sha256sums=('60897ff24d4822395a227b62811c3b8768b701844961e93303d6d6d9463d7e3f'
-            '020a2debda885afc5748ebc3620ec9c9320f21d9caad631c8d79216b38f96d56'
-            'd92da92d64c8c35c19c17b19a7bdfe6d0a00fae28207d1681dec707e8e8dc9f9')
+source=(http://ftp.gnome.org/pub/gnome/sources/$pkgname/${pkgver:0:4}/$pkgname-$pkgver.tar.xz)
+sha256sums=('2b3a1111caba26e67b96559a3118a700dbfb6a4c6ad7ebd3e509df227995411c')
 
-prepare() {
-  cd $pkgname-$pkgver
-  patch -Np1 -i ../rar1.patch
-  patch -Np1 -i ../rar2.patch
-}
-
 build() {
   cd $pkgname-$pkgver
 

Deleted: rar1.patch
===================================================================
--- rar1.patch	2015-07-03 09:02:11 UTC (rev 241739)
+++ rar1.patch	2015-07-03 10:15:03 UTC (rev 241740)
@@ -1,47 +0,0 @@
-From 160fd2dab3977fa9fdf727cb74e6a23b8fc9d20b Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Ball=C3=B3=20Gy=C3=B6rgy?= <ballogyor at gmail.com>
-Date: Thu, 16 Apr 2015 10:34:57 +0200
-Subject: Give priority to rar and unrar that supports RAR files better
-
-rar and unrar supports the RAR5 archive format, while libarchive and p7zip not.
-
-diff --git a/src/fr-archive-libarchive.c b/src/fr-archive-libarchive.c
-index 9674098..2b70528 100644
---- a/src/fr-archive-libarchive.c
-+++ b/src/fr-archive-libarchive.c
-@@ -137,6 +137,16 @@ fr_archive_libarchive_get_capabilities (FrArchive  *archive,
- 		return capabilities;
- 	}
- 
-+	/* give priority to rar and unrar that supports RAR files better. */
-+	if ((strcmp (mime_type, "application/x-rar") == 0)
-+	    || (strcmp (mime_type, "application/x-cbr") == 0))
-+	{
-+		if (_g_program_is_available ("rar", check_command)
-+		    || _g_program_is_available ("unrar", check_command)) {
-+			return capabilities;
-+		}
-+	}
-+
- 	/* tar.lrz format requires external lrzip */
- 	if (strcmp (mime_type, "application/x-lrzip-compressed-tar") == 0) {
- 		if (!_g_program_is_available ("lrzip", check_command))
-diff --git a/src/fr-command-7z.c b/src/fr-command-7z.c
-index e6e8258..62a8fbe 100644
---- a/src/fr-command-7z.c
-+++ b/src/fr-command-7z.c
-@@ -616,7 +616,10 @@ fr_command_7z_get_capabilities (FrArchive  *archive,
- 		if (_g_mime_type_matches (mime_type, "application/x-rar")
- 		    || _g_mime_type_matches (mime_type, "application/x-cbr"))
- 		{
--			if (! check_command || g_file_test ("/usr/lib/p7zip/Codecs/Rar29.so", G_FILE_TEST_EXISTS))
-+			/* give priority to rar and unrar that supports RAR files better. */
-+			if (!_g_program_is_available ("rar", check_command)
-+			    && !_g_program_is_available ("unrar", check_command)
-+			    && g_file_test ("/usr/lib/p7zip/Codecs/Rar29.so", G_FILE_TEST_EXISTS))
- 				capabilities |= FR_ARCHIVE_CAN_READ;
- 		}
- 		else
--- 
-cgit v0.10.2
-

Deleted: rar2.patch
===================================================================
--- rar2.patch	2015-07-03 09:02:11 UTC (rev 241739)
+++ rar2.patch	2015-07-03 10:15:03 UTC (rev 241740)
@@ -1,22 +0,0 @@
-From f243fe19623b69ae628ae55cd2eabb8182fcfcef Mon Sep 17 00:00:00 2001
-From: Paolo Bacchilega <paobac at src.gnome.org>
-Date: Sun, 17 May 2015 07:35:44 +0200
-Subject: restore the original condition
-
-
-diff --git a/src/fr-command-7z.c b/src/fr-command-7z.c
-index 62a8fbe..fc33d4d 100644
---- a/src/fr-command-7z.c
-+++ b/src/fr-command-7z.c
-@@ -619,7 +619,7 @@ fr_command_7z_get_capabilities (FrArchive  *archive,
- 			/* give priority to rar and unrar that supports RAR files better. */
- 			if (!_g_program_is_available ("rar", check_command)
- 			    && !_g_program_is_available ("unrar", check_command)
--			    && g_file_test ("/usr/lib/p7zip/Codecs/Rar29.so", G_FILE_TEST_EXISTS))
-+			    && (! check_command || g_file_test ("/usr/lib/p7zip/Codecs/Rar29.so", G_FILE_TEST_EXISTS)))
- 				capabilities |= FR_ARCHIVE_CAN_READ;
- 		}
- 		else
--- 
-cgit v0.10.2
-



More information about the arch-commits mailing list