From nobody Mon Apr 29 06:34:58 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 4VSYTt3Fdfz5JP1Z; Mon, 29 Apr 2024 06:34:58 +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 4VSYTt1pcZz4LJZ; Mon, 29 Apr 2024 06:34:58 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1714372498; 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=TKj4mqieLNLIN+ArJBx/RQuMFBoTv3ePSxthBLbbTQQ=; b=Ae3WtRUUZ/XK9KHcE98bVdaQRUGMahMLzIdgAj6jnmmgcyUfx6t1XQisDp+gZ9fFbRG/A0 3cLbIeJriJeN+PCbxJY+JA0jYsRFaU8raz4wD0Am/R5WmgqsNEAYPL4Zvv6r45subHjcyt HvGwcmDJcp6ks6yFX4hQWVp6GuGZ/gMRH4cWhYwin1siSzt9RCfUFGnxjS8KiBUCMTe3um ebks4+cyYBn4OG+F2J31SblpiIrNoUaGvi04oB2NpGcwRs6bEb7BXkk9FBc8cLYbrc6KJI kz4rZFwsDvxQ57nWyNQqay5Locq16DRFjZ+CqpkK7NwSzRfOq/17RI0zIdoAeQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1714372498; a=rsa-sha256; cv=none; b=BnXPIzBcfOy3fpWm0cVcLK3yszSJCQxFjIm2sqftwcvUSyX5oon4/SL3/ypJ2dbYvLpD02 3D+5jwcTyxv6hi5VwIsgWq9tfPyVXJnPOcye0np45IiinFHOIc2qfuiVS0l2CRHWMocgQF ooWLZhcXgce6TbNi8QVmUw7rRLHenBSt9Fp6djubplDkmefHFxUlWI00dVkkaHd1WOmNuY gKv/1dSwOwwRa7FHopJIJCu4wfOTJwTWQxNnCttWOGLVrEkvQxihqQH/k78knoTzl/E/EG q0g8B7OOUFwutJDXW/GV84IWMiwOnx0lXlBFMFMGUSZrWMC0z9S51AhoXMYw7g== 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=1714372498; 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=TKj4mqieLNLIN+ArJBx/RQuMFBoTv3ePSxthBLbbTQQ=; b=Bx5efyx29Ef0kEyoRWU++ZRfqLXJhPpGg9+r7FDsgMSzQxITkTStdIbnA1PHYoyiF1WzcQ 39GWpeU2w8rSI94dzdpDFfmT2b4nfRDcPzu2c/XvAtCdThvZ4ZSvbBxngLNJi6C89qxPfp BByjy0R2nUmsBzchfOm1v1jROdJizWOTtWC3WR3g3QJCekDwveVw1qWsS12U3XpERuiv0C 6FAY82ND7v8YdaNrgCMag6yJXvdu0d7+APaOVuS6ZeVhBodSsO0rKQh+v++zPCzpGwvD2I w2TKNpRBVat8+kqrvVBskLNgIkCNCQWnEOVI8HnC+MjTyrbnu+PhaYt65r5HCQ== 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 4VSYTt1QCPzy86; Mon, 29 Apr 2024 06:34:58 +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 43T6YwwL064827; Mon, 29 Apr 2024 06:34:58 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 43T6YwhA064824; Mon, 29 Apr 2024 06:34:58 GMT (envelope-from git) Date: Mon, 29 Apr 2024 06:34:58 GMT Message-Id: <202404290634.43T6YwhA064824@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: f9c6c779d5d0 - main - sysutils/conky{-awesome}: update to 0.120.2 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: f9c6c779d5d0f98f7e11b7fac8d0ab7aef7d6858 Auto-Submitted: auto-generated The branch main has been updated by fernape: URL: https://cgit.FreeBSD.org/ports/commit/?id=f9c6c779d5d0f98f7e11b7fac8d0ab7aef7d6858 commit f9c6c779d5d0f98f7e11b7fac8d0ab7aef7d6858 Author: Fernando Apesteguía AuthorDate: 2024-04-25 06:41:26 +0000 Commit: Fernando Apesteguía CommitDate: 2024-04-29 06:34:22 +0000 sysutils/conky{-awesome}: update to 0.120.2 ChangeLog: https://github.com/brndnmtthws/conky/releases/tag/v1.20.2 Features * Separate cairo-xlib.h Lua bindings from cairo.h * Cleanup build flags, global namespace and includes * Use perfect hash (gperf) for parsing color names * set_struts improvements Bug fixes * Fix imlib_cache_size_setting::lua_setter Miscellaneous * Bump version * Annoyingly, the artifacts go into a subdir * Always run Nix & AppImage builds on PRs * Track more context labels * Fix matrix URL * Revert "Fix matrix URL" * Fix web components and pages (UI) --- sysutils/conky/Makefile | 8 +++++--- sysutils/conky/distinfo | 6 +++--- sysutils/conky/files/patch-lua_CMakeLists.txt | 16 ++++++++-------- sysutils/conky/files/patch-src_display-x11.cc | 6 +++--- sysutils/conky/files/patch-src_x11.h | 16 ---------------- 5 files changed, 19 insertions(+), 33 deletions(-) diff --git a/sysutils/conky/Makefile b/sysutils/conky/Makefile index 241bb9031ebb..349b704907b7 100644 --- a/sysutils/conky/Makefile +++ b/sysutils/conky/Makefile @@ -1,5 +1,5 @@ PORTNAME= conky -PORTVERSION= 1.20.1 +PORTVERSION= 1.20.2 DISTVERSIONPREFIX= v CATEGORIES= sysutils @@ -10,7 +10,8 @@ WWW= https://github.com/brndnmtthws/conky LICENSE= GPLv3 LICENSE_FILE= ${WRKSRC}/LICENSE.md -BUILD_DEPENDS= gsed:textproc/gsed +BUILD_DEPENDS= gperf:devel/gperf \ + gsed:textproc/gsed LIB_DEPENDS= libinotify.so:devel/libinotify USES= cmake compiler:c++11-lib cpe gettext-runtime iconv \ @@ -76,7 +77,8 @@ LUA_CAIRO_IMPLIES= X11 LUA_CAIRO_USES= gnome LUA_CAIRO_USE= GNOME=cairo LUA_CAIRO_CMAKE_BOOL= BUILD_LUA_CAIRO -LUA_CAIRO_PLIST_FILES= lib/conky/libcairo.so +LUA_CAIRO_PLIST_FILES= lib/conky/libcairo.so \ + lib/conky/libcairo_xlib.so LUA_IMLIB2_IMPLIES= IMLIB2 X11 LUA_IMLIB2_CMAKE_BOOL= BUILD_LUA_IMLIB2 diff --git a/sysutils/conky/distinfo b/sysutils/conky/distinfo index 50efb30b9efe..fd80db491a5a 100644 --- a/sysutils/conky/distinfo +++ b/sysutils/conky/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1713443191 -SHA256 (brndnmtthws-conky-v1.20.1_GH0.tar.gz) = 5e0531d1bbb589ee2369876340c341073d3bc13f8a79c05f89ec6170d6374085 -SIZE (brndnmtthws-conky-v1.20.1_GH0.tar.gz) = 1839204 +TIMESTAMP = 1714027251 +SHA256 (brndnmtthws-conky-v1.20.2_GH0.tar.gz) = 16f2e17d35252c1c3b97363016ede5cd68be719c32a51961420fcd46859bf503 +SIZE (brndnmtthws-conky-v1.20.2_GH0.tar.gz) = 1837320 diff --git a/sysutils/conky/files/patch-lua_CMakeLists.txt b/sysutils/conky/files/patch-lua_CMakeLists.txt index 16473e5f4093..72858b2abd11 100644 --- a/sysutils/conky/files/patch-lua_CMakeLists.txt +++ b/sysutils/conky/files/patch-lua_CMakeLists.txt @@ -1,11 +1,11 @@ ---- lua/CMakeLists.txt.orig 2024-04-17 02:04:14 UTC +--- lua/CMakeLists.txt.orig 2024-04-24 13:56:28 UTC +++ lua/CMakeLists.txt -@@ -30,6 +30,8 @@ if(BUILD_X11) - get_filename_component(X11_SM_LIB_PATH ${X11_SM_LIB} DIRECTORY) - link_directories(${X11_SM_LIB_PATH}) +@@ -28,6 +28,8 @@ if(BUILD_LUA_CAIRO) + if(BUILD_LUA_CAIRO) + include_directories(${luacairo_includes} ${CMAKE_CURRENT_SOURCE_DIR}) -+ link_directories(${LIBS}) ++ link_directories(${LIBS}) + - # cairo_set_dash() needs this special hack to work properly if you have a - # better solution, please let me know - wrap_tolua(luacairo_src cairo.pkg libcairo.patch) + # cairo_set_dash() needs this special hack to work properly if you have a + # better solution, please let me know + wrap_tolua(luacairo_src cairo.pkg libcairo.patch) diff --git a/sysutils/conky/files/patch-src_display-x11.cc b/sysutils/conky/files/patch-src_display-x11.cc index 6daaa35ff2d6..e98b4f3e347a 100644 --- a/sysutils/conky/files/patch-src_display-x11.cc +++ b/sysutils/conky/files/patch-src_display-x11.cc @@ -1,6 +1,6 @@ ---- src/display-x11.cc.orig 2024-04-17 02:04:14 UTC +--- src/display-x11.cc.orig 2024-04-24 13:56:28 UTC +++ src/display-x11.cc -@@ -762,7 +762,9 @@ bool handle_event( +@@ -683,7 +683,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; @@ -10,7 +10,7 @@ bool not_over_conky = ev.xcrossing.x_root <= window.x || ev.xcrossing.y_root <= window.y || -@@ -771,11 +773,13 @@ bool handle_event( +@@ -692,11 +694,13 @@ bool handle_event( if ((not_over_conky && ev.xcrossing.type == LeaveNotify) || (!not_over_conky && ev.xcrossing.type == EnterNotify)) { diff --git a/sysutils/conky/files/patch-src_x11.h b/sysutils/conky/files/patch-src_x11.h deleted file mode 100644 index 24e397f56352..000000000000 --- a/sysutils/conky/files/patch-src_x11.h +++ /dev/null @@ -1,16 +0,0 @@ ---- src/x11.h.orig 2024-04-17 02:04:14 UTC -+++ src/x11.h -@@ -22,6 +22,7 @@ - * - */ - -+#ifdef BUILD_X11 - #pragma once - - #include "config.h" -@@ -246,3 +247,5 @@ extern priv::use_xpmdb_setting use_xpmdb; - #else - extern priv::use_xpmdb_setting use_xpmdb; - #endif -+ -+#endif /* BUILD_X11 */