From nobody Thu Aug 07 11:02:14 2025 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 4byPPh0ZpVz647Fq; Thu, 07 Aug 2025 11:02:16 +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 "R10" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4byPPf6h8Sz3ggJ; Thu, 07 Aug 2025 11:02:14 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1754564535; 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=u5kDc8XRsRluGGi/Q/wCMsXRqjkMf+hTbe9pzbQeLOg=; b=qRuzopvCSw0xIgx3SsVUHjAfuBtzAGGzG/qCIi+yjd7zlYvdARtCnSjCFaHw+HBvqpb3XY c9bCLIjdWeMWZ+Rb10xqMbC6omLoQmELAY4ZB/eA9uaqevqWU4P4q6PZet45UY0viRIHbH cUzCcfNmAoq/BtQ3uhtTbU4ZPY6k/qQSHMah4G+/sv2pzUQHWFKALuTpMGJKs2lxRIr0rv Pn3SZvUuzSg5ezUtJ+6TaQIez2B+h3nSmAyB2+tbnscQEfponaUQIevnLZACUiT6mkTOu3 wRZnooZS4i98q/MQrB4ZoWXanDhEwad3q3LVuKrMnQfLku7OqMXqPhpljFreRg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1754564535; 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=u5kDc8XRsRluGGi/Q/wCMsXRqjkMf+hTbe9pzbQeLOg=; b=haaYaqcP1UfCF3hP85Secw+GoDmMPTBqJJ1YNhHbrJirbVrcqqy0q9k/iFB8VpzzeMGN2D jkyX2XbLq0sDMrHHC9v1aQpGXXoVbwBX2MoFkIFNCiSAXV/bQouHjayjseWSedVjkha70a eBcg7DsaW/EWSKDuG85+mraeWZWYfPMft4SJvsnBwXbEYcBXzbSo5ZOtqgbxpNGlcyZBjf MlU3xzcBoTwHKmPds7zf3kFOr6niuDETpV80Ob3S9ezVVTR7aaizKF4xuVs4XbLzIPAbHG dZNGj2uQHTHQV01xrDDHeP6829wEpyfdde5ZazT6uokVvgYKpYxVpOmLml1iZg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1754564535; a=rsa-sha256; cv=none; b=CkvqwKsw39C1fg7imW/CRRwJrrT35AJRPyimJiBQ8yD8vKQ8usE0gFckXVxGnN1RV3sGhF K2GozbFk6H35OWVfJSTj+2Ogqml0UEP2QYzdhnMPM3SB6KWnmaZO23ICpafRgfe/YOV5cS Kw9yB6plqDpZVC/uMfVhp8Z6vSUW8dOTP/jCz/5HJjmuBHskLGTQ4lElcXqZY5v8RXOspz Zojkcg310fwnOcOQedwmVOms637zPL8g7EqaWSAzkIQSYAeMnDPiZzoxcrziKLUwDVr/gD f+6ZBvvyX7GXWlktiDghPvU6fumok9p3xXQYHV1ei5GpGmBUDw3pSrr7+bWYgw== 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 4byPPf64gSz12fs; Thu, 07 Aug 2025 11:02:14 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 577B2EKb051139; Thu, 7 Aug 2025 11:02:14 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 577B2Ehh051136; Thu, 7 Aug 2025 11:02:14 GMT (envelope-from git) Date: Thu, 7 Aug 2025 11:02:14 GMT Message-Id: <202508071102.577B2Ehh051136@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Hiroki Tagato Subject: git: 43f4f5406e96 - main - x11/hypridle: add patch to avoid illegal hardware instruction on startup 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: X-BeenThere: dev-commits-ports-main@freebsd.org Sender: owner-dev-commits-ports-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: tagattie X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 43f4f5406e967d12da97e8e3db3f3a03f173f149 Auto-Submitted: auto-generated The branch main has been updated by tagattie: URL: https://cgit.FreeBSD.org/ports/commit/?id=43f4f5406e967d12da97e8e3db3f3a03f173f149 commit 43f4f5406e967d12da97e8e3db3f3a03f173f149 Author: fgorter AuthorDate: 2025-08-07 10:58:42 +0000 Commit: Hiroki Tagato CommitDate: 2025-08-07 11:01:56 +0000 x11/hypridle: add patch to avoid illegal hardware instruction on startup The issue is also reported at: https://github.com/hyprwm/hypridle/issues/68 While here, use hyprland-protocols from ports. PR: 288679 Reported by: fgorter Obtained from: https://github.com/hyprwm/hypridle/issues/68#issuecomment-2428697344 --- x11/hypridle/Makefile | 9 ++++++--- x11/hypridle/distinfo | 4 +--- x11/hypridle/files/patch-CMakeLists.txt | 23 ----------------------- x11/hypridle/files/patch-src_core_Hypridle.cpp | 12 ++++++++++++ 4 files changed, 19 insertions(+), 29 deletions(-) diff --git a/x11/hypridle/Makefile b/x11/hypridle/Makefile index c8ee2817c025..d0afc5ea17cf 100644 --- a/x11/hypridle/Makefile +++ b/x11/hypridle/Makefile @@ -1,7 +1,7 @@ PORTNAME= hypridle DISTVERSIONPREFIX= v DISTVERSION= 0.1.6 -PORTREVISION= 4 +PORTREVISION= 5 CATEGORIES= x11 wayland MAINTAINER= tagattie@FreeBSD.org @@ -11,7 +11,8 @@ WWW= https://github.com/hyprwm/hypridle LICENSE= BSD3CLAUSE LICENSE_FILE= ${WRKSRC}/LICENSE -BUILD_DEPENDS= hyprwayland-scanner>=0.4.4:devel/hyprwayland-scanner \ +BUILD_DEPENDS= hyprland-protocols>=0.6.0:graphics/hyprland-protocols \ + hyprwayland-scanner>=0.4.4:devel/hyprwayland-scanner \ wayland-protocols>0:graphics/wayland-protocols LIB_DEPENDS= libhyprlang.so:devel/hyprlang \ libhyprutils.so:devel/hyprutils \ @@ -19,10 +20,12 @@ LIB_DEPENDS= libhyprlang.so:devel/hyprlang \ libwayland-client.so:graphics/wayland USES= compiler:c++11-lib cmake pkgconfig + USE_GITHUB= yes GH_ACCOUNT= hyprwm -GH_TUPLE= hyprwm:hyprland-protocols:v0.6.2:hyprland_protocols/subprojects/hyprland-protocols + LDFLAGS+= -Wl,--as-needed # sdbus-cpp deps + PLIST_FILES= bin/${PORTNAME} \ lib/systemd/user/${PORTNAME}.service \ share/hypr/${PORTNAME}.conf diff --git a/x11/hypridle/distinfo b/x11/hypridle/distinfo index fc3e365f6a9a..73c23c1a0e6c 100644 --- a/x11/hypridle/distinfo +++ b/x11/hypridle/distinfo @@ -1,5 +1,3 @@ -TIMESTAMP = 1743171426 +TIMESTAMP = 1754557031 SHA256 (hyprwm-hypridle-v0.1.6_GH0.tar.gz) = ea4faf92e7ef303a538551e2b0ea67a557b2d711574993a5a3fea3b27667dc63 SIZE (hyprwm-hypridle-v0.1.6_GH0.tar.gz) = 17053 -SHA256 (hyprwm-hyprland-protocols-v0.6.2_GH0.tar.gz) = bba082af141599d4342e7b8505401a6e3a32be819d9eb23ce6c90f7407e62c1f -SIZE (hyprwm-hyprland-protocols-v0.6.2_GH0.tar.gz) = 9887 diff --git a/x11/hypridle/files/patch-CMakeLists.txt b/x11/hypridle/files/patch-CMakeLists.txt deleted file mode 100644 index a3f2db7850a9..000000000000 --- a/x11/hypridle/files/patch-CMakeLists.txt +++ /dev/null @@ -1,23 +0,0 @@ --- Checking for module 'hyprland-protocols>=0.6.0' --- Package 'hyprland-protocols' not found -CMake Error at /usr/local/share/cmake/Modules/FindPkgConfig.cmake:645 (message): - The following required packages were not found: - - - hyprland-protocols>=0.6.0 - ---- CMakeLists.txt.orig 2025-03-28 14:17:06 UTC -+++ CMakeLists.txt -@@ -57,8 +57,12 @@ message(STATUS "Found wayland-scanner pkgdatadir at ${ - pkg_get_variable(WAYLAND_SCANNER_PKGDATA_DIR wayland-scanner pkgdatadir) - message(STATUS "Found wayland-scanner pkgdatadir at ${WAYLAND_SCANNER_PKGDATA_DIR}") - --pkg_check_modules(hyprland_protocols_dep REQUIRED IMPORTED_TARGET hyprland-protocols>=0.6.0) -+pkg_check_modules(hyprland_protocols_dep IMPORTED_TARGET hyprland-protocols>=0.6.0) -+if(hyprland_protocols_dep_FOUND) - pkg_get_variable(HYPRLAND_PROTOCOLS hyprland-protocols pkgdatadir) -+else() -+set(HYPRLAND_PROTOCOLS "${CMAKE_SOURCE_DIR}/subprojects/hyprland-protocols") -+endif() - message(STATUS "Found hyprland-protocols at ${HYPRLAND_PROTOCOLS}") - - function(protocolnew protoPath protoName external) diff --git a/x11/hypridle/files/patch-src_core_Hypridle.cpp b/x11/hypridle/files/patch-src_core_Hypridle.cpp new file mode 100644 index 000000000000..d5f2395f2518 --- /dev/null +++ b/x11/hypridle/files/patch-src_core_Hypridle.cpp @@ -0,0 +1,12 @@ +https://github.com/hyprwm/hypridle/issues/68#issuecomment-2428697344 + +--- src/core/Hypridle.cpp.orig 2025-08-07 09:04:25 UTC ++++ src/core/Hypridle.cpp +@@ -180,6 +180,7 @@ void CHypridle::enterEventLoop() { + } + }); + ++ m_sEventLoopInternals.loopRequestMutex.try_lock(); + while (1) { // dbus events + // wait for being awakened + m_sEventLoopInternals.loopRequestMutex.unlock(); // unlock, we are ready to take events