summarylogtreecommitdiffstats
diff options
context:
space:
mode:
authorIngo Bürk2017-12-03 17:49:58 +0100
committerIngo Bürk2017-12-03 17:49:58 +0100
commit518fcbfef0b2cc23789162645bbb6e94d46b1037 (patch)
treeaa9b54e3eabb8e42ce85fa012374d0c81879a82f
parent26c00088bac015b8a8691e0e1cb5357e8404687a (diff)
downloadaur-518fcbfef0b2cc23789162645bbb6e94d46b1037.tar.gz
Make i3lock build again
-rw-r--r--.SRCINFO6
-rw-r--r--PKGBUILD30
2 files changed, 23 insertions, 13 deletions
diff --git a/.SRCINFO b/.SRCINFO
index ba1ffc51146e..28870cf3a296 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,8 +1,8 @@
pkgbase = i3lock-git
pkgdesc = An improved screenlocker based upon XCB and PAM
- pkgver = 2.10
+ pkgver = 2.10.1.gef4f9e4
pkgrel = 1
- url = http://i3wm.org/i3lock/
+ url = https://i3wm.org/i3lock/
arch = i686
arch = x86_64
groups = i3-vcs
@@ -16,7 +16,7 @@ pkgbase = i3lock-git
conflicts = i3lock
options = docs
backup = etc/pam.d/i3lock
- source = git://code.i3wm.org/i3lock
+ source = git://github.com/i3/i3lock#branch=master
sha1sums = SKIP
pkgname = i3lock-git
diff --git a/PKGBUILD b/PKGBUILD
index fbeb7e04a259..5c06b4986b48 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -4,11 +4,11 @@
# Contributor: William Giokas <1007380@gmail.com>
pkgname=i3lock-git
-pkgver=2.10
+pkgver=2.10.1.gef4f9e4
pkgrel=1
pkgdesc="An improved screenlocker based upon XCB and PAM"
arch=('i686' 'x86_64')
-url="http://i3wm.org/i3lock/"
+url="https://i3wm.org/i3lock/"
license=('MIT')
groups=('i3-vcs')
provides=('i3lock')
@@ -17,34 +17,44 @@ depends=('xcb-util-image' 'libev' 'cairo' 'libxkbcommon-x11')
backup=("etc/pam.d/i3lock")
options=('docs')
makedepends=('git')
-source=(git://code.i3wm.org/i3lock)
+source=('git://github.com/i3/i3lock#branch=master')
sha1sums=('SKIP')
_gitname='i3lock'
pkgver() {
cd "$srcdir/$_gitname"
- git describe --tags | sed 's/\([^-]*-g\)/r\1/;s/-/./g'
+ git describe --tags | sed 's/-/./g'
}
build() {
cd "$_gitname"
# Fix ticket FS#31544, sed line taken from gentoo
- sed -i -e 's:login:system-auth:' i3lock.pam
+ sed -i -e 's:login:system-auth:' pam/i3lock
+
+ autoreconf --force --install
+
+ rm -rf build/
+ mkdir -p build && cd build/
+
+ ../configure \
+ --prefix=/usr \
+ --sysconfdir=/etc \
+ --disable-sanitizers
make
- gzip i3lock.1
}
package() {
cd "$_gitname"
- make DESTDIR="${pkgdir}" install
+ cd build/
+
+ make DESTDIR="$pkgdir/" install
- install -Dm644 i3lock.1.gz ${pkgdir}/usr/share/man/man1/i3lock.1.gz
- install -Dm644 LICENSE ${pkgdir}/usr/share/licenses/${pkgname}/LICENSE
- make clean
+ install -Dm644 ../LICENSE \
+ "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE"
}
# vim:set ts=2 sw=2 et: