Skip to content

Commit 507134d

Browse files
committed
sysutils/conky: update to 1.21.1
ChangeLog: https://github.com/brndnmtthws/conky/releases/tag/v1.21.1 * Bug fixes * Disable Vc_ENABLE_INSTALL * Remove _member_access from geometry * Fix build with specific option combination. * Disable Xinput * Miscellaneous * Bump version * Refactor the CMake 3rdparty/Vc-related bits * Fix dockerhub login * build(deps): bump DeterminateSystems/magic-nix-cache-action from 4 to 6 * build(deps): bump DeterminateSystems/nix-installer-action from 10 to 11 * Group all actions dependabot updates
1 parent afaedf7 commit 507134d

File tree

5 files changed

+16
-31
lines changed

5 files changed

+16
-31
lines changed

‎sysutils/conky/Makefile‎

Lines changed: 2 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
PORTNAME= conky
2-
PORTVERSION= 1.21.0
2+
PORTVERSION= 1.21.1
33
DISTVERSIONPREFIX= v
44
CATEGORIES= sysutils
55

@@ -28,8 +28,7 @@ CMAKE_ARGS= -DAPP_SED=${LOCALBASE}/bin/gsed \
2828
CONFLICTS?= conky-awesome
2929

3030
SLAVEDIRS= sysutils/conky-awesome
31-
PLIST_FILES= bin/conky \
32-
lib/libVc.a
31+
PLIST_FILES= bin/conky
3332
PORTDOCS= config_settings.yaml lua.yaml variables.yaml
3433
PORTEXAMPLES= conky.conf conky_no_x11.conf convert.lua
3534

@@ -164,8 +163,4 @@ post-install-DOCS-on:
164163
${INSTALL_MAN} ${WRKSRC}/doc/${FILE} ${STAGEDIR}${DOCSDIR}
165164
.endfor
166165

167-
post-install:
168-
${RM} -rf ${STAGEDIR}${PREFIX}/include
169-
${RM} -rf ${STAGEDIR}${PREFIX}/lib/cmake
170-
171166
.include <bsd.port.mk>

‎sysutils/conky/distinfo‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
1-
TIMESTAMP = 1715452113
2-
SHA256 (brndnmtthws-conky-v1.21.0_GH0.tar.gz) = fff08ee35c15caf85ca62119c2694b9392f770eb4a8f1b5e07738d96edd0e5ac
3-
SIZE (brndnmtthws-conky-v1.21.0_GH0.tar.gz) = 2146867
1+
TIMESTAMP = 1716140477
2+
SHA256 (brndnmtthws-conky-v1.21.1_GH0.tar.gz) = dccfee01fc208c4fde2bfb7c39c0fdc692d82de0f94e733ddf22e1199969bc5d
3+
SIZE (brndnmtthws-conky-v1.21.1_GH0.tar.gz) = 2146994

‎sysutils/conky/files/patch-src_llua.h‎

Lines changed: 0 additions & 10 deletions
This file was deleted.
Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
1-
--- src/x11-settings.cc.orig 2024-05-07 20:02:47 UTC
1+
--- src/x11-settings.cc.orig 2024-05-19 17:48:45 UTC
22
+++ src/x11-settings.cc
33
@@ -77,7 +77,7 @@ bool use_xpmdb_setting::set_up(lua::state &l) {
44
if (!out_to_x.get(l)) return false;
55

66
window.back_buffer =
7-
- XCreatePixmap(display, window.window, window.width + 1, window.height + 1,
8-
+ XCreatePixmap(display, window.window, window.geometry.get_width() + 1, window.geometry.get_height() + 1,
7+
- XCreatePixmap(display, window.window, window.geometry.get_width() + 1, window.geometry.get_height() + 1,
8+
+ XCreatePixmap(display, window.window, window.geometry.width() + 1, window.geometry.height() + 1,
99
DefaultDepth(display, screen));
1010
if (window.back_buffer != None) {
1111
window.drawable = window.back_buffer;
Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,16 @@
1-
--- src/x11.cc.orig 2024-05-14 16:06:21 UTC
1+
--- src/x11.cc.orig 2024-05-19 17:48:25 UTC
22
+++ src/x11.cc
3-
@@ -1215,10 +1215,10 @@ void xpmdb_swap_buffers(void) {
3+
@@ -1219,10 +1219,10 @@ void xpmdb_swap_buffers(void) {
44
void xpmdb_swap_buffers(void) {
55
if (use_xpmdb.get(*state)) {
66
XCopyArea(display, window.back_buffer, window.window, window.gc, 0, 0,
7-
- window.width, window.height, 0, 0);
8-
+ window.geometry.get_width(), window.geometry.get_height(), 0, 0);
7+
- window.geometry.get_width(), window.geometry.get_height(), 0, 0);
8+
+ window.geometry.width(), window.geometry.height(), 0, 0);
99
XSetForeground(display, window.gc, 0);
10-
- XFillRectangle(display, window.drawable, window.gc, 0, 0, window.width,
11-
- window.height);
12-
+ XFillRectangle(display, window.drawable, window.gc, 0, 0, window.geometry.get_width(),
13-
+ window.geometry.get_height());
10+
- XFillRectangle(display, window.drawable, window.gc, 0, 0, window.geometry.get_width(),
11+
- window.geometry.get_height());
12+
+ XFillRectangle(display, window.drawable, window.gc, 0, 0, window.geometry.width(),
13+
+ window.geometry.height());
1414
XFlush(display);
1515
}
1616
}

0 commit comments

Comments
 (0)