system/conky: Updated for version 1.15.0.

Signed-off-by: Willy Sudiarto Raharjo <willysr@slackbuilds.org>

4 files changed, 15 insertions, 17 deletions

diff --git a/system/conky/conky.1.gz b/system/conky/conky.1.gz
new file mode 100644
index 0000000000..1efa84a6a7
--- /dev/null
+++ b/system/conky/conky.1.gz
diff --git a/system/conky/conky.SlackBuild b/system/conky/conky.SlackBuild
index a720da9f62..241cf0edaf 100644
--- a/system/conky/conky.SlackBuild
+++ b/system/conky/conky.SlackBuild
@@ -22,12 +22,10 @@
 #  OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
 #  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
-# 20220409 bkw: Modified by SlackBuilds.org, BUILD=2: fix doist.sh.
-
 cd $(dirname $0) ; CWD=$(pwd)
 
 PRGNAM=conky
-VERSION=${VERSION:-1.13.1}
+VERSION=${VERSION:-1.15.0}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 PKGTYPE=${PKGTYPE:-tgz}
@@ -96,9 +94,6 @@ 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 {} \+
 
-# fix MANDIR
-sed -i 's,share/man/man1,man/man1,g' CMakeLists.txt
-
 mkdir -p build
 cd build
   cmake \
@@ -108,14 +103,14 @@ cd build
     -DLIB_SUFFIX=${LIBDIRSUFFIX} \
     -DDOC_PATH=/usr/doc/$PRGNAM-$VERSION \
     -DMAINTAINER_MODE=ON \
-    -DBUILD_DOCS=ON \
+    -DBUILD_DOCS=OFF \
+	-DBUILD_EXTRAS=ON \
     -DBUILD_XDBE=ON \
     -DBUILD_AUDACIOUS=$audacious \
     -DBUILD_NVIDIA=$nvidia \
     -DBUILD_CURL=ON \
     -DBUILD_WLAN=ON \
     -DBUILD_RSS=ON \
-    -DBUILD_WEATHER_METAR=ON \
     -DBUILD_PULSEAUDIO=ON \
     -DBUILD_MPD=ON \
     -DBUILD_IMLIB2=ON \
@@ -133,8 +128,11 @@ find $PKG -type f -iname '*.a' -exec rm -rf {} \+
 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
 
-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
+# Conky now requires pandoc to generate the man pages.  
+# No need to add that dependency, we will use the
+# man page provided by the conky team.
+mkdir -p $PKG/usr/man/man1
+cp $CWD/conky.1.gz $PKG/usr/man/man1
 
 # Copy existing config files
 mkdir -p $PKG/etc/conky
@@ -144,9 +142,9 @@ cp data/conky_no_x11.conf $PKG/etc/conky/conky_no_x11.conf.new
 # Vim and Nano syntax highlighting files
 mkdir -p $PKG/usr/share/nano
 mkdir -p $PKG/usr/share/vim/vimfiles/{syntax,ftdetect}
-cp extras/vim/syntax/conkyrc.vim $PKG/usr/share/vim/vimfiles/syntax
+cp build/extras/vim/syntax/conkyrc.vim $PKG/usr/share/vim/vimfiles/syntax
 cp extras/vim/ftdetect/conkyrc.vim $PKG/usr/share/vim/vimfiles/ftdetect
-cp extras/nano/conky.nanorc $PKG/usr/share/nano/conky.nanorc
+cp build/extras/nano/conky.nanorc $PKG/usr/share/nano/conky.nanorc
 
 mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
 cp -a AUTHORS COPYING LICENSE.BSD README.md \
diff --git a/system/conky/conky.info b/system/conky/conky.info
index a6c9ffb823..ffb96d1cc1 100644
--- a/system/conky/conky.info
+++ b/system/conky/conky.info
@@ -1,10 +1,10 @@
 PRGNAM="conky"
-VERSION="1.13.1"
+VERSION="1.15.0"
 HOMEPAGE="https://github.com/brndnmtthws/conky"
-DOWNLOAD="https://github.com/brndnmtthws/conky/archive/v1.13.1/conky-1.13.1.tar.gz"
-MD5SUM="79080d2df4aca7b927ec6158cc73dfb8"
+DOWNLOAD="https://github.com/brndnmtthws/conky/archive/v1.15.0/conky-1.15.0.tar.gz"
+MD5SUM="7adbf5c0e7c3d7dee4d6e95c4b0a369d"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES="lua53 imlib2"
 MAINTAINER="M.Dinslage"
-EMAIL="daedra1980@gmail.com"
+EMAIL="matthewdinslage@gmail.com"
diff --git a/system/conky/slack-desc b/system/conky/slack-desc
index ae5b923539..940546faea 100644
--- a/system/conky/slack-desc
+++ b/system/conky/slack-desc
@@ -15,5 +15,5 @@ conky: your root desktop or in its own window.  Conky has many built-in
 conky: objects, as well as the ability to execute programs and scripts, then
 conky: display the output from stdout.
 conky:
-conky: Homepage: http://conky.sourceforge.net
+conky: Homepage: https://github.com/brndnmtthws/conky
 conky: