From nobody Sun Mar 27 19:03:42 2022 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 57C391A437F8; Sun, 27 Mar 2022 19:03: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 4KRQGQ1y7mz4f8b; Sun, 27 Mar 2022 19:03:42 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1648407822; 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=kB3hCJaELJZw2ItdHdXwV7SPHl21N8UFV3XjEjNB3PE=; b=HZtjm/a5oW4YCwB9RVGHOyLpYlyy89XkrAQeNNJGp761lzJZxLJgAEN9hgAW2clOQabcyD aF4oZxF7x8y2n2leuctygl7FAXXNnGvFusenKIaj6ZWQ2GoPC8sn2hNS2R2A6Zj4nO81rD BVuL6VNQS7si97wSkDzEKmLPGgxHN5jLqaY3TWgxlBzCfCK9Tdb+W01gSh4b0Z318SHzj+ 0Bfw3lsm+E/WXO5BQY/qYSbgPJwN/iKJFlChawJcA0b+tFpYFpHYSJIU5rVWVw4BINrxmN rRRTSnOrH1OWA9lc8a80xMRMzQ3puh0Pixl1V9z4HV0CKviCoIoJc/fCHtRikQ== 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 237491AF37; Sun, 27 Mar 2022 19:03:42 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 22RJ3gmY042446; Sun, 27 Mar 2022 19:03:42 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 22RJ3gUi042445; Sun, 27 Mar 2022 19:03:42 GMT (envelope-from git) Date: Sun, 27 Mar 2022 19:03:42 GMT Message-Id: <202203271903.22RJ3gUi042445@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: "=?utf-8?Q?Alexandre C. Guimar=C3=A3es?=" Subject: git: a24c133df8bb - main - x11/polybar: Update to 3.6.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: 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: rigoletto X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: a24c133df8bba72dd02d80cc953e29f5e4f247f3 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1648407822; 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=kB3hCJaELJZw2ItdHdXwV7SPHl21N8UFV3XjEjNB3PE=; b=nEempdpSWRmQWUUE3mVJ58PaWlp+7tl/03UGB/54wvbeCOlM77CsfoidICVU7QgtpfEjp1 DqR6TiqfI6pOTwSKuTmxAWX6wNUpTNuy0DtRdm5eLPLhi/8uunUpqURE0N1DQ7tpA4vBj7 NDKSwpVBVCTmB1f4RbwK9WU2QcplPbuLhh/jhgof2T/VgUkPXpIniRaWUgfvjqDOBmEZYv 7I6wWbxHLcVxyW0i3FmPTpQoA8guK3NVto2le0F/F8sBsAFAqLbfkfBhuKBeLCbbJL4psj YGsuOWrtWUXjcd89hpT8SHKF9yPeWVsLu1KLufqJT6Ys/wT+mXcnS4PrkN1qFg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1648407822; a=rsa-sha256; cv=none; b=YOq3eJ08EYYMGP0dz23/Cttd7bbUmxQS0OODaROp7EwxRYVork91gCoaQFIlED2OA2H4Cv yLUts2WiYnAg+Q+wXbSF7okmm4sWjFh0aAi3ru85nbfFnAtRhgPC97r2dvRe9V3k3KuH+I EbwIqSRdU35fcib1dnZ9btzOTjKaMfzg4/NXTzcDbm/hxrsBFBixUv5/u+stFNc0jTHDog W7fhz8VAdl0J2PE0BYRnn4Xd/nTk9/MryaZk0dbDJEm/dRowTs7mC6m/uo7cojopFXrI0f P+hXMiwS2Ze2zzviznmbkkgXcGGM1Tv8To90bVRodDTWbFDS3iOCUBofk98zVg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by rigoletto: URL: https://cgit.FreeBSD.org/ports/commit/?id=a24c133df8bba72dd02d80cc953e29f5e4f247f3 commit a24c133df8bba72dd02d80cc953e29f5e4f247f3 Author: Alexandre C. Guimarães AuthorDate: 2022-03-27 19:02:18 +0000 Commit: Alexandre C. Guimarães CommitDate: 2022-03-27 19:03:18 +0000 x11/polybar: Update to 3.6.1 --- x11/polybar/Makefile | 26 +++++++++++++++++++------- x11/polybar/distinfo | 6 +++--- x11/polybar/files/patch-CMakeLists.txt | 11 +++++++++++ x11/polybar/files/patch-src_utils_file.cpp | 11 +++++++++++ x11/polybar/pkg-plist | 3 ++- 5 files changed, 46 insertions(+), 11 deletions(-) diff --git a/x11/polybar/Makefile b/x11/polybar/Makefile index b788800852a9..5c256ce0cf0a 100644 --- a/x11/polybar/Makefile +++ b/x11/polybar/Makefile @@ -1,6 +1,5 @@ PORTNAME= polybar -DISTVERSION= 3.5.7 -PORTREVISION= 1 +DISTVERSION= 3.6.1 CATEGORIES= x11 MASTER_SITES= https://github.com/polybar/polybar/releases/download/${DISTVERSION}/ @@ -14,6 +13,7 @@ BUILD_DEPENDS= xcb-proto>=1.9:x11/xcb-proto LIB_DEPENDS= libfontconfig.so:x11-fonts/fontconfig \ libfreetype.so:print/freetype2 \ libinotify.so:devel/libinotify \ + libuv.so:devel/libuv \ libxcb-ewmh.so:x11/xcb-util-wm \ libxcb-icccm.so:x11/xcb-util-wm \ libxcb-image.so:x11/xcb-util-image \ @@ -28,10 +28,10 @@ USE_GNOME= cairo USE_XORG= xcb # Needs libnl to work. Disabling it completely. -CMAKE_OFF= ENABLE_NETWORK +CMAKE_OFF= ENABLE_NETWORK BUILD_DOC -OPTIONS_DEFINE= ALSA CURSOR DEBUG GITHUB I3 IPC MPD PULSEAUDIO \ - TESTS XKEYBOARD +OPTIONS_DEFINE= ALSA CURSOR DEBUG GITHUB I3 IPC MPD \ + PULSEAUDIO TESTS XKEYBOARD OPTIONS_DEFAULT= CURSOR GITHUB I3 IPC MPD PULSEAUDIO XKEYBOARD OPTIONS_SUB= yes @@ -50,11 +50,11 @@ ALSA_LIB_DEPENDS= libasound.so:audio/alsa-lib CURSOR_CMAKE_BOOL= WITH_XCURSOR CURSOR_LIB_DEPENDS= libxcb-cursor.so:x11/xcb-util-cursor +DEBUG_CMAKE_BOOL= DEBUG_LOGGER + GITHUB_CMAKE_BOOL= ENABLE_CURL GITHUB_LIB_DEPENDS= libcurl.so:ftp/curl -DEBUG_CMAKE_BOOL= DEBUG_LOGGER - I3_BUILD_DEPENDS= ${LOCALBASE}/include/i3/ipc.h:x11-wm/i3 I3_CMAKE_BOOL= ENABLE_I3 I3_LIB_DEPENDS= libjsoncpp.so:devel/jsoncpp @@ -75,6 +75,18 @@ TESTS_CMAKE_BOOL= BUILD_TESTS XKEYBOARD_CMAKE_BOOL= ENABLE_XKEYBOARD XKEYBOARD_LIB_DEPENDS= libxcb-xkb.so:x11/libxcb +ETCFIX = include/utils/command.hpp \ + contrib/bash/polybar \ + contrib/zsh/_polybar \ + doc/man/polybar.1.rst \ + doc/man/polybar.5.rst \ + CHANGELOG.md + +post-patch: +.for f in ${ETCFIX} + @${REINPLACE_CMD} -e 's|/etc|${PREFIX}/etc|g' ${WRKSRC}/${f} +.endfor + do-test-TESTS-on: cd ${TEST_WRKSRC} && ${SETENV} BUILD_TESTS=ON \ ${SH} ${WRKSRC}/common/travis/tests.sh diff --git a/x11/polybar/distinfo b/x11/polybar/distinfo index c398c5e505e7..a9bf7664683c 100644 --- a/x11/polybar/distinfo +++ b/x11/polybar/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1632255455 -SHA256 (polybar-3.5.7.tar.gz) = 73210e6d74217acb953b253990b4302343b7b6a7870fe1da9a1855daa44123db -SIZE (polybar-3.5.7.tar.gz) = 411318 +TIMESTAMP = 1646493488 +SHA256 (polybar-3.6.1.tar.gz) = a898ba8c847895be41efe5a31bb1b839da2c10b130b8411d5016982fbaadff7b +SIZE (polybar-3.6.1.tar.gz) = 437027 diff --git a/x11/polybar/files/patch-CMakeLists.txt b/x11/polybar/files/patch-CMakeLists.txt new file mode 100644 index 000000000000..00a661bf7aad --- /dev/null +++ b/x11/polybar/files/patch-CMakeLists.txt @@ -0,0 +1,11 @@ +--- 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-src_utils_file.cpp b/x11/polybar/files/patch-src_utils_file.cpp new file mode 100644 index 000000000000..b2a5c05f39ce --- /dev/null +++ b/x11/polybar/files/patch-src_utils_file.cpp @@ -0,0 +1,11 @@ +--- src/utils/file.cpp.orig 2022-03-27 18:43:31 UTC ++++ src/utils/file.cpp +@@ -322,7 +322,7 @@ namespace file_util { + possible_paths.push_back(xdg_config_dir + suffix + ".ini"); + } + +- possible_paths.push_back("/etc" + suffix + ".ini"); ++ possible_paths.push_back("${CMAKE_INSTALL_PREFIX}/etc" + suffix + ".ini"); + + for (const string& p : possible_paths) { + if (exists(p)) { diff --git a/x11/polybar/pkg-plist b/x11/polybar/pkg-plist index 1cd6ace0a6d6..fae322946d7f 100644 --- a/x11/polybar/pkg-plist +++ b/x11/polybar/pkg-plist @@ -1,5 +1,6 @@ bin/polybar -%%IPC%%bin/polybar-msg +bin/polybar-msg +%%ETCDIR%%/config.ini share/bash-completion/completions/polybar share/zsh/site-functions/_polybar share/zsh/site-functions/_polybar_msg