From 161594b6e295ea2d0e17b583b122ff571fbc147b Mon Sep 17 00:00:00 2001 From: Francesco Colista Date: Thu, 16 Mar 2017 16:23:00 +0000 Subject: [PATCH] community/tint2: fix build with the correct version --- community/tint2/APKBUILD | 17 +++++++++++------ 1 file changed, 11 insertions(+), 6 deletions(-) diff --git a/community/tint2/APKBUILD b/community/tint2/APKBUILD index c08555e32bb..cbe1f6d030d 100644 --- a/community/tint2/APKBUILD +++ b/community/tint2/APKBUILD @@ -3,8 +3,8 @@ # Maintainer: Francesco Colista pkgname=tint2 pkgver=0.13.1 -_gitver=4d12abdb4263d6875b069e7b2c214e65a7c1edac -pkgrel=1 +_gitver="4d12abdb4263d6875b069e7b2c214e65a7c1edac" +pkgrel=2 pkgdesc="tint2 is a simple unintrusive panel/taskbar" url="https://gitlab.com/o9000/tint2" arch="all" @@ -18,10 +18,15 @@ makedepends="$depends_dev cmake imlib2-dev glib-dev pango-dev cairo-dev install="" subpackages="$pkgname-doc $pkgname-lang" source="http://dev.alpinelinux.org/archive/${pkgname}/${pkgname}-${pkgver}.tar.gz" -builddir="$srcdir"/$pkgname-$pkgver-$_gitver +builddir="$srcdir"/$pkgname-${pkgver//./-}-$_gitver + +prepare() { + cd "$builddir" + mkdir -p build || return 1 +} build() { - cd "$builddir" + cd "$builddir"/build cmake \ -DCMAKE_INSTALL_PREFIX=/usr \ -DCMAKE_INSTALL_LIBDIR=lib \ @@ -29,12 +34,12 @@ build() { -DCMAKE_BUILD_TYPE=Release \ -DCMAKE_CXX_FLAGS="$CXXFLAGS" \ -DCMAKE_C_FLAGS="$CFLAGS" \ - || return 1 + .. || return 1 make || return 1 } package() { - cd "$builddir" + cd "$builddir"/build make DESTDIR="${pkgdir}" install || return 1 }