Date: Fri, 31 May 2024 06:32:03 GMT
From: Fernando =?utf-8?Q?Apestegu=C3=ADa?= <fernape@FreeBSD.org>
To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org
Subject: git: cfc9a1e749ee - main - sysutils/conky{-awesome}: update to 1.21.2
Message-ID: <202405310632.44V6W3uS048273@gitrepo.freebsd.org>
next in thread | raw e-mail | index | archive | help
The branch main has been updated by fernape: URL: https://cgit.FreeBSD.org/ports/commit/?id=cfc9a1e749ee6c2869d1139dcd395db2747712b8 commit cfc9a1e749ee6c2869d1139dcd395db2747712b8 Author: Fernando Apesteguía <fernape@FreeBSD.org> AuthorDate: 2024-05-30 15:17:33 +0000 Commit: Fernando Apesteguía <fernape@FreeBSD.org> CommitDate: 2024-05-31 06:31:24 +0000 sysutils/conky{-awesome}: update to 1.21.2 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 --- sysutils/conky/Makefile | 2 +- sysutils/conky/distinfo | 6 +++--- sysutils/conky/files/patch-CMakeLists.txt | 6 +++--- sysutils/conky/files/patch-src_x11-settings.cc | 11 ----------- sysutils/conky/files/patch-src_x11.cc | 16 ---------------- 5 files changed, 7 insertions(+), 34 deletions(-) diff --git a/sysutils/conky/Makefile b/sysutils/conky/Makefile index 6a84d03b15e5..fd26609ce559 100644 --- a/sysutils/conky/Makefile +++ b/sysutils/conky/Makefile @@ -1,5 +1,5 @@ PORTNAME= conky -PORTVERSION= 1.21.1 +PORTVERSION= 1.21.2 DISTVERSIONPREFIX= v CATEGORIES= sysutils diff --git a/sysutils/conky/distinfo b/sysutils/conky/distinfo index fd4e7cac4151..8253d0b857ee 100644 --- a/sysutils/conky/distinfo +++ b/sysutils/conky/distinfo @@ -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 diff --git a/sysutils/conky/files/patch-CMakeLists.txt b/sysutils/conky/files/patch-CMakeLists.txt index 6f3f5c0807f3..96f293f00010 100644 --- a/sysutils/conky/files/patch-CMakeLists.txt +++ b/sysutils/conky/files/patch-CMakeLists.txt @@ -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) diff --git a/sysutils/conky/files/patch-src_x11-settings.cc b/sysutils/conky/files/patch-src_x11-settings.cc deleted file mode 100644 index b91b3e469084..000000000000 --- a/sysutils/conky/files/patch-src_x11-settings.cc +++ /dev/null @@ -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; diff --git a/sysutils/conky/files/patch-src_x11.cc b/sysutils/conky/files/patch-src_x11.cc deleted file mode 100644 index 8ecbb03b3840..000000000000 --- a/sysutils/conky/files/patch-src_x11.cc +++ /dev/null @@ -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); - } - }
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202405310632.44V6W3uS048273>