Skip to content

Commit

Permalink
sysutils/conky{-awesome}: update to 1.19.8
Browse files Browse the repository at this point in the history
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()
  • Loading branch information
fernape committed Feb 28, 2024
1 parent 6a6678e commit 3d7fdd1
Show file tree
Hide file tree
Showing 5 changed files with 16 additions and 24 deletions.
2 changes: 1 addition & 1 deletion sysutils/conky-awesome/Makefile
Expand Up @@ -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"
12 changes: 7 additions & 5 deletions 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

Expand Down Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand Down
6 changes: 3 additions & 3 deletions 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
9 changes: 5 additions & 4 deletions 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}")
Expand All @@ -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)
11 changes: 0 additions & 11 deletions sysutils/conky/files/patch-doc_CMakeLists.txt

This file was deleted.

0 comments on commit 3d7fdd1

Please sign in to comment.