Initial commit

3 files changed, 46 insertions, 43 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 46bb924ed484..0b5665dc35a9 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,26 +1,24 @@
 pkgbase = i3lock-lixxia-git
-	pkgdesc = An improved screenlocker based upon XCB and PAM (Lixxia fork)
-	pkgver = r297.a27257f
+	pkgdesc = Copy of i3lock that displays a 12-hour clock and always shows unlock indicator
+	pkgver = r344.be2a08a
 	pkgrel = 1
 	url = https://github.com/Lixxia/i3lock
 	arch = i686
 	arch = x86_64
 	groups = i3
-	license = MIT
-	makedepends = autoconf
-	makedepends = git
-	makedepends = gzip
-	makedepends = make
-	depends = xcb-util-image
-	depends = libev
+	license = BSD
 	depends = cairo
+	depends = libev
+	depends = libx11
+	depends = libxcb
+	depends = libxkbcommon
 	depends = libxkbcommon-x11
 	depends = pam
+	depends = xcb-util
 	provides = i3lock
 	conflicts = i3lock
 	backup = etc/pam.d/i3lock
-	source = git://github.com/Lixxia/i3lock.git
+	source = i3lock-lixxia-git::git+https://github.com/Lixxia/i3lock
 	md5sums = SKIP
 
 pkgname = i3lock-lixxia-git
-
diff --git a/.gitignore b/.gitignore
index d9e4e7fd4f09..c594201db3f2 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,7 +1,6 @@
-*.pkg.tar.xz
-i3lock/
-src/
-pkg/
-
-*~
-\#*\#
\ No newline at end of file
+/pkg/
+/src/
+/i3lock-lixxia-git/
+*.xz
+*.tgz
+*.zst
diff --git a/PKGBUILD b/PKGBUILD
index ba1ecb9801a6..adbdd1655fa3 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,42 +1,48 @@
-# Maintainer: s3lph <account-arch-aur-gzxkqqna at kernelpanic dot lol>
-# Contributor: Lukas Tobler <luk4s.tobler@gmail.com>
+# Maintainer: Stijn Seghers <stijnseghers at gmail dot com>
 
 pkgname=i3lock-lixxia-git
-pkgver=r297.a27257f
+pkgver=r344.be2a08a
 pkgrel=1
-pkgdesc="An improved screenlocker based upon XCB and PAM (Lixxia fork)"
+pkgdesc='Copy of i3lock that displays a 12-hour clock and always shows unlock indicator'
 arch=('i686' 'x86_64')
-url="https://github.com/Lixxia/i3lock"
-license=('MIT')
+url='https://github.com/Lixxia/i3lock'
+license=('BSD')
 groups=('i3')
-depends=('xcb-util-image' 'libev' 'cairo' 'libxkbcommon-x11' 'pam')
-makedepends=('autoconf' 'git' 'gzip' 'make')
+depends=('cairo' 'libev' 'libx11' 'libxcb' 'libxkbcommon' 'libxkbcommon-x11' 'pam' 'xcb-util')
 provides=('i3lock')
 conflicts=('i3lock')
-backup=("etc/pam.d/i3lock")
-source=("git://github.com/Lixxia/i3lock.git")
+backup=('etc/pam.d/i3lock')
+source=("${pkgname}::git+${url}")
 md5sums=('SKIP')
 
 pkgver() {
-  cd "${srcdir}/i3lock"
-  printf "r%s.%s" "$(git rev-list --count HEAD)" "$(git rev-parse --short HEAD)"
+    cd "$pkgname"
+
+    printf "r%s.%s" "$(git rev-list --count HEAD)" "$(git rev-parse --short=7 HEAD)"
+}
+
+prepare() {
+    cd "$pkgname"
+
+    # Patch compilation error: https://github.com/Lixxia/i3lock/issues/22
+    sed -i 's/^int input_position;$/extern &/' unlock_indicator.c
 }
 
 build() {
-  cd "${srcdir}/i3lock"
-  autoreconf -fi
-  mkdir -p build
-  gzip -c i3lock.1 > build/i3lock.1.gz
-  cd "${srcdir}/i3lock/build"
-  ../configure \
-    --prefix=${pkgdir}/usr \
-    --sysconfdir=${pkgdir}/etc
-  make
+    cd "$pkgname"
+
+    autoreconf -fi
+    mkdir -p build
+    cd build
+    ../configure \
+        --prefix="${pkgdir}/usr" \
+        --sysconfdir="${pkgdir}/etc"
+    make
 }
 
 package() {
-  cd "${srcdir}/i3lock/build"
-  make install
-  install -Dm644 i3lock.1.gz ${pkgdir}/usr/share/man/man1/i3lock.1.gz
-  install -Dm644 ../LICENSE ${pkgdir}/usr/share/licenses/${pkgname}/LICENSE
+    cd "${pkgname}/build"
+
+    make install
+    install -Dm 644 ../LICENSE -t "${pkgdir}/usr/share/licenses/${pkgname}"
 }