From a8b18fc081588e0495f704e6eea6c56c77609fc6 Mon Sep 17 00:00:00 2001
From: Matteo Bernardini <ponce@slackbuilds.org>
Date: Thu, 21 Oct 2021 14:16:59 +0200
Subject: desktop/polybar: Updated for version 3.5.7.

Signed-off-by: Matteo Bernardini <ponce@slackbuilds.org>

Signed-off-by: Willy Sudiarto Raharjo <willysr@slackbuilds.org>
---
 desktop/polybar/polybar.SlackBuild | 27 ++++++++++++---------------
 1 file changed, 12 insertions(+), 15 deletions(-)

(limited to 'desktop/polybar/polybar.SlackBuild')

diff --git a/desktop/polybar/polybar.SlackBuild b/desktop/polybar/polybar.SlackBuild
index eb1a40fe22dd3..3dd1cd15fb7dc 100644
--- a/desktop/polybar/polybar.SlackBuild
+++ b/desktop/polybar/polybar.SlackBuild
@@ -25,7 +25,7 @@
 cd $(dirname $0) ; CWD=$(pwd)
 
 PRGNAM=polybar
-VERSION=${VERSION:-3.3.1}
+VERSION=${VERSION:-3.5.7}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 PKGTYPE=${PKGTYPE:-tgz}
@@ -73,9 +73,9 @@ rm -rf $PRGNAM-$VERSION
 tar xvf $CWD/$PRGNAM-$VERSION.tar.gz
 cd $PRGNAM-$VERSION
 # Extract the Git modules to lib
-for mod in i3ipcpp-0.7.0 xpp-1.4.0; do
+for mod in i3ipcpp-0.7.0 xpp-20210303_7a9960b; do
   rm -rf lib/${mod%-*}
-  tar xvf $CWD/$mod.tar.gz
+  tar xvf $CWD/$mod.tar.?z
   mv $mod lib/${mod%-*}
 done
 chown -R root:root .
@@ -85,16 +85,10 @@ 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 {} \;
 
-( cd lib/xpp
-  patch -p1 < $CWD/00165e1a6d5dd61bc153e1352b21ec07fc81245d.patch )
-
-# Fixes install location
-sed -i -e '/share\/doc\/polybar/s/share\///' doc/CMakeLists.txt
-sed -i -e "/DESTINATION doc\/polybar/s/polybar/$PRGNAM-$VERSION/" doc/CMakeLists.txt
-sed -i -e '/share\/man\/man1/s/share\///' man/CMakeLists.txt
-
 # Fixes version
-sed -i -e "/execute_process(COMMAND git describe --tags --dirty=-git/s/git.*/echo $VERSION/" include/CMakeLists.txt
+sed -i -e "/execute_process(COMMAND git describe --tags --dirty=-git/s/git.*/echo $VERSION/" include/CMakeLists.txt || exit 1
+
+export PYTHON=python3
 
 mkdir -p build
 cd build
@@ -102,13 +96,16 @@ cd build
     -DCMAKE_C_FLAGS:STRING="$SLKCFLAGS" \
     -DCMAKE_CXX_FLAGS:STRING="$SLKCFLAGS -Wno-error=implicit-fallthrough -Wno-error=stringop-truncation -Wno-error=deprecated-copy" \
     -DCMAKE_INSTALL_PREFIX=/usr \
+    -DPYTHON_EXECUTABLE=/usr/bin/python3 \
+    -DCMAKE_INSTALL_MANDIR=/usr/man \
+    -DCMAKE_INSTALL_DOCDIR=/usr/doc/$PRGNAM-$VERSION \
     -DCMAKE_BUILD_TYPE=Release ..
-  make -j1
+  make
   make install/strip DESTDIR=$PKG
 cd ..
 
-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
+find $PKG/usr/man -type f -exec gzip -9 {} \; || true
+for i in $( find $PKG/usr/man -type l ) ; do ln -s $( readlink $i ).gz $i.gz ; rm $i ; done || true
 
 mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
 cp -a LICENSE README.md SUPPORT.md $PKG/usr/doc/$PRGNAM-$VERSION
-- 
cgit v1.2.3