From bbc459adbddc91823f3bbe713cbaa6c185a3dbc2 Mon Sep 17 00:00:00 2001
From: "Emmanuel N. Millan" <emmanueln@gmail.com>
Date: Fri, 7 Oct 2022 23:17:06 +0100
Subject: desktop/i3: Updated for version 4.21.

Signed-off-by: Willy Sudiarto Raharjo <willysr@slackbuilds.org>
---
 desktop/i3/i3.SlackBuild | 32 ++++++++++++++++----------------
 desktop/i3/i3.info       |  6 +++---
 2 files changed, 19 insertions(+), 19 deletions(-)

(limited to 'desktop')

diff --git a/desktop/i3/i3.SlackBuild b/desktop/i3/i3.SlackBuild
index 31482f5cef..2ef8378428 100644
--- a/desktop/i3/i3.SlackBuild
+++ b/desktop/i3/i3.SlackBuild
@@ -7,7 +7,7 @@
 # Updated by Marcin Herda <mherda@slackword.net>
 # Cleaning up docs by ponce
 # Copyright 2017 - 2018  Johannes Schoepfer, Germany
-# Updated by Emmanuel N. Millan, Argentina, 2019
+# Updated by Emmanuel N. Millan, Argentina, 2019 - 2022
 #
 # Redistribution and use of this script, with or without modification, is
 # permitted provided that the following conditions are met:
@@ -29,7 +29,7 @@
 cd $(dirname $0) ; CWD=$(pwd)
 
 PRGNAM=i3
-VERSION=${VERSION:-4.18.3}
+VERSION=${VERSION:-4.21}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 PKGTYPE=${PKGTYPE:-tgz}
@@ -74,7 +74,7 @@ rm -rf $PKG
 mkdir -p $TMP $PKG $OUTPUT
 cd $TMP
 rm -rf $PRGNAM-$VERSION
-tar xvf $CWD/$PRGNAM-$VERSION.tar.bz2
+tar xvf $CWD/$PRGNAM-$VERSION.tar.xz
 cd $PRGNAM-$VERSION
 chown -R root:root .
 find -L . \
@@ -83,25 +83,23 @@ 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 -fi
 
 mkdir -p build
 ( cd build
   CFLAGS="$SLKCFLAGS" \
-  ../configure \
-    --prefix=/usr \
-    --libdir=/usr/lib$LIBDIRSUFFIX \
-    --mandir=/usr/man \
-    --docdir=/usr/doc/$PRGNAM-$VERSION \
-    --sysconfdir=/etc \
-    --localstatedir=/var \
-    --build=$ARCH-slackware-linux
-
-  # V=1 makes build verbose
-  CFLAGS="$SLKCFLAGS" make V=1
-  make install-strip DESTDIR=$PKG
+	  meson -Dmans=true \
+	  --prefix /usr \
+	  --libdir /usr/lib$LIBDIRSUFFIX \
+	  --mandir /usr/man \
+  	  --sysconfdir /etc \
+	  --localstatedir /var \
+	  ..
+  CFLAGS="$SLKCFLAGS" ninja
+  DESTDIR=$PKG ninja install
 )
 
+
+
 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
 
@@ -129,6 +127,8 @@ cp -a docs/* $PKG/usr/doc/$PRGNAM-$VERSION/txt
   rm i3-pod2html *.conf *.dia
 )
 
+rm -r $PKG/usr/share/doc
+
 cd AnyEvent-I3
 
 perl Makefile.PL \
diff --git a/desktop/i3/i3.info b/desktop/i3/i3.info
index 5fdec7d05b..37b0512032 100644
--- a/desktop/i3/i3.info
+++ b/desktop/i3/i3.info
@@ -1,8 +1,8 @@
 PRGNAM="i3"
-VERSION="4.18.3"
+VERSION="4.21"
 HOMEPAGE="https://www.i3wm.org"
-DOWNLOAD="https://i3wm.org/downloads/i3-4.18.3.tar.bz2"
-MD5SUM="7437afcd40261332ce25de99cd5aa17c"
+DOWNLOAD="https://i3wm.org/downloads/i3-4.21.tar.xz"
+MD5SUM="419745b2c170d9eead8c21917204f2ef"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES="dmenu libev xcb-util-xrm yajl perl-JSON-XS perl-AnyEvent"
-- 
cgit v1.2.3