From nobody Mon Sep 2 14:47:59 2024 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 4WyBSb6ppLz5TXCF; Mon, 02 Sep 2024 14:47:59 +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 "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4WyBSb63gHz4kBW; Mon, 2 Sep 2024 14:47:59 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1725288479; 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=ilQjfVRbehj8WsML53rFV0CMfDJsYILi6UArC06CykI=; b=fl7lfXA6vQZFOX6ri9LQZ/Cjbjp5yRIZ/EEyXiOGSBaJx5UadrudvQbo0aSNWxsEbgYM9M IClw9KybNKV3XxEQudgAuqBBu8NMMm6dSEbHfS6TENSzy3L5Il36rB7QmjUqznHi54Yivh 9eXukZ7I5Kc7pG9cDXOZhawrcRdoOTWvcWQhv6wXNO1KSZBCPMmOjSQDZK1lOTZ3RGCrof Nksc0ig6bgpWY2tsEPQdoXajAI74wM0JaE6DuyaEkfKPyoWmfw9GyYvk3VWrs8x3DMIXfd a18kdjJFC4KL2nFcE3+7c3sXmn9G+9AyhtvrzMQOX++vr+bw3ZvU/tumKwpAmg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1725288479; a=rsa-sha256; cv=none; b=WoZRfA038lsfimeR9j6rZj1Ztp4WksxvE1A0ntKwhXvD2SZ3jvFSLoM4umDUVeYvKO0rbp 41D25x+KCk/vPo2WG5sLh02mR9b6P8e/J4QAt2dxDfo8/F1HZ68xXTpLyjoVueWzQsyY/D goY4MPzWfGfE3KA4ZyT6qZfmqqXWBeyljrm27XKeNrENw4M4RN5M16Jhs2vFNEbqKO5KMk aL6N5dDxRAwl+uzvV3mv2JJBdXdd+Wh+c3JIYcDF4uy3SRhDiE3RrSIaURWSyeB5Fv1eaj tofXdpNEZl4bm5v8pkFM6pY3F++DC323HqJHom1ZQM+b9b6GxPDX3JcSVfrbyA== 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=1725288479; 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=ilQjfVRbehj8WsML53rFV0CMfDJsYILi6UArC06CykI=; b=EjUipOE9EtVDaNNri6ajoQNtOYMOjskUeFYzn8CTJ1NOSxpUw+fpmGPNLl4cj56F9KeZXK ZiXdCT694ggAs+oCUGfm74TtWAuJPFRS9bV7R7pKQU2LqYtxgSdzBZz58aCykYkSNpxPXv dIab07kaYBCwhmGdLfmF7opYFjciWTBx5bjG/Qfx/00Jxfx3aKzg8zrWHkdj8/K/ZLjQVC +e+XoJoadWUVA5o6ZKB36zg72Bb9jRkPZ1P5tiKE04uVhg1q2N5TWs23squL+wD03xkH22 FcbDXumqrrFomCZXGRaTN/549m4aRrHU0/Uo7Xp/xJWcJoJktqjeRbi4FcxmiQ== 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 4WyBSb5fl7z1GBP; Mon, 2 Sep 2024 14:47:59 +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 482ElxdP010742; Mon, 2 Sep 2024 14:47:59 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 482Elx8E010739; Mon, 2 Sep 2024 14:47:59 GMT (envelope-from git) Date: Mon, 2 Sep 2024 14:47:59 GMT Message-Id: <202409021447.482Elx8E010739@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: 5fed0aee8298 - main - x11-wm/hyprland: switch to USES=cmake 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: jbeich X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 5fed0aee8298ea4a878a6447b44986a01afa1d57 Auto-Submitted: auto-generated The branch main has been updated by jbeich: URL: https://cgit.FreeBSD.org/ports/commit/?id=5fed0aee8298ea4a878a6447b44986a01afa1d57 commit 5fed0aee8298ea4a878a6447b44986a01afa1d57 Author: Jan Beich AuthorDate: 2024-09-02 13:01:18 +0000 Commit: Jan Beich CommitDate: 2024-09-02 14:44:32 +0000 x11-wm/hyprland: switch to USES=cmake --- x11-wm/hyprland/Makefile | 21 +++++++++------------ x11-wm/hyprland/distinfo | 4 ++++ 2 files changed, 13 insertions(+), 12 deletions(-) diff --git a/x11-wm/hyprland/Makefile b/x11-wm/hyprland/Makefile index 5bde57fe05b9..9940f1f679d3 100644 --- a/x11-wm/hyprland/Makefile +++ b/x11-wm/hyprland/Makefile @@ -1,11 +1,13 @@ PORTNAME= hyprland DISTVERSIONPREFIX= v DISTVERSION= 0.42.0 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= x11-wm wayland PATCH_SITES= https://github.com/${GH_ACCOUNT}/${GH_PROJECT}/commit/ PATCHFILES+= 4fdc0d55e4b4.patch:-p1 # https://github.com/hyprwm/Hyprland/issues/6842 +PATCHFILES+= ff3f41c9a5d1.patch:-p1 # https://github.com/hyprwm/Hyprland/pull/7626 +PATCHFILES+= 89fa6a6a66e6.patch:-p1 # https://github.com/hyprwm/Hyprland/pull/7626 MAINTAINER= jbeich@FreeBSD.org COMMENT= Dynamic tiling Wayland compositor that doesn't sacrifice on its looks #' @@ -16,10 +18,10 @@ LICENSE_FILE= ${WRKSRC}/LICENSE BUILD_DEPENDS= evdev-proto>0:devel/evdev-proto \ hyprwayland-scanner>=0.3.10:devel/hyprwayland-scanner \ + tomlplusplus>0:devel/tomlplusplus \ wayland-protocols>=1.35:graphics/wayland-protocols LIB_DEPENDS= libhyprlang.so:devel/hyprlang \ libhyprutils.so:devel/hyprutils \ - libtomlplusplus.so:devel/tomlplusplus \ libdrm.so:graphics/libdrm \ libwayland-server.so:graphics/wayland \ libuuid.so:misc/e2fsprogs-libuuid \ @@ -28,7 +30,7 @@ LIB_DEPENDS= libhyprlang.so:devel/hyprlang \ libinput.so:x11/libinput \ libxkbcommon.so:x11/libxkbcommon -USES= cmake:indirect compiler:c++11-lib gl gnome meson pkgconfig xorg +USES= cmake compiler:c++11-lib gl gnome pkgconfig xorg USE_GITHUB= yes USE_GL= egl gbm opengl USE_GNOME= cairo pango @@ -37,7 +39,8 @@ GH_ACCOUNT= hyprwm GH_PROJECT= Hyprland GH_TUPLE= hyprwm:hyprland-protocols:v0.2-5-ge06482e:hyprland_protocols/subprojects/hyprland-protocols \ canihavesomecoffee:udis86:1.7.2-186-g5336633:udis86/subprojects/udis86 -MESON_ARGS= -Dsystemd=disabled +CMAKE_ON= NO_SYSTEMD +LDFLAGS+= -Wl,--as-needed # GL, pango deps # Generated by "make update-hash" for commit_pins in hyprpm.toml GH_HASH= 9a09eac79b85c846e3a865a9078a3f8ff65a9259 @@ -59,10 +62,10 @@ 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 +X11_CMAKE_BOOL_OFF= NO_XWAYLAND post-patch: -# Extract (snapshot) version from the port instead of meson.build +# Extract (snapshot) version from the port instead of CMakeLists.txt @${REINPLACE_CMD} -i .nogit \ -e '/^HASH/s/=.*/=${GH_HASH}/' \ -e '/^BRANCH/s/=.*/=main/' \ @@ -85,12 +88,6 @@ post-patch: ${WRKSRC}/src/desktop/Window.cpp \ ${WRKSRC}/src/plugins/HookSystem.cpp -.ifdef GH_TUPLE -post-configure: - @${REINPLACE_CMD} 's/meson install/& \ - --skip-subprojects/' ${BUILD_WRKSRC}/build.ninja -.endif - post-install: # Plugin API installs all headers (no private vs. public) @(cd ${STAGEDIR}${PREFIX} && ${FIND} include/${PORTNAME} ! -type d) >>${TMPPLIST} diff --git a/x11-wm/hyprland/distinfo b/x11-wm/hyprland/distinfo index e1063e370761..ba0c441a4c48 100644 --- a/x11-wm/hyprland/distinfo +++ b/x11-wm/hyprland/distinfo @@ -7,3 +7,7 @@ SHA256 (canihavesomecoffee-udis86-1.7.2-186-g5336633_GH0.tar.gz) = 69aff959179ff SIZE (canihavesomecoffee-udis86-1.7.2-186-g5336633_GH0.tar.gz) = 116938 SHA256 (4fdc0d55e4b4.patch) = 1f3e4cf9c33a37683127feca287318a5532eff95fdaa1a5b87aad8aaca1aa220 SIZE (4fdc0d55e4b4.patch) = 970 +SHA256 (ff3f41c9a5d1.patch) = 942e5271c07c853ced50584179ffc89ee7a1e0269fed0c661e371be34b5dac58 +SIZE (ff3f41c9a5d1.patch) = 727 +SHA256 (89fa6a6a66e6.patch) = 2e3bc9a15a4de383976c41d3a0c80e3c44dc181adedf1ec843a867eb26c0a027 +SIZE (89fa6a6a66e6.patch) = 1103