[patch] suggested fix

emacs-add-wayland.patch (text/plain), 2.78 KB, created by Mazunki Hoksaas on 2024-05-04 15:39:26 UTC

diff --git a/emacs-29.3-r2.ebuild b/emacs-29.3-r3.ebuild
index 14d83ce44514..f1f38f2ff49d 100644
--- a/emacs-29.3-r2.ebuild
+++ b/emacs-29.3-r3.ebuild
@@ -43,7 +43,12 @@ DESCRIPTION="The extensible, customizable, self-documenting real-time display ed
 HOMEPAGE="https://www.gnu.org/software/emacs/"
 
 LICENSE="GPL-3+ FDL-1.3+ BSD HPND MIT W3C unicode PSF-2"
-IUSE="acl alsa aqua athena cairo dbus dynamic-loading games gfile gif +gmp gpm gsettings gtk gui gzip-el harfbuzz imagemagick +inotify jit jpeg json kerberos lcms libxml2 livecd m17n-lib mailutils motif png selinux sound source sqlite ssl svg systemd +threads tiff toolkit-scroll-bars tree-sitter valgrind webp wide-int +X Xaw3d xft +xpm xwidgets zlib"
+IUSE="acl alsa aqua athena cairo dbus dynamic-loading games gfile gif +gmp gpm gsettings gtk gui gzip-el harfbuzz imagemagick +inotify jit jpeg json kerberos lcms libxml2 livecd m17n-lib mailutils motif png selinux sound source sqlite ssl svg systemd +threads tiff toolkit-scroll-bars tree-sitter valgrind wayland webp wide-int +X Xaw3d xft +xpm xwidgets zlib"
+
+REQUIRED_USE="
+	gui? ( ^^ ( aqua wayland X ) )
+	gtk? ( || ( wayland X ) )
+"
 
 X_DEPEND="x11-libs/libICE
 	x11-libs/libSM
@@ -249,7 +254,7 @@ src_configure() {
 	# General GUI support is enabled by the "gui" USE flag, then
 	# the window system is selected as follows:
 	#   "aqua" -> Nextstep
-	#   "gtk -X" -> pure GTK
+	#   "wayland" -> pure GTK
 	#   otherwise -> X11
 	# For X11 there is the further choice of toolkits GTK, Motif,
 	# Athena (Lucid), or no toolkit. They are enabled (in order of
@@ -262,9 +267,11 @@ src_configure() {
 		einfo "Configuring to build with Nextstep (Macintosh Cocoa) support"
 		myconf+=" --with-ns --disable-ns-self-contained"
 		myconf+=" --without-x --without-pgtk"
-	elif use gtk && ! use X; then
-		einfo "Configuring to build with pure GTK (without X11) support"
-		myconf+=" --with-pgtk --without-x --without-ns"
+	elif use wayland; then
+		einfo "Configuring to build with pure GTK support"
+		myconf+=" --with-pgtk"  # assumes pgtk is required for native wayland support
+		myconf+=" $(use_with X)"  # Xwayland
+		myconf+=" --without-ns"
 		myconf+=" --with-toolkit-scroll-bars" #836392
 		myconf+=" --without-gconf"
 		myconf+=" $(use_with gsettings)"
@@ -272,7 +279,7 @@ src_configure() {
 		myconf+=" $(use_with m17n-lib libotf)"
 		myconf+=" $(use_with m17n-lib m17n-flt)"
 		myconf+=" $(use_with xwidgets)"
-	else
+	elif use X; then
 		# X11
 		myconf+=" --with-x --without-pgtk --without-ns"
 		myconf+=" --without-gconf"
@@ -330,6 +337,8 @@ src_configure() {
 		fi
 		! use gtk && use xwidgets && ewarn \
 			"USE flag \"xwidgets\" has no effect if \"gtk\" is not set."
+	elif use gtk || use gui; then
+		eerror "Requested window system support, but all supported ones were disabled"
 	fi
 
 	if use gui; then