From 47404d5ed14719d8b0be17ea01aa72a2597e58fe Mon Sep 17 00:00:00 2001 From: André Fabian Silva Delgado Date: Tue, 9 Jun 2015 23:45:08 -0300 Subject: atril-1.10.0-1.parabola1: updating version --- libre/atril/PKGBUILD | 45 +++++++++------------- libre/atril/libarchive.patch | 91 -------------------------------------------- 2 files changed, 18 insertions(+), 118 deletions(-) delete mode 100644 libre/atril/libarchive.patch (limited to 'libre') diff --git a/libre/atril/PKGBUILD b/libre/atril/PKGBUILD index 1864baa18..a0a188c9a 100644 --- a/libre/atril/PKGBUILD +++ b/libre/atril/PKGBUILD @@ -1,50 +1,41 @@ -# $Id: PKGBUILD 120642 2014-10-14 14:16:49Z flexiondotorg $ # Maintainer (Arch): Martin Wimpress # Maintainer: André Silva -pkgname=atril -pkgver=1.8.1 -pkgrel=2.parabola1 -pkgdesc="Simply a document viewer, with libarchive support" +_ver=1.10 +_pkgbase=atril +pkgname=(${_pkgbase}) +pkgver=${_ver}.0 +pkgrel=1.parabola1 +pkgdesc="MATE document viewer (GTK2 version), with libarchive support for compressed comic books" url="http://mate-desktop.org" arch=('i686' 'x86_64' 'mips64el') license=('GPL') depends=('dconf' 'dbus' 'desktop-file-utils' 'gtk2' 'libsecret' 'libsm' 'libspectre' - 'mate-desktop' 'mate-icon-theme' 'poppler-glib' 'zlib') -makedepends=('caja' 'djvulibre' 'gobject-introspection' 'libgxps' 'mate-common' - 'perl-xml-parser' 'texlive-bin' 'yelp-tools') + 'mate-desktop>=1.10' 'mate-icon-theme' 'poppler-glib' 'webkitgtk2' 'zlib' 'libarchive') +makedepends=('caja>=1.10' 'djvulibre' 'gobject-introspection' 'libgxps' + 'mate-common' 'texlive-bin' 'yelp-tools') optdepends=('caja: Document Properties extension' 'djvulibre: DjVu support' 'libgxps: XPS support' - 'p7zip: cbz and cb7 compressed comic books' 'texlive-bin: DVI support' - 'libarchive: cbr compressed comic books' 'yelp: for reading MATE help documents') -replaces=('mate-document-viewer' "$pkgname-libre") -provides=('mate-document-viewer') -conflicts=('mate-document-viewer' "$pkgname-libre") groups=('mate-extra') -source=("http://pub.mate-desktop.org/releases/1.8/${pkgname}-${pkgver}.tar.xz" - 'libarchive.patch') -sha1sums=('2051be961a84d118ad0a278ec22bf48ca5d3fc35' - 'e88168d61b18ce8e340ef3db9c6df6bb66c65d14') -install=${pkgname}.install - -prepare() { - cd "${srcdir}/${pkgname}-${pkgver}" - patch -Np1 -i ../libarchive.patch - NOCONFIGURE=1 ./autogen.sh -} +conflicts=("${_pkgbase}-gtk3" "${_pkgbase}-libre") +replaces=("${_pkgbase}-libre") +source=("http://pub.mate-desktop.org/releases/${_ver}/${_pkgbase}-${pkgver}.tar.xz") +sha1sums=('7abd5b9310d88cb5da05248f1c55bb9ac069ac28') +install=${_pkgbase}.install build() { - cd "${srcdir}/${pkgname}-${pkgver}" + cd "${srcdir}/${_pkgbase}-${pkgver}" ./configure \ --prefix=/usr \ - --libexecdir=/usr/lib/${pkgname} \ + --libexecdir=/usr/lib/${_pkgbase} \ --with-gtk=2.0 \ --enable-gtk-doc \ --enable-djvu \ --enable-dvi \ + --enable-epub \ --enable-t1lib \ --enable-pixbuf \ --enable-comics \ @@ -55,6 +46,6 @@ build() { } package() { - cd "${srcdir}/${pkgname}-${pkgver}" + cd "${srcdir}/${_pkgbase}-${pkgver}" make DESTDIR="${pkgdir}" install } diff --git a/libre/atril/libarchive.patch b/libre/atril/libarchive.patch deleted file mode 100644 index f86908267..000000000 --- a/libre/atril/libarchive.patch +++ /dev/null @@ -1,91 +0,0 @@ -diff --git a/backend/comics/comics-document.c b/backend/comics/comics-document.c -index a135a74..380cb54 100644 ---- a/backend/comics/comics-document.c -+++ b/backend/comics/comics-document.c -@@ -54,8 +54,7 @@ - - typedef enum - { -- RARLABS, -- GNAUNRAR, -+ LIBARCHIVE, - UNZIP, - P7ZIP, - TAR -@@ -107,11 +106,8 @@ typedef struct { - } ComicBookDecompressCommand; - - static const ComicBookDecompressCommand command_usage_def[] = { -- /* RARLABS unrar */ -- {"%s p -c- -ierr --", "%s vb -c- -- %s", NULL , FALSE, NO_OFFSET}, -- -- /* GNA! unrar */ -- {NULL , "%s t %s" , "%s -xf %s %s" , FALSE, NO_OFFSET}, -+ /* libarchive */ -+ {NULL , "%s tf %s" , "%s xf %s %s" , FALSE, NO_OFFSET}, - - /* unzip */ - {"%s -p -C --" , "%s %s" , NULL , TRUE , OFFSET_ZIP}, -@@ -282,7 +278,7 @@ comics_generate_command_lines (ComicsDocument *comics_document, - if (comics_document->dir == NULL) - return FALSE; - -- /* unrar-free can't create directories, but ev_mkdtemp already created the dir */ -+ /* libarchive can't create directories on rar support, but ev_mkdtemp already created the dir */ - - comics_document->decompress_tmp = - g_strdup_printf (command_usage_def[type].decompress_tmp, -@@ -321,51 +317,10 @@ comics_check_decompress_command (gchar *mime_type, - - if (!strcmp (mime_type, "application/x-cbr") || - !strcmp (mime_type, "application/x-rar")) { -- /* The RARLAB provides a no-charge proprietary (freeware) -- * decompress-only client for Linux called unrar. Another -- * option is a GPLv2-licensed command-line tool developed by -- * the Gna! project. Confusingly enough, the free software RAR -- * decoder is also named unrar. For this reason we need to add -- * some lines for disambiguation. Sorry for the added the -- * complexity but it's life :) -- * Finally, some distributions, like Debian, rename this free -- * option as unrar-free. -- * */ -- comics_document->selected_command = -- g_find_program_in_path ("unrar"); -- if (comics_document->selected_command) { -- /* We only use std_err to avoid printing useless error -- * messages on the terminal */ -- success = -- g_spawn_command_line_sync ( -- comics_document->selected_command, -- &std_out, &std_err, -- &retval, &err); -- if (!success) { -- g_propagate_error (error, err); -- g_error_free (err); -- return FALSE; -- /* I don't check retval status because RARLAB unrar -- * doesn't have a way to return 0 without involving an -- * operation with a file*/ -- } else if (WIFEXITED (retval)) { -- if (g_strrstr (std_out,"freeware") != NULL) -- /* The RARLAB freeware client */ -- comics_document->command_usage = RARLABS; -- else -- /* The Gna! free software client */ -- comics_document->command_usage = GNAUNRAR; -- -- g_free (std_out); -- g_free (std_err); -- return TRUE; -- } -- } -- /* The Gna! free software client with Debian naming convention */ - comics_document->selected_command = -- g_find_program_in_path ("unrar-free"); -+ g_find_program_in_path ("bsdtar"); - if (comics_document->selected_command) { -- comics_document->command_usage = GNAUNRAR; -+ comics_document->command_usage = LIBARCHIVE; - return TRUE; - } - -- cgit v1.2.3