From nobody Mon Nov 13 20:56:24 2023 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 4SThYP0s95z50dN4; Mon, 13 Nov 2023 20:56:25 +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 4SThYP0NCFz3JxX; Mon, 13 Nov 2023 20:56:25 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1699908985; 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=D8HKspeKiKdgq8/pbcj/rBwvvu1xk71dJvTuX8oLUHs=; b=PuMOCFNSeb503PmZquSQ7eMyoBnKvUP7COq5xD+6L0dPMBFCPGgpeIJsSEPKMo5a7FBiYj XdfdeqRpHLbry4DpSA0YrcirDvuYzUU2t1P0FjIqnTck7oYE4XUqqAlNBVbMiaBaRP2k99 RtB7xMOGT9zxBcvbcqH2l5F0VmPFYsmTPCV1Nu+x8MYHuaTjsuXaJ7gweMTLnbDFMYA+21 rlU9qC+BJ+JiInu5mQ1VhzpnPsYThrmBwI9Y0Rw+Ol/ZiKmuslLYPD3Q+RzqC7UeaIqhNr 9TDuBg911mmsXTNZHaJ9Wk8SdnLceIL5gXq4my1aY8bcxXGki53kzmOpddVCGQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1699908985; 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=D8HKspeKiKdgq8/pbcj/rBwvvu1xk71dJvTuX8oLUHs=; b=wUBEa2mZyYqpmJSutRR/SyMtSVYp9vYJ4Iu8+Xvlw9JapxyKRYTYUmAEQGgVCTKiTmryZm cQk7xyrdTXaK9fVjbVbGhLT3gx5gaMKsfFqwC5jk0Rah60WZJiI2ScNS73JbkWX3t8Np5O z/HDpJJs/cttgqgr6eEjpyAHvoX9rvPDHYu13qDcg8ndMPpho2Q0KKpEXEWcITmKQzTf0q YfnQm39fUXYMumBsEfmCJXQP0OFkNHgwgcU9mQUZyWF3d8/NLGekrgbFZ1Lr4x2PRfCzse XUa/ptMRHYqJ8RCD9zVRvcQ8KfLqnyyyyVB23Ggn+iea1ZnJKkSXd4XD1VjkQA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1699908985; a=rsa-sha256; cv=none; b=qv3M2rhj+a2wKMJVuXorpF+Td1QLfCKHc1ogCh3aZ+xEW6L3aDjwe54uYcjJnxLABafUdu u0x785qYHXgpBTiy1p9yVgn3tPZjwKH+Ci2KelnC1ecmlqXftxItaOl+AcJPdOIAhOkpbP wnDV5hz4/9MY1VBuj+/97iLLlkYXDDy72rIwEspu2fChXLyF800tTH7/Zvky13WO0VBP3G CON8FfMEDtShyHU9fRvM48dgC2ueKnpmlA4a1uBcB4WnAVz1SIyKz8Mbr92ojBXdPvB7R7 MGEFpitQJdEbC3DqGNO4TRbdGdT4nnYNjVWkTUEb2g8adzdRKb66zMRmMfZi/g== 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 4SThYN6Ybsz65T; Mon, 13 Nov 2023 20:56:24 +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 3ADKuOKi011627; Mon, 13 Nov 2023 20:56:24 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 3ADKuO6V011624; Mon, 13 Nov 2023 20:56:24 GMT (envelope-from git) Date: Mon, 13 Nov 2023 20:56:24 GMT Message-Id: <202311132056.3ADKuO6V011624@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Joel Bodenmann Subject: git: 468f1ec7596d - main - x11/polybar: Update to 3.7.0 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: jbo X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 468f1ec7596d48409e999422b2007d42f0b15e17 Auto-Submitted: auto-generated The branch main has been updated by jbo: URL: https://cgit.FreeBSD.org/ports/commit/?id=468f1ec7596d48409e999422b2007d42f0b15e17 commit 468f1ec7596d48409e999422b2007d42f0b15e17 Author: Joel Bodenmann AuthorDate: 2023-11-12 19:29:41 +0000 Commit: Joel Bodenmann CommitDate: 2023-11-13 20:55:13 +0000 x11/polybar: Update to 3.7.0 Changelog: https://github.com/polybar/polybar/releases/tag/3.7.0 Approved by: tcberner (mentor) Differential Revision: https://reviews.freebsd.org/D42529 --- x11/polybar/Makefile | 3 +-- x11/polybar/distinfo | 6 +++--- x11/polybar/files/patch-CMakeLists.txt | 11 ----------- x11/polybar/files/patch-include_cairo_context.hpp | 10 ++++++++++ x11/polybar/files/patch-include_common.hpp | 8 ++++---- x11/polybar/files/patch-lib_i3ipcpp_src_ipc.cpp | 10 ++++++++++ x11/polybar/files/patch-src_modules_cpu.cpp | 16 +++++++--------- x11/polybar/files/patch-src_modules_memory.cpp | 14 ++++++-------- x11/polybar/files/patch-src_utils_string.cpp | 10 ++++++++++ 9 files changed, 51 insertions(+), 37 deletions(-) diff --git a/x11/polybar/Makefile b/x11/polybar/Makefile index 499f4b60d957..4f4397e78ffe 100644 --- a/x11/polybar/Makefile +++ b/x11/polybar/Makefile @@ -1,6 +1,5 @@ PORTNAME= polybar -DISTVERSION= 3.6.3 -PORTREVISION= 3 +DISTVERSION= 3.7.0 CATEGORIES= x11 MASTER_SITES= https://github.com/polybar/polybar/releases/download/${DISTVERSION}/ diff --git a/x11/polybar/distinfo b/x11/polybar/distinfo index f1d6b1a6b110..899c89a1255d 100644 --- a/x11/polybar/distinfo +++ b/x11/polybar/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1651678522 -SHA256 (polybar-3.6.3.tar.gz) = f25758573567208fc7b6f4d4115a6117a87389cbcc094cf605d079775be95fa5 -SIZE (polybar-3.6.3.tar.gz) = 439838 +TIMESTAMP = 1699810833 +SHA256 (polybar-3.7.0.tar.gz) = b8e07aca94a013341b7d47ee548afe84f519113f202300565d4852885a11e91d +SIZE (polybar-3.7.0.tar.gz) = 494588 diff --git a/x11/polybar/files/patch-CMakeLists.txt b/x11/polybar/files/patch-CMakeLists.txt deleted file mode 100644 index 00a661bf7aad..000000000000 --- a/x11/polybar/files/patch-CMakeLists.txt +++ /dev/null @@ -1,11 +0,0 @@ ---- CMakeLists.txt.orig 2022-03-27 18:35:56 UTC -+++ CMakeLists.txt -@@ -63,7 +63,7 @@ endif() - - if(BUILD_CONFIG) - install(FILES ${CMAKE_SOURCE_DIR}/doc/config.ini -- DESTINATION /etc/${PROJECT_NAME} -+ DESTINATION ${CMAKE_INSTALL_PREFIX}/etc/${PROJECT_NAME} - COMPONENT config) - endif() - diff --git a/x11/polybar/files/patch-include_cairo_context.hpp b/x11/polybar/files/patch-include_cairo_context.hpp new file mode 100644 index 000000000000..fdb744f74a2c --- /dev/null +++ b/x11/polybar/files/patch-include_cairo_context.hpp @@ -0,0 +1,10 @@ +--- include/cairo/context.hpp.orig 2023-11-12 19:12:43 UTC ++++ include/cairo/context.hpp +@@ -3,6 +3,7 @@ + #include + + #include ++#include + #include + #include + #include diff --git a/x11/polybar/files/patch-include_common.hpp b/x11/polybar/files/patch-include_common.hpp index fe04eb492818..82f3db90dd21 100644 --- a/x11/polybar/files/patch-include_common.hpp +++ b/x11/polybar/files/patch-include_common.hpp @@ -1,12 +1,12 @@ ---- include/common.hpp.orig 2020-12-02 17:15:49 UTC +--- include/common.hpp.orig 2023-11-05 22:37:13 UTC +++ include/common.hpp -@@ -5,6 +5,9 @@ +@@ -6,6 +6,9 @@ + #include #include - #include +#include +#include + #include "settings.hpp" - #define POLYBAR_NS \ + #define POLYBAR_NS namespace polybar { diff --git a/x11/polybar/files/patch-lib_i3ipcpp_src_ipc.cpp b/x11/polybar/files/patch-lib_i3ipcpp_src_ipc.cpp new file mode 100644 index 000000000000..8d75f7072573 --- /dev/null +++ b/x11/polybar/files/patch-lib_i3ipcpp_src_ipc.cpp @@ -0,0 +1,10 @@ +--- lib/i3ipcpp/src/ipc.cpp.orig 2023-11-12 19:08:48 UTC ++++ lib/i3ipcpp/src/ipc.cpp +@@ -1,6 +1,7 @@ + #include "i3ipc++/ipc.hpp" + + #include ++#include + + #include + #include diff --git a/x11/polybar/files/patch-src_modules_cpu.cpp b/x11/polybar/files/patch-src_modules_cpu.cpp index 7d31e2c08bff..7fdd0a291ce3 100644 --- a/x11/polybar/files/patch-src_modules_cpu.cpp +++ b/x11/polybar/files/patch-src_modules_cpu.cpp @@ -1,9 +1,7 @@ -diff --git src/modules/cpu.cpp src/modules/cpu.cpp -index 527f27fb..179d9221 100644 ---- src/modules/cpu.cpp +--- src/modules/cpu.cpp.orig 2023-11-05 22:37:13 UTC +++ src/modules/cpu.cpp @@ -2,6 +2,11 @@ - + #include #include +#ifdef __FreeBSD__ @@ -11,12 +9,12 @@ index 527f27fb..179d9221 100644 + #include + #include +#endif - + #include "drawtypes/label.hpp" #include "drawtypes/progressbar.hpp" -@@ -128,6 +133,41 @@ namespace modules { +@@ -129,6 +134,41 @@ namespace modules { m_cputimes.clear(); - + try { +#ifdef __FreeBSD__ + // Get number of CPUs @@ -55,8 +53,8 @@ index 527f27fb..179d9221 100644 +#else std::ifstream in(PATH_CPU_INFO); string str; - -@@ -148,6 +188,7 @@ namespace modules { + +@@ -149,6 +189,7 @@ namespace modules { m_cputimes.back()->total = m_cputimes.back()->user + m_cputimes.back()->nice + m_cputimes.back()->system + m_cputimes.back()->idle + m_cputimes.back()->steal; } diff --git a/x11/polybar/files/patch-src_modules_memory.cpp b/x11/polybar/files/patch-src_modules_memory.cpp index b0d836e120db..908adb9a168d 100644 --- a/x11/polybar/files/patch-src_modules_memory.cpp +++ b/x11/polybar/files/patch-src_modules_memory.cpp @@ -1,6 +1,4 @@ -diff --git src/modules/memory.cpp src/modules/memory.cpp -index eb36e5dc..042d85cb 100644 ---- src/modules/memory.cpp +--- src/modules/memory.cpp.orig 2023-11-05 22:37:13 UTC +++ src/modules/memory.cpp @@ -1,6 +1,10 @@ #include @@ -10,12 +8,12 @@ index eb36e5dc..042d85cb 100644 + #include + #include +#endif - + #include "drawtypes/label.hpp" #include "drawtypes/progressbar.hpp" -@@ -63,6 +67,25 @@ namespace modules { +@@ -64,6 +68,25 @@ namespace modules { unsigned long long kb_swap_free{0ULL}; - + try { +#ifdef __FreeBSD__ + std::size_t sz; @@ -38,8 +36,8 @@ index eb36e5dc..042d85cb 100644 +#else std::ifstream meminfo(PATH_MEMORY_INFO); std::map parsed; - -@@ -91,6 +114,7 @@ namespace modules { + +@@ -92,6 +115,7 @@ namespace modules { // old kernel; give a best-effort approximation of available memory kb_avail = parsed["MemFree"] + parsed["Buffers"] + parsed["Cached"] + parsed["SReclaimable"] - parsed["Shmem"]; } diff --git a/x11/polybar/files/patch-src_utils_string.cpp b/x11/polybar/files/patch-src_utils_string.cpp new file mode 100644 index 000000000000..2d5897731e5b --- /dev/null +++ b/x11/polybar/files/patch-src_utils_string.cpp @@ -0,0 +1,10 @@ +--- src/utils/string.cpp.orig 2023-11-12 19:11:07 UTC ++++ src/utils/string.cpp +@@ -1,6 +1,7 @@ + #include "utils/string.hpp" + + #include ++#include + #include + #include + #include