[arch-commits] Commit in engrampa/repos (6 files)
Balló György
bgyorgy at archlinux.org
Sun Aug 7 08:25:09 UTC 2016
Date: Sunday, August 7, 2016 @ 08:25:08
Author: bgyorgy
Revision: 185746
archrelease: copy trunk to community-staging-i686, community-staging-x86_64
Added:
engrampa/repos/community-staging-i686/
engrampa/repos/community-staging-i686/PKGBUILD
(from rev 185745, engrampa/trunk/PKGBUILD)
engrampa/repos/community-staging-i686/fr-rpm-bsdtar.patch
(from rev 185745, engrampa/trunk/fr-rpm-bsdtar.patch)
engrampa/repos/community-staging-x86_64/
engrampa/repos/community-staging-x86_64/PKGBUILD
(from rev 185745, engrampa/trunk/PKGBUILD)
engrampa/repos/community-staging-x86_64/fr-rpm-bsdtar.patch
(from rev 185745, engrampa/trunk/fr-rpm-bsdtar.patch)
----------------------------------------------+
community-staging-i686/PKGBUILD | 48 ++++++++++++++++++++
community-staging-i686/fr-rpm-bsdtar.patch | 60 +++++++++++++++++++++++++
community-staging-x86_64/PKGBUILD | 48 ++++++++++++++++++++
community-staging-x86_64/fr-rpm-bsdtar.patch | 60 +++++++++++++++++++++++++
4 files changed, 216 insertions(+)
Copied: engrampa/repos/community-staging-i686/PKGBUILD (from rev 185745, engrampa/trunk/PKGBUILD)
===================================================================
--- community-staging-i686/PKGBUILD (rev 0)
+++ community-staging-i686/PKGBUILD 2016-08-07 08:25:08 UTC (rev 185746)
@@ -0,0 +1,48 @@
+# Contributor: Martin Wimpress <code at flexion.org>
+
+_ver=1.14
+_pkgbase=engrampa
+pkgname=(${_pkgbase})
+pkgver=${_ver}.1
+pkgrel=1
+pkgdesc="Archive manipulator for MATE (GTK2 version)"
+url="http://mate-desktop.org"
+arch=('i686' 'x86_64')
+license=('GPL')
+depends=('gtk2' 'gzip' 'libarchive' 'tar' 'unzip' 'zip')
+makedepends=('caja' 'intltool' 'itstool')
+optdepends=('caja: file archiver extension'
+ 'p7zip: 7Z and ARJ archive support'
+ 'unace: ACE archive support'
+ 'unrar: RAR archive support')
+groups=('mate-extra')
+conflicts=("${_pkgbase}-gtk3")
+source=("http://pub.mate-desktop.org/releases/${_ver}/${_pkgbase}-${pkgver}.tar.xz"
+ fr-rpm-bsdtar.patch)
+sha1sums=('1245f5203b37b842cfaf818781b17cd22f1234b1'
+ '219b05a979bf6f249aaae27964f02345fd81168d')
+
+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=2.0 \
+ --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 "${srcdir}/${_pkgbase}-${pkgver}"
+ make DESTDIR="${pkgdir}" install
+}
Copied: engrampa/repos/community-staging-i686/fr-rpm-bsdtar.patch (from rev 185745, engrampa/trunk/fr-rpm-bsdtar.patch)
===================================================================
--- community-staging-i686/fr-rpm-bsdtar.patch (rev 0)
+++ community-staging-i686/fr-rpm-bsdtar.patch 2016-08-07 08:25:08 UTC (rev 185746)
@@ -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");
+ }
Copied: engrampa/repos/community-staging-x86_64/PKGBUILD (from rev 185745, engrampa/trunk/PKGBUILD)
===================================================================
--- community-staging-x86_64/PKGBUILD (rev 0)
+++ community-staging-x86_64/PKGBUILD 2016-08-07 08:25:08 UTC (rev 185746)
@@ -0,0 +1,48 @@
+# Contributor: Martin Wimpress <code at flexion.org>
+
+_ver=1.14
+_pkgbase=engrampa
+pkgname=(${_pkgbase})
+pkgver=${_ver}.1
+pkgrel=1
+pkgdesc="Archive manipulator for MATE (GTK2 version)"
+url="http://mate-desktop.org"
+arch=('i686' 'x86_64')
+license=('GPL')
+depends=('gtk2' 'gzip' 'libarchive' 'tar' 'unzip' 'zip')
+makedepends=('caja' 'intltool' 'itstool')
+optdepends=('caja: file archiver extension'
+ 'p7zip: 7Z and ARJ archive support'
+ 'unace: ACE archive support'
+ 'unrar: RAR archive support')
+groups=('mate-extra')
+conflicts=("${_pkgbase}-gtk3")
+source=("http://pub.mate-desktop.org/releases/${_ver}/${_pkgbase}-${pkgver}.tar.xz"
+ fr-rpm-bsdtar.patch)
+sha1sums=('1245f5203b37b842cfaf818781b17cd22f1234b1'
+ '219b05a979bf6f249aaae27964f02345fd81168d')
+
+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=2.0 \
+ --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 "${srcdir}/${_pkgbase}-${pkgver}"
+ make DESTDIR="${pkgdir}" install
+}
Copied: engrampa/repos/community-staging-x86_64/fr-rpm-bsdtar.patch (from rev 185745, engrampa/trunk/fr-rpm-bsdtar.patch)
===================================================================
--- community-staging-x86_64/fr-rpm-bsdtar.patch (rev 0)
+++ community-staging-x86_64/fr-rpm-bsdtar.patch 2016-08-07 08:25:08 UTC (rev 185746)
@@ -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