mirror of
https://github.com/gentoo-mirror/gentoo.git
synced 2026-09-24 04:59:14 -07:00
x11-terms/ghostty: remove IUSE glfw, always build gtk runtime
Upstream does not want the GLFW runtime to be a user-facing option.
The required source packages are still included in the ebuild and users
can build the backend using ZBS_EXTRA_ARGS="-Dapp-runtime=glfw" in
/etc/portage/package.env if they wish.
Combined revision bump with previous commits.
Link: e9e82d94ac
Signed-off-by: sin-ack <sin-ack@protonmail.com>
Signed-off-by: Joonas Niilola <juippis@gentoo.org>
This commit is contained in:
@@ -62,19 +62,19 @@ KEYWORDS="~amd64"
|
||||
|
||||
# TODO: simdutf integration (missing Gentoo version)
|
||||
# TODO: spirv-cross integration (missing Gentoo package)
|
||||
# TODO: glfw integration (no option from upstream)
|
||||
RDEPEND="
|
||||
gui-libs/gtk:4=[X?]
|
||||
|
||||
adwaita? ( gui-libs/libadwaita:1= )
|
||||
gtk? (
|
||||
gui-libs/gtk:4=[X?]
|
||||
X? ( x11-libs/libX11 )
|
||||
)
|
||||
X? ( x11-libs/libX11 )
|
||||
|
||||
system-fontconfig? ( >=media-libs/fontconfig-2.14.2:= )
|
||||
system-freetype? (
|
||||
system-harfbuzz? ( >=media-libs/freetype-2.13.2:=[bzip2,harfbuzz] )
|
||||
!system-harfbuzz? ( >=media-libs/freetype-2.13.2:=[bzip2] )
|
||||
)
|
||||
system-fontconfig? ( >=media-libs/fontconfig-2.14.2:= )
|
||||
system-freetype? ( >=media-libs/freetype-2.13.2:=[bzip2] )
|
||||
system-glslang? ( >=dev-util/glslang-1.3.296.0:= )
|
||||
system-harfbuzz? ( >=media-libs/harfbuzz-8.4.0:= )
|
||||
system-libpng? ( >=media-libs/libpng-1.6.43:= )
|
||||
@@ -87,19 +87,13 @@ BDEPEND="
|
||||
man? ( virtual/pandoc )
|
||||
"
|
||||
|
||||
IUSE="+X +adwaita man +gtk glfw"
|
||||
IUSE="+X +adwaita man"
|
||||
# System integrations
|
||||
IUSE+="
|
||||
+system-fontconfig +system-freetype +system-glslang +system-harfbuzz +system-libpng +system-libxml2
|
||||
+system-oniguruma +system-zlib
|
||||
"
|
||||
|
||||
REQUIRED_USE="
|
||||
X? ( gtk )
|
||||
adwaita? ( gtk )
|
||||
^^ ( gtk glfw )
|
||||
"
|
||||
|
||||
# XXX: Because we set --release=fast below, Zig will automatically strip
|
||||
# the binary. Until Ghostty provides a way to disable the banner while
|
||||
# having debug symbols we have ignore pre-stripped file warnings.
|
||||
@@ -115,6 +109,7 @@ src_configure() {
|
||||
# XXX: Ghostty displays a banner saying it is a debug build unless ReleaseFast is used.
|
||||
--release=fast
|
||||
|
||||
-Dapp-runtime=gtk
|
||||
-Dfont-backend=fontconfig_freetype
|
||||
-Drenderer=opengl
|
||||
-Dgtk-adwaita=$(usex adwaita true false)
|
||||
@@ -132,16 +127,6 @@ src_configure() {
|
||||
-f$(usex system-zlib sys no-sys)=zlib
|
||||
)
|
||||
|
||||
if use gtk; then
|
||||
my_zbs_args+=(
|
||||
-Dapp-runtime=gtk
|
||||
)
|
||||
elif use glfw; then
|
||||
my_zbs_args+=(
|
||||
-Dapp-runtime=glfw
|
||||
)
|
||||
fi
|
||||
|
||||
zig_src_configure
|
||||
}
|
||||
|
||||
|
||||
@@ -14,8 +14,6 @@
|
||||
</upstream>
|
||||
<use>
|
||||
<flag name="adwaita">Use <pkg>gui-libs/libadwaita</pkg> for better GNOME integration</flag>
|
||||
<flag name="gtk">Use the GTK 4 backend for windowing</flag>
|
||||
<flag name="glfw">Use the GLFW backend for windowing</flag>
|
||||
<flag name="system-fontconfig">Use system fontconfig instead of the bundled one</flag>
|
||||
<flag name="system-freetype">Use system freetype instead of the bundled one</flag>
|
||||
<flag name="system-glslang">Use system glslang instead of the bundled one</flag>
|
||||
|
||||
Reference in New Issue
Block a user