From bb551c5c762dcf12dbaf6d47d68ca6eb5cc2e058 Mon Sep 17 00:00:00 2001
From: Johannes Schoepfer <slackbuilds[at]schoepfer[dot]info>
Date: Thu, 10 Nov 2016 22:17:06 +0000
Subject: desktop/i3: Updated for version 4.13.

Signed-off-by: David Spencer <idlemoor@slackbuilds.org>
---
 desktop/i3/i3.SlackBuild | 38 +++++++++++++++++++++++++-------------
 desktop/i3/i3.info       | 10 +++++-----
 2 files changed, 30 insertions(+), 18 deletions(-)

(limited to 'desktop')

diff --git a/desktop/i3/i3.SlackBuild b/desktop/i3/i3.SlackBuild
index b9c6b6d103..3f3eef256d 100644
--- a/desktop/i3/i3.SlackBuild
+++ b/desktop/i3/i3.SlackBuild
@@ -6,7 +6,7 @@
 # Updated by Eugene Suter <easuter@gmail.com>
 # Updated by Marcin Herda <mherda@slackword.net>
 # Cleaning up docs by ponce
-# Updated by Johannes Schoepfer <slackbuilds@schoepfer.info>
+# Updated by Johannes Schoepfer
 #
 # Redistribution and use of this script, with or without modification, is
 # permitted provided that the following conditions are met:
@@ -26,13 +26,13 @@
 # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 PRGNAM=i3
-VERSION=${VERSION:-4.12}
+VERSION=${VERSION:-4.13}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
 if [ -z "$ARCH" ]; then
   case "$( uname -m )" in
-    i?86) ARCH=i486 ;;
+    i?86) ARCH=i586 ;;
     arm*) ARCH=arm ;;
        *) ARCH=$( uname -m ) ;;
   esac
@@ -43,8 +43,8 @@ TMP=${TMP:-/tmp/SBo}
 PKG=$TMP/package-$PRGNAM
 OUTPUT=${OUTPUT:-/tmp}
 
-if [ "$ARCH" = "i486" ]; then
-  SLKCFLAGS="-O2 -march=i486 -mtune=i686"
+if [ "$ARCH" = "i586" ]; then
+  SLKCFLAGS="-O2 -march=i586 -mtune=i686"
   LIBDIRSUFFIX=""
 elif [ "$ARCH" = "i686" ]; then
   SLKCFLAGS="-O2 -march=i686 -mtune=i686"
@@ -72,9 +72,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 {} \;
 
-# V=1 make build verbose
-CFLAGS="$SLKCFLAGS" make V=1
-make install DESTDIR=$PKG
+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
+)
 
 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
@@ -95,17 +108,16 @@ mkdir -p $PKG/etc/X11/xinit
 cat $CWD/xinitrc.i3 > $PKG/etc/X11/xinit/xinitrc.i3
 chmod 0755 $PKG/etc/X11/xinit/xinitrc.i3
 
-# Install man pages
-mkdir -p $PKG/usr/man/man1
-cp man/*.1 $PKG/usr/man/man1
-find $PKG/usr/man -type f -exec gzip -9 {} \;
+# man pages
+find $PKG/usr/man -type f -exec gzip -9 {} +
 
 mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION/html $PKG/usr/doc/$PRGNAM-$VERSION/txt
 cp -a DEPENDS LICENSE RELEASE-NOTES-* $PKG/usr/doc/$PRGNAM-$VERSION
 cp -a docs/* $PKG/usr/doc/$PRGNAM-$VERSION/txt
 ( cd $PKG/usr/doc/$PRGNAM-$VERSION/txt
   mv *.html *.png *.css ../html/
-  rm i3-pod2html *.conf *.dia *.mk Makefile )
+  rm i3-pod2html *.conf *.dia
+)
 cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
 
 mkdir -p $PKG/install
diff --git a/desktop/i3/i3.info b/desktop/i3/i3.info
index 2e8e95afe3..24655455ee 100644
--- a/desktop/i3/i3.info
+++ b/desktop/i3/i3.info
@@ -1,10 +1,10 @@
 PRGNAM="i3"
-VERSION="4.12"
+VERSION="4.13"
 HOMEPAGE="http://www.i3wm.org"
-DOWNLOAD="http://i3wm.org/downloads/i3-4.12.tar.bz2"
-MD5SUM="308fc79ed252e1f3c8a093598e13e326"
+DOWNLOAD="http://i3wm.org/downloads/i3-4.13.tar.bz2"
+MD5SUM="08d17dcf1fde665a15f7d411486546ae"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
-REQUIRES="dmenu libev libxkbcommon yajl"
+REQUIRES="dmenu libev libxkbcommon xcb-util-xrm yajl"
 MAINTAINER="Johannes Schoepfer"
-EMAIL="slackbuilds@schoepfer.info"
+EMAIL="slackbuilds[at]schoepfer[dot]info"
-- 
cgit v1.2.3-65-gdbad