aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorA. Wilcox <AWilcox@Wilcox-Tech.com>2018-02-10 13:39:46 -0600
committerWilliam Pitcock <nenolod@dereferenced.org>2018-02-12 14:56:58 +0000
commit4307ea6f79a360536438ab97bab081742b1866a0 (patch)
treed5a9cbfe5bc64b74100310506a2407ba114686ba
parent76e055f5b82a40158413d776c8466fd32c556b67 (diff)
downloadaports-4307ea6f79a360536438ab97bab081742b1866a0.tar.bz2
aports-4307ea6f79a360536438ab97bab081742b1866a0.tar.xz
main/rarian: modernise, fix license, repatch
-rw-r--r--main/rarian/APKBUILD26
-rw-r--r--main/rarian/user-segfault.patch4
2 files changed, 14 insertions, 16 deletions
diff --git a/main/rarian/APKBUILD b/main/rarian/APKBUILD
index 23a4e6fdf9..d41be593fc 100644
--- a/main/rarian/APKBUILD
+++ b/main/rarian/APKBUILD
@@ -1,27 +1,26 @@
# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
pkgname=rarian
pkgver=0.8.1
-pkgrel=6
+pkgrel=7
pkgdesc="Documentation meta-data library, designed as a replacement for Scrollkeeper."
url="https://rarian.freedesktop.org/"
arch="all"
-license="GPL"
+options="!check" # No test suite.
+license="GPL-2.0+, LGPL-2.1+, Zlib"
subpackages="$pkgname-dev"
depends="bash"
makedepends="libxslt-dev"
source="https://download.gnome.org/sources/$pkgname/0.8/$pkgname-$pkgver.tar.bz2
user-segfault.patch"
-_builddir=""$srcdir/$pkgname-$pkgver""
-
prepare() {
- cd "$_builddir"
- update_config_sub || return 1
- patch -p0 -i "$srcdir"/user-segfault.patch || return 1
+ cd "$builddir"
+ update_config_sub
+ default_prepare
}
build() {
- cd "$_builddir"
+ cd "$builddir"
./configure \
--build=$CBUILD \
--host=$CHOST \
@@ -29,15 +28,14 @@ build() {
--sysconfdir=/etc \
--localstatedir=/var \
--enable-scrollkeeper-compat \
- --disable-static \
- || return 1
- make || return 1
+ --disable-static
+ make
}
package() {
- cd "$srcdir"/$pkgname-$pkgver
- make -j1 DESTDIR="$pkgdir" install || return 1
+ cd "$builddir"
+ make -j1 DESTDIR="$pkgdir" install
}
sha512sums="64f3e7fbe423e45a59453805fe6b4116e0ffad43c7e88fe362d76a326c70936c6b46c4a4dc57cf43e3535c16f2f07fa1b2affa0aaeae637ee3ede48850c1fc60 rarian-0.8.1.tar.bz2
-e4644e1cf6ad8de28bde163604b073b1366c8b35fa65873a91d38770dd0cadf4322797e85e5ccfcfd9d1fccce6a72c45d8b189328077b7400a24e5103677b939 user-segfault.patch"
+d5aa41c69e1ba43850e58914526b2f93377a7f293729dc6fb39a9daa7321a70e9eb5c417ec8705618dfd69628efc86776e425eed55ceae4a003a8cd074592166 user-segfault.patch"
diff --git a/main/rarian/user-segfault.patch b/main/rarian/user-segfault.patch
index 3311cecdd2..29ab1e52ce 100644
--- a/main/rarian/user-segfault.patch
+++ b/main/rarian/user-segfault.patch
@@ -1,5 +1,5 @@
---- util/rarian-sk-get-cl.cpp~ 2008-07-28 19:23:28.000000000 +0200
-+++ util/rarian-sk-get-cl.cpp 2008-07-28 19:23:28.000000000 +0200
+--- rarian-0.8.1/util/rarian-sk-get-cl.cpp~ 2008-07-28 19:23:28.000000000 +0200
++++ rarian-0.8.1/util/rarian-sk-get-cl.cpp 2008-07-28 19:23:28.000000000 +0200
@@ -160,6 +160,11 @@
{
char *filename = NULL;