From addb33f7bbd2b63f04b7ee34ab18a72739041cc6 Mon Sep 17 00:00:00 2001 From: Jan200101 Date: Jan 03 2025 23:36:28 +0000 Subject: update unbundling process, add glad license and bundle --- diff --git a/ghostty.spec b/ghostty.spec index d5bd792..f90739a 100644 --- a/ghostty.spec +++ b/ghostty.spec @@ -5,9 +5,9 @@ # Zig only dependencies are vendored all other dependencies will be resolved from the system # in future releases. -# fontconfig is unused +# unbundled https://github.com/ghostty-org/ghostty/pull/4520 %global fontconfig_version 2.14.2 -# harfbuzz is unused +# unbundled https://github.com/ghostty-org/ghostty/pull/4205 %global harfbuzz_version 8.4.0 %global utfcpp_version 4.0.5 %global iterm2_color_commit e030599a6a6e19fcd1ea047c7714021170129d56 @@ -16,12 +16,11 @@ %global libvaxis_commit1 6d729a2dc3b934818dffe06d2ba3ce02841ed74b %global libvaxis_commit2 dc0a228a5544988d4a920cfb40be9cd28db41423 %global sentry_version 0.7.8 -# glslang is unused %global glslang_version 14.2.0 -# freetype is unused +# unbundled https://github.com/ghostty-org/ghostty/pull/4543 %global freetype_version 2.13.2 %global freetype_dash_version %{lua x = string.gsub(macros['freetype_version'], "%.", "-"); print(x)} -# oniguruma is unused +# unbundled https://github.com/ghostty-org/ghostty/pull/4534 %global oniguruma_version 6.9.9 %global highway_version 1.1.0 %global libxev_commit db6a52bafadf00360e675fefa7926e8e6c0e9931 @@ -100,7 +99,8 @@ Summary: Fast, native, feature-rich terminal emulator pushing modern feat # pkg/cimgui: MIT # pkg/breakpad: MIT AND BSD-2-Clause AND BSD-3-Clause AND BSD-4-Clause AND Apache-2.0 AND MIT AND curl AND APSL-2.0 AND ClArtistic AND Unicode-3.0 AND LicenseRef-Fedora-Public-Domain AND (GPL-2.0-or-later WITH Autoconf-exception-generic) # pkg/wuffs: Apache-2.0 AND MIT -License: MIT AND MIT-Modern-Variant AND Zlib AND curl AND MPL-2.0 AND HPND AND LicenseRef-Fedora-Public-Domain AND Unicode-DFS-2016 AND Unicode-3.0 AND BSL-1.0 AND Apache-2.0 AND BSD-2-Clause AND BSD-3-Clause AND BSD-4-Clause AND (FTL OR GPL-2.0-or-later) AND APSL-2.0 AND ClArtistic AND GPL-3.0-or-later AND (GPL-2.0-or-later WITH Autoconf-exception-generic) AND OFL-1.1 +# vendor/glad (WTFPL OR CC0-1.0) AND Apache-2.0 +License: MIT AND MIT-Modern-Variant AND Zlib AND curl AND MPL-2.0 AND HPND AND LicenseRef-Fedora-Public-Domain AND Unicode-DFS-2016 AND Unicode-3.0 AND BSL-1.0 AND Apache-2.0 AND BSD-2-Clause AND BSD-3-Clause AND BSD-4-Clause AND (FTL OR GPL-2.0-or-later) AND APSL-2.0 AND ClArtistic AND GPL-3.0-or-later AND (GPL-2.0-or-later WITH Autoconf-exception-generic) AND OFL-1.1 AND (WTFPL OR CC0-1.0) URL: https://ghostty.org/ Source0: https://release.files.ghostty.org/%{version}/ghostty-%{version}.tar.gz @@ -167,6 +167,8 @@ Provides: bundled(zg) = %{zg_version} Provides: bundled(zig-objc) = %{zig_objc_commit} Provides: bundled(zig-js) = %{zig_js_commit} Provides: bundled(simdutf) = 5.2.8 +# only the generated output is vendored +Provides: bundled(glad2) = 2.0.0 # the fonts are included with ghostty and are embedded directly into the executable # https://github.com/ghostty-org/ghostty/blob/v1.0.0/src/font/embedded.zig