3 files changed, 38 insertions, 31 deletions
diff --git a/desktop/i3blocks/i3blocks.SlackBuild b/desktop/i3blocks/i3blocks.SlackBuild
index 0dda1d1512..d9bb24d551 100644
--- a/desktop/i3blocks/i3blocks.SlackBuild
+++ b/desktop/i3blocks/i3blocks.SlackBuild
@@ -1,8 +1,9 @@
-#!/bin/sh
+#!/bin/bash
 
 # Slackware build script for i3blocks
 
 # Copyright 2016 Andre Fernando, Indonesia
+# Copyright 2020 Manuel Argüelles, Panamá City, Panamá
 # All rights reserved.
 #
 # Redistribution and use of this script, with or without modification, is
@@ -22,10 +23,13 @@
 #  OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
 #  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
+cd $(dirname $0) ; CWD=$(pwd)
+
 PRGNAM=i3blocks
-VERSION=${VERSION:-1.4}
+VERSION=${VERSION:-1.5}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
+PKGTYPE=${PKGTYPE:-tgz}
 
 if [ -z "$ARCH" ]; then
   case "$( uname -m )" in
@@ -35,7 +39,14 @@ if [ -z "$ARCH" ]; then
   esac
 fi
 
-CWD=$(pwd)
+# If the variable PRINT_PACKAGE_NAME is set, then this script will report what
+# the name of the created package would be, and then exit. This information
+# could be useful to other scripts.
+if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then
+  echo "$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE"
+  exit 0
+fi
+
 TMP=${TMP:-/tmp/SBo}
 PKG=$TMP/package-$PRGNAM
 OUTPUT=${OUTPUT:-/tmp}
@@ -69,24 +80,31 @@ 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 {} \;
 
-for i in $CWD/patches/* ; do
-  patch -p0 < $i
-done
-
+./autogen.sh
 CFLAGS="$SLKCFLAGS" \
-  make clean all 
-
-make install DESTDIR=$PKG
+CXXFLAGS="$SLKCFLAGS" \
+./configure \
+  --prefix=/usr \
+  --libdir=/usr/lib${LIBDIRSUFFIX} \
+  --sysconfdir=/etc \
+  --localstatedir=/var \
+  --mandir=/usr/man \
+  --docdir=/usr/doc/$PRGNAM-$VERSION \
+  --build=$ARCH-slackware-linux
+
+make
+make -j1 install 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
 
 mv $PKG/etc/i3blocks.conf $PKG/etc/i3blocks.conf.new
 
-mv $PKG/usr/share/man $PKG/usr/man
-rmdir $PKG/usr/share
 find $PKG/usr/man -type f -exec gzip -9 {} \;
 for i in $( find $PKG/usr/man -type l ) ; do ln -s $( readlink $i ).gz $i.gz ; rm $i ; done
 
 mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
-cp -a CHANGELOG.md COPYING README.md $PKG/usr/doc/$PRGNAM-$VERSION
+cp -a COPYING $PKG/usr/doc/$PRGNAM-$VERSION
 cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
 
 mkdir -p $PKG/install
@@ -94,4 +112,4 @@ cat $CWD/slack-desc > $PKG/install/slack-desc
 cat $CWD/doinst.sh > $PKG/install/doinst.sh
 
 cd $PKG
-/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
+/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE
diff --git a/desktop/i3blocks/i3blocks.info b/desktop/i3blocks/i3blocks.info
index 5db64a401b..e358b48bdd 100644
--- a/desktop/i3blocks/i3blocks.info
+++ b/desktop/i3blocks/i3blocks.info
@@ -1,10 +1,10 @@
 PRGNAM="i3blocks"
-VERSION="1.4"
+VERSION="1.5"
 HOMEPAGE="http://vivien.github.io/i3blocks"
-DOWNLOAD="https://github.com/vivien/i3blocks/releases/download/1.4/i3blocks-1.4.tar.gz"
-MD5SUM="27329578aed80dc716e3391d675967a4"
+DOWNLOAD="https://github.com/vivien/i3blocks/archive/1.5/i3blocks-1.5.tar.gz"
+MD5SUM="5aa965d2c43db72e46c7410ad0685a20"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
-REQUIRES="pandoc"
-MAINTAINER="Andre Fernando"
-EMAIL="ando344@gmail.com"
+REQUIRES=""
+MAINTAINER="Manuel Argüelles"
+EMAIL="manuel.arguelles@gmail.com"
diff --git a/desktop/i3blocks/patches/prefix_usr.patch b/desktop/i3blocks/patches/prefix_usr.patch
deleted file mode 100644
index 0c172cc561..0000000000
--- a/desktop/i3blocks/patches/prefix_usr.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- Makefile	2016-12-12 19:18:05.357761324 +0700
-+++ prefix_usr	2016-12-12 19:18:42.467759669 +0700
-@@ -1,7 +1,7 @@
- RELEASE_VERSION = 1.4
- 
- ifndef PREFIX
--  PREFIX=/usr/local
-+  PREFIX=/usr
- endif
- ifndef SYSCONFDIR
-   ifeq ($(PREFIX),/usr)