diff options
| author | M.Dinslage <matthewdinslage@gmail.com> | 2023-03-06 00:16:32 +0000 |
|---|---|---|
| committer | Willy Sudiarto Raharjo <willysr@slackbuilds.org> | 2023-03-12 08:48:31 +0700 |
| commit | 50e8f0120cee6306fe8c547cf30f9fb2b2735d7d (patch) | |
| tree | 021315fc7cf80f12521beea8426a5169c1f9d5d1 /system/conky | |
| parent | 22437896aa326b0443d8ae6c27558642a5d41bc3 (diff) | |
system/conky: Updated for version 1.18.2.
Signed-off-by: bedlam <dave@slackbuilds.org>
Signed-off-by: Willy Sudiarto Raharjo <willysr@slackbuilds.org>
Diffstat (limited to 'system/conky')
| -rw-r--r-- | system/conky/conky.SlackBuild | 5 | ||||
| -rw-r--r-- | system/conky/conky.info | 6 | ||||
| -rw-r--r-- | system/conky/lua-5.1.x-fix.patch | 36 |
3 files changed, 4 insertions, 43 deletions
diff --git a/system/conky/conky.SlackBuild b/system/conky/conky.SlackBuild index 64f3a76fd8a7..784a03037923 100644 --- a/system/conky/conky.SlackBuild +++ b/system/conky/conky.SlackBuild @@ -25,7 +25,7 @@ cd $(dirname $0) ; CWD=$(pwd) PRGNAM=conky -VERSION=${VERSION:-1.18.1} +VERSION=${VERSION:-1.18.2} BUILD=${BUILD:-1} TAG=${TAG:-_SBo} PKGTYPE=${PKGTYPE:-tgz} @@ -94,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 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 \ diff --git a/system/conky/conky.info b/system/conky/conky.info index 34447d323f0b..4fa23058bf4a 100644 --- a/system/conky/conky.info +++ b/system/conky/conky.info @@ -1,8 +1,8 @@ PRGNAM="conky" -VERSION="1.18.1" +VERSION="1.18.2" HOMEPAGE="https://github.com/brndnmtthws/conky" -DOWNLOAD="https://github.com/brndnmtthws/conky/archive/v1.18.1/conky-1.18.1.tar.gz" -MD5SUM="3a5ed55c578831bb9221ef6added9cf7" +DOWNLOAD="https://github.com/brndnmtthws/conky/archive/v1.18.2/conky-1.18.2.tar.gz" +MD5SUM="9094405cdc5532e92045cc086aea6227" DOWNLOAD_x86_64="" MD5SUM_x86_64="" REQUIRES="lua53 imlib2" diff --git a/system/conky/lua-5.1.x-fix.patch b/system/conky/lua-5.1.x-fix.patch deleted file mode 100644 index ce0d5b0e69cb..000000000000 --- a/system/conky/lua-5.1.x-fix.patch +++ /dev/null @@ -1,36 +0,0 @@ -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) |