From 3fe6bf52db8e4714f64bcf7230372ef5f86c84cc Mon Sep 17 00:00:00 2001 From: André Fabian Silva Delgado Date: Mon, 26 Sep 2016 12:15:48 -0300 Subject: engrampa-1.16.0-2.parabola1: updating version --- libre/engrampa-gtk3/PKGBUILD | 47 -------------------------- libre/engrampa-gtk3/fr-rpm-bsdtar.patch | 60 --------------------------------- libre/engrampa/PKGBUILD | 36 ++++++++++---------- 3 files changed, 17 insertions(+), 126 deletions(-) delete mode 100644 libre/engrampa-gtk3/PKGBUILD delete mode 100644 libre/engrampa-gtk3/fr-rpm-bsdtar.patch (limited to 'libre') diff --git a/libre/engrampa-gtk3/PKGBUILD b/libre/engrampa-gtk3/PKGBUILD deleted file mode 100644 index d50d6b60c..000000000 --- a/libre/engrampa-gtk3/PKGBUILD +++ /dev/null @@ -1,47 +0,0 @@ -# Contributor (Arch): Martin Wimpress -# Maintainer: André Silva - -_ver=1.14 -_pkgbase=engrampa -pkgname=(${_pkgbase}-gtk3) -pkgver=${_ver}.1 -pkgrel=1.parabola1 -pkgdesc="Archive manipulator for MATE (GTK3 version), without nonfree unace and unrar recommendation" -url="http://mate-desktop.org" -arch=('i686' 'x86_64' 'armv7h') -license=('GPL') -depends=('gtk3' 'gzip' 'libarchive' 'tar' 'unzip' 'zip') -makedepends=('caja-gtk3' 'intltool' 'itstool') -optdepends=('caja-gtk3: file archiver extension' - 'p7zip: 7Z and ARJ archive support') -groups=('mate-extra-gtk3') -conflicts=("${_pkgbase}") -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=3.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 -} diff --git a/libre/engrampa-gtk3/fr-rpm-bsdtar.patch b/libre/engrampa-gtk3/fr-rpm-bsdtar.patch deleted file mode 100644 index 93a783176..000000000 --- a/libre/engrampa-gtk3/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"); - } diff --git a/libre/engrampa/PKGBUILD b/libre/engrampa/PKGBUILD index c4cad14a9..eb1350791 100644 --- a/libre/engrampa/PKGBUILD +++ b/libre/engrampa/PKGBUILD @@ -1,39 +1,37 @@ # Contributor (Arch): Martin Wimpress # Maintainer: André Silva -_ver=1.14 -_pkgbase=engrampa -pkgname=(${_pkgbase}) -pkgver=${_ver}.1 -pkgrel=1.parabola1 -pkgdesc="Archive manipulator for MATE (GTK2 version), without nonfree unace and unrar recommendation" +_ver=1.16 +pkgname=engrampa +pkgver=${_ver}.0 +pkgrel=2.parabola1 +pkgdesc="Archive manipulator for MATE, without nonfree unace and unrar recommendation" url="http://mate-desktop.org" arch=('i686' 'x86_64' 'armv7h') license=('GPL') -depends=('gtk2' 'gzip' 'libarchive' 'tar' 'unzip' 'zip') -makedepends=('caja>=1.12' 'mate-common' 'yelp-tools') -optdepends=('caja: file archiver extension' +depends=('gtk3' 'gzip' 'libarchive' 'tar' 'unzip' 'zip') +makedepends=('caja-gtk3' 'intltool' 'itstool') +optdepends=('caja-gtk3: file archiver extension' 'p7zip: 7Z and ARJ archive support') -groups=('mate-extra') -conflicts=("${_pkgbase}-gtk3" "${_pkgbase}-libre" "${_pkgbase}-parabola") -replaces=("${_pkgbase}-libre" "${_pkgbase}-parabola") -source=("http://pub.mate-desktop.org/releases/${_ver}/${_pkgbase}-${pkgver}.tar.xz" +groups=('mate-extra' 'mate-extra-gtk3') +conflicts=("engrampa-gtk3") +replaces=("engrampa-gtk3") +source=("http://pub.mate-desktop.org/releases/${_ver}/${pkgname}-${pkgver}.tar.xz" fr-rpm-bsdtar.patch) -sha1sums=('1245f5203b37b842cfaf818781b17cd22f1234b1' +sha1sums=('90865e0c59bec33ed899c3a0a8d2787aa09d526b' '219b05a979bf6f249aaae27964f02345fd81168d') prepare() { - cd "${srcdir}/${_pkgbase}-${pkgver}" + cd ${pkgname}-${pkgver} # This patch 'depends' on libarchive patch -Np1 -i "${srcdir}/fr-rpm-bsdtar.patch" } build() { - cd "${srcdir}/${_pkgbase}-${pkgver}" + cd ${pkgname}-${pkgver} ./configure \ --prefix=/usr \ - --libexecdir=/usr/lib/${_pkgbase} \ - --with-gtk=2.0 \ + --libexecdir=/usr/lib/${pkgname} \ --disable-packagekit #https://bugzilla.gnome.org/show_bug.cgi?id=656231 @@ -43,6 +41,6 @@ build() { } package() { - cd "${srcdir}/${_pkgbase}-${pkgver}" + cd ${pkgname}-${pkgver} make DESTDIR="${pkgdir}" install } -- cgit v1.2.3