Sync with upstream 2.14.1 and update the documentation

.gitignore

@@ -1,31 +1,10 @@
-/i3lock
+/i3lock-extended
 *.o
 tags
 *.swp
 
-################################################################################
-# https://raw.githubusercontent.com/github/gitignore/master/Autotools.gitignore
-################################################################################
-
-# http://www.gnu.org/software/automake
-
-Makefile.in
-/ar-lib
-/test-driver
-
-# http://www.gnu.org/software/autoconf
-
-/autom4te.cache
-/autoscan.log
-/autoscan-*.log
-/aclocal.m4
-/compile
-/config.h.in
-/config.guess
-/config.sub
-/configure
-/configure.scan
-/depcomp
-/install-sh
-/missing
-/stamp-h1
+# We recommend building in a subdirectory called build.
+# If you chose a different directory name,
+# it is up to you to arrange for it to be ignored by git,
+# e.g. by listing your directory in .git/info/exclude.
+/build

CHANGELOG

@@ -1,3 +1,9 @@
+2023-03-18 i3lock-extended 2.2.14
+
+ • Fetch and sync with i3lock 2.14.1
+ • Update README.md
+
+
 2020-12-29 i3lock-extended 2.2.13a
 
  • Fix and sort the help (-h) string

INSTALL.md

@@ -1,6 +1,6 @@
 i3lock - improved screen locker
 ===============================
-[i3lock](https://i3wm.org/i3lock/)> is a simple screen locker like slock.
+[i3lock](https://i3wm.org/i3lock/) is a simple screen locker like slock.
 After starting it, you will see a white screen (you can configure the
 color/an image). You can return to your screen by entering your password.
 
@@ -44,8 +44,16 @@ Requirements
 
 Running i3lock
 -------------
-Simply invoke the 'i3lock' command. To get out of it, enter your password and
-press enter.
+
+To test i3lock, you can directly run the `i3lock` command. To get out of it,
+enter your password and press enter.
+
+For a more permanent setup, we strongly recommend using `xss-lock` so that the
+screen is locked *before* your laptop suspends:
+
+```
+xss-lock --transfer-sleep-lock -- i3lock --nofork
+```
 
 On OpenBSD the `i3lock` binary needs to be setgid `auth` to call the
 authentication helpers, e.g. `/usr/libexec/auth/login_passwd`.
@@ -58,17 +66,11 @@ i3lock unless you have a reason to do so.
 First install the dependencies listed in requirements section, then run these
 commands (might need to be adapted to your OS):
 ```
-autoreconf --force --install
-
 rm -rf build/
 mkdir -p build && cd build/
 
-../configure \
-  --prefix=/usr \
-  --sysconfdir=/etc \
-  --disable-sanitizers
-
-make
+meson .. -Dprefix=/usr
+ninja
 ```
 
 Upstream

LICENSE

@@ -1,5 +1,5 @@
 i3lock-extended
-Copyright (C) 2020 Simeon Simeonov
+Copyright (C) 2020-2023 Simeon Simeonov
 
 This program is free software: you can redistribute it and/or modify
 it under the terms of the GNU General Public License as published by

README.md

@@ -1,7 +1,7 @@
 # i3lock-extended
 
 i3lock-extended is a fork of i3lock (https://github.com/i3/i3lock).
-It was started by Simeon Simeonov (sgs @ Freenode) as a small hack, 
+It was started by Simeon Simeonov (sgs @ LiberaChat) as a small hack, 
 implementing a LED-clock on top of an existing and robust screensaver.
 
 i3lock-extended adds some additional functionality and is a free-software
@@ -40,7 +40,9 @@ extended revision if used].
 ### Gentoo
 
    ```bash
-   layman -a sgs
+   # add sgs' custom repository using app-eselect/eselect-repository
+   eselect repository add sgs
+
    emerge x11-misc/i3lock-extended
    ```
 
@@ -58,25 +60,26 @@ Install the package:
    ```
 
 
-### From source
+### From source (meson > 0.55.0)
 
    ```bash
-   wget https://simeon.simeonov.no/programs/i3lock_extended/downloads/i3lock-extended-<version>.tar.xz
-   tar Jxvf i3lock-extended-<version>.tar.xz && cd i3lock-extended-<version>
-   ./configure --prefix=/usr --sysconfdir=/etc --disable-sanitizers
-   make
-   make install
+   wget https://github.com/blackm0re/i3lock_extended/releases/download/<version>/i3lock-extended-<version>.tar.xz
+   tar Jxvf i3lock-extended-<version>.tar.xz
+   cd i3lock-extended-<version>
+   meson setup build --prefix=/usr
+   meson compile -C build
+   sudo meson install -C build
    ```
 
 
-### From git
+### From git (meson > 0.55.0)
 
    ```bash
-   git clone https://github.com/blackm0re/i3lock-extended.git && cd i3lock-extended
-   autoreconf --force --install
-   ./configure --prefix=/usr --sysconfdir=/etc --disable-sanitizers
-   make
-   make install
+   git clone https://github.com/blackm0re/i3lock-extended.git
+   cd i3lock-extended
+   meson setup build --prefix=/usr
+   meson compile -C build
+   sudo meson install -C build
    ```
 
 
@@ -112,12 +115,12 @@ i3lock-extended is hosted on GitHub: https://github.com/blackm0re/i3lock-extende
 
 ## Author
 
-Simeon Simeonov - sgs @ Freenode
+Simeon Simeonov - sgs @ LiberaChat
 
 
 ## [License](https://github.com/blackm0re/i3lock-extended/blob/master/LICENSE)
 
-Copyright 2020 Simeon Simeonov
+Copyright 2020-2023 Simeon Simeonov
 
 Licensed under the GPLv3: http://www.gnu.org/licenses/gpl-3.0.html