diff options
| author | A. Wilcox <AWilcox@Wilcox-Tech.com> | 2018-02-05 15:45:41 -0600 |
|---|---|---|
| committer | William Pitcock <nenolod@dereferenced.org> | 2018-02-07 04:58:22 +0000 |
| commit | f2625e8f31bb237d49e60a33eb1665b4979ead80 (patch) | |
| tree | 1923395d8e77fc9a6e57fd18d5c1e8deccb7c373 /main/dbus | |
| parent | f05f591ca5f2997d5650c54a03b098725404027f (diff) | |
| download | aports-f2625e8f31bb237d49e60a33eb1665b4979ead80.tar.bz2 aports-f2625e8f31bb237d49e60a33eb1665b4979ead80.tar.xz | |
main/dbus: modernise, fix issues
- disable test suite, it requires X11 running
- fix oddly phrased pkgdescs for subpackages
- correct license to SPDX format
- explicitly set session socket directory to upstream-recommended /tmp
- enable more documentation
Diffstat (limited to 'main/dbus')
| -rw-r--r-- | main/dbus/APKBUILD | 21 |
1 files changed, 12 insertions, 9 deletions
diff --git a/main/dbus/APKBUILD b/main/dbus/APKBUILD index 5dcc69d68d..f0a3fb43a4 100644 --- a/main/dbus/APKBUILD +++ b/main/dbus/APKBUILD @@ -1,17 +1,18 @@ # Maintainer: Natanael Copa <ncopa@alpinelinux.org> pkgname=dbus pkgver=1.10.24 -pkgrel=0 +pkgrel=1 pkgdesc="Freedesktop.org message bus system" url="http://www.freedesktop.org/Software/dbus" pkggroups="messagebus" arch="all" -license="GPL custom" +options="!check" # Requires running X11 server. +license="AFL-2.1 OR GPL-2.0+" subpackages="$pkgname-dev $pkgname-doc $pkgname-libs $pkgname-x11" triggers="$pkgname.trigger=/etc/dbus-1/system.d" depends= depends_dev="util-linux-dev" -makedepends="$depends_dev expat-dev libx11-dev autoconf automake libtool" +makedepends="$depends_dev expat-dev libx11-dev autoconf automake libtool xmlto" install="$pkgname.pre-install $pkgname.post-install" source="http://dbus.freedesktop.org/releases/dbus/dbus-$pkgver.tar.gz fix-int64-print.patch @@ -40,26 +41,28 @@ build() { --disable-dnotify \ --disable-tests \ --disable-asserts \ - --with-x \ - || return 1 - make || return 1 + --enable-user-session \ + --enable-xml-docs \ + --with-session-socket-dir=/tmp \ + --with-x + make } package() { cd "$srcdir"/$pkgname-$pkgver - make -j1 DESTDIR="$pkgdir" install || return 1 + make -j1 DESTDIR="$pkgdir" install install -Dm755 "$srcdir"/dbus.initd "$pkgdir"/etc/init.d/dbus } libs() { - pkgdesc="Libraries for acces D-BUS" + pkgdesc="D-BUS access libraries" replaces="dbus" mkdir -p "$subpkgdir"/usr/lib mv "$pkgdir"/usr/lib/lib*.so.* "$subpkgdir"/usr/lib/ } x11() { - pkgdesc="X11-requiring add-ons for D-BUS" + pkgdesc="X11 add-ons for D-BUS" depends="dbus=$pkgver-r$pkgrel" mkdir -p "$subpkgdir"/usr/bin mv "$pkgdir"/usr/bin/dbus-launch "$subpkgdir"/usr/bin/ |