[arch-commits] Commit in engrampa-gtk3/repos (12 files)

Martin Wimpress flexiondotorg at archlinux.org
Mon Oct 5 08:57:47 UTC 2015


    Date: Monday, October 5, 2015 @ 10:57:46
  Author: flexiondotorg
Revision: 142973

archrelease: copy trunk to community-i686, community-x86_64

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

--------------------------------------+
 /PKGBUILD                            |   98 ++++++++++++++++++++++++++
 /engrampa.install                    |   26 +++++++
 /fr-rpm-bsdtar.patch                 |  120 +++++++++++++++++++++++++++++++++
 community-i686/PKGBUILD              |   49 -------------
 community-i686/engrampa.install      |   13 ---
 community-i686/fr-rpm-bsdtar.patch   |   60 ----------------
 community-x86_64/PKGBUILD            |   49 -------------
 community-x86_64/engrampa.install    |   13 ---
 community-x86_64/fr-rpm-bsdtar.patch |   60 ----------------
 9 files changed, 244 insertions(+), 244 deletions(-)

Deleted: community-i686/PKGBUILD
===================================================================
--- community-i686/PKGBUILD	2015-10-05 08:57:31 UTC (rev 142972)
+++ community-i686/PKGBUILD	2015-10-05 08:57:46 UTC (rev 142973)
@@ -1,49 +0,0 @@
-# $Id$
-# Maintainer : Martin Wimpress <code at flexion.org>
-
-_ver=1.10
-_pkgbase=engrampa
-pkgname=(${_pkgbase}-gtk3)
-pkgver=${_ver}.1
-pkgrel=1
-pkgdesc="Archive manipulator for MATE (GTK3 version [EXPERIMENTAL])"
-url="http://mate-desktop.org"
-arch=('i686' 'x86_64')
-license=('GPL')
-depends=('bzip2' 'desktop-file-utils' 'gtk3' 'gzip' 'libarchive' 'tar')
-makedepends=('caja-gtk3>=1.10' 'mate-common' 'yelp-tools')
-optdepends=('caja-gtk3: file archiver extension'
-            'unrar: for RAR uncompression'
-            'zip: for ZIP archives' 'unzip: for ZIP archives'
-            'p7zip: 7zip compression utility' 'arj: for ARJ archives'
-            'unace: extraction tool for the proprietary ace archive format'
-            'yelp: for reading MATE help documents')
-groups=('mate-extra-gtk3')
-conflicts=("${_pkgbase}")
-source=("http://pub.mate-desktop.org/releases/${_ver}/${_pkgbase}-${pkgver}.tar.xz"
-        fr-rpm-bsdtar.patch)
-sha1sums=('280daa5ef6c660d1d1c5da33ee2952b12095ff08'
-          '219b05a979bf6f249aaae27964f02345fd81168d')
-install=${_pkgbase}.install
-
-prepare() {
-    cd "${srcdir}/${_pkgbase}-${pkgver}"
-    # This patch 'depends' on libarchive
-    patch -Np1 -i "${srcdir}/fr-rpm-bsdtar.patch"
-}
-
-build() {
-    cd "${srcdir}/${_pkgbase}-${pkgver}"
-    ./configure \
-        --prefix=/usr \
-        --libexecdir=/usr/lib/${_pkgbase} \
-        --with-gtk=3.0 \
-        --disable-static \
-        --disable-packagekit
-    make
-}
-
-package() {
-    cd "${srcdir}/${_pkgbase}-${pkgver}"
-    make DESTDIR="${pkgdir}" install
-}

Copied: engrampa-gtk3/repos/community-i686/PKGBUILD (from rev 142972, engrampa-gtk3/trunk/PKGBUILD)
===================================================================
--- community-i686/PKGBUILD	                        (rev 0)
+++ community-i686/PKGBUILD	2015-10-05 08:57:46 UTC (rev 142973)
@@ -0,0 +1,49 @@
+# $Id$
+# Maintainer : Martin Wimpress <code at flexion.org>
+
+_ver=1.10
+_pkgbase=engrampa
+pkgname=(${_pkgbase}-gtk3)
+pkgver=${_ver}.2
+pkgrel=1
+pkgdesc="Archive manipulator for MATE (GTK3 version [EXPERIMENTAL])"
+url="http://mate-desktop.org"
+arch=('i686' 'x86_64')
+license=('GPL')
+depends=('bzip2' 'desktop-file-utils' 'gtk3' 'gzip' 'libarchive' 'tar')
+makedepends=('caja-gtk3>=1.10' 'mate-common' 'yelp-tools')
+optdepends=('caja-gtk3: file archiver extension'
+            'unrar: for RAR uncompression'
+            'zip: for ZIP archives' 'unzip: for ZIP archives'
+            'p7zip: 7zip compression utility' 'arj: for ARJ archives'
+            'unace: extraction tool for the proprietary ace archive format'
+            'yelp: for reading MATE help documents')
+groups=('mate-extra-gtk3')
+conflicts=("${_pkgbase}")
+source=("http://pub.mate-desktop.org/releases/${_ver}/${_pkgbase}-${pkgver}.tar.xz"
+        fr-rpm-bsdtar.patch)
+sha1sums=('28321d373ebe270e4475ecb5a743d69a981a4d02'
+          '219b05a979bf6f249aaae27964f02345fd81168d')
+install=${_pkgbase}.install
+
+prepare() {
+    cd "${srcdir}/${_pkgbase}-${pkgver}"
+    # This patch 'depends' on libarchive
+    patch -Np1 -i "${srcdir}/fr-rpm-bsdtar.patch"
+}
+
+build() {
+    cd "${srcdir}/${_pkgbase}-${pkgver}"
+    ./configure \
+        --prefix=/usr \
+        --libexecdir=/usr/lib/${_pkgbase} \
+        --with-gtk=3.0 \
+        --disable-static \
+        --disable-packagekit
+    make
+}
+
+package() {
+    cd "${srcdir}/${_pkgbase}-${pkgver}"
+    make DESTDIR="${pkgdir}" install
+}

Deleted: community-i686/engrampa.install
===================================================================
--- community-i686/engrampa.install	2015-10-05 08:57:31 UTC (rev 142972)
+++ community-i686/engrampa.install	2015-10-05 08:57:46 UTC (rev 142973)
@@ -1,13 +0,0 @@
-post_install() {
-    glib-compile-schemas /usr/share/glib-2.0/schemas/
-    gtk-update-icon-cache -q -t -f /usr/share/icons/hicolor
-    update-desktop-database -q
-}
-
-post_upgrade() {
-    post_install
-}
-
-post_remove() {
-    post_install
-}

Copied: engrampa-gtk3/repos/community-i686/engrampa.install (from rev 142972, engrampa-gtk3/trunk/engrampa.install)
===================================================================
--- community-i686/engrampa.install	                        (rev 0)
+++ community-i686/engrampa.install	2015-10-05 08:57:46 UTC (rev 142973)
@@ -0,0 +1,13 @@
+post_install() {
+    glib-compile-schemas /usr/share/glib-2.0/schemas/
+    gtk-update-icon-cache -q -t -f /usr/share/icons/hicolor
+    update-desktop-database -q
+}
+
+post_upgrade() {
+    post_install
+}
+
+post_remove() {
+    post_install
+}

Deleted: community-i686/fr-rpm-bsdtar.patch
===================================================================
--- community-i686/fr-rpm-bsdtar.patch	2015-10-05 08:57:31 UTC (rev 142972)
+++ community-i686/fr-rpm-bsdtar.patch	2015-10-05 08:57:46 UTC (rev 142973)
@@ -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-gtk3/repos/community-i686/fr-rpm-bsdtar.patch (from rev 142972, engrampa-gtk3/trunk/fr-rpm-bsdtar.patch)
===================================================================
--- community-i686/fr-rpm-bsdtar.patch	                        (rev 0)
+++ community-i686/fr-rpm-bsdtar.patch	2015-10-05 08:57:46 UTC (rev 142973)
@@ -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");
+ }

Deleted: community-x86_64/PKGBUILD
===================================================================
--- community-x86_64/PKGBUILD	2015-10-05 08:57:31 UTC (rev 142972)
+++ community-x86_64/PKGBUILD	2015-10-05 08:57:46 UTC (rev 142973)
@@ -1,49 +0,0 @@
-# $Id$
-# Maintainer : Martin Wimpress <code at flexion.org>
-
-_ver=1.10
-_pkgbase=engrampa
-pkgname=(${_pkgbase}-gtk3)
-pkgver=${_ver}.1
-pkgrel=1
-pkgdesc="Archive manipulator for MATE (GTK3 version [EXPERIMENTAL])"
-url="http://mate-desktop.org"
-arch=('i686' 'x86_64')
-license=('GPL')
-depends=('bzip2' 'desktop-file-utils' 'gtk3' 'gzip' 'libarchive' 'tar')
-makedepends=('caja-gtk3>=1.10' 'mate-common' 'yelp-tools')
-optdepends=('caja-gtk3: file archiver extension'
-            'unrar: for RAR uncompression'
-            'zip: for ZIP archives' 'unzip: for ZIP archives'
-            'p7zip: 7zip compression utility' 'arj: for ARJ archives'
-            'unace: extraction tool for the proprietary ace archive format'
-            'yelp: for reading MATE help documents')
-groups=('mate-extra-gtk3')
-conflicts=("${_pkgbase}")
-source=("http://pub.mate-desktop.org/releases/${_ver}/${_pkgbase}-${pkgver}.tar.xz"
-        fr-rpm-bsdtar.patch)
-sha1sums=('280daa5ef6c660d1d1c5da33ee2952b12095ff08'
-          '219b05a979bf6f249aaae27964f02345fd81168d')
-install=${_pkgbase}.install
-
-prepare() {
-    cd "${srcdir}/${_pkgbase}-${pkgver}"
-    # This patch 'depends' on libarchive
-    patch -Np1 -i "${srcdir}/fr-rpm-bsdtar.patch"
-}
-
-build() {
-    cd "${srcdir}/${_pkgbase}-${pkgver}"
-    ./configure \
-        --prefix=/usr \
-        --libexecdir=/usr/lib/${_pkgbase} \
-        --with-gtk=3.0 \
-        --disable-static \
-        --disable-packagekit
-    make
-}
-
-package() {
-    cd "${srcdir}/${_pkgbase}-${pkgver}"
-    make DESTDIR="${pkgdir}" install
-}

Copied: engrampa-gtk3/repos/community-x86_64/PKGBUILD (from rev 142972, engrampa-gtk3/trunk/PKGBUILD)
===================================================================
--- community-x86_64/PKGBUILD	                        (rev 0)
+++ community-x86_64/PKGBUILD	2015-10-05 08:57:46 UTC (rev 142973)
@@ -0,0 +1,49 @@
+# $Id$
+# Maintainer : Martin Wimpress <code at flexion.org>
+
+_ver=1.10
+_pkgbase=engrampa
+pkgname=(${_pkgbase}-gtk3)
+pkgver=${_ver}.2
+pkgrel=1
+pkgdesc="Archive manipulator for MATE (GTK3 version [EXPERIMENTAL])"
+url="http://mate-desktop.org"
+arch=('i686' 'x86_64')
+license=('GPL')
+depends=('bzip2' 'desktop-file-utils' 'gtk3' 'gzip' 'libarchive' 'tar')
+makedepends=('caja-gtk3>=1.10' 'mate-common' 'yelp-tools')
+optdepends=('caja-gtk3: file archiver extension'
+            'unrar: for RAR uncompression'
+            'zip: for ZIP archives' 'unzip: for ZIP archives'
+            'p7zip: 7zip compression utility' 'arj: for ARJ archives'
+            'unace: extraction tool for the proprietary ace archive format'
+            'yelp: for reading MATE help documents')
+groups=('mate-extra-gtk3')
+conflicts=("${_pkgbase}")
+source=("http://pub.mate-desktop.org/releases/${_ver}/${_pkgbase}-${pkgver}.tar.xz"
+        fr-rpm-bsdtar.patch)
+sha1sums=('28321d373ebe270e4475ecb5a743d69a981a4d02'
+          '219b05a979bf6f249aaae27964f02345fd81168d')
+install=${_pkgbase}.install
+
+prepare() {
+    cd "${srcdir}/${_pkgbase}-${pkgver}"
+    # This patch 'depends' on libarchive
+    patch -Np1 -i "${srcdir}/fr-rpm-bsdtar.patch"
+}
+
+build() {
+    cd "${srcdir}/${_pkgbase}-${pkgver}"
+    ./configure \
+        --prefix=/usr \
+        --libexecdir=/usr/lib/${_pkgbase} \
+        --with-gtk=3.0 \
+        --disable-static \
+        --disable-packagekit
+    make
+}
+
+package() {
+    cd "${srcdir}/${_pkgbase}-${pkgver}"
+    make DESTDIR="${pkgdir}" install
+}

Deleted: community-x86_64/engrampa.install
===================================================================
--- community-x86_64/engrampa.install	2015-10-05 08:57:31 UTC (rev 142972)
+++ community-x86_64/engrampa.install	2015-10-05 08:57:46 UTC (rev 142973)
@@ -1,13 +0,0 @@
-post_install() {
-    glib-compile-schemas /usr/share/glib-2.0/schemas/
-    gtk-update-icon-cache -q -t -f /usr/share/icons/hicolor
-    update-desktop-database -q
-}
-
-post_upgrade() {
-    post_install
-}
-
-post_remove() {
-    post_install
-}

Copied: engrampa-gtk3/repos/community-x86_64/engrampa.install (from rev 142972, engrampa-gtk3/trunk/engrampa.install)
===================================================================
--- community-x86_64/engrampa.install	                        (rev 0)
+++ community-x86_64/engrampa.install	2015-10-05 08:57:46 UTC (rev 142973)
@@ -0,0 +1,13 @@
+post_install() {
+    glib-compile-schemas /usr/share/glib-2.0/schemas/
+    gtk-update-icon-cache -q -t -f /usr/share/icons/hicolor
+    update-desktop-database -q
+}
+
+post_upgrade() {
+    post_install
+}
+
+post_remove() {
+    post_install
+}

Deleted: community-x86_64/fr-rpm-bsdtar.patch
===================================================================
--- community-x86_64/fr-rpm-bsdtar.patch	2015-10-05 08:57:31 UTC (rev 142972)
+++ community-x86_64/fr-rpm-bsdtar.patch	2015-10-05 08:57:46 UTC (rev 142973)
@@ -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-gtk3/repos/community-x86_64/fr-rpm-bsdtar.patch (from rev 142972, engrampa-gtk3/trunk/fr-rpm-bsdtar.patch)
===================================================================
--- community-x86_64/fr-rpm-bsdtar.patch	                        (rev 0)
+++ community-x86_64/fr-rpm-bsdtar.patch	2015-10-05 08:57:46 UTC (rev 142973)
@@ -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