From nobody Wed Feb 28 14:39:02 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 4TlH6Z6HsWz5Bhp8; Wed, 28 Feb 2024 14:39:02 +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 4TlH6Z5rNSz4lcD; Wed, 28 Feb 2024 14:39:02 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1709131142; 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=0nmW4y2bhAP3ma78CDgaeaSt2vRit2LZI+Da9vWvx+Q=; b=j3RnLIZz1aWlsKzLAz0q2FBf3BVw1iVEMqIabCceqMLiMKWa8A3boqaw2XaZNlH/CKUtnl XFvAldUZuEVURAr/MriopyHCRIyi9tpYS83wMpRMK3NmbxVRv5PLa6uWNK0Sy1R2zrS3MV hCtLXJ+rO7hQlYwqdHWt6phvSJt2fSpRZFz65n1DIdkG9jfOvz+OOxap7jb3HBxVTlKZt0 gTE8JDnFiANY27jscdBZrmsq1UyVjtwiAX87Q7rpIEQa3w5mGMUPcurbxG8HTgIR9Fof4H J5Bx4YFcWURbsKFP7WvK1ZmAxwPV211+vEYBQMUV+btj+c8eWwAATdo2lcwgDA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1709131142; a=rsa-sha256; cv=none; b=cC9UH4x2Zyhv/SKQU3NkT6BUhw/KdW9hhU+TmJk1dSlPpkyktD5rSM2NBn71al6Q4/BGjB 7CcVY/9BKmpE157zF1YoT1xLlfNAD2FTXANDtmQvBQHuNUh08Zj1YnCED1LipVgdY+frhN 8Un0N41rRo1/zpNj42aewWfKtDNvIjyaMq/hKyfLPsXRmEcTlpEnA71FZJKgDGrIN5wnMB XUv9w1CXQ0m/aHPKUHNRXoNihQQnfaFPrerhg8u4r4gVyU2+BCKdsjejJ3b57Hxl4RWeeP r5zi1wNThXg86KjdIRk9HAxycbKytTtnhqvqf9pRt+bgTBnuJRi+bblk9AZdXA== 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=1709131142; 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=0nmW4y2bhAP3ma78CDgaeaSt2vRit2LZI+Da9vWvx+Q=; b=PZb0Ou2eZihoo8CUOXWg5FlxzKKVQ+ofKS++i0kZErVQOiwqwcACK224WHA/9z2plc4zVr iRHQFamKSvJguMW8y/OauB24Htlnd4BVHHDFOrklKYxFLalYE+CBlQsL1SXbcuJ94W9uxY DjaH7x5HoyqQSzi1FcUrkgHjK4rwEcrH+Cf9z0vWoOKe8/MmMs6dqoVeH+5oDlgi5FnKk2 NUZqhA78IGWJOSIkmCf3JhX5zkvUewJUYtl+RepA9qrCnWmGVZZC4d59EBBOpagIXaY/cO QMdNAnPjRyTO/rB/LeEnEQXS86/7Wjx+D9Iv87bT+gSWJX7F5sRp8sajdx4uCg== 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 4TlH6Z4b0Fz114w; Wed, 28 Feb 2024 14:39:02 +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 41SEd2Zj000085; Wed, 28 Feb 2024 14:39:02 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 41SEd2g2000082; Wed, 28 Feb 2024 14:39:02 GMT (envelope-from git) Date: Wed, 28 Feb 2024 14:39:02 GMT Message-Id: <202402281439.41SEd2g2000082@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: 3d7fdd1b3f07 - main - sysutils/conky{-awesome}: update to 1.19.8 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: Sender: owner-dev-commits-ports-main@freebsd.org X-BeenThere: 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: 3d7fdd1b3f078812b58ed26e42a452a46b9d187e Auto-Submitted: auto-generated The branch main has been updated by fernape: URL: https://cgit.FreeBSD.org/ports/commit/?id=3d7fdd1b3f078812b58ed26e42a452a46b9d187e commit 3d7fdd1b3f078812b58ed26e42a452a46b9d187e Author: Fernando Apesteguía AuthorDate: 2024-02-21 16:37:11 +0000 Commit: Fernando Apesteguía CommitDate: 2024-02-28 14:38:55 +0000 sysutils/conky{-awesome}: update to 1.19.8 Take maintainership. We can't exclude X11 option anymore in conky-awesome. ChangeLog: https://github.com/brndnmtthws/conky/releases/tag/v1.19.8 Accumulated changes since 1.19.7 Features * [Docs] Improve speedgraphs' scale description * Drop graph/linechart from web header * Fix labeler v5 * Show cached memory as in free (Linux only) * Fix typo in config_settings.yaml * Remove build date and associated vars * Update copyright * Update macos build images * Bump flake deps * Bump web deps, improve mdx handling * Add basic pulseaudio source (microphone etc.) support * Enable lua bindings in nix flake * Compile tolua++ output as C++ * Refactor web search index Bug fixes * X11: Fix infinite loops caused * Fix update_interval handling from CLI args * Fix bad new/delete usage * Fix build for imlib2 <1.10.0 * Fix buffer overflow on X11 error bug * Fix C mangling for lua bindings * Add wlr layer shell check * Fix xcb include path * Don't call FcFini() --- sysutils/conky-awesome/Makefile | 2 +- sysutils/conky/Makefile | 12 +++++++----- sysutils/conky/distinfo | 6 +++--- sysutils/conky/files/patch-CMakeLists.txt | 9 +++++---- sysutils/conky/files/patch-doc_CMakeLists.txt | 11 ----------- 5 files changed, 16 insertions(+), 24 deletions(-) diff --git a/sysutils/conky-awesome/Makefile b/sysutils/conky-awesome/Makefile index afb86d1e0dd5..d321d8d83632 100644 --- a/sysutils/conky-awesome/Makefile +++ b/sysutils/conky-awesome/Makefile @@ -8,7 +8,7 @@ DESCR= ${.CURDIR}/pkg-descr CONFLICTS= conky -OPTIONS_EXCLUDE= X11 ARGB DOUBLE_BUFFER IMLIB2 MOUSE_EVENTS XFT XINERAMA LUA_CAIRO \ +OPTIONS_EXCLUDE= ARGB DOUBLE_BUFFER IMLIB2 MOUSE_EVENTS XFT XINERAMA LUA_CAIRO \ LUA_IMLIB2 LUA_RSVG WAYLAND .include "${MASTERDIR}/Makefile" diff --git a/sysutils/conky/Makefile b/sysutils/conky/Makefile index ef5e22174a27..ce91add6cdad 100644 --- a/sysutils/conky/Makefile +++ b/sysutils/conky/Makefile @@ -1,13 +1,15 @@ PORTNAME= conky -PORTVERSION= 1.19.6 -PORTREVISION= 1 +PORTVERSION= 1.19.8 DISTVERSIONPREFIX= v CATEGORIES= sysutils -MAINTAINER= ports@FreeBSD.org +MAINTAINER= fernape@FreeBSD.org COMMENT?= Advanced, highly configurable system monitor for X11 WWW= https://github.com/brndnmtthws/conky +LICENSE= GPLv3 +LICENSE_FILE= ${WRKSRC}/LICENSE.md + BUILD_DEPENDS= gsed:textproc/gsed LIB_DEPENDS= libinotify.so:devel/libinotify @@ -91,7 +93,7 @@ MANPAGES_BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}Jinja2>=0:devel/py-Jinja2@${PY_FL pandoc:textproc/hs-pandoc MANPAGES_USES= python:build MANPAGES_CMAKE_BOOL= BUILD_DOCS -MANPAGES_PLIST_FILES= man/man1/conky.1.gz +MANPAGES_PLIST_FILES= share/man/man1/conky.1.gz METAR_IMPLIES= CURL METAR_CMAKE_BOOL= BUILD_WEATHER_METAR @@ -122,7 +124,7 @@ WAYLAND_CMAKE_BOOL= BUILD_WAYLAND WAYLAND_LDFLAGS= -Wl,--as-needed # pangoft2 deps: glib20, freetype2, harfbuzz X11_USES= xorg -X11_USE= XORG=x11,xdamage,xext,xfixes +X11_USE= XORG=x11,xdamage,xext,xfixes,xi X11_CMAKE_BOOL= BUILD_X11 OWN_WINDOW XFT_IMPLIES= X11 diff --git a/sysutils/conky/distinfo b/sysutils/conky/distinfo index 8714f6fbd5b0..91f8cccb26c6 100644 --- a/sysutils/conky/distinfo +++ b/sysutils/conky/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1697267722 -SHA256 (brndnmtthws-conky-v1.19.6_GH0.tar.gz) = 1bf5868da44056badd4718a3c8dcc6905f7118a9f86e785b354a8ecdb157a59e -SIZE (brndnmtthws-conky-v1.19.6_GH0.tar.gz) = 1727487 +TIMESTAMP = 1709105678 +SHA256 (brndnmtthws-conky-v1.19.8_GH0.tar.gz) = 8ac01452554559ace15e5966cb65eb37ef73b98c72967e6e0974c7ba98a1a88d +SIZE (brndnmtthws-conky-v1.19.8_GH0.tar.gz) = 1711683 diff --git a/sysutils/conky/files/patch-CMakeLists.txt b/sysutils/conky/files/patch-CMakeLists.txt index e8131e7911a6..6f3f5c0807f3 100644 --- a/sysutils/conky/files/patch-CMakeLists.txt +++ b/sysutils/conky/files/patch-CMakeLists.txt @@ -1,12 +1,13 @@ ---- CMakeLists.txt.orig 2022-10-12 18:18:08 UTC +--- CMakeLists.txt.orig 2024-02-26 18:33:49 UTC +++ CMakeLists.txt -@@ -73,11 +73,14 @@ if(NOT DEFINED DOC_PATH) +@@ -74,12 +74,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}") endif(NOT DEFINED DOC_PATH) + -set(DOC_FILES extras/convert.lua data/conky_no_x11.conf data/conky.conf) +if(NOT DEFINED SAMPLE_PATH) + set(SAMPLE_PATH "share/examples/${CPACK_PACKAGE_NAME}") @@ -16,5 +17,5 @@ -install(FILES ${DOC_FILES} DESTINATION ${DOC_PATH}) +install(FILES ${SAMPLE_FILES} DESTINATION ${SAMPLE_PATH}) - if(${CMAKE_SYSTEM_NAME} MATCHES "Linux") - install(FILES conky.desktop DESTINATION share/applications) + if(CHECK_CODE_QUALITY) + find_package(ClangTidy) diff --git a/sysutils/conky/files/patch-doc_CMakeLists.txt b/sysutils/conky/files/patch-doc_CMakeLists.txt deleted file mode 100644 index d6ef42b5aa55..000000000000 --- a/sysutils/conky/files/patch-doc_CMakeLists.txt +++ /dev/null @@ -1,11 +0,0 @@ ---- doc/CMakeLists.txt.orig 2022-10-12 18:18:08 UTC -+++ doc/CMakeLists.txt -@@ -32,7 +32,7 @@ if(BUILD_DOCS) - ) - add_dependencies(conky.1 man.md) - -- set(MAN_PATH "share/man/man1") -+ set(MAN_PATH "man/man1") - set(MAN_FILES ${CMAKE_CURRENT_BINARY_DIR}/conky.1) - - install(FILES ${DOC_FILES} DESTINATION ${DOC_PATH})