diff options
Diffstat (limited to 'libre/engrampa')
| -rw-r--r-- | libre/engrampa/PKGBUILD | 44 | ||||
| -rw-r--r-- | libre/engrampa/fr-rpm-bsdtar.patch | 60 |
2 files changed, 18 insertions, 86 deletions
diff --git a/libre/engrampa/PKGBUILD b/libre/engrampa/PKGBUILD index 69eb417fe..30ddc5282 100644 --- a/libre/engrampa/PKGBUILD +++ b/libre/engrampa/PKGBUILD @@ -1,9 +1,10 @@ +# Maintainer (Arch): Brad Fanella <cesura@archlinux.org> # Contributor (Arch): Martin Wimpress <code@flexion.org> # Maintainer (Hyperbola): André Silva <emulatorman@hyperbola.info> # Maintainer: Omar Vega Ramos <ovruni@gnu.org.pe> pkgname=engrampa -pkgver=1.22.2 +pkgver=1.24.0 pkgrel=1 pkgrel+=.parabola1 pkgdesc="Archive manipulator for MATE" @@ -12,40 +13,31 @@ url="https://mate-desktop.org" arch=('x86_64') arch+=('i686' 'armv7h') license=('GPL') -depends=('gtk3' 'gzip' 'libarchive' 'tar' 'unzip' 'zip') -makedepends=('caja' 'intltool' 'itstool' 'python') +depends=('gtk3' 'gzip' 'gettext' 'libarchive' 'tar' 'unzip' 'zip') +makedepends=('caja' 'itstool' 'python') optdepends=('caja: Caja support' - 'p7zip: 7Z and ARJ archive support' - 'brotli: Brotli compression support') + 'p7zip: 7Z and ARJ 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=('ed21d1ceafbbe31e35c9225f0dc6a451ae2f8aff454bacef60df5a31e6b3075e' - 'dc05c3b3fbc8242d1c85b58f756f998d644d920c8444d0872e9ffef1ce297f77') - -prepare() { - cd "${pkgname}-${pkgver}" - - # This patch 'depends' on libarchive - patch -Np1 -i "${srcdir}/fr-rpm-bsdtar.patch" -} +source=("https://pub.mate-desktop.org/releases/${pkgver%.*}/${pkgname}-${pkgver}.tar.xz") +sha256sums=('d415f486edc9a5474024b3928ff1127ba4534a703a60993a3912fffcf0988a8d') build() { - cd "${pkgname}-${pkgver}" - ./configure \ - --prefix=/usr \ - --libexecdir=/usr/lib/${pkgname} \ - --disable-packagekit + 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 + #https://bugzilla.gnome.org/show_bug.cgi?id=656231 + sed -i -e 's/ -shared / -Wl,-O1,--as-needed\0/g' libtool - make + make } package() { - cd "${pkgname}-${pkgver}" - make DESTDIR="${pkgdir}" install + cd "${pkgname}-${pkgver}" + make DESTDIR="${pkgdir}" install } diff --git a/libre/engrampa/fr-rpm-bsdtar.patch b/libre/engrampa/fr-rpm-bsdtar.patch deleted file mode 100644 index 93a783176..000000000 --- a/libre/engrampa/fr-rpm-bsdtar.patch +++ /dev/null @@ -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"); - } |