aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorA. Wilcox <AWilcox@Wilcox-Tech.com>2017-08-31 22:32:10 -0500
committerNatanael Copa <ncopa@alpinelinux.org>2017-09-19 10:54:40 +0000
commita02691d702d762dfdeb63107b465adf3456876ba (patch)
treee33e02934ef1820e6dc8520a6f9f593b9037c9ef
parent3651e41726f8baf204c9d5cef25418d8baab0629 (diff)
downloadaports-a02691d702d762dfdeb63107b465adf3456876ba.tar.gz
aports-a02691d702d762dfdeb63107b465adf3456876ba.tar.bz2
aports-a02691d702d762dfdeb63107b465adf3456876ba.tar.xz
main/xcb-utils*: modernise, update depends, add test suites
-rw-r--r--main/xcb-util-cursor/APKBUILD36
-rw-r--r--main/xcb-util-image/APKBUILD34
-rw-r--r--main/xcb-util-keysyms/APKBUILD32
-rw-r--r--main/xcb-util-renderutil/APKBUILD34
-rw-r--r--main/xcb-util-wm/APKBUILD34
-rw-r--r--main/xcb-util/APKBUILD10
6 files changed, 78 insertions, 102 deletions
diff --git a/main/xcb-util-cursor/APKBUILD b/main/xcb-util-cursor/APKBUILD
index 0455314bcd..677eb5fd2d 100644
--- a/main/xcb-util-cursor/APKBUILD
+++ b/main/xcb-util-cursor/APKBUILD
@@ -2,32 +2,22 @@
# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
pkgname=xcb-util-cursor
pkgver=0.1.3
-pkgrel=0
-pkgdesc="Utility libraries for XC Binding - cursor"
+pkgrel=1
+pkgdesc="X C-language Binding - cursor library (port of libXcursor)"
url="http://xcb.freedesktop.org/"
arch="all"
license="MIT"
depends=
-depends_dev="xcb-util-dev xcb-util-renderutil-dev xcb-util-image-dev"
-makedepends="$depends_dev m4"
+depends_dev="xcb-util-dev"
+makedepends="$depends_dev m4 util-macros xcb-util-image-dev xcb-util-renderutil-dev"
+checkdepends="check-dev"
install=""
subpackages="$pkgname-dev"
source="http://xcb.freedesktop.org/dist/xcb-util-cursor-$pkgver.tar.gz
"
-_builddir="$srcdir"/xcb-util-cursor-$pkgver
-prepare() {
- local i
- cd "$_builddir"
- for i in $source; do
- case $i in
- *.patch) msg $i; patch -p1 -i "$srcdir"/$i || return 1;;
- esac
- done
-}
-
build() {
- cd "$_builddir"
+ cd "$builddir"
export CFLAGS="$CFLAGS -std=gnu99"
./configure \
--build=$CBUILD \
@@ -36,14 +26,18 @@ build() {
--sysconfdir=/etc \
--mandir=/usr/share/man \
--infodir=/usr/share/info \
- --localstatedir=/var \
- || return 1
- make || return 1
+ --localstatedir=/var
+ make
+}
+
+check() {
+ cd "$builddir"
+ make check
}
package() {
- cd "$_builddir"
- make DESTDIR="$pkgdir" install || return 1
+ cd "$builddir"
+ make DESTDIR="$pkgdir" install
}
md5sums="4b0768fa497127131a47f07e5c8cf745 xcb-util-cursor-0.1.3.tar.gz"
diff --git a/main/xcb-util-image/APKBUILD b/main/xcb-util-image/APKBUILD
index 2840697ec9..fea8b78805 100644
--- a/main/xcb-util-image/APKBUILD
+++ b/main/xcb-util-image/APKBUILD
@@ -2,33 +2,23 @@
# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
pkgname=xcb-util-image
pkgver=0.4.0
-pkgrel=0
-pkgdesc="Utility libraries for XC Binding - image"
+pkgrel=1
+pkgdesc="X C-language Binding - port of Xlib XImage and XShmImage"
url="http://xcb.freedesktop.org/"
arch="all"
license="MIT"
depends=
depends_dev="xcb-util-dev"
-makedepends="$depends_dev m4"
+makedepends="$depends_dev m4 util-macros"
+checkdepends="check-dev"
install=""
replaces="xcb-util"
subpackages="$pkgname-dev"
source="http://xcb.freedesktop.org/dist/xcb-util-image-$pkgver.tar.gz
"
-_builddir="$srcdir"/xcb-util-image-$pkgver
-prepare() {
- local i
- cd "$_builddir"
- for i in $source; do
- case $i in
- *.patch) msg $i; patch -p1 -i "$srcdir"/$i || return 1;;
- esac
- done
-}
-
build() {
- cd "$_builddir"
+ cd "$builddir"
export CFLAGS="$CFLAGS -std=gnu99"
./configure \
--build=$CBUILD \
@@ -37,14 +27,18 @@ build() {
--sysconfdir=/etc \
--mandir=/usr/share/man \
--infodir=/usr/share/info \
- --localstatedir=/var \
- || return 1
- make || return 1
+ --localstatedir=/var
+ make
+}
+
+check() {
+ cd "$builddir"
+ make check
}
package() {
- cd "$_builddir"
- make DESTDIR="$pkgdir" install || return 1
+ cd "$builddir"
+ make DESTDIR="$pkgdir" install
}
md5sums="32c9c2f72ebd58a2b2e210f27fee86f7 xcb-util-image-0.4.0.tar.gz"
diff --git a/main/xcb-util-keysyms/APKBUILD b/main/xcb-util-keysyms/APKBUILD
index 6c63f74796..4645c9a8f2 100644
--- a/main/xcb-util-keysyms/APKBUILD
+++ b/main/xcb-util-keysyms/APKBUILD
@@ -2,32 +2,22 @@
# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
pkgname=xcb-util-keysyms
pkgver=0.4.0
-pkgrel=0
-pkgdesc="Utility libraries for XC Binding - keysyms"
+pkgrel=1
+pkgdesc="X C-language Binding - X constants and keycodes"
url="http://xcb.freedesktop.org/"
arch="all"
license="MIT"
depends=
depends_dev="xcb-util-dev"
makedepends="$depends_dev m4"
+checkdepends="check-dev"
install=""
replaces="xcb-util"
subpackages="$pkgname-dev"
source="http://xcb.freedesktop.org/dist/xcb-util-keysyms-$pkgver.tar.gz"
-_builddir="$srcdir"/xcb-util-keysyms-$pkgver
-prepare() {
- local i
- cd "$_builddir"
- for i in $source; do
- case $i in
- *.patch) msg $i; patch -p1 -i "$srcdir"/$i || return 1;;
- esac
- done
-}
-
build() {
- cd "$_builddir"
+ cd "$builddir"
./configure \
--build=$CBUILD \
--host=$CHOST \
@@ -35,14 +25,18 @@ build() {
--sysconfdir=/etc \
--mandir=/usr/share/man \
--infodir=/usr/share/info \
- --localstatedir=/var \
- || return 1
- make || return 1
+ --localstatedir=/var
+ make
+}
+
+check() {
+ cd "$builddir"
+ make check
}
package() {
- cd "$_builddir"
- make DESTDIR="$pkgdir" install || return 1
+ cd "$builddir"
+ make DESTDIR="$pkgdir" install
}
md5sums="2decde7b02b4b3bde99a02c17b64d5dc xcb-util-keysyms-0.4.0.tar.gz"
diff --git a/main/xcb-util-renderutil/APKBUILD b/main/xcb-util-renderutil/APKBUILD
index 19e193fa67..019d9a4611 100644
--- a/main/xcb-util-renderutil/APKBUILD
+++ b/main/xcb-util-renderutil/APKBUILD
@@ -2,32 +2,22 @@
# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
pkgname=xcb-util-renderutil
pkgver=0.3.9
-pkgrel=0
-pkgdesc="Utility libraries for XC Binding - renderutil"
+pkgrel=1
+pkgdesc="X C-language Binding - Convenience functions for XRender extension"
url="http://xcb.freedesktop.org/"
arch="all"
license="MIT"
depends=
depends_dev="xcb-util-dev"
-makedepends="$depends_dev m4"
+makedepends="$depends_dev m4 util-macros"
+checkdepends="check-dev"
install=""
replaces="xcb-util"
subpackages="$pkgname-dev"
source="http://xcb.freedesktop.org/dist/xcb-util-renderutil-$pkgver.tar.gz"
-_builddir="$srcdir"/xcb-util-renderutil-$pkgver
-prepare() {
- local i
- cd "$_builddir"
- for i in $source; do
- case $i in
- *.patch) msg $i; patch -p1 -i "$srcdir"/$i || return 1;;
- esac
- done
-}
-
build() {
- cd "$_builddir"
+ cd "$builddir"
./configure \
--build=$CBUILD \
--host=$CHOST \
@@ -35,14 +25,18 @@ build() {
--sysconfdir=/etc \
--mandir=/usr/share/man \
--infodir=/usr/share/info \
- --localstatedir=/var \
- || return 1
- make || return 1
+ --localstatedir=/var
+ make
+}
+
+check() {
+ cd "$builddir"
+ make check
}
package() {
- cd "$_builddir"
- make DESTDIR="$pkgdir" install || return 1
+ cd "$builddir"
+ make DESTDIR="$pkgdir" install
}
md5sums="ac18c1b70ae69845e112f1d987926436 xcb-util-renderutil-0.3.9.tar.gz"
diff --git a/main/xcb-util-wm/APKBUILD b/main/xcb-util-wm/APKBUILD
index 8db39cf910..ce450a3e11 100644
--- a/main/xcb-util-wm/APKBUILD
+++ b/main/xcb-util-wm/APKBUILD
@@ -2,32 +2,22 @@
# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
pkgname=xcb-util-wm
pkgver=0.4.1
-pkgrel=0
-pkgdesc="Utility libraries for XC Binding - wm"
+pkgrel=1
+pkgdesc="X C-language Binding - helpers for ICCCM and EWMH"
url="http://xcb.freedesktop.org/"
arch="all"
license="MIT"
depends=
depends_dev="xcb-util-dev"
-makedepends="$depends_dev m4"
+makedepends="$depends_dev m4 util-macros"
+checkdepends="check"
install=""
replaces="xcb-util"
subpackages="$pkgname-dev"
source="http://xcb.freedesktop.org/dist/xcb-util-wm-$pkgver.tar.gz"
-_builddir="$srcdir"/xcb-util-wm-$pkgver
-prepare() {
- local i
- cd "$_builddir"
- for i in $source; do
- case $i in
- *.patch) msg $i; patch -p1 -i "$srcdir"/$i || return 1;;
- esac
- done
-}
-
build() {
- cd "$_builddir"
+ cd "$builddir"
./configure \
--build=$CBUILD \
--host=$CHOST \
@@ -35,14 +25,18 @@ build() {
--sysconfdir=/etc \
--mandir=/usr/share/man \
--infodir=/usr/share/info \
- --localstatedir=/var \
- || return 1
- make || return 1
+ --localstatedir=/var
+ make
+}
+
+check() {
+ cd "$builddir"
+ make check
}
package() {
- cd "$_builddir"
- make DESTDIR="$pkgdir" install || return 1
+ cd "$builddir"
+ make DESTDIR="$pkgdir" install
}
md5sums="0831399918359bf82930124fa9fd6a9b xcb-util-wm-0.4.1.tar.gz"
diff --git a/main/xcb-util/APKBUILD b/main/xcb-util/APKBUILD
index 90e925808b..ad8309dc05 100644
--- a/main/xcb-util/APKBUILD
+++ b/main/xcb-util/APKBUILD
@@ -2,12 +2,13 @@
pkgname=xcb-util
pkgver=0.4.0
pkgrel=1
-pkgdesc="Utility libraries for XC Binding"
+pkgdesc="Utility libraries for X C-language Binding"
url="http://xcb.freedesktop.org"
arch="all"
license="GPL"
-depends_dev="libxcb-dev"
+depends_dev="libxcb-dev util-macros"
makedepends="$depends_dev m4 gperf"
+checkdepends="check-dev"
subpackages="$pkgname-dev"
source="http://xcb.freedesktop.org/dist/$pkgname-$pkgver.tar.bz2"
builddir="$srcdir/$pkgname-$pkgver"
@@ -22,6 +23,11 @@ build() {
make
}
+check() {
+ cd "$builddir"
+ make check
+}
+
package() {
cd "$builddir"
make DESTDIR="$pkgdir" install