Browse Source

system/conky: Updated for version 1.18.1.

Signed-off-by: Willy Sudiarto Raharjo <willysr@slackbuilds.org>
pull/196/head
M.Dinslage 3 years ago
committed by Willy Sudiarto Raharjo
parent
commit
ae2fc20393
No known key found for this signature in database GPG Key ID: 3F617144D7238786
  1. 5
      system/conky/conky.SlackBuild
  2. 6
      system/conky/conky.info
  3. 36
      system/conky/lua-5.1.x-fix.patch

5
system/conky/conky.SlackBuild

@ -25,7 +25,7 @@
cd $(dirname $0) ; CWD=$(pwd)
PRGNAM=conky
VERSION=${VERSION:-1.18.0}
VERSION=${VERSION:-1.18.1}
BUILD=${BUILD:-1}
TAG=${TAG:-_SBo}
PKGTYPE=${PKGTYPE:-tgz}
@ -94,6 +94,9 @@ 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 compiling if both lua 5.1 and 5.3 are installed
patch -p1 < $CWD/lua-5.1.x-fix.patch
mkdir -p build
cd build
cmake \

6
system/conky/conky.info

@ -1,8 +1,8 @@
PRGNAM="conky"
VERSION="1.18.0"
VERSION="1.18.1"
HOMEPAGE="https://github.com/brndnmtthws/conky"
DOWNLOAD="https://github.com/brndnmtthws/conky/archive/v1.18.0/conky-1.18.0.tar.gz"
MD5SUM="6c667abb16744eec15266be4d6069ebb"
DOWNLOAD="https://github.com/brndnmtthws/conky/archive/v1.18.1/conky-1.18.1.tar.gz"
MD5SUM="3a5ed55c578831bb9221ef6added9cf7"
DOWNLOAD_x86_64=""
MD5SUM_x86_64=""
REQUIRES="lua53 imlib2"

36
system/conky/lua-5.1.x-fix.patch

@ -0,0 +1,36 @@
From 209bb5d24d538a0fdd256c64ef103071b756ca72 Mon Sep 17 00:00:00 2001
From: Brenden Matthews <brenden@brndn.io>
Date: Sun, 26 Feb 2023 12:50:05 -0500
Subject: [PATCH] Require Lua 5.3 or newer
This fixes #1431.
---
cmake/ConkyPlatformChecks.cmake | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/cmake/ConkyPlatformChecks.cmake b/cmake/ConkyPlatformChecks.cmake
index 2232c63d0..5e3715090 100644
--- a/cmake/ConkyPlatformChecks.cmake
+++ b/cmake/ConkyPlatformChecks.cmake
@@ -442,7 +442,7 @@ if(BUILD_WAYLAND)
set(conky_includes ${conky_includes} ${PANGOFT2_INCLUDE_DIRS})
endif(BUILD_WAYLAND)
-include(FindLua)
+find_package(Lua "5.3" REQUIRED)
set(conky_libs ${conky_libs} ${LUA_LIBRARIES})
set(conky_includes ${conky_includes} ${LUA_INCLUDE_DIR})
@@ -465,9 +465,9 @@ if(BUILD_X11)
pkg_search_module(IMLIB2 REQUIRED imlib2 Imlib2)
set(luaimlib2_libs ${IMLIB2_LIBS} ${IMLIB2_LDFLAGS} ${LUA_LIBRARIES})
set(luaimlib2_includes
- ${IMLIB2_INCLUDE_DIRS}
- ${LUA_INCLUDE_DIR}
- ${X11_INCLUDE_DIR})
+ ${IMLIB2_INCLUDE_DIRS}
+ ${LUA_INCLUDE_DIR}
+ ${X11_INCLUDE_DIR})
endif(BUILD_LUA_IMLIB2)
if(BUILD_LUA_RSVG)
Loading…
Cancel
Save