gentoo auto-resync : 22:11:2024 - 03:03:01

4 files changed, 127 insertions, 0 deletions

diff --git a/gui-wm/Manifest.gz b/gui-wm/Manifest.gz
index 511f75728e93..6999b6881ecc 100644
--- a/gui-wm/Manifest.gz
+++ b/gui-wm/Manifest.gz
diff --git a/gui-wm/hyprland/Manifest b/gui-wm/hyprland/Manifest
index 0c2105e4cf66..c57f1881a576 100644
--- a/gui-wm/hyprland/Manifest
+++ b/gui-wm/hyprland/Manifest
@@ -1,9 +1,11 @@
+AUX hyprland-0.42.0-no_xwayland.patch 599 BLAKE2B 097306d9ef607b31b6ce251575e46b136ce0e8cf410ee206c3f634b571499dc070f9ad060c8d91258865c4d82045039072f3efbfd206ef08ffa082517f4a1ab9 SHA512 3745a0397a559e5a00b845cc11c4f45170071445203c286cdae15661a6bc43d408ec012b73c563acba06a7a60448ed1d530e70bdf81c26cccbf7e53cced81daf
 DIST hyprland-0.42.0.gh.tar.gz 54225438 BLAKE2B a947289c5568408d71383034a290f114b974f442ed1f56ac3ec30e49519ee886ac83e1f2611577a7240a555480a59bc01defb79b2aca2122ef0d81ea007f5486 SHA512 839916957abc867ad9a3a32b6f74830055060b99c4c1de314f71a85f8d55ef051c5adb7c79dd7a7e10f81d1130aa032458bb65ce2454198a79faa719021f66af
 DIST hyprland-0.44.1.gh.tar.gz 54398098 BLAKE2B ab5b52fa27591ad1f6db524663a85c2eb3f1137c8a55d6eaad9a41837fe057d6a92a75fb3bec930693a10311e3b82488ff94af86f4c2d58557879bffea02426f SHA512 2ffa16a180ec9f9e6b20481b0724e24524a499f7a224f72598426a6630c675632f2447a2f7dfd4609e8da9a86dda7919e40002a91dc917af2541e639fb4d542d
 DIST hyprland-0.45.0.gh.tar.gz 54409358 BLAKE2B 9744b525d2128d3723e42267620fa0b2e593eea13c564c3f2e38264dda97eacc422d44dc3c86b79deadbc785ba6f121148206ca47fb7f30b07722c2ef448199e SHA512 06b0d3eee9831e2f1dfa5e93c12cea82d3bcfa80685cfacac8f076a4467848c77b5bb06d8c389046588c1cc2340a2405c22b09794fec37bae4a9e3697a0875a2
 DIST hyprland-0.45.1.gh.tar.gz 54410237 BLAKE2B 789df658e9705ece110e7c8b693a4dcc839e906a763d1ae16d8607b167bd3bbf60f301bda9ae1b202bd4bae51a1fe9f5ae9bf8c0dcdb5296024f469d7acb91b7 SHA512 dd9902fba8658f197ad27bf1e1597d6fce2b2a9a4d1dde48721ef162a89025e923dc8847a525eb444968d590c52a9a3bbd4e35d3781639d0b3f1d20b61920a43
 DIST hyprland-0.45.2.gh.tar.gz 54410230 BLAKE2B 06a45c12b2655bb6a7eccda8948858a07b90b08d534de254c7a05facf6822869143ebb1cd55e3d42a6c51cee05717e89ec2cfb820c6d2901c4cd012c5fda9d5b SHA512 3159f0bd2153602a9d3938dc1e82a6b765bbaf672755b68a55ea863c5cb537c6811d7485f4451cfabce2ec8338ccb4b8eafbceb5632d23cba62f09c9e2fa3864
 EBUILD hyprland-0.42.0-r1.ebuild 2356 BLAKE2B c2d0a4a9a15396bc685ce985f6371ac63625390ffd1b7c8fde772118e45763abe282e8ec21949202016b11eaf597b1ad2284417812ce38e3c0b03da217ad3324 SHA512 b9f14ea6b456f75c0b4bbefc9fb827c5a47bde06f6ec4d034c2325da8dabb488bbe369357f3b5a9e4e2a75279773cc70680d27cf1a8293d5c8d6fc4b082bae1b
+EBUILD hyprland-0.42.0-r2.ebuild 2408 BLAKE2B 579edbf7d0a4fff9c74879862c952f16bbb83420838b1c768d210113d5e9c20ad7ba01e0c8ce16b1db347954c266c4bde9f9eac303112ef9200cdbe2ebbf98d5 SHA512 7d31dac59baff7d7227c3c0c6a508cf9e307d641af9895ee65296fbf484e2e612f75fc5c031005d3812cc494071052d518d502e050c60cd134d8b4cbac576d1f
 EBUILD hyprland-0.44.1.ebuild 2378 BLAKE2B 204ba37efcef9681c991416731ec4b3d6c113a71816dc19a57d1d27faba073fe08fcc0244861ad328574bb95bf747878ca31f654d5cbb02527c56b8de5314e0f SHA512 5f84e28ba96c95ad4f28c83caa9765f4df63b6b0a33a2b20d4524dedd2d5633aff5fe0422bda62857e1002078ca7a939433e9ab7a37ab3c1ad93354205c196e6
 EBUILD hyprland-0.45.0.ebuild 2378 BLAKE2B 204ba37efcef9681c991416731ec4b3d6c113a71816dc19a57d1d27faba073fe08fcc0244861ad328574bb95bf747878ca31f654d5cbb02527c56b8de5314e0f SHA512 5f84e28ba96c95ad4f28c83caa9765f4df63b6b0a33a2b20d4524dedd2d5633aff5fe0422bda62857e1002078ca7a939433e9ab7a37ab3c1ad93354205c196e6
 EBUILD hyprland-0.45.1.ebuild 2378 BLAKE2B 204ba37efcef9681c991416731ec4b3d6c113a71816dc19a57d1d27faba073fe08fcc0244861ad328574bb95bf747878ca31f654d5cbb02527c56b8de5314e0f SHA512 5f84e28ba96c95ad4f28c83caa9765f4df63b6b0a33a2b20d4524dedd2d5633aff5fe0422bda62857e1002078ca7a939433e9ab7a37ab3c1ad93354205c196e6
diff --git a/gui-wm/hyprland/files/hyprland-0.42.0-no_xwayland.patch b/gui-wm/hyprland/files/hyprland-0.42.0-no_xwayland.patch
new file mode 100644
index 000000000000..b9beeb8b56d0
--- /dev/null
+++ b/gui-wm/hyprland/files/hyprland-0.42.0-no_xwayland.patch
@@ -0,0 +1,21 @@
+From e09ae925a5847b9af7b0d422997cb64f093c75ef Mon Sep 17 00:00:00 2001
+From: Nick H <gerkola@gmail.com>
+Date: Tue, 27 Aug 2024 00:59:21 +0200
+Subject: [PATCH] Fix NO_XWAYLAND compilation
+
+---
+ src/xwayland/XWayland.hpp | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/src/xwayland/XWayland.hpp b/src/xwayland/XWayland.hpp
+index d1cc4421887..40c0ba656cd 100644
+--- a/src/xwayland/XWayland.hpp
++++ b/src/xwayland/XWayland.hpp
+@@ -3,6 +3,7 @@
+ #include <memory>
+ #include "../helpers/signal/Signal.hpp"
+ #include "../helpers/memory/Memory.hpp"
++#include "../macros.hpp"
+ 
+ #include "XSurface.hpp"
+ 
diff --git a/gui-wm/hyprland/hyprland-0.42.0-r2.ebuild b/gui-wm/hyprland/hyprland-0.42.0-r2.ebuild
new file mode 100644
index 000000000000..3cf17ab9e722
--- /dev/null
+++ b/gui-wm/hyprland/hyprland-0.42.0-r2.ebuild
@@ -0,0 +1,104 @@
+# Copyright 2023-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit meson toolchain-funcs
+
+DESCRIPTION="A dynamic tiling Wayland compositor that doesn't sacrifice on its looks"
+HOMEPAGE="https://github.com/hyprwm/Hyprland"
+
+if [[ "${PV}" = *9999 ]]; then
+	inherit git-r3
+	EGIT_REPO_URI="https://github.com/hyprwm/${PN^}.git"
+else
+	SRC_URI="https://github.com/hyprwm/${PN^}/releases/download/v${PV}/source-v${PV}.tar.gz -> ${P}.gh.tar.gz"
+	S="${WORKDIR}/${PN}-source"
+
+	KEYWORDS="~amd64"
+fi
+
+LICENSE="BSD"
+SLOT="0"
+IUSE="X legacy-renderer systemd"
+
+# hyprpm (hyprland plugin manager) requires the dependencies at runtime
+# so that it can clone, compile and install plugins.
+HYPRPM_RDEPEND="
+	app-alternatives/ninja
+	dev-build/cmake
+	dev-build/meson
+	dev-libs/libliftoff
+	dev-vcs/git
+	virtual/pkgconfig
+"
+RDEPEND="
+	${HYPRPM_RDEPEND}
+	dev-cpp/tomlplusplus
+	dev-libs/glib:2
+	dev-libs/libinput
+	>=dev-libs/wayland-1.20.0
+	gui-libs/aquamarine
+	>=gui-libs/hyprcursor-0.1.9
+	media-libs/libglvnd
+	x11-libs/cairo
+	x11-libs/libdrm
+	x11-libs/libxkbcommon
+	x11-libs/pango
+	x11-libs/pixman
+	x11-libs/libXcursor
+	X? (
+		x11-libs/libxcb:0=
+		x11-base/xwayland
+		x11-libs/xcb-util-errors
+		x11-libs/xcb-util-wm
+	)
+"
+DEPEND="
+	${RDEPEND}
+	>=dev-libs/hyprland-protocols-0.3
+	>=dev-libs/hyprlang-0.3.2
+	>=dev-libs/wayland-protocols-1.36
+	>=gui-libs/hyprutils-0.2.1
+"
+BDEPEND="
+	|| ( >=sys-devel/gcc-13:* >=sys-devel/clang-16:* )
+	app-misc/jq
+	dev-build/cmake
+	>=dev-util/hyprwayland-scanner-0.3.8
+	virtual/pkgconfig
+"
+
+PATCHES=(
+	"${FILESDIR}"/${P}-no_xwayland.patch
+)
+
+pkg_setup() {
+	[[ ${MERGE_TYPE} == binary ]] && return
+
+	if tc-is-gcc && ver_test $(gcc-version) -lt 13 ; then
+		eerror "Hyprland requires >=sys-devel/gcc-13 to build"
+		eerror "Please upgrade GCC: emerge -v1 sys-devel/gcc"
+		die "GCC version is too old to compile Hyprland!"
+	elif tc-is-clang && ver_test $(clang-version) -lt 16 ; then
+		eerror "Hyprland requires >=sys-devel/clang-16 to build"
+		eerror "Please upgrade Clang: emerge -v1 sys-devel/clang"
+		die "Clang version is too old to compile Hyprland!"
+	fi
+}
+
+src_prepare() {
+	# skip version.h
+	sed -i -e "s|scripts/generateVersion.sh|echo|g" meson.build || die
+	default
+}
+
+src_configure() {
+	local emesonargs=(
+		$(meson_feature legacy-renderer legacy_renderer)
+		$(meson_feature systemd)
+		$(meson_feature X xwayland)
+	)
+
+	meson_src_configure
+}