From nobody Sun May 19 17:59:41 2024 X-Original-To: dev-commits-ports-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4Vj7kk05hfz5Krr7; Sun, 19 May 2024 17:59:42 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Vj7kj6k8yz4xqP; Sun, 19 May 2024 17:59:41 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1716141581; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=qD253SP07YD1npOPwViee8NLcNJmzSnwVuKHDGCjM9g=; b=gc/c/hdNC3S4ty8rGlmH4ROfKI3CbsoGio7fV8iXjm78MXg8TF3Kq0o+vt+Ywqscggp026 k7rWYfsD908/KpojRnZ4kW7SxVY0E6IfVSfwwED3xn67UDyx8KAhhZ4ptMqW/YEojcuquR 5YxwCe4gLeaR2IQC1o4U4iQHxHgwPVxYoA5WhOb9VmeoJZ71j4bBkB1cABuSMQbGBMZVgB 6ltnhK+XdUZ/zEHP3EaJ+XxBC8Vf8W5dXEHKARLudueuNgCZ79OBGugmed8ANCnJim3iPW EX27bTVXZ9LlY3Wsp6824Uk3aU3KcTZUBU5Y3rzXxxM4jKchmVxsPBAsq055xA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1716141581; a=rsa-sha256; cv=none; b=yBpcYAW746UIUuqFs1+nd8nTyK2ty/YcSn5h/CNj8Dg+SWZqplYPXfJdRqt4qZjaHs5j5K pX+JXaYKZOoJWppZQsgwrV/VaFp9eAaH/wP/fxLZ6uCETuqFh21e+EwXIuRsR3gBkBKFHn 4/F/biI4KEhQJ3KFu+5K1jc239OVhjf0Be9v2e4TPgpGeMfo3Z5CfC550OH6pOaF8rhiZ2 bbctVAvJMPvv3EqDwLFx0MMcDkUa13Y1X39+VbFsFjkcVPH4Q+Yt5qCjy1tLXkIjpcqVoA o/xz178L2iXfvmXfzr3RKY9V8togm4wAzWBKbhj1OE2IscpHxsJYhcpgs+xkpQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1716141581; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=qD253SP07YD1npOPwViee8NLcNJmzSnwVuKHDGCjM9g=; b=eSj2jaQXLNyVCGVwaBvXJ+c3TKrd+tHcnR37X/NcdjEbLpMDRmtiDlskq/2iI5WrbG8PAp l1820zWZKwZXsA9bZE6WRCKefI9+5XPAuf0so/c4q5PQE0EDkoA1eDdIsLF4uSPeinfV6F Nxj0O9RjQ+pslPgBo2pfK/zYdJrb8eO8mx70EOBbF6GKPoOl3YRwrngIXTnKmuGV3v1w1p cU272pfF43OgxLHkGv/SHvMPrMcKLBTKumpVG4Ih6cCJyJ4Kkkigx+z1gGEo3YxZuTf3Kh I2oa3pN/F/qXab3sbdiNAhZa0nkoudhkvWhCMK0MoI3XcZGCJwdJYOfWSZSJ3Q== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4Vj7kj6CHwz1KBb; Sun, 19 May 2024 17:59:41 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 44JHxfIS042354; Sun, 19 May 2024 17:59:41 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 44JHxfD9042351; Sun, 19 May 2024 17:59:41 GMT (envelope-from git) Date: Sun, 19 May 2024 17:59:41 GMT Message-Id: <202405191759.44JHxfD9042351@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Fernando =?utf-8?Q?Apestegu=C3=ADa?= Subject: git: 507134dd494f - main - sysutils/conky: update to 1.21.1 List-Id: Commit messages for all branches of the ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-ports-all@freebsd.org Sender: owner-dev-commits-ports-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: fernape X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 507134dd494f33f794df1b14352947077871f741 Auto-Submitted: auto-generated The branch main has been updated by fernape: URL: https://cgit.FreeBSD.org/ports/commit/?id=507134dd494f33f794df1b14352947077871f741 commit 507134dd494f33f794df1b14352947077871f741 Author: Fernando Apesteguía AuthorDate: 2024-05-19 17:43:24 +0000 Commit: Fernando Apesteguía CommitDate: 2024-05-19 17:59:15 +0000 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 --- sysutils/conky/Makefile | 9 ++------- sysutils/conky/distinfo | 6 +++--- sysutils/conky/files/patch-src_llua.h | 10 ---------- sysutils/conky/files/patch-src_x11-settings.cc | 6 +++--- sysutils/conky/files/patch-src_x11.cc | 16 ++++++++-------- 5 files changed, 16 insertions(+), 31 deletions(-) diff --git a/sysutils/conky/Makefile b/sysutils/conky/Makefile index e991646e9e4b..6a84d03b15e5 100644 --- a/sysutils/conky/Makefile +++ b/sysutils/conky/Makefile @@ -1,5 +1,5 @@ PORTNAME= conky -PORTVERSION= 1.21.0 +PORTVERSION= 1.21.1 DISTVERSIONPREFIX= v CATEGORIES= sysutils @@ -28,8 +28,7 @@ CMAKE_ARGS= -DAPP_SED=${LOCALBASE}/bin/gsed \ CONFLICTS?= conky-awesome SLAVEDIRS= sysutils/conky-awesome -PLIST_FILES= bin/conky \ - lib/libVc.a +PLIST_FILES= bin/conky PORTDOCS= config_settings.yaml lua.yaml variables.yaml PORTEXAMPLES= conky.conf conky_no_x11.conf convert.lua @@ -164,8 +163,4 @@ post-install-DOCS-on: ${INSTALL_MAN} ${WRKSRC}/doc/${FILE} ${STAGEDIR}${DOCSDIR} .endfor -post-install: - ${RM} -rf ${STAGEDIR}${PREFIX}/include - ${RM} -rf ${STAGEDIR}${PREFIX}/lib/cmake - .include diff --git a/sysutils/conky/distinfo b/sysutils/conky/distinfo index 28921e65f13d..fd4e7cac4151 100644 --- a/sysutils/conky/distinfo +++ b/sysutils/conky/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1715452113 -SHA256 (brndnmtthws-conky-v1.21.0_GH0.tar.gz) = fff08ee35c15caf85ca62119c2694b9392f770eb4a8f1b5e07738d96edd0e5ac -SIZE (brndnmtthws-conky-v1.21.0_GH0.tar.gz) = 2146867 +TIMESTAMP = 1716140477 +SHA256 (brndnmtthws-conky-v1.21.1_GH0.tar.gz) = dccfee01fc208c4fde2bfb7c39c0fdc692d82de0f94e733ddf22e1199969bc5d +SIZE (brndnmtthws-conky-v1.21.1_GH0.tar.gz) = 2146994 diff --git a/sysutils/conky/files/patch-src_llua.h b/sysutils/conky/files/patch-src_llua.h deleted file mode 100644 index f5486ed1186f..000000000000 --- a/sysutils/conky/files/patch-src_llua.h +++ /dev/null @@ -1,10 +0,0 @@ ---- src/llua.h.orig 2024-05-07 20:02:47 UTC -+++ src/llua.h -@@ -31,6 +31,7 @@ extern "C" { - } - - #include -+#include "geometry.h" - - #ifdef BUILD_MOUSE_EVENTS - #include "mouse-events.h" diff --git a/sysutils/conky/files/patch-src_x11-settings.cc b/sysutils/conky/files/patch-src_x11-settings.cc index d5602d3839a7..b91b3e469084 100644 --- a/sysutils/conky/files/patch-src_x11-settings.cc +++ b/sysutils/conky/files/patch-src_x11-settings.cc @@ -1,11 +1,11 @@ ---- src/x11-settings.cc.orig 2024-05-07 20:02:47 UTC +--- 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.width + 1, window.height + 1, -+ XCreatePixmap(display, window.window, window.geometry.get_width() + 1, window.geometry.get_height() + 1, +- 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 index b341e374a623..8ecbb03b3840 100644 --- a/sysutils/conky/files/patch-src_x11.cc +++ b/sysutils/conky/files/patch-src_x11.cc @@ -1,16 +1,16 @@ ---- src/x11.cc.orig 2024-05-14 16:06:21 UTC +--- src/x11.cc.orig 2024-05-19 17:48:25 UTC +++ src/x11.cc -@@ -1215,10 +1215,10 @@ void xpmdb_swap_buffers(void) { +@@ -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.width, window.height, 0, 0); -+ window.geometry.get_width(), window.geometry.get_height(), 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.width, -- window.height); -+ 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.get_width(), +- window.geometry.get_height()); ++ XFillRectangle(display, window.drawable, window.gc, 0, 0, window.geometry.width(), ++ window.geometry.height()); XFlush(display); } }