From 637edf8f0bd75fd53b869585de8710a26b7c2c8f Mon Sep 17 00:00:00 2001
From: "A. Wilcox" <AWilcox@Wilcox-Tech.com>
Date: Fri, 23 Feb 2018 14:57:29 -0600
Subject: main/libgsf: add check, modernise, fix license

---
 main/libgsf/APKBUILD | 30 +++++++++++++++---------------
 1 file changed, 15 insertions(+), 15 deletions(-)

(limited to 'main/libgsf')

diff --git a/main/libgsf/APKBUILD b/main/libgsf/APKBUILD
index 385a4a5623..97fa0872ef 100644
--- a/main/libgsf/APKBUILD
+++ b/main/libgsf/APKBUILD
@@ -1,30 +1,25 @@
 # Maintainer: Natanael Copa <ncopa@alpinelinux.org>
 pkgname=libgsf
 pkgver=1.14.42
-pkgrel=0
+pkgrel=1
 pkgdesc="The GNOME Structured File Library is a utility library for reading and writing structured file formats."
 url="https://www.gnome.org/"
 arch="all"
-license="GPL LGPL"
+license="LGPL-2.1-only"
 subpackages="$pkgname-dev $pkgname-doc $pkgname-lang"
 depends=
 depends_dev="bzip2-dev"
-makedepends="libxml2-dev glib-dev bzip2-dev intltool python2 zlib-dev"
+makedepends="libxml2-dev glib-dev bzip2-dev intltool python3 zlib-dev
+	gobject-introspection-dev"
 source="https://download.gnome.org/sources/$pkgname/1.14/$pkgname-$pkgver.tar.xz"
 
-_builddir="$srcdir/$pkgname-$pkgver"
-
 # secfixes:
 #   1.14.41-r0:
 #   - CVE-2016-9888
 
-prepare() {
-	cd "$_builddir"
-}
-
 build() {
-	cd "$_builddir"
-	sed -i -e 's/gsf-gnome//' -e 's/thumbnailer//' Makefile.* || return 1
+	cd "$builddir"
+	sed -i -e 's/gsf-gnome//' -e 's/thumbnailer//' Makefile.*
 	./configure \
 		--build=$CBUILD \
 		--host=$CHOST \
@@ -35,13 +30,18 @@ build() {
 		--disable-static \
 		--without-gnome-vfs \
 		--without-bonobo \
-		|| return 1
-	make || return 1
+		--enable-introspection
+	make
+}
+
+check() {
+	cd "$builddir"
+	make check
 }
 
 package() {
-	cd "$_builddir"
-	make DESTDIR="$pkgdir" install || return 1
+	cd "$builddir"
+	make DESTDIR="$pkgdir" install
 	rm -f "$pkgdir"/usr/share/man/man1/gsf-office-thumbnailer.1
 }
 
-- 
cgit v1.2.3