FreeBSD/freebsd-ports
Fork 14
Code Releases Activity

sysutils/conky{-awesome}: update to 1.21.2

Browse source 
Remove upstreamed patches.

ChangeLog: https://github.com/brndnmtthws/conky/releases/tag/v1.21.2

Features

 * Don't include the -pre in install dir path.

Bug fixes

 * Fix build with specific option combination.
 * Remove dpi scaling of minimum_width & maximum_width
 * Make dpi_scale match original behavior
 * Don't test colour names without map
 * Fix typo in conky.cc

Miscellaneous

 * Bump version
 * Docker: don't login without creds
This commit is contained in:
Fernando Apesteguía 2024-05-30 17:17:33 +02:00
commit cfc9a1e749
5 changed files with 7 additions and 34 deletions
Download patch file Download diff file Expand all files Collapse all files

2
sysutils/conky/Makefile
View file

@ -1,5 +1,5 @@
PORTNAME= conky
PORTVERSION= 1.21.1
PORTVERSION= 1.21.2
DISTVERSIONPREFIX= v
CATEGORIES= sysutils

6
sysutils/conky/distinfo
View file

@ -1,3 +1,3 @@
TIMESTAMP = 1716140477
SHA256 (brndnmtthws-conky-v1.21.1_GH0.tar.gz) = dccfee01fc208c4fde2bfb7c39c0fdc692d82de0f94e733ddf22e1199969bc5d
SIZE (brndnmtthws-conky-v1.21.1_GH0.tar.gz) = 2146994
TIMESTAMP = 1717082241
SHA256 (brndnmtthws-conky-v1.21.2_GH0.tar.gz) = d2196f4e61b696265145f6e0ad306376229147bd1cbe0c54ec87d5cd2473f752
SIZE (brndnmtthws-conky-v1.21.2_GH0.tar.gz) = 2147033

6
sysutils/conky/files/patch-CMakeLists.txt
View file

@ -1,10 +1,10 @@
--- CMakeLists.txt.orig 2024-02-26 18:33:49 UTC
--- CMakeLists.txt.orig 2024-05-30 14:36:45 UTC
+++ CMakeLists.txt
@@ -74,12 +74,15 @@ if(NOT DEFINED DOC_PATH)
@@ -79,12 +79,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}-${RELEASE_VERSION}")
+ set(DOC_PATH "share/doc/${CPACK_PACKAGE_NAME}")
endif(NOT DEFINED DOC_PATH)

11
sysutils/conky/files/patch-src_x11-settings.cc
View file

@ -1,11 +0,0 @@
--- src/x11-settings.cc.orig 2024-05-19 17:48:45 UTC
+++ src/x11-settings.cc
@@ -77,7 +77,7 @@ bool use_xpmdb_setting::set_up(lua::state &l) {
if (!out_to_x.get(l)) return false;
window.back_buffer =
- XCreatePixmap(display, window.window, window.geometry.get_width() + 1, window.geometry.get_height() + 1,
+ XCreatePixmap(display, window.window, window.geometry.width() + 1, window.geometry.height() + 1,
DefaultDepth(display, screen));
if (window.back_buffer != None) {
window.drawable = window.back_buffer;

16
sysutils/conky/files/patch-src_x11.cc
View file

@ -1,16 +0,0 @@
--- src/x11.cc.orig 2024-05-19 17:48:25 UTC
+++ src/x11.cc
@@ -1219,10 +1219,10 @@ void xpmdb_swap_buffers(void) {
void xpmdb_swap_buffers(void) {
if (use_xpmdb.get(*state)) {
XCopyArea(display, window.back_buffer, window.window, window.gc, 0, 0,
- window.geometry.get_width(), window.geometry.get_height(), 0, 0);
+ window.geometry.width(), window.geometry.height(), 0, 0);
XSetForeground(display, window.gc, 0);
- XFillRectangle(display, window.drawable, window.gc, 0, 0, window.geometry.get_width(),
- window.geometry.get_height());
+ XFillRectangle(display, window.drawable, window.gc, 0, 0, window.geometry.width(),
+ window.geometry.height());
XFlush(display);
}
}