desktop/i3-gaps: Updated for version 4.19.1.

Signed-off-by: Willy Sudiarto Raharjo <willysr@slackbuilds.org>

3 files changed, 21 insertions, 44 deletions

diff --git a/desktop/i3-gaps/i3-gaps.SlackBuild b/desktop/i3-gaps/i3-gaps.SlackBuild
index acab752bee433..4e173c22a0faf 100644
--- a/desktop/i3-gaps/i3-gaps.SlackBuild
+++ b/desktop/i3-gaps/i3-gaps.SlackBuild
@@ -28,7 +28,7 @@
 # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 PRGNAM=i3-gaps
-VERSION=${VERSION:-4.18.3}
+VERSION=${VERSION:-4.19.1}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
@@ -66,7 +66,6 @@ mkdir -p $TMP $PKG $OUTPUT
 cd $TMP
 rm -rf $PRGNAM-$VERSION
 tar xvf $CWD/i3-$VERSION.tar.gz
-patch -p0 < $CWD/i3-gaps.patch
 cd i3-$VERSION
 chown -R root:root .
 find -L . \
@@ -75,24 +74,22 @@ find -L . \
  \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \
   -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
 
-autoreconf --force --install
-
-mkdir -p build
-( cd build
+mkdir build
+cd build
   CFLAGS="$SLKCFLAGS" \
-  ../configure \
-    --prefix=/usr \
-    --libdir=/usr/lib$LIBDIRSUFFIX \
+  CXXFLAGS="$SLKCFLAGS" \
+  meson .. \
+    --buildtype=release \
+    --infodir=/usr/info \
+    --libdir=/usr/lib${LIBDIRSUFFIX} \
+    --localstatedir=/var \
     --mandir=/usr/man \
-    --docdir=/usr/doc/$PRGNAM-$VERSION \
+    --prefix=/usr \
     --sysconfdir=/etc \
-    --localstatedir=/var \
-    --build=$ARCH-slackware-linux
-
-  # V=1 makes build verbose
-  CFLAGS="$SLKCFLAGS" make V=1
-  make install-strip DESTDIR=$PKG
-)
+    -Ddocdir=/usr/doc/$PRGNAM-$VERSION
+  ninja
+  DESTDIR=$PKG ninja install
+cd ..
 
 find $PKG -print0 | xargs -0 file | grep -e "executable" -e "shared object" | grep ELF \
   | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true
@@ -132,7 +129,10 @@ make
 make test
 make install DESTDIR=$PKG
 
-find $PKG -name perllocal.pod -o -name ".packlist" -o -name "*.bs" | xargs rm -f || true
+find $PKG -name perllocal.pod \
+  -o -name ".packlist" \
+  -o -name "*.bs" \
+  | xargs rm -f
 
 mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION/AnyEvent-I3
 cp -a Changes README MANIFEST $PKG/usr/doc/$PRGNAM-$VERSION/AnyEvent-I3/
diff --git a/desktop/i3-gaps/i3-gaps.info b/desktop/i3-gaps/i3-gaps.info
index 10a16128e3830..75b6b0e2e670e 100644
--- a/desktop/i3-gaps/i3-gaps.info
+++ b/desktop/i3-gaps/i3-gaps.info
@@ -1,8 +1,8 @@
 PRGNAM="i3-gaps"
-VERSION="4.18.3"
+VERSION="4.19.1"
 HOMEPAGE="https://github.com/Airblader/i3"
-DOWNLOAD="https://github.com/Airblader/i3/archive/4.18.3/i3-4.18.3.tar.gz"
-MD5SUM="951cec592968c5c3146377322b4aec04"
+DOWNLOAD="https://github.com/Airblader/i3/archive/4.19.1/i3-4.19.1.tar.gz"
+MD5SUM="7cbdc9eff28b4b6c8a7c1118d96ebd27"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES="dmenu libev xcb-util-xrm yajl perl-JSON-XS perl-AnyEvent"
diff --git a/desktop/i3-gaps/i3-gaps.patch b/desktop/i3-gaps/i3-gaps.patch
deleted file mode 100644
index cf23d503d13ef..0000000000000
--- a/desktop/i3-gaps/i3-gaps.patch
+++ /dev/null
@@ -1,23 +0,0 @@
---- i3-4.18.3/include/libi3.h	2020-10-20 17:06:25.000000000 +0900
-+++ i3-4.18.3.patched/include/libi3.h	2021-01-09 16:11:52.571112045 +0900
-@@ -341,7 +341,7 @@
-  */
- uint32_t get_colorpixel(const char *hex) __attribute__((const));
- 
--#ifndef HAVE_strndup
-+#ifndef HAVE_STRNDUP
- /**
-  * Taken from FreeBSD
-  * Returns a pointer to a new string which is a duplicate of the
-diff --color -ruN i3-4.18.3/libi3/strndup.c i3-4.18.3.patched/libi3/strndup.c
---- i3-4.18.3/libi3/strndup.c	2020-10-20 17:06:25.000000000 +0900
-+++ i3-4.18.3.patched/libi3/strndup.c	2021-01-09 16:12:46.972114812 +0900
-@@ -10,7 +10,7 @@
- #include <sys/types.h>
- #include <string.h>
- 
--#ifndef HAVE_strndup
-+#ifndef HAVE_STRNDUP
- /*
-  * Taken from FreeBSD
-  * Returns a pointer to a new string which is a duplicate of the