desktop/i3: Updated for version 4.6.

Signed-off-by: Robby Workman <rworkman@slackbuilds.org>

4 files changed, 21 insertions, 26 deletions

diff --git a/desktop/i3/doinst.sh b/desktop/i3/doinst.sh
index d5e0f114d2..78f4e66fda 100644
--- a/desktop/i3/doinst.sh
+++ b/desktop/i3/doinst.sh
@@ -12,9 +12,7 @@ config() {
 }
 
 config etc/i3/config.new
-config etc/i3/welcome.new
 config etc/i3/config.keycodes.new
-config etc/X11/xinit/xinitrc.i3.new
 
 if [ -x /usr/bin/update-desktop-database ]; then
   /usr/bin/update-desktop-database -q usr/share/applications >/dev/null 2>&1
diff --git a/desktop/i3/i3.SlackBuild b/desktop/i3/i3.SlackBuild
index 1637fe94c9..11b1a00774 100644
--- a/desktop/i3/i3.SlackBuild
+++ b/desktop/i3/i3.SlackBuild
@@ -1,17 +1,18 @@
 #!/bin/sh
 
-# Slackware build script for i3
+# Slackware build script for i3wm.
+
 
 # Written by Eugene Wissner <belka.ew@gmail.com>
 # Updated by Eugene Suter <easuter@gmail.com>
 # Updated by Marcin Herda <mherda@slackword.net>
+# Cleaning up docs by ponce
 
 PRGNAM=i3
-VERSION="4.2"
-BUILD=${BUILD:-3}
+VERSION=${VERSION:-4.6}
+BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
-
 if [ -z "$ARCH" ]; then
   case "$( uname -m )" in
     i?86) ARCH=i486 ;;
@@ -54,14 +55,8 @@ find . \
  \( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \
  -exec chmod 644 {} \;
 
-# instead of ./configure
-sed -i "s,local/lib,lib$LIBDIRSUFFIX," common.mk
-
-# make building verbose
-sed -i "/^\.SILENT/d" common.mk
-
-CFLAGS="$SLKCFLAGS" \
-  make
+# V=1 make build verbose
+CFLAGS="$SLKCFLAGS" make V=1
 make install DESTDIR=$PKG
 
 find $PKG | xargs file | grep -e "executable" -e "shared object" | grep ELF \
@@ -70,10 +65,9 @@ find $PKG | xargs file | grep -e "executable" -e "shared object" | grep ELF \
 # Don't clobber the default config
 mv $PKG/etc/i3/config $PKG/etc/i3/config.new
 mv $PKG/etc/i3/config.keycodes $PKG/etc/i3/config.keycodes.new
-mv $PKG/etc/i3/welcome $PKG/etc/i3/welcome.new
 
 # Make xterm default terminal
-sed -i 's/urxvt/xterm/' $PKG/etc/i3/config.new
+sed -i 's/i3-sensible-terminal/xterm/' $PKG/etc/i3/config.new
 
 # KDM menu entry
 mkdir -p $PKG/usr/share/apps/kdm/sessions
@@ -81,18 +75,21 @@ ln -s /usr/share/xsessions/i3.desktop $PKG/usr/share/apps/kdm/sessions/
 
 # Install an xinitrc script
 mkdir -p $PKG/etc/X11/xinit
-cat $CWD/xinitrc.i3 > $PKG/etc/X11/xinit/xinitrc.i3.new
-chmod 0755 $PKG/etc/X11/xinit/xinitrc.i3.new
+cat $CWD/xinitrc.i3 > $PKG/etc/X11/xinit/xinitrc.i3
+chmod 0755 $PKG/etc/X11/xinit/xinitrc.i3
 
 # Install man pages
+make -C man ; make -C docs
 mkdir -p $PKG/usr/man/man1
 cp man/*.1 $PKG/usr/man/man1
 find $PKG/usr/man -type f -exec gzip -9 {} \;
 
-mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
-cp -a \
-  DEPENDS LICENSE GOALS docs/* \
-  $PKG/usr/doc/$PRGNAM-$VERSION
+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 )
 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 989c412938..6136028494 100644
--- a/desktop/i3/i3.info
+++ b/desktop/i3/i3.info
@@ -1,8 +1,8 @@
 PRGNAM="i3"
-VERSION="4.2"
+VERSION="4.6"
 HOMEPAGE="http://www.i3wm.org"
-DOWNLOAD="http://i3wm.org/downloads/i3-4.2.tar.bz2"
-MD5SUM="11b7e5ecdd837341978c72341cb890c6"
+DOWNLOAD="http://i3wm.org/downloads/i3-4.6.tar.bz2"
+MD5SUM="11901176eea90632384434c371840cfd"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES="dmenu libev yajl"
diff --git a/desktop/i3/xinitrc.i3 b/desktop/i3/xinitrc.i3
index b316e5c130..ed8dfd0532 100644
--- a/desktop/i3/xinitrc.i3
+++ b/desktop/i3/xinitrc.i3
@@ -15,6 +15,6 @@ sysmodmap=/etc/X11/xinit/.Xmodmap
 if [ -z "$DESKTOP_SESSION" -a -x /usr/bin/ck-launch-session ]; then
     exec ck-launch-session dbus-launch --exit-with-session /usr/bin/i3
 else
-    exec i3
+    exec /usr/bin/i3
 fi