From nobody Fri Apr 19 16:08:17 2024 X-Original-To: dev-commits-ports-main@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 4VLfh14pksz5HJZr; Fri, 19 Apr 2024 16:08:17 +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 4VLfh14220z4Zmg; Fri, 19 Apr 2024 16:08:17 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1713542897; 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=2Vmop1UOR8se8SDinbFGLJHTXGIZ+E0aBH6rN9H8vJ0=; b=t6gm5kyY/gwGE735NVpWLJ6flcqfsBaR0/KMKQIOWoRZud1TdwgqTBO/NyWzEYx8T9ZpjX Ic3Lc8OpWYIwBBH6NDQccmKLssrMj+LxcjtbBDwAc7n099XvBHfVZNC70cLrPy70WESXqu geu5svKxFE2lerkoXNTOfMaAkODxKRPid4B76z/mOXa6qIRnGDmOvEqn9eXlgmsR0yYGEL jy27giuAmzxHk7avSA5ROjXvlXPCagvUWQWO/tjXRgz0BshxsQ5u0IqTDsM8M2SG8W0rCb oz8QN2QTlcx0Lcp4MSszSo14Mutm89FvWa39uqpHPqNoNEBIgzstC1+6n7V6gw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1713542897; a=rsa-sha256; cv=none; b=CmzFdfcRZh3omFhfJTwd0e84xQAiNfZbjVGvFYg4h/jFk8dNA20gcK+SFdQc/xnE77Jji5 llz6W07xAVialPNKz/6BQnM3g0QE4yDmt1DaJWAtZdsInJ0ReV+QCNnA2LcLvgU8n/Obfs BZ0tWCkhBFsx2ffpG+aEM4mHpXmXCan/56GD/+wVJUzJxsZhrvmTMhETnsZZyWi4YIDS0+ ddHi3uc5iQM4zBvnn7PAT+w6kZ65INB20eeLf4ippnx8qu3iXMIEokgCNWClQDM1FZ6NQw r9Q8b+KISRlNBHJIdrNCp5m2RopFNnxFT1X/YfaLNdfYkVjkrSRUpJS8y/S+xw== 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=1713542897; 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=2Vmop1UOR8se8SDinbFGLJHTXGIZ+E0aBH6rN9H8vJ0=; b=EHS74qJivLZg56u4chNzA4gYGgAwIJxtqVoMvpdR6uWeoP3YAOFbSORtT3zswe7XF3/byW cnjEebeYxtg52HqJHrT6U5WsI0G7/9IgHBMcU6fvY01SFZwHpVhYNQwPtkxAjV9G73MRnw U5SSQm4k+dlcqH0nZHmu53MGJAQAIqGQrUF2Lw1WhVHM1E5EaENUa38ryxbra13EQIv09r vK0tn1Mt678EktH653e+kM3o3pCfslIdfKWnTCH1Xqwjbz54MgM3Bv1coJXcWCacC4aLod TBshZdG+bAuyn74QRASLNxN6gcp7fiYKn6ixr/G2A4vasJLaRvhHSVtjpYdCRg== 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 4VLfh13Knmz10Sk; Fri, 19 Apr 2024 16:08:17 +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 43JG8HFj034045; Fri, 19 Apr 2024 16:08:17 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 43JG8HuY034042; Fri, 19 Apr 2024 16:08:17 GMT (envelope-from git) Date: Fri, 19 Apr 2024 16:08:17 GMT Message-Id: <202404191608.43JG8HuY034042@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: 8d540f0bc78e - main - sysutils/conky: update to 1.20.1 List-Id: Commits to the main branch of the FreeBSD ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-ports-main@freebsd.org Sender: owner-dev-commits-ports-main@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: 8d540f0bc78e7104ae79469baebeb125046edb82 Auto-Submitted: auto-generated The branch main has been updated by fernape: URL: https://cgit.FreeBSD.org/ports/commit/?id=8d540f0bc78e7104ae79469baebeb125046edb82 commit 8d540f0bc78e7104ae79469baebeb125046edb82 Author: Fernando Apesteguía AuthorDate: 2024-04-17 13:08:47 +0000 Commit: Fernando Apesteguía CommitDate: 2024-04-19 16:07:41 +0000 sysutils/conky: update to 1.20.1 Bugfix over the short-lived 1.20.0 ChangeLog: https://github.com/brndnmtthws/conky/releases/tag/v1.20.0 Features * Build AppImage separately per OS * Rotate appimage signing key * Add/use clang 15 on ubuntu builds * Define text_object.data.l as "long long" * Bump web deps, fix lint * Updated flake per NixOS/nix#5532 * Fix bad imlib2 typedefs for imlib<1.10 * Use --force with brew install, block upgrades * Tidy up docs * Update README.md * Update README.md * Handle external PropertyNotify events * Label dependency changes * Tweak XSendEvent arguments * Add modified date to web docs * Improve documentation for window types and hints * Refactor x11 event handling * Issue template: Link docs to obtain stack traces * Exclusive XInput event handling Bug fixes * Enable wayland in appimage build * Fix regression in lua_load path handling * Lua imlib2 fixes * Increase max length of ACPI temp (fixes #977) * Skip propagation of non-input events * Fix render order in draw_stuff * Fix event propagation on Openbox * Fix missing y_abs argument copy --- sysutils/conky/Makefile | 2 +- sysutils/conky/distinfo | 6 +++--- sysutils/conky/files/patch-lua_CMakeLists.txt | 4 ++-- sysutils/conky/files/patch-src_display-x11.cc | 26 ++++++++++++++++++++++++++ sysutils/conky/files/patch-src_x11.h | 6 +++--- 5 files changed, 35 insertions(+), 9 deletions(-) diff --git a/sysutils/conky/Makefile b/sysutils/conky/Makefile index ce91add6cdad..241bb9031ebb 100644 --- a/sysutils/conky/Makefile +++ b/sysutils/conky/Makefile @@ -1,5 +1,5 @@ PORTNAME= conky -PORTVERSION= 1.19.8 +PORTVERSION= 1.20.1 DISTVERSIONPREFIX= v CATEGORIES= sysutils diff --git a/sysutils/conky/distinfo b/sysutils/conky/distinfo index 91f8cccb26c6..50efb30b9efe 100644 --- a/sysutils/conky/distinfo +++ b/sysutils/conky/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1709105678 -SHA256 (brndnmtthws-conky-v1.19.8_GH0.tar.gz) = 8ac01452554559ace15e5966cb65eb37ef73b98c72967e6e0974c7ba98a1a88d -SIZE (brndnmtthws-conky-v1.19.8_GH0.tar.gz) = 1711683 +TIMESTAMP = 1713443191 +SHA256 (brndnmtthws-conky-v1.20.1_GH0.tar.gz) = 5e0531d1bbb589ee2369876340c341073d3bc13f8a79c05f89ec6170d6374085 +SIZE (brndnmtthws-conky-v1.20.1_GH0.tar.gz) = 1839204 diff --git a/sysutils/conky/files/patch-lua_CMakeLists.txt b/sysutils/conky/files/patch-lua_CMakeLists.txt index 9bd166966418..16473e5f4093 100644 --- a/sysutils/conky/files/patch-lua_CMakeLists.txt +++ b/sysutils/conky/files/patch-lua_CMakeLists.txt @@ -1,6 +1,6 @@ ---- lua/CMakeLists.txt.orig 2023-02-18 14:34:53 UTC +--- lua/CMakeLists.txt.orig 2024-04-17 02:04:14 UTC +++ lua/CMakeLists.txt -@@ -31,6 +31,8 @@ if(BUILD_X11) +@@ -30,6 +30,8 @@ if(BUILD_X11) get_filename_component(X11_SM_LIB_PATH ${X11_SM_LIB} DIRECTORY) link_directories(${X11_SM_LIB_PATH}) diff --git a/sysutils/conky/files/patch-src_display-x11.cc b/sysutils/conky/files/patch-src_display-x11.cc new file mode 100644 index 000000000000..6daaa35ff2d6 --- /dev/null +++ b/sysutils/conky/files/patch-src_display-x11.cc @@ -0,0 +1,26 @@ +--- src/display-x11.cc.orig 2024-04-17 02:04:14 UTC ++++ src/display-x11.cc +@@ -762,7 +762,9 @@ bool handle_event( + conky::display_output_x11 *surface, Display *display, XEvent &ev, + bool *consumed, void **cookie) { + if (ev.type != EnterNotify && ev.type != LeaveNotify) return false; ++#ifdef BUILD_XINPUT + if (window.xi_opcode != 0) return true; // handled by mouse_input already ++#endif + + bool not_over_conky = ev.xcrossing.x_root <= window.x || + ev.xcrossing.y_root <= window.y || +@@ -771,11 +773,13 @@ bool handle_event( + + if ((not_over_conky && ev.xcrossing.type == LeaveNotify) || + (!not_over_conky && ev.xcrossing.type == EnterNotify)) { ++#ifdef BUILD_MOUSE_EVENTS + llua_mouse_hook(mouse_crossing_event( + ev.xcrossing.type == EnterNotify ? mouse_event_t::AREA_ENTER + : mouse_event_t::AREA_LEAVE, + ev.xcrossing.x, ev.xcrossing.y, ev.xcrossing.x_root, + ev.xcrossing.y_root)); ++#endif + } + return true; + } diff --git a/sysutils/conky/files/patch-src_x11.h b/sysutils/conky/files/patch-src_x11.h index c0a45206d133..24e397f56352 100644 --- a/sysutils/conky/files/patch-src_x11.h +++ b/sysutils/conky/files/patch-src_x11.h @@ -1,4 +1,4 @@ ---- src/x11.h.orig 2022-12-26 18:54:10 UTC +--- src/x11.h.orig 2024-04-17 02:04:14 UTC +++ src/x11.h @@ -22,6 +22,7 @@ * @@ -7,8 +7,8 @@ +#ifdef BUILD_X11 #pragma once - #include -@@ -157,3 +158,5 @@ extern priv::use_xpmdb_setting use_xpmdb; + #include "config.h" +@@ -246,3 +247,5 @@ extern priv::use_xpmdb_setting use_xpmdb; #else extern priv::use_xpmdb_setting use_xpmdb; #endif