summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorA. Wilcox <awilcox@wilcox-tech.com>2018-10-19 03:27:45 +0000
committerA. Wilcox <awilcox@wilcox-tech.com>2018-10-19 03:27:45 +0000
commit77c9995d3bdc44ac0801bc7489de48eb83d72a4b (patch)
tree1cf7c15a829bcf1bcd3132675432ba1931b599aa
parent476d1533c7cafbbbe78323d3e81949cd54b1c03d (diff)
parentfd01d27e541459e11a7e10b89f013ae3965b8a1a (diff)
downloadpackages-77c9995d3bdc44ac0801bc7489de48eb83d72a4b.tar.gz
packages-77c9995d3bdc44ac0801bc7489de48eb83d72a4b.tar.bz2
packages-77c9995d3bdc44ac0801bc7489de48eb83d72a4b.tar.xz
packages-77c9995d3bdc44ac0801bc7489de48eb83d72a4b.zip
Merge branch 'i3lock-bump' into 'master'
user/i3lock: take, bump to 2.11 See merge request !94
-rw-r--r--user/i3lock/APKBUILD29
1 files changed, 16 insertions, 13 deletions
diff --git a/user/i3lock/APKBUILD b/user/i3lock/APKBUILD
index 9791fdc02..8080867c7 100644
--- a/user/i3lock/APKBUILD
+++ b/user/i3lock/APKBUILD
@@ -1,15 +1,16 @@
# Contributor: Johannes Matheis <jomat+alpinebuild@jmt.gr>
-# Maintainer:
+# Maintainer: Max Rees <maxcrees@me.com>
pkgname=i3lock
-pkgver=2.10
-pkgrel=1
+pkgver=2.11
+pkgrel=0
pkgdesc="Simple X11 screen locker"
url="https://i3wm.org/i3lock/"
arch="all"
+options="!check" # No test suite.
license="MIT"
depends="xkeyboard-config"
makedepends="cairo-dev libev-dev libxkbcommon-dev linux-pam-dev cmd:which
- xcb-util-image-dev"
+ xcb-util-image-dev xcb-util-xrm-dev"
subpackages="$pkgname-doc"
source="$url/$pkgname-$pkgver.tar.bz2"
@@ -19,24 +20,26 @@ prepare() {
# At present, this has no functional difference.
# But when we start developing our PAM stack into something more
# mature, this will be important, because i3lock runs unprivileged.
- sed -i -e 's:login:base-auth:g' i3lock.pam
+ sed -i -e 's:login:base-auth:g' pam/i3lock
}
build() {
cd "$builddir"
- make
-}
-check() {
- cd "$builddir"
- ./i3lock -v
+ ./configure \
+ --build=$CBUILD \
+ --host=$CHOST \
+ --prefix=/usr \
+ --sysconfdir=/etc \
+ --mandir=/usr/share/man \
+ --localstatedir=/var
+
+ make
}
package() {
cd "$builddir"
make DESTDIR="$pkgdir" install
- install -m755 -d "$pkgdir/usr/share/man/man1/"
- install -m644 $pkgname.1 "$pkgdir/usr/share/man/man1/"
}
-sha512sums="ea865b202668212b58d0b97d0263171847e1bd0c529e2fd3d26c15ef253861b9a8357ff2efaa6a4f342c4d0d1ab03bc00f95f4d4008760ec8e0767ac29195517 i3lock-2.10.tar.bz2"
+sha512sums="c00741a66fdb5477a4b7e993d173f98fe95f0254fa74c50f83ddf8078a477d26a9fab126fbe31b509df2dbd35ed5ec64b95475621b8babf6f6c0f6db38160c8a i3lock-2.11.tar.bz2"