From nobody Wed May 01 22:49:05 2024 X-Original-To: dev-commits-ports-all@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 4VVC0y0fkDz5KBvS; Wed, 1 May 2024 22:49:06 +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 4VVC0y07HBz4xvP; Wed, 1 May 2024 22:49:06 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1714603746; 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=KzIkWH4XGMrFQbHceK6d2VJ1NlqMhSzeXEa5b+C2Fj4=; b=Y0Xvd7ASSck6HE/yMtx9xsT5G4CBLhvYS/EGXhDmGt2Ev+axLyqPYzrfvWb4UfLIB6ooLo BEHQs6wetE6tyCV39Dov8xSTp7H3/VMNyzsRzKU2XcwvsCIlXdz5xXjHRDpE2aaNkJV3Aw Ml81rigVE8F3SuQuFXQyygfLo9pfX3CMLyBYT/S6m/feqUkQ3bPBI4D8RBYYKlvE0sWMIR 1wwKXtSE7ibWd4fR6jLaPfR6VEonlU7adHMTul5G63UiJ2t4wrugIEoMCEiVLzFxiAU43d ToxokOh+N9AvK+StQ4cA2zuoWYzKX4LF+12fe3z3qPUrbIBLb26uFeMdSOnQQg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1714603746; a=rsa-sha256; cv=none; b=oFC1H1+yc4YQhqK+gO7e2X+oJdpN0K5Gxr291tIjVF2gj69x4j9GepSiwX7duR4xlCaxgF PeQwpf20v8/bt/ADQd3QcAjq58dCKOQsGeNk5x5P2VLjX/ADSUwQqn/fTVVUtbHaBRlkbA HG/ZIq658GehKbfuZH0bGRioIJlrXTfsoJlAJohrbu2tbT5DlPmQ3mHYDAv0HrAZG9rNT0 PUTQ/s1u/fLb8/gI1spcHtbEH2tgAf2qetHReqCFPg5F5EbwWO7QynXFUdmJLUkigMUZ+C zztoHRVfMx2nsgYr6E9zcRAl/2/K2MOQ/5xOkqepfd/5VseDBpJ21Si1QY6kzg== 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=1714603746; 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=KzIkWH4XGMrFQbHceK6d2VJ1NlqMhSzeXEa5b+C2Fj4=; b=FIq0ujIkAUEP/JqfitGawsyobSLN+LiaEYuC7weHRGw2lWaE2pP81injZ/N2NyCRZFmQzO xJRbKh9q886jAC6MWTOtA0ctVwXZkUthivNIYQOaJuiIVSfhdcajiS3hTbALULyMfiOg4W YdcKAWlzXEiXVnCa0UKoAtl56VPLvcrdv4U6Jmw8IQ+dvLR3RPEVxeRCUGT4x+JjNR09HV T2GX3HRKH0h0//GbwGF1jkSumlNKwA/l6H3BzLqQOrfYgO9lEbAtV49A8ot4vL1DRrbAJb 3ke1+kuTWtMeq71UudDoBOEnVWx4Y6KSxgVGG09mnhEK2QhJVOA3wRxFExwGdQ== 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 4VVC0x6rBGzd2R; Wed, 1 May 2024 22:49:05 +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 441Mn5r9088159; Wed, 1 May 2024 22:49:05 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 441Mn5fj088156; Wed, 1 May 2024 22:49:05 GMT (envelope-from git) Date: Wed, 1 May 2024 22:49:05 GMT Message-Id: <202405012249.441Mn5fj088156@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Jan Beich Subject: git: 9a6f7b230495 - main - x11/waybar: restore 5d35e5882352 after c8720b3105e2 List-Id: Commit messages for all branches of the ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-ports-all@freebsd.org Sender: owner-dev-commits-ports-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: jbeich X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 9a6f7b2304952eeadd05429289adfddd3bafa3a8 Auto-Submitted: auto-generated The branch main has been updated by jbeich: URL: https://cgit.FreeBSD.org/ports/commit/?id=9a6f7b2304952eeadd05429289adfddd3bafa3a8 commit 9a6f7b2304952eeadd05429289adfddd3bafa3a8 Author: Jan Beich AuthorDate: 2024-05-01 22:40:43 +0000 Commit: Jan Beich CommitDate: 2024-05-01 22:47:44 +0000 x11/waybar: restore 5d35e5882352 after c8720b3105e2 Missed FreeBSD 13.3 (libc++ 17) as 13.2 (libc++ 14) isn't EOL until 2024-07-01 thus not covered by pkg-fallout@ yet. --- x11/waybar/Makefile | 20 ++++++++++++++++++++ x11/waybar/distinfo | 2 ++ 2 files changed, 22 insertions(+) diff --git a/x11/waybar/Makefile b/x11/waybar/Makefile index 6392729061d9..c712d5c24634 100644 --- a/x11/waybar/Makefile +++ b/x11/waybar/Makefile @@ -172,4 +172,24 @@ pre-test: ${TOUCH} ${WRKDIR}/.meson_build_tests; \ fi +# XXX Drop after FreeBSD 13.3 EOL around 2025-07-01 (don't forget distinfo) +.if ${CXX} == c++ && exists(/usr/include/c++/v1/__chrono/concepts.h) && \ + !exists(/usr/include/c++/v1/__chrono/tzdb.h) || make(makesum) || make(fetch) +USES+= cmake:indirect +CMAKE_ARGS= -B ${WRKDIR}/libcxx_build -S ${WRKSRC_libcxx}/libcxx +CMAKE_OFF= LIBCXX_INCLUDE_BENCHMARKS +CMAKE_INSTALL_PREFIX= ${WRKDIR}/libcxx_prefix + +# XXX Move into separate port and standardize via USES +GH_TUPLE+= llvm:llvm-project:llvmorg-16.0.1:libcxx +CXXFLAGS+= -nostdinc++ -isystem${WRKDIR}/libcxx_prefix/include/c++/v1 +# Don't link against new libc++ as it's not necessary +#LDFLAGS+= -nostdlib++ -L${WRKDIR}/libcxx_prefix/lib -l:libc++.a -lcxxrt + +pre-configure: bundled-libcxx +bundled-libcxx: + @${SETENVI} ${WRK_ENV} ${CONFIGURE_ENV} ${CMAKE_BIN} ${CMAKE_ARGS} + @${DO_MAKE_BUILD:NDESTDIR*} install -C ${WRKDIR}/libcxx_build +.endif # exists(/usr/include/c++/v1/__chrono/concepts.h) + .include diff --git a/x11/waybar/distinfo b/x11/waybar/distinfo index 209213bd424c..db7e8b7db044 100644 --- a/x11/waybar/distinfo +++ b/x11/waybar/distinfo @@ -1,6 +1,8 @@ TIMESTAMP = 1713887948 SHA256 (Alexays-Waybar-0.10.2_GH0.tar.gz) = 7ecccfe5d326d66987a32e77e02b825019d191670ab8e87412df01dd0913f9c0 SIZE (Alexays-Waybar-0.10.2_GH0.tar.gz) = 301414 +SHA256 (llvm-llvm-project-llvmorg-16.0.1_GH0.tar.gz) = b5a9ff1793b1e2d388a3819bf35797002b1d2e40bb35a10c65605e0ea1435271 +SIZE (llvm-llvm-project-llvmorg-16.0.1_GH0.tar.gz) = 179289803 SHA256 (f41458ea24a5.patch) = a125479cf8bf9b57306f8cd3df9fc969e43ddd797abd56a61f9328ba5877634c SIZE (f41458ea24a5.patch) = 2490 SHA256 (67de082393dc.patch) = 71da4a4b2577f9a08555187151fc532b57a137f5de45622861e1307f70fffc3b