Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

vte3 0.78.0 #190556

Merged
merged 2 commits into from
Nov 2, 2024
Merged
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
76 changes: 67 additions & 9 deletions Formula/v/vte3.rb
Original file line number Diff line number Diff line change
@@ -1,18 +1,17 @@
class Vte3 < Formula
desc "Terminal emulator widget used by GNOME terminal"
homepage "https://wiki.gnome.org/Apps/Terminal/VTE"
url "https://download.gnome.org/sources/vte/0.76/vte-0.76.4.tar.xz"
sha256 "9c52d1da6c6f7409289351fc1cba8948cd3b47d048cbfede763a0f75b77453cc"
url "https://download.gnome.org/sources/vte/0.78/vte-0.78.0.tar.xz"
sha256 "07f09c6228a8bb3c1599dd0f5a6ec797b30d3010c3ac91cf21b69d9635dfaf7c"
license "LGPL-2.0-or-later"
revision 2

bottle do
sha256 arm64_sequoia: "0457725b7fc07a0f77b3bfcd6f240de02d50ecd8dfab5cd4fb0e88ee3a99cb69"
sha256 arm64_sonoma: "1e96261e3049c032f2a7bff97ba440a67cc207f5ebfcd7c80e9bb1de709b549b"
sha256 arm64_ventura: "11bba52b00ac35620cb543b2d1845232a03296b4d1479f3043a71e72c3e17953"
sha256 sonoma: "74f33d20e5a7e9da46a45da48a9848c83e9d4500eebb87f706f38275ae34da0b"
sha256 ventura: "b0ec7576a35384a3bba045c0dbeb36dcc23f9910977b3ad338da38cb83e46899"
sha256 x86_64_linux: "5a91c0978386f56b3c6111af5717130bd738d277b5edff7ca2bda2a98548e7b3"
sha256 arm64_sequoia: "eef8c092ba17930300120ef2dfc3d80313d71c460032107034e8a385aa810993"
sha256 arm64_sonoma: "735c2e01451c22e5f9852f228abb9fc8bf9f428ac26c1271798da1eb974c1ec8"
sha256 arm64_ventura: "14458e231ae63d8419e5df350edb561646f5ffdffa7cf66d58086577a2be85d3"
sha256 sonoma: "2016d3be03232ffec5e8ac2eb8a842e9384c2a35e029f734aa6b338cf3c322fc"
sha256 ventura: "b4ffbc7244f0109309ad2be6f0bfb52484927ea51d54ae780b06d8d7eefc4e35"
sha256 x86_64_linux: "368fb07431244bf6312f01e73999f9d39792631cef5b7fca59a3b63f3b065515"
end

depends_on "gettext" => :build
Expand All @@ -21,12 +20,14 @@ class Vte3 < Formula
depends_on "ninja" => :build
depends_on "pkg-config" => [:build, :test]
depends_on "vala" => :build

depends_on "at-spi2-core"
depends_on "cairo"
depends_on "fribidi"
depends_on "gdk-pixbuf"
depends_on "glib"
depends_on "gnutls"
depends_on "graphene"
depends_on "gtk+3"
depends_on "gtk4"
depends_on "icu4c@76"
Expand All @@ -35,12 +36,29 @@ class Vte3 < Formula
depends_on "pango"
depends_on "pcre2"

uses_from_macos "python" => :build

on_macos do
depends_on "llvm" => :build if DevelopmentTools.clang_build_version <= 1500
depends_on "gettext"
# Undefined symbols for architecture x86_64:
# "std::__1::__libcpp_verbose_abort(char const*, ...)", referenced from: ...
depends_on "llvm" if DevelopmentTools.clang_build_version <= 1400

# Use fast_float implementation for from_chars
# upstream bug report, https://gitlab.gnome.org/GNOME/vte/-/issues/2823
patch do
url "https://gitlab.gnome.org/kraj/vte/-/commit/c90b078ecf4382458a9af44d765d710eb46b0453.diff"
sha256 "fd8fd85339df1aa5ffb2617d6e67d26e26abb9caeb06ef7766b13341231c2c79"
end
patch do
url "https://gitlab.gnome.org/kraj/vte/-/commit/2a32e43e43b04771a3357d3d4ccbafa7714e0114.diff"
sha256 "f69f103b19de93f94fca05dea5a151b4109085ce716472acddb9a112502437d4"
end
carlocab marked this conversation as resolved.
Show resolved Hide resolved
patch do
url "https://gitlab.gnome.org/kraj/vte/-/commit/705e019713539bdaf2c50763ba585484c6253a59.diff"
sha256 "d09c512852a65a81f56b07c013ee0cc0c17b9dcbf63d9fcc2ac58173092bb80b"
end
end

on_linux do
Expand All @@ -59,6 +77,8 @@ class Vte3 < Formula
end

# submitted upstream as https://gitlab.gnome.org/tschoonj/vte/merge_requests/1
# color-test upstream fix commit, https://gitlab.gnome.org/GNOME/vte/-/commit/c8838779d5f8c0e03411cef9775cd8f5a10a6204
# meson build fix, upstream bug report, https://gitlab.gnome.org/GNOME/vte/-/issues/2827
patch :DATA

def install
Expand All @@ -73,6 +93,11 @@ def install
end
end

if ENV.compiler == :clang
ENV.append "CXXFLAGS", "-stdlib=libc++"
ENV.append "LDFLAGS", "-stdlib=libc++"
end

ENV["XML_CATALOG_FILES"] = etc/"xml/catalog"

system "meson", "setup", "build", "-Dgir=true",
Expand Down Expand Up @@ -133,3 +158,36 @@ def install
include_directories: incs,
dependencies: libvte_gtk3_deps,
cpp_args: libvte_gtk3_cppflags,
diff --git a/src/color-test.cc b/src/color-test.cc
index 0ed9089..1bfad31 100644
--- a/src/color-test.cc
+++ b/src/color-test.cc
@@ -165,7 +165,7 @@ static void
test_color_to_string (void)
{
auto test = [](std::string str,
- bool alpha = false) constexpr noexcept -> void
+ bool alpha = false) noexcept -> void
{
auto const value = parse<rgba>(str);
assert(value);
diff --git a/src/meson.build b/src/meson.build
index 228ecf0..fba5958 100644
--- a/src/meson.build
+++ b/src/meson.build
@@ -73,6 +73,7 @@ minifont_coverage_sources = custom_target(
),
capture: false,
command: [
+ python,
files('minifont-coverage.py'),
'--output', '@OUTPUT@',
'@INPUT@',
@@ -596,6 +597,7 @@ test_minifont_sources += custom_target(
),
capture: false,
command: [
+ python,
files('minifont-coverage.py'),
'--output', '@OUTPUT@',
'--tests',
Loading