[arch-commits] Commit in engrampa/repos/community-x86_64 (4 files)

Brad Fanella cesura at archlinux.org
Sat Mar 30 01:34:34 UTC 2019


    Date: Saturday, March 30, 2019 @ 01:34:33
  Author: cesura
Revision: 446177

archrelease: copy trunk to community-x86_64

Added:
  engrampa/repos/community-x86_64/PKGBUILD
    (from rev 446176, engrampa/trunk/PKGBUILD)
  engrampa/repos/community-x86_64/fr-rpm-bsdtar.patch
    (from rev 446176, engrampa/trunk/fr-rpm-bsdtar.patch)
Deleted:
  engrampa/repos/community-x86_64/PKGBUILD
  engrampa/repos/community-x86_64/fr-rpm-bsdtar.patch

---------------------+
 PKGBUILD            |   96 ++++++++++++++++++++--------------------
 fr-rpm-bsdtar.patch |  120 +++++++++++++++++++++++++-------------------------
 2 files changed, 109 insertions(+), 107 deletions(-)

Deleted: PKGBUILD
===================================================================
--- PKGBUILD	2019-03-30 01:33:46 UTC (rev 446176)
+++ PKGBUILD	2019-03-30 01:34:33 UTC (rev 446177)
@@ -1,47 +0,0 @@
-# Maintainer: Brad Fanella <cesura at archlinux.org>
-# Contributor: Martin Wimpress <code at flexion.org>
-
-pkgname=engrampa
-pkgver=1.20.2
-pkgrel=1
-pkgdesc="Archive manipulator for MATE"
-url="https://mate-desktop.org"
-arch=('x86_64')
-license=('GPL')
-depends=('gtk3' 'gzip' 'libarchive' 'tar' 'unzip' 'zip')
-makedepends=('caja' 'intltool' 'itstool' 'python')
-optdepends=('caja: file archiver extension'
-            'p7zip: 7Z and ARJ archive support'
-            'unace: ACE archive support'
-            'unrar: RAR archive support')
-groups=('mate-extra')
-conflicts=("engrampa-gtk3")
-replaces=("engrampa-gtk3")
-source=("https://pub.mate-desktop.org/releases/${pkgver%.*}/${pkgname}-${pkgver}.tar.xz"
-        fr-rpm-bsdtar.patch)
-sha256sums=('5bb8d1467824a770b2bdfe4e8b3d0a1b0e2e6482859482ebb9863fe5da29493a'
-            'dc05c3b3fbc8242d1c85b58f756f998d644d920c8444d0872e9ffef1ce297f77')
-
-prepare() {
-    cd ${pkgname}-${pkgver}
-    # This patch 'depends' on libarchive
-    patch -Np1 -i "${srcdir}/fr-rpm-bsdtar.patch"
-}
-
-build() {
-    cd ${pkgname}-${pkgver}
-    ./configure \
-        --prefix=/usr \
-        --libexecdir=/usr/lib/${pkgname} \
-        --disable-packagekit
-
-    #https://bugzilla.gnome.org/show_bug.cgi?id=656231
-    sed -i -e 's/ -shared / -Wl,-O1,--as-needed\0/g' libtool
-
-    make
-}
-
-package() {
-    cd ${pkgname}-${pkgver}
-    make DESTDIR="${pkgdir}" install
-}

Copied: engrampa/repos/community-x86_64/PKGBUILD (from rev 446176, engrampa/trunk/PKGBUILD)
===================================================================
--- PKGBUILD	                        (rev 0)
+++ PKGBUILD	2019-03-30 01:34:33 UTC (rev 446177)
@@ -0,0 +1,49 @@
+# Maintainer: Brad Fanella <cesura at archlinux.org>
+# Contributor: Martin Wimpress <code at flexion.org>
+
+pkgname=engrampa
+pkgver=1.22.0
+pkgrel=1
+pkgdesc="Archive manipulator for MATE"
+url="https://mate-desktop.org"
+arch=('x86_64')
+license=('GPL')
+depends=('gtk3' 'gzip' 'libarchive' 'tar' 'unzip' 'zip')
+makedepends=('caja' 'intltool' 'itstool' 'python')
+optdepends=('caja: Caja support'
+	    'p7zip: 7Z and ARJ archive support'
+            'unace: ACE archive support'
+            'unrar: RAR archive support'
+	    'brotli: Brotli compression support')
+groups=('mate-extra')
+conflicts=("engrampa-gtk3")
+replaces=("engrampa-gtk3")
+source=("https://pub.mate-desktop.org/releases/${pkgver%.*}/${pkgname}-${pkgver}.tar.xz"
+        fr-rpm-bsdtar.patch)
+sha256sums=('f7b0af06ac305aff59b1078f03599b1dc0c937b01212408c3d0a6b411dbdd29b'
+            'dc05c3b3fbc8242d1c85b58f756f998d644d920c8444d0872e9ffef1ce297f77')
+
+prepare() {
+    	cd "${pkgname}-${pkgver}"
+    
+	# This patch 'depends' on libarchive
+    	patch -Np1 -i "${srcdir}/fr-rpm-bsdtar.patch"
+}
+
+build() {
+    	cd "${pkgname}-${pkgver}"
+    	./configure \
+        	--prefix=/usr \
+        	--libexecdir=/usr/lib/${pkgname} \
+        	--disable-packagekit
+
+    	#https://bugzilla.gnome.org/show_bug.cgi?id=656231
+    	sed -i -e 's/ -shared / -Wl,-O1,--as-needed\0/g' libtool
+
+    	make
+}
+
+package() {
+    	cd "${pkgname}-${pkgver}"
+    	make DESTDIR="${pkgdir}" install
+}

Deleted: fr-rpm-bsdtar.patch
===================================================================
--- fr-rpm-bsdtar.patch	2019-03-30 01:33:46 UTC (rev 446176)
+++ fr-rpm-bsdtar.patch	2019-03-30 01:34:33 UTC (rev 446177)
@@ -1,60 +0,0 @@
-This makes Engrampa use bsdtar to extract .RPM packages instead of using cpio.
-It is useful on systems that do not have cpio or RPM/YUM
-This patch was created for Arch Linux, however should work on any system that has bsdtar capable of handling cpio archives.
-
-------------------+
- rpm2cpio.c       |   2 +-
- fr-command-rpm.c |   8 ++++----
- 2 files changed, 5 insertions(+), 5 deletions(-)
-
-Index: src/commands/rpm2cpio.c
-================================
---- mate-file-archiver-1.6.0/src/commands/rpm2cpio.c 2013-03-31
-+++ mate-file-archiver-1.6.0/src/commands/rpm2cpio.c	2013-07-26
-@@ -128,7 +128,7 @@
- 		archive_command = "bzip2 -dc";
- 	fclose (stream);
- 
--	command = g_strdup_printf ("sh -c \"dd if=%s ibs=%u skip=1 2>/dev/null | %s | cpio %s\"", g_shell_quote (filename), offset, archive_command, cpio_args->str);
-+	command = g_strdup_printf ("sh -c \"dd if=%s ibs=%u skip=1 2>/dev/null | %s | bsdtar %s\"", g_shell_quote (filename), offset, archive_command, cpio_args->str);
- 
- 	return system (command);
- }
-Index: src/fr-command-rpm.c
-================================
---- mate-file-archiver-1.6.0/src/fr-command-rpm.c	2013-03-31
-+++ mate-file-archiver-1.6.0/src/fr-command-rpm.c	2013-07-26
-@@ -175,7 +175,7 @@
- 
- 	fr_process_begin_command (comm->process, "sh");
- 	fr_process_add_arg (comm->process, "-c");
--	fr_process_add_arg_concat (comm->process, PRIVEXECDIR "rpm2cpio ", comm->e_filename, " -itv", NULL);
-+	fr_process_add_arg_concat (comm->process, PRIVEXECDIR "rpm2cpio ", comm->e_filename, " -tvf -", NULL);
- 	fr_process_end_command (comm->process);
- 	fr_process_start (comm->process);
- }
-@@ -200,7 +200,7 @@
- 
- 	cmd = g_string_new (PRIVEXECDIR "rpm2cpio ");
- 	g_string_append (cmd, comm->e_filename);
--	g_string_append (cmd, " -idu ");
-+	g_string_append (cmd, " -xf - ");
- 	for (scan = file_list; scan; scan = scan->next) {
- 		char *filename = g_shell_quote (scan->data);
- 		g_string_append (cmd, filename);
-@@ -233,7 +233,7 @@
- 	FrCommandCap capabilities;
- 
- 	capabilities = FR_COMMAND_CAN_ARCHIVE_MANY_FILES;
--	if (is_program_available ("cpio", check_command))
-+	if (is_program_available ("bsdtar", check_command))
- 		capabilities |= FR_COMMAND_CAN_READ;
- 
- 	return capabilities;
-@@ -244,7 +244,7 @@
- fr_command_rpm_get_packages (FrCommand  *comm,
- 			     const char *mime_type)
- {
--	return PACKAGES ("cpio,rpm");
-+	return PACKAGES ("bsdtar,rpm");
- }

Copied: engrampa/repos/community-x86_64/fr-rpm-bsdtar.patch (from rev 446176, engrampa/trunk/fr-rpm-bsdtar.patch)
===================================================================
--- fr-rpm-bsdtar.patch	                        (rev 0)
+++ fr-rpm-bsdtar.patch	2019-03-30 01:34:33 UTC (rev 446177)
@@ -0,0 +1,60 @@
+This makes Engrampa use bsdtar to extract .RPM packages instead of using cpio.
+It is useful on systems that do not have cpio or RPM/YUM
+This patch was created for Arch Linux, however should work on any system that has bsdtar capable of handling cpio archives.
+
+------------------+
+ rpm2cpio.c       |   2 +-
+ fr-command-rpm.c |   8 ++++----
+ 2 files changed, 5 insertions(+), 5 deletions(-)
+
+Index: src/commands/rpm2cpio.c
+================================
+--- mate-file-archiver-1.6.0/src/commands/rpm2cpio.c 2013-03-31
++++ mate-file-archiver-1.6.0/src/commands/rpm2cpio.c	2013-07-26
+@@ -128,7 +128,7 @@
+ 		archive_command = "bzip2 -dc";
+ 	fclose (stream);
+ 
+-	command = g_strdup_printf ("sh -c \"dd if=%s ibs=%u skip=1 2>/dev/null | %s | cpio %s\"", g_shell_quote (filename), offset, archive_command, cpio_args->str);
++	command = g_strdup_printf ("sh -c \"dd if=%s ibs=%u skip=1 2>/dev/null | %s | bsdtar %s\"", g_shell_quote (filename), offset, archive_command, cpio_args->str);
+ 
+ 	return system (command);
+ }
+Index: src/fr-command-rpm.c
+================================
+--- mate-file-archiver-1.6.0/src/fr-command-rpm.c	2013-03-31
++++ mate-file-archiver-1.6.0/src/fr-command-rpm.c	2013-07-26
+@@ -175,7 +175,7 @@
+ 
+ 	fr_process_begin_command (comm->process, "sh");
+ 	fr_process_add_arg (comm->process, "-c");
+-	fr_process_add_arg_concat (comm->process, PRIVEXECDIR "rpm2cpio ", comm->e_filename, " -itv", NULL);
++	fr_process_add_arg_concat (comm->process, PRIVEXECDIR "rpm2cpio ", comm->e_filename, " -tvf -", NULL);
+ 	fr_process_end_command (comm->process);
+ 	fr_process_start (comm->process);
+ }
+@@ -200,7 +200,7 @@
+ 
+ 	cmd = g_string_new (PRIVEXECDIR "rpm2cpio ");
+ 	g_string_append (cmd, comm->e_filename);
+-	g_string_append (cmd, " -idu ");
++	g_string_append (cmd, " -xf - ");
+ 	for (scan = file_list; scan; scan = scan->next) {
+ 		char *filename = g_shell_quote (scan->data);
+ 		g_string_append (cmd, filename);
+@@ -233,7 +233,7 @@
+ 	FrCommandCap capabilities;
+ 
+ 	capabilities = FR_COMMAND_CAN_ARCHIVE_MANY_FILES;
+-	if (is_program_available ("cpio", check_command))
++	if (is_program_available ("bsdtar", check_command))
+ 		capabilities |= FR_COMMAND_CAN_READ;
+ 
+ 	return capabilities;
+@@ -244,7 +244,7 @@
+ fr_command_rpm_get_packages (FrCommand  *comm,
+ 			     const char *mime_type)
+ {
+-	return PACKAGES ("cpio,rpm");
++	return PACKAGES ("bsdtar,rpm");
+ }


More information about the arch-commits mailing list