From: Paul Bredbury <brebs@sent.com>
To: alpine-aports@lists.alpinelinux.org
Cc: Paul Bredbury <brebs@sent.com>
Subject: [alpine-aports] [PATCH 14/16] community/atril: upgrade to 1.22.1
Date: Sun, 16 Jun 2019 10:34:30 +0100
Message-Id: <20190616093432.20377-14-brebs@sent.com>
In-Reply-To: <20190616093432.20377-1-brebs@sent.com>
References: <20190616093432.20377-1-brebs@sent.com>
Precedence: list
MIME-Version: 1.0
Content-Transfer-Encoding: 8bit

Add support for XPS files.

Remove patch, is applied upstream.

Remove unnecessary "cd" commands.
---
 community/atril/APKBUILD         | 19 ++++++-------------
 community/atril/install-sh.patch | 10 ----------
 2 files changed, 6 insertions(+), 23 deletions(-)
 delete mode 100644 community/atril/install-sh.patch

diff --git a/community/atril/APKBUILD b/community/atril/APKBUILD
index c54e3bd412..b50b79fb59 100644
--- a/community/atril/APKBUILD
+++ b/community/atril/APKBUILD
@@ -1,7 +1,7 @@
 # Contributor: Alan Lacerda <alacerda@alpinelinux.org>
 # Maintainer: Alan Lacerda <alacerda@alpinelinux.org>
 pkgname=atril
-pkgver=1.22.0
+pkgver=1.22.1
 pkgrel=0
 pkgdesc="A document viewer for MATE"
 url="https://github.com/mate-desktop/atril"
@@ -10,37 +10,30 @@ license="GPL-2.0-or-later"
 depends="mate-icon-theme"
 # make check is broken: https://github.com/mate-desktop/atril/issues/167
 options="!check"
-makedepends="intltool glib-dev gtk+3.0-dev  mate-desktop-dev
+makedepends="intltool glib-dev gtk+3.0-dev mate-desktop-dev
 	dconf-dev libsm-dev libsecret-dev caja-extensions-dev caja-dev
-	poppler-dev tiff-dev itstool libxml2-utils libxml2-dev python2-dev
-	libspectre-dev webkit2gtk-dev"
+	poppler-dev tiff-dev itstool libgxps-dev libxml2-utils libxml2-dev
+	libspectre-dev python2-dev webkit2gtk-dev"
 subpackages="$pkgname-dev $pkgname-doc $pkgname-lang"
-source="https://pub.mate-desktop.org/releases/${pkgver%.*}/$pkgname-$pkgver.tar.xz
-	install-sh.patch"
-
+source="https://pub.mate-desktop.org/releases/${pkgver%.*}/$pkgname-$pkgver.tar.xz"
 builddir="$srcdir/$pkgname-$pkgver"
 
 build() {
-	cd "$builddir"
 	./configure \
 		--build=$CBUILD \
 		--host=$CHOST \
 		--sysconfdir=/etc \
 		--enable-static=no \
-		--with-gtk=3.0 \
 		--prefix=/usr
 	make
 }
 
 check() {
-	cd "$builddir"
 	make check
 }
 
 package() {
-	cd "$builddir"
 	make DESTDIR="${pkgdir}" install
 }
 
-sha512sums="bf940178647c348fd78e828bcb3a55c4ff6195d4020bf198ae5ba4a96e2fe582f7e30fb9d4cde4143e82ae783358373d3a9fd68413295586da9fe1b374e2f034  atril-1.22.0.tar.xz
-2220612dcda2f992ce6e7d8225c3d012497ff297921c24d40853553783c6b0f95c8e25ab0ad3454931e6e104a9951892972c045e4b9e2672cbbe34cd5a0936f3  install-sh.patch"
+sha512sums="838ae397c868ac417c9266e4a06525d66214650cf8647e91c1472d83d50c8954f6dbb29411384892a98f0929e1fbac9947118bd0db10d50400fc0d5270a3619d  atril-1.22.1.tar.xz"
diff --git a/community/atril/install-sh.patch b/community/atril/install-sh.patch
deleted file mode 100644
index d32f681c0e..0000000000
--- a/community/atril/install-sh.patch
+++ /dev/null
@@ -1,10 +0,0 @@
-diff --git a/install-sh b/install-sh
-index defb86a..8175c64 100755
---- a/install-sh
-+++ b/install-sh
-@@ -1,4 +1,4 @@
--#!/usr/bin/sh
-+#!/bin/sh
- # install - install a program, script, or datafile
- 
- scriptversion=2018-03-11.20; # UTC
-- 
2.22.0



---
Unsubscribe:  alpine-aports+unsubscribe@lists.alpinelinux.org
Help:         alpine-aports+help@lists.alpinelinux.org
---