diff options
author | A. Wilcox <AWilcox@Wilcox-Tech.com> | 2017-09-16 23:15:31 -0500 |
---|---|---|
committer | Natanael Copa <ncopa@alpinelinux.org> | 2017-09-19 11:12:11 +0000 |
commit | 053eea54c53d15d2f4ca3e5c10c8f7a881b86e6b (patch) | |
tree | 4c34f9d665df086d7c0197d34ea2b83ee1317b88 /main/openbox | |
parent | d941d21a504b3adf6607ff9b97d0053e99d53640 (diff) | |
download | aports-053eea54c53d15d2f4ca3e5c10c8f7a881b86e6b.tar.bz2 aports-053eea54c53d15d2f4ca3e5c10c8f7a881b86e6b.tar.xz |
main/openbox: modernise, fix deps, config more, add test
Diffstat (limited to 'main/openbox')
-rw-r--r-- | main/openbox/APKBUILD | 54 |
1 files changed, 28 insertions, 26 deletions
diff --git a/main/openbox/APKBUILD b/main/openbox/APKBUILD index 89e0685bbe..fb1c4331da 100644 --- a/main/openbox/APKBUILD +++ b/main/openbox/APKBUILD @@ -2,48 +2,50 @@ # Maintainer: Natanael Copa <ncopa@alpinelinux.org> pkgname=openbox pkgver=3.6.1 -pkgrel=0 +pkgrel=1 pkgdesc="A highly configurable and standards-compliant X11 window manager" url="http://openbox.org" arch="all" license="GPLv2+" depends= -depends_dev="pango-dev libxml2-dev libxcursor-dev libxrandr-dev libxinerama-dev startup-notification-dev" -makedepends="$depends_dev" +depends_dev="libxcursor-dev libxrandr-dev libxinerama-dev startup-notification-dev" +makedepends="$depends_dev pango-dev libxml2-dev imlib2-dev librsvg-dev + gettext-dev" install="" -subpackages="$pkgname-dev $pkgname-doc $pkgname-libs $pkgname-gnome $pkgname-kde" +subpackages="$pkgname-dev $pkgname-doc $pkgname-libs $pkgname-gnome + $pkgname-kde $pkgname-lang" source="http://openbox.org/dist/openbox/openbox-$pkgver.tar.gz http://icculus.org/openbox/tools/setlayout.c" -_builddir="$srcdir"/openbox-$pkgver +builddir="$srcdir"/openbox-$pkgver + prepare() { - local i - cd "$_builddir" - update_config_sub || return 1 - for i in $source; do - case $i in - *.patch) msg $i; patch -p1 -i "$srcdir"/$i || return 1;; - esac - done + cd "$builddir" + update_config_sub + default_prepare } build() { - cd "$_builddir" + cd "$builddir" ./configure \ --build=$CBUILD \ --host=$CHOST \ --prefix=/usr \ --sysconfdir=/etc \ - --disable-static \ - || return 1 - make || return 1 - gcc $CFLAGS $LDFLAGS -o setlayout "$srcdir"/setlayout.c -lX11 || return 1 + --disable-static + make + gcc $CFLAGS $LDFLAGS -o setlayout "$srcdir"/setlayout.c -lX11 +} + +check() { + cd "$builddir" + make check } package() { - cd "$_builddir" - make -j1 DESTDIR="$pkgdir" install || return 1 - install "$_builddir"/setlayout "$pkgdir"/usr/bin/setlayout + cd "$builddir" + make -j1 DESTDIR="$pkgdir" install + install "$builddir"/setlayout "$pkgdir"/usr/bin/setlayout } libs() { @@ -59,11 +61,11 @@ gnome() { mv "$pkgdir"/usr/bin/*gnome* \ "$pkgdir"/usr/bin/gdm-control \ - "$subpkgdir"/usr/bin/ || return 1 + "$subpkgdir"/usr/bin/ mv "$pkgdir"/usr/share/*gnome* \ - "$subpkgdir"/usr/share/ || return 1 + "$subpkgdir"/usr/share/ mv "$pkgdir"/usr/share/xsessions/*gnome* \ - "$subpkgdir"/usr/share/xsessions/ || return 1 + "$subpkgdir"/usr/share/xsessions/ } kde() { @@ -72,9 +74,9 @@ kde() { "$subpkgdir"/usr/share/xsessions mv "$pkgdir"/usr/bin/*kde* \ - "$subpkgdir"/usr/bin/ || return 1 + "$subpkgdir"/usr/bin/ mv "$pkgdir"/usr/share/xsessions/*kde* \ - "$subpkgdir"/usr/share/xsessions/ || return 1 + "$subpkgdir"/usr/share/xsessions/ } md5sums="b72794996c6a3ad94634727b95f9d204 openbox-3.6.1.tar.gz |