From 6235c4fdfda7c6dd55c72ce40ba4e6278816a0de Mon Sep 17 00:00:00 2001 From: fabolous005 Date: Wed, 5 Feb 2025 10:00:47 +0100 Subject: [PATCH] Postsync update gentoo --- metadata/md5-cache/x11-terms/ghostty-9999 | 8 +-- ...sable-terminfo-database-installation.patch | 57 +++++++++++++++++++ x11-terms/ghostty/ghostty-9999.ebuild | 27 +++++---- 3 files changed, 77 insertions(+), 15 deletions(-) create mode 100644 x11-terms/ghostty/files/ghostty-1.1.0-build-disable-terminfo-database-installation.patch diff --git a/metadata/md5-cache/x11-terms/ghostty-9999 b/metadata/md5-cache/x11-terms/ghostty-9999 index 55bdca0..75d43f7 100644 --- a/metadata/md5-cache/x11-terms/ghostty-9999 +++ b/metadata/md5-cache/x11-terms/ghostty-9999 @@ -1,15 +1,15 @@ BDEPEND=>=dev-vcs/git-1.8.2.1[curl] || ( dev-lang/zig:0.13 dev-lang/zig-bin:0.13 ) virtual/pkgconfig DEFINED_PHASES=compile configure install prepare setup test unpack -DEPEND=adwaita? ( gui-libs/libadwaita:1= ) gtk? ( gui-libs/gtk:4=[X] system-libxml2? ( >=dev-libs/libxml2-2.11.5:= ) ) 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:= ) system-oniguruma? ( >=dev-libs/oniguruma-6.9.9:= ) system-zlib? ( >=sys-libs/zlib-1.3.1:= ) system-simdutf? ( >=dev-cpp/simdutf-5.7.2:= ) +DEPEND=adwaita? ( gui-libs/libadwaita:1= ) gtk? ( gui-libs/gtk:4=[X?] X? ( x11-libs/libX11 ) system-libxml2? ( >=dev-libs/libxml2-2.11.5:= ) ) 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:= ) system-oniguruma? ( >=dev-libs/oniguruma-6.9.9:= ) system-zlib? ( >=sys-libs/zlib-1.3.1:= ) system-simdutf? ( >=dev-cpp/simdutf-5.7.2:= ) DESCRIPTION=Ghostty is a fast, feature-rich, and cross-platform terminal emulator that uses platform-native UI and GPU acceleration. EAPI=8 HOMEPAGE=ghostty.org INHERIT=git-r3 zig -IUSE=adwaita man gtk +glfw +system-fontconfig +system-freetype +system-glslang +system-harfbuzz +system-libpng system-libxml2 +system-oniguruma +system-zlib +system-simdutf +IUSE=adwaita man +gtk glfw X +system-fontconfig +system-freetype +system-glslang +system-harfbuzz +system-libpng system-libxml2 +system-oniguruma +system-zlib +system-simdutf LICENSE=MIT PROPERTIES=live -RDEPEND=adwaita? ( gui-libs/libadwaita:1= ) gtk? ( gui-libs/gtk:4=[X] system-libxml2? ( >=dev-libs/libxml2-2.11.5:= ) ) 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:= ) system-oniguruma? ( >=dev-libs/oniguruma-6.9.9:= ) system-zlib? ( >=sys-libs/zlib-1.3.1:= ) system-simdutf? ( >=dev-cpp/simdutf-5.7.2:= ) +RDEPEND=adwaita? ( gui-libs/libadwaita:1= ) gtk? ( gui-libs/gtk:4=[X?] X? ( x11-libs/libX11 ) system-libxml2? ( >=dev-libs/libxml2-2.11.5:= ) ) 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:= ) system-oniguruma? ( >=dev-libs/oniguruma-6.9.9:= ) system-zlib? ( >=sys-libs/zlib-1.3.1:= ) system-simdutf? ( >=dev-cpp/simdutf-5.7.2:= ) REQUIRED_USE=adwaita? ( gtk ) ^^ ( gtk glfw ) SLOT=0 _eclasses_=git-r3 875eb471682d3e1f18da124be97dcc81 multiprocessing 1e32df7deee68372153dca65f4a7c21f edo 367e103a74bf77e6a8da7894d999fa3c toolchain-funcs 14648d8795f7779e11e1bc7cf08b7536 multilib b2a329026f2e404e9e371097dda47f96 flag-o-matic 357f1a896fbedcd06e5ce55419c49eb9 linux-info ea4122ba1d8791a12b78e53f9510a2e3 zig-utils 2cc5a6c85266162fa5afdbc6c68f4895 zig 1dedc2f01be682d4a76e3f24b00c9252 -_md5_=1b6a49c652e22942e9afb37c31b7fe12 +_md5_=0651af9d01301e25ea0cea9db9f7a1a4 diff --git a/x11-terms/ghostty/files/ghostty-1.1.0-build-disable-terminfo-database-installation.patch b/x11-terms/ghostty/files/ghostty-1.1.0-build-disable-terminfo-database-installation.patch new file mode 100644 index 0000000..f3212c6 --- /dev/null +++ b/x11-terms/ghostty/files/ghostty-1.1.0-build-disable-terminfo-database-installation.patch @@ -0,0 +1,57 @@ +From 79e953d91173a808dc2fbc33a39582ffc921263b Mon Sep 17 00:00:00 2001 +From: sin-ack +Date: Thu, 30 Jan 2025 23:21:16 +0000 +Subject: [PATCH] build: Disable terminfo database installation + +Database installation is unconditional in Ghostty and causes conflicts +with newer ncurses versions which have the database merged in. + +Bug: https://bugs.gentoo.org/948830 +Signed-off-by: sin-ack +--- + src/build/GhosttyResources.zig | 30 ------------------------------ + 1 file changed, 30 deletions(-) + +diff --git a/src/build/GhosttyResources.zig b/src/build/GhosttyResources.zig +index a7ff40cb..ad400d72 100644 +--- a/src/build/GhosttyResources.zig ++++ b/src/build/GhosttyResources.zig +@@ -46,36 +46,6 @@ pub fn init(b: *std.Build, cfg: *const Config) !GhosttyResources { + const cap_install = b.addInstallFile(out_source, "share/terminfo/ghostty.termcap"); + try steps.append(&cap_install.step); + } +- +- // Compile the terminfo source into a terminfo database +- { +- const run_step = RunStep.create(b, "tic"); +- run_step.addArgs(&.{ "tic", "-x", "-o" }); +- const path = run_step.addOutputFileArg("terminfo"); +- run_step.addFileArg(source); +- _ = run_step.captureStdErr(); // so we don't see stderr +- +- // Ensure that `share/terminfo` is a directory, otherwise the `cp +- // -R` will create a file named `share/terminfo` +- const mkdir_step = RunStep.create(b, "make share/terminfo directory"); +- switch (cfg.target.result.os.tag) { +- // windows mkdir shouldn't need "-p" +- .windows => mkdir_step.addArgs(&.{"mkdir"}), +- else => mkdir_step.addArgs(&.{ "mkdir", "-p" }), +- } +- mkdir_step.addArg(b.fmt("{s}/share/terminfo", .{b.install_path})); +- try steps.append(&mkdir_step.step); +- +- // Use cp -R instead of Step.InstallDir because we need to preserve +- // symlinks in the terminfo database. Zig's InstallDir step doesn't +- // handle symlinks correctly yet. +- const copy_step = RunStep.create(b, "copy terminfo db"); +- copy_step.addArgs(&.{ "cp", "-R" }); +- copy_step.addFileArg(path); +- copy_step.addArg(b.fmt("{s}/share", .{b.install_path})); +- copy_step.step.dependOn(&mkdir_step.step); +- try steps.append(©_step.step); +- } + } + + // Shell-integration +-- +2.45.3 diff --git a/x11-terms/ghostty/ghostty-9999.ebuild b/x11-terms/ghostty/ghostty-9999.ebuild index 5583096..ab2654a 100644 --- a/x11-terms/ghostty/ghostty-9999.ebuild +++ b/x11-terms/ghostty/ghostty-9999.ebuild @@ -13,7 +13,7 @@ EGIT_REPO_URI="https://github.com/ghostty-org/ghostty.git" LICENSE="MIT" SLOT="0" -IUSE="adwaita man gtk +glfw" +IUSE="adwaita man +gtk glfw X" IUSE+=" +system-fontconfig +system-freetype +system-glslang +system-harfbuzz +system-libpng system-libxml2 +system-oniguruma +system-zlib +system-simdutf" REQUIRED_USE=" adwaita? ( gtk ) @@ -24,7 +24,10 @@ REQUIRED_USE=" RDEPEND=" adwaita? ( gui-libs/libadwaita:1= ) gtk? ( - gui-libs/gtk:4=[X] + gui-libs/gtk:4=[X?] + X? ( + x11-libs/libX11 + ) system-libxml2? ( >=dev-libs/libxml2-2.11.5:= ) ) @@ -44,6 +47,7 @@ QA_PRESTRIPPED="usr/bin/ghostty" PATCHES=( "${FILESDIR}"/${PN}-1.0.0-bzip2-dependency.patch + "${FILESDIR}"/${PN}-1.1.0-build-disable-terminfo-database-installation.patch ) src_unpack() { @@ -58,13 +62,20 @@ src_unpack() { src_prepare() { default - my_zbs_args=( - -Doptimize=ReleaseFast +} + + +src_configure() { + local my_zbs_args=( + --release=fast + -Dfont-backend=fontconfig_freetype -Drenderer=opengl -Dgtk-adwaita=$(usex adwaita true false) -Demit-docs=$(usex man true false) -Demit-terminfo=false + -Demit-termcap=false + -Dgtk-x11=$(usex X true false) -f$(usex system-fontconfig sys no-sys)=fontconfig -f$(usex system-freetype sys no-sys)=freetype @@ -91,16 +102,10 @@ src_prepare() { fi zig_src_configure + } src_compile() { BUILD_DIR=${S} zig_src_compile } - -src_install() { - zig_src_install - # dosym -r /usr/share/terminfo/x/xterm-ghostty /usr/share/terminfo/g/ghostty - # rm -r ${IMAGE}/usr/share/terminfo/g/ghostty || die - # rm -r ${IMAGE}/usr/share/terminfo/x/xterm-ghostty || die -}