From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id D34FA15813A for ; Tue, 07 Jan 2025 22:45:02 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id B917EE07D8; Tue, 07 Jan 2025 22:45:01 +0000 (UTC) Received: from smtp.gentoo.org (woodpecker.gentoo.org [140.211.166.183]) (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) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 9D217E07D8 for ; Tue, 07 Jan 2025 22:45:01 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (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) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id A0AEC3412DE for ; Tue, 07 Jan 2025 22:45:00 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id D9B6C1870 for ; Tue, 07 Jan 2025 22:44:58 +0000 (UTC) From: "Sam James" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Sam James" Message-ID: <1736289845.7d2273a9e780199b7a28bd06d17234130bc469e5.sam@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: x11-wm/mutter/ X-VCS-Repository: repo/gentoo X-VCS-Files: x11-wm/mutter/mutter-46.4-r1.ebuild x11-wm/mutter/mutter-46.4.ebuild x11-wm/mutter/mutter-46.7-r1.ebuild x11-wm/mutter/mutter-46.7.ebuild x11-wm/mutter/mutter-9999.ebuild X-VCS-Directories: x11-wm/mutter/ X-VCS-Committer: sam X-VCS-Committer-Name: Sam James X-VCS-Revision: 7d2273a9e780199b7a28bd06d17234130bc469e5 X-VCS-Branch: master Date: Tue, 07 Jan 2025 22:44:58 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: 2993e6f3-43d4-40cc-82f4-c4e2ba94159c X-Archives-Hash: bf29922f5497f36be044be5614009b9b commit: 7d2273a9e780199b7a28bd06d17234130bc469e5 Author: Sam James gentoo org> AuthorDate: Tue Jan 7 22:37:03 2025 +0000 Commit: Sam James gentoo org> CommitDate: Tue Jan 7 22:44:05 2025 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7d2273a9 x11-wm/mutter: depend on media-libs/libdisplay-info unconditionally While it's an optional dep in 46.x, it's mandatory in upstream master, and it was automagic before this commit. Just require it. Signed-off-by: Sam James gentoo.org> x11-wm/mutter/{mutter-46.4.ebuild => mutter-46.4-r1.ebuild} | 3 ++- x11-wm/mutter/{mutter-46.7.ebuild => mutter-46.7-r1.ebuild} | 3 ++- x11-wm/mutter/mutter-9999.ebuild | 7 ++++--- 3 files changed, 8 insertions(+), 5 deletions(-) diff --git a/x11-wm/mutter/mutter-46.4.ebuild b/x11-wm/mutter/mutter-46.4-r1.ebuild similarity index 99% rename from x11-wm/mutter/mutter-46.4.ebuild rename to x11-wm/mutter/mutter-46.4-r1.ebuild index 69fca7491985..5987f69cd1b6 100644 --- a/x11-wm/mutter/mutter-46.4.ebuild +++ b/x11-wm/mutter/mutter-46.4-r1.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2024 Gentoo Authors +# Copyright 1999-2025 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 @@ -52,6 +52,7 @@ DEPEND=" >=media-libs/lcms-2.6:2 >=media-libs/harfbuzz-2.6.0:= >=dev-libs/libei-1.0.901 + media-libs/libdisplay-info:= gnome? ( gnome-base/gnome-desktop:4= ) diff --git a/x11-wm/mutter/mutter-46.7.ebuild b/x11-wm/mutter/mutter-46.7-r1.ebuild similarity index 99% rename from x11-wm/mutter/mutter-46.7.ebuild rename to x11-wm/mutter/mutter-46.7-r1.ebuild index 6136cb52f942..5930d24a87d8 100644 --- a/x11-wm/mutter/mutter-46.7.ebuild +++ b/x11-wm/mutter/mutter-46.7-r1.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2024 Gentoo Authors +# Copyright 1999-2025 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 @@ -52,6 +52,7 @@ DEPEND=" >=media-libs/lcms-2.6:2 >=media-libs/harfbuzz-2.6.0:= >=dev-libs/libei-1.0.901 + media-libs/libdisplay-info:= gnome? ( gnome-base/gnome-desktop:4= ) diff --git a/x11-wm/mutter/mutter-9999.ebuild b/x11-wm/mutter/mutter-9999.ebuild index 69fca7491985..5930d24a87d8 100644 --- a/x11-wm/mutter/mutter-9999.ebuild +++ b/x11-wm/mutter/mutter-9999.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2024 Gentoo Authors +# Copyright 1999-2025 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 @@ -15,7 +15,7 @@ if [[ ${PV} == 9999 ]]; then SRC_URI="" SLOT="0/14" # This can get easily out of date, but better than 9967 else - KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc64 ~riscv ~x86" + KEYWORDS="amd64 ~arm arm64 ~loong ~ppc64 ~riscv x86" SLOT="0/$(($(ver_cut 1) - 32))" # 0/libmutter_api_version - ONLY gnome-shell (or anything using mutter-clutter-.pc) should use the subslot fi @@ -52,6 +52,7 @@ DEPEND=" >=media-libs/lcms-2.6:2 >=media-libs/harfbuzz-2.6.0:= >=dev-libs/libei-1.0.901 + media-libs/libdisplay-info:= gnome? ( gnome-base/gnome-desktop:4= ) @@ -73,7 +74,7 @@ DEPEND=" ) udev? ( >=virtual/libudev-232-r1:= - >=dev-libs/libgudev-232 + >=dev-libs/libgudev-238 ) systemd? ( sys-apps/systemd ) x11-libs/libSM