aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorFernando ApesteguĂ­a <fernape@FreeBSD.org>2024-02-21 16:37:11 +0000
committerFernando ApesteguĂ­a <fernape@FreeBSD.org>2024-02-28 14:38:55 +0000
commit3d7fdd1b3f078812b58ed26e42a452a46b9d187e (patch)
treed615c0593272acb754ba98db67bf66710e4afd6e
parent6a6678eefe429ff40c7521ccdb93b5c4196f570f (diff)
downloadports-3d7fdd1b3f078812b58ed26e42a452a46b9d187e.tar.gz
ports-3d7fdd1b3f078812b58ed26e42a452a46b9d187e.zip
sysutils/conky{-awesome}: update to 1.19.8
Take maintainership. We can't exclude X11 option anymore in conky-awesome. ChangeLog: https://github.com/brndnmtthws/conky/releases/tag/v1.19.8 Accumulated changes since 1.19.7 Features * [Docs] Improve speedgraphs' scale description * Drop graph/linechart from web header * Fix labeler v5 * Show cached memory as in free (Linux only) * Fix typo in config_settings.yaml * Remove build date and associated vars * Update copyright * Update macos build images * Bump flake deps * Bump web deps, improve mdx handling * Add basic pulseaudio source (microphone etc.) support * Enable lua bindings in nix flake * Compile tolua++ output as C++ * Refactor web search index Bug fixes * X11: Fix infinite loops caused * Fix update_interval handling from CLI args * Fix bad new/delete usage * Fix build for imlib2 <1.10.0 * Fix buffer overflow on X11 error bug * Fix C mangling for lua bindings * Add wlr layer shell check * Fix xcb include path * Don't call FcFini()
-rw-r--r--sysutils/conky-awesome/Makefile2
-rw-r--r--sysutils/conky/Makefile12
-rw-r--r--sysutils/conky/distinfo6
-rw-r--r--sysutils/conky/files/patch-CMakeLists.txt9
-rw-r--r--sysutils/conky/files/patch-doc_CMakeLists.txt11
5 files changed, 16 insertions, 24 deletions
diff --git a/sysutils/conky-awesome/Makefile b/sysutils/conky-awesome/Makefile
index afb86d1e0dd5..d321d8d83632 100644
--- a/sysutils/conky-awesome/Makefile
+++ b/sysutils/conky-awesome/Makefile
@@ -8,7 +8,7 @@ DESCR= ${.CURDIR}/pkg-descr
CONFLICTS= conky
-OPTIONS_EXCLUDE= X11 ARGB DOUBLE_BUFFER IMLIB2 MOUSE_EVENTS XFT XINERAMA LUA_CAIRO \
+OPTIONS_EXCLUDE= ARGB DOUBLE_BUFFER IMLIB2 MOUSE_EVENTS XFT XINERAMA LUA_CAIRO \
LUA_IMLIB2 LUA_RSVG WAYLAND
.include "${MASTERDIR}/Makefile"
diff --git a/sysutils/conky/Makefile b/sysutils/conky/Makefile
index ef5e22174a27..ce91add6cdad 100644
--- a/sysutils/conky/Makefile
+++ b/sysutils/conky/Makefile
@@ -1,13 +1,15 @@
PORTNAME= conky
-PORTVERSION= 1.19.6
-PORTREVISION= 1
+PORTVERSION= 1.19.8
DISTVERSIONPREFIX= v
CATEGORIES= sysutils
-MAINTAINER= ports@FreeBSD.org
+MAINTAINER= fernape@FreeBSD.org
COMMENT?= Advanced, highly configurable system monitor for X11
WWW= https://github.com/brndnmtthws/conky
+LICENSE= GPLv3
+LICENSE_FILE= ${WRKSRC}/LICENSE.md
+
BUILD_DEPENDS= gsed:textproc/gsed
LIB_DEPENDS= libinotify.so:devel/libinotify
@@ -91,7 +93,7 @@ MANPAGES_BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}Jinja2>=0:devel/py-Jinja2@${PY_FL
pandoc:textproc/hs-pandoc
MANPAGES_USES= python:build
MANPAGES_CMAKE_BOOL= BUILD_DOCS
-MANPAGES_PLIST_FILES= man/man1/conky.1.gz
+MANPAGES_PLIST_FILES= share/man/man1/conky.1.gz
METAR_IMPLIES= CURL
METAR_CMAKE_BOOL= BUILD_WEATHER_METAR
@@ -122,7 +124,7 @@ WAYLAND_CMAKE_BOOL= BUILD_WAYLAND
WAYLAND_LDFLAGS= -Wl,--as-needed # pangoft2 deps: glib20, freetype2, harfbuzz
X11_USES= xorg
-X11_USE= XORG=x11,xdamage,xext,xfixes
+X11_USE= XORG=x11,xdamage,xext,xfixes,xi
X11_CMAKE_BOOL= BUILD_X11 OWN_WINDOW
XFT_IMPLIES= X11
diff --git a/sysutils/conky/distinfo b/sysutils/conky/distinfo
index 8714f6fbd5b0..91f8cccb26c6 100644
--- a/sysutils/conky/distinfo
+++ b/sysutils/conky/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1697267722
-SHA256 (brndnmtthws-conky-v1.19.6_GH0.tar.gz) = 1bf5868da44056badd4718a3c8dcc6905f7118a9f86e785b354a8ecdb157a59e
-SIZE (brndnmtthws-conky-v1.19.6_GH0.tar.gz) = 1727487
+TIMESTAMP = 1709105678
+SHA256 (brndnmtthws-conky-v1.19.8_GH0.tar.gz) = 8ac01452554559ace15e5966cb65eb37ef73b98c72967e6e0974c7ba98a1a88d
+SIZE (brndnmtthws-conky-v1.19.8_GH0.tar.gz) = 1711683
diff --git a/sysutils/conky/files/patch-CMakeLists.txt b/sysutils/conky/files/patch-CMakeLists.txt
index e8131e7911a6..6f3f5c0807f3 100644
--- a/sysutils/conky/files/patch-CMakeLists.txt
+++ b/sysutils/conky/files/patch-CMakeLists.txt
@@ -1,12 +1,13 @@
---- CMakeLists.txt.orig 2022-10-12 18:18:08 UTC
+--- CMakeLists.txt.orig 2024-02-26 18:33:49 UTC
+++ CMakeLists.txt
-@@ -73,11 +73,14 @@ if(NOT DEFINED DOC_PATH)
+@@ -74,12 +74,15 @@ if(NOT DEFINED DOC_PATH)
endif()
if(NOT DEFINED DOC_PATH)
- set(DOC_PATH "share/doc/${CPACK_PACKAGE_NAME}-${VERSION}")
+ set(DOC_PATH "share/doc/${CPACK_PACKAGE_NAME}")
endif(NOT DEFINED DOC_PATH)
+
-set(DOC_FILES extras/convert.lua data/conky_no_x11.conf data/conky.conf)
+if(NOT DEFINED SAMPLE_PATH)
+ set(SAMPLE_PATH "share/examples/${CPACK_PACKAGE_NAME}")
@@ -16,5 +17,5 @@
-install(FILES ${DOC_FILES} DESTINATION ${DOC_PATH})
+install(FILES ${SAMPLE_FILES} DESTINATION ${SAMPLE_PATH})
- if(${CMAKE_SYSTEM_NAME} MATCHES "Linux")
- install(FILES conky.desktop DESTINATION share/applications)
+ if(CHECK_CODE_QUALITY)
+ find_package(ClangTidy)
diff --git a/sysutils/conky/files/patch-doc_CMakeLists.txt b/sysutils/conky/files/patch-doc_CMakeLists.txt
deleted file mode 100644
index d6ef42b5aa55..000000000000
--- a/sysutils/conky/files/patch-doc_CMakeLists.txt
+++ /dev/null
@@ -1,11 +0,0 @@
---- doc/CMakeLists.txt.orig 2022-10-12 18:18:08 UTC
-+++ doc/CMakeLists.txt
-@@ -32,7 +32,7 @@ if(BUILD_DOCS)
- )
- add_dependencies(conky.1 man.md)
-
-- set(MAN_PATH "share/man/man1")
-+ set(MAN_PATH "man/man1")
- set(MAN_FILES ${CMAKE_CURRENT_BINARY_DIR}/conky.1)
-
- install(FILES ${DOC_FILES} DESTINATION ${DOC_PATH})