From nobody Mon Jun 10 20:58:44 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 4Vykg92Zj5z5N76L; Mon, 10 Jun 2024 20:58:45 +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 4Vykg903qnz4KlV; Mon, 10 Jun 2024 20:58:45 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1718053125; 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=VqOumZWDJ3N1U6LV2fa3+GmUdNXvm9Wa338fEx9+bTY=; b=Xe+dFqeUJDIvNuyExJiwrjGzh0WOKW+cWPx+HYjdgOGthekiH5rnXvRiwvnhPo+H882qsD adFpjQ1pLPbMrZZDQVdpu1/HUhH1Ud64uz3GSF07Bs0dSthLebAx48ZU7t2ocowqhqdr7Z kZfGZp4c0P5IAtUKEcmgjuHKydbjjFXsUvKgHB/ghE76/79cVc4V7+6q2h+pRu9tioXEdE pZfZ7KIxIaDuwAhYdOyBt4K8jPIgIE0ulNoCzotALoBG2sN96z6XZQRo5DowHfUJt1TdyI Wqc1r45Cj+3USHOKIgZ6IQIht/1quvRMSDXtxYB3K6WrEilkk2DNEhdutT6mog== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1718053125; a=rsa-sha256; cv=none; b=qpIaEkr83bxiAS7ISeWFuhwtOybdr3sUX5z6k3areoovqhl0rlflo/1OXBsDt5s7201p3f LEP3ZG74lJNqaXyjO2y3rzCzGqy4dUWorrjZIH34bphh0orMQgVEY7n0D+FYOvYtIkavDg 2YISM6mtowdxLl90GBL+4mJmOrn8DAEYDkXX78RTzM5xmBkIUlHt/6UEahny/FXfTpqf+A bVJH9rCLv0XzOt+LF/+7MO/1875C95zsEVHe9cd92/FvvDZ1Tf42aBnNu/HJJ1k4/QIOWd JxuNoalZ9hFGy0i7yHohWa+YyxiCdvJXJSe3h1cJBJ2NAqkYzueQ9KR7YUJJIg== 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=1718053125; 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=VqOumZWDJ3N1U6LV2fa3+GmUdNXvm9Wa338fEx9+bTY=; b=vR96WugTvsTVZJdhyzOJBGke/2834M2lLVhAth68fzB6gTnaLjRKirgwF/vGJXQWVoysHo On+OjTWJUdtopd+60F46KfM6VTQh1Plzi+H0H/rrFKlreWgTSeCclwd/mpgsNjMeewdI3k zHniEiMwI82IUbqgNFZxfk3GH0ixibhW375njDwbIobI9eaBkAEfzeyYdmbTFKFveoctJN 2yNL7OsT2QQuHCeJ0jzlbIU6F4JRYL66NVxtcun3eeGobOYCx/1zhqpmDqr78tRFJchFGv EQhYxUG/qMFQ/yWXJmoVunqaMLEjShRoV0i1qIkTqOOWTxwCvBtaUTri8ALwFg== 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 4Vykg86NjMzgr4; Mon, 10 Jun 2024 20:58:44 +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 45AKwi3V095925; Mon, 10 Jun 2024 20:58:44 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 45AKwib4095922; Mon, 10 Jun 2024 20:58:44 GMT (envelope-from git) Date: Mon, 10 Jun 2024 20:58:44 GMT Message-Id: <202406102058.45AKwib4095922@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: 7ac50dcdbfa3 - main - x11-wm/hyprland: downgrade to 0.40.0 due to broken runtime 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: 7ac50dcdbfa3671fbb037abc490cafacf07c4fbf Auto-Submitted: auto-generated The branch main has been updated by jbeich: URL: https://cgit.FreeBSD.org/ports/commit/?id=7ac50dcdbfa3671fbb037abc490cafacf07c4fbf commit 7ac50dcdbfa3671fbb037abc490cafacf07c4fbf Author: Jan Beich AuthorDate: 2024-06-10 20:57:48 +0000 Commit: Jan Beich CommitDate: 2024-06-10 20:57:50 +0000 x11-wm/hyprland: downgrade to 0.40.0 due to broken runtime https://github.com/hyprwm/Hyprland/issues/6408 This reverts commit 868e50e50b55501cb2d871cf090c19962a87565c. --- x11-wm/hyprland/Makefile | 13 ++++++------- x11-wm/hyprland/distinfo | 14 +++++++------- x11-wm/hyprland/files/patch-libc++16 | 35 ----------------------------------- 3 files changed, 13 insertions(+), 49 deletions(-) diff --git a/x11-wm/hyprland/Makefile b/x11-wm/hyprland/Makefile index 12209a038fbc..88790806ab9f 100644 --- a/x11-wm/hyprland/Makefile +++ b/x11-wm/hyprland/Makefile @@ -1,10 +1,11 @@ PORTNAME= hyprland DISTVERSIONPREFIX= v -DISTVERSION= 0.41.0 +DISTVERSION= 0.40.0 +PORTREVISION= 2 CATEGORIES= x11-wm wayland PATCH_SITES= https://github.com/${GH_ACCOUNT}/${GH_PROJECT}/commit/ -PATCHFILES+= 766b935ad405.patch:-p1 # https://github.com/hyprwm/Hyprland/pull/6402 +PATCHFILES+= ec092bd601d9.patch:-p1 # hyprwayland-scanner 0.3.5 MAINTAINER= jbeich@FreeBSD.org COMMENT= Dynamic tiling Wayland compositor that doesn't sacrifice on its looks #' @@ -14,7 +15,7 @@ LICENSE= BSD3CLAUSE LICENSE_FILE= ${WRKSRC}/LICENSE BUILD_DEPENDS= evdev-proto>0:devel/evdev-proto \ - hyprwayland-scanner>=0.3.10:devel/hyprwayland-scanner \ + hyprwayland-scanner>=0.3.5:devel/hyprwayland-scanner \ wayland-protocols>=1.35:graphics/wayland-protocols LIB_DEPENDS= libhyprlang.so:devel/hyprlang \ libtomlplusplus.so:devel/tomlplusplus \ @@ -33,12 +34,12 @@ USE_GNOME= cairo pango USE_XORG= pixman GH_ACCOUNT= hyprwm GH_PROJECT= Hyprland -GH_TUPLE= hyprwm:hyprland-protocols:v0.2-5-ge06482e:hyprland_protocols/subprojects/hyprland-protocols \ +GH_TUPLE= hyprwm:hyprland-protocols:v0.2-4-g0c2ce70:hyprland_protocols/subprojects/hyprland-protocols \ canihavesomecoffee:udis86:1.7.2-186-g5336633:udis86/subprojects/udis86 MESON_ARGS= -Dsystemd=disabled # Generated by "make update-hash" for commit_pins in hyprpm.toml -GH_HASH= ea2501d4556f84d3de86a4ae2f4b22a474555b9f +GH_HASH= cba1ade848feac44b2eda677503900639581c3f4 # XXX Drop after FreeBSD 14.0 EOL around 2024-10-01 .if exists(/usr/lib/libc++.so) && !exists(/usr/include/c++/v1/__format/write_escaped.h) @@ -55,8 +56,6 @@ OPTIONS_DEFINE= X11 OPTIONS_DEFAULT=X11 X11_USE= XORG=xcb -X11_LIB_DEPENDS= libxcb-errors.so:x11/xcb-util-errors \ - libxcb-icccm.so:x11/xcb-util-wm X11_MESON_ENABLED= xwayland post-patch: diff --git a/x11-wm/hyprland/distinfo b/x11-wm/hyprland/distinfo index 0846791c59e6..47990b4eaf0a 100644 --- a/x11-wm/hyprland/distinfo +++ b/x11-wm/hyprland/distinfo @@ -1,11 +1,11 @@ -TIMESTAMP = 1718029386 -SHA256 (hyprwm-Hyprland-v0.41.0_GH0.tar.gz) = 9795f146b3e36b1baa13bee03f0b72d3cea0799c8dad53669d31868e60fb4d96 -SIZE (hyprwm-Hyprland-v0.41.0_GH0.tar.gz) = 48025595 -SHA256 (hyprwm-hyprland-protocols-v0.2-5-ge06482e_GH0.tar.gz) = 05055f71e1f08496320bab54daa190f2fafec1a0e019af244edf1d37cdbf9b8a -SIZE (hyprwm-hyprland-protocols-v0.2-5-ge06482e_GH0.tar.gz) = 7424 +TIMESTAMP = 1714837352 +SHA256 (hyprwm-Hyprland-v0.40.0_GH0.tar.gz) = b7b438f08bb921c6d51e2c2fd7b26b9495c56f9e66123184e7ef0f334eda9647 +SIZE (hyprwm-Hyprland-v0.40.0_GH0.tar.gz) = 47946709 +SHA256 (hyprwm-hyprland-protocols-v0.2-4-g0c2ce70_GH0.tar.gz) = d8eb9712d66a167a22a0dae829b6dba2b85814b566d0a87918c944e7c0388d1b +SIZE (hyprwm-hyprland-protocols-v0.2-4-g0c2ce70_GH0.tar.gz) = 6478 SHA256 (canihavesomecoffee-udis86-1.7.2-186-g5336633_GH0.tar.gz) = 69aff959179ff6247b375b92e797221dbd8e078eabbf1366280b0532617e7fb8 SIZE (canihavesomecoffee-udis86-1.7.2-186-g5336633_GH0.tar.gz) = 116938 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 (766b935ad405.patch) = 718d835e800e9c6240a3be614afc739ede50012b100831cd5a3eaa6a7d16d654 -SIZE (766b935ad405.patch) = 1693 +SHA256 (ec092bd601d9.patch) = a4ab9aad0aeba3aa1f806f5716b01745ef1ea24bae1349b1d2fe3ab29fee5e1c +SIZE (ec092bd601d9.patch) = 2181 diff --git a/x11-wm/hyprland/files/patch-libc++16 b/x11-wm/hyprland/files/patch-libc++16 deleted file mode 100644 index 52303c71d65d..000000000000 --- a/x11-wm/hyprland/files/patch-libc++16 +++ /dev/null @@ -1,35 +0,0 @@ -Drop after FreeBSD 14.0 EOL around 2024-09-30 - -In file included from ../src/pch/pch.hpp:1: -In file included from ../src/Compositor.hpp:7: -In file included from ../src/defines.hpp:2: -../src/debug/Log.hpp:58:35: error: call to consteval function 'std::basic_format_string>> &>::basic_format_string' is not a constant expression - logMsg += std::format("[{}] ", hms); - ^ -/usr/include/c++/v1/__format/format_functions.h:341:46: note: initializer of '__types_' is not a constant expression - _Context{__types_.data(), __handles_.data(), sizeof...(_Args)}); - ^ -../src/debug/Log.hpp:58:35: note: in call to 'basic_format_string("[{}] ")' - logMsg += std::format("[{}] ", hms); - ^ -/usr/include/c++/v1/__format/format_functions.h:353:63: note: declared here - static constexpr array<__format::__arg_t, sizeof...(_Args)> __types_{ - ^ - ---- src/debug/Log.hpp.orig 2024-06-05 16:30:46.000000000 +0000 -+++ src/debug/Log.hpp -@@ -51,11 +51,12 @@ namespace Debug { - #ifndef _LIBCPP_VERSION - const auto zt = std::chrono::zoned_time{std::chrono::current_zone(), std::chrono::system_clock::now()}; - const auto hms = std::chrono::hh_mm_ss{zt.get_local_time() - std::chrono::floor(zt.get_local_time())}; -+ logMsg += std::format("[{}] ", hms); - #else - // TODO: current clang 17 does not support `zoned_time`, remove this once clang 19 is ready -- const auto hms = std::chrono::hh_mm_ss{std::chrono::system_clock::now() - std::chrono::floor(std::chrono::system_clock::now())}; -+ auto c = std::chrono::hh_mm_ss{std::chrono::system_clock::now() - std::chrono::floor(std::chrono::system_clock::now())}; -+ logMsg += std::format("{:%H}:{:%M}:{:%S}", c.hours(), c.minutes(), c.subseconds()); - #endif -- logMsg += std::format("[{}] ", hms); - } - - // no need for try {} catch {} because std::format_string ensures that vformat never throw std::format_error