vte3 0.58.0

Closes #44073.

Signed-off-by: FX Coudert <fxcoudert@gmail.com>
This commit is contained in:
Tom Schoonjans 2019-09-09 21:24:21 +01:00 committed by FX Coudert
parent 647d7d8fb4
commit 21e68ddea3

View file

@ -1,9 +1,8 @@
class Vte3 < Formula class Vte3 < Formula
desc "Terminal emulator widget used by GNOME terminal" desc "Terminal emulator widget used by GNOME terminal"
homepage "https://developer.gnome.org/vte/" homepage "https://developer.gnome.org/vte/"
url "https://download.gnome.org/sources/vte/0.56/vte-0.56.3.tar.xz" url "https://download.gnome.org/sources/vte/0.58/vte-0.58.0.tar.xz"
sha256 "17a1d4bc8848f1d2acfa4c20aaa24b9bac49f057b8909c56d3dafec2e2332648" sha256 "0705571d81f74e60d8dbeb5bf3658bfc6c3d84cf27a67a30ee7de6a693fadb45"
revision 1
bottle do bottle do
rebuild 1 rebuild 1
@ -13,8 +12,8 @@ class Vte3 < Formula
end end
depends_on "gobject-introspection" => :build depends_on "gobject-introspection" => :build
depends_on "gtk-doc" => :build depends_on "meson" => :build
depends_on "intltool" => :build depends_on "ninja" => :build
depends_on "pkg-config" => :build depends_on "pkg-config" => :build
depends_on "gettext" depends_on "gettext"
depends_on "gnutls" depends_on "gnutls"
@ -22,18 +21,25 @@ class Vte3 < Formula
depends_on "pcre2" depends_on "pcre2"
depends_on "vala" depends_on "vala"
# submitted upstream as https://gitlab.gnome.org/tschoonj/vte/merge_requests/1
patch :DATA
def install def install
ENV["XML_CATALOG_FILES"] = "#{etc}/xml/catalog" ENV["XML_CATALOG_FILES"] = "#{etc}/xml/catalog"
args = [ args = [
"--disable-dependency-tracking",
"--prefix=#{prefix}", "--prefix=#{prefix}",
"--disable-Bsymbolic", "-Dgir=true",
"--enable-introspection=yes", "-Dgtk3=true",
"--enable-gtk-doc", "-Dgnutls=true",
"-Dvapi=true",
] ]
system "./configure", *args
system "make", "install" mkdir "build" do
system "meson", *args, ".."
system "ninja", "-v"
system "ninja", "install", "-v"
end
end end
test do test do
@ -111,3 +117,50 @@ class Vte3 < Formula
system "./test" system "./test"
end end
end end
__END__
diff --git a/meson.build b/meson.build
index 82266cf7..2e49d669 100644
--- a/meson.build
+++ b/meson.build
@@ -72,6 +72,8 @@ lt_age = vte_minor_version * 100 + vte_micro_version - lt_revision
lt_current = vte_major_version + lt_age
libvte_gtk3_soversion = '@0@.@1@.@2@'.format(libvte_soversion, lt_current, lt_revision)
+osx_version_current = lt_current + 1
+libvte_gtk3_osxversions = [osx_version_current, '@0@.@1@.0'.format(osx_version_current, lt_revision)]
libvte_gtk4_soversion = libvte_soversion.to_string()
# i18n
diff --git a/src/meson.build b/src/meson.build
index 1481c089..b9590d26 100644
--- a/src/meson.build
+++ b/src/meson.build
@@ -178,6 +178,7 @@ if get_option('gtk3')
vte_gtk3_api_name,
sources: libvte_gtk3_sources,
version: libvte_gtk3_soversion,
+ darwin_versions: libvte_gtk3_osxversions,
include_directories: incs,
dependencies: libvte_gtk3_deps,
cpp_args: libvte_common_cppflags,
diff --git a/meson.build b/meson.build
index 2e49d669..ed8c2ab4 100644
--- a/meson.build
+++ b/meson.build
@@ -359,13 +359,8 @@ linker_flags = [
'-Wl,-Bsymbolic-functions'
]
-foreach flag: linker_flags
- assert(cc.has_link_argument(flag), flag + ' is required but not supported')
- add_project_link_arguments(flag, language: 'c')
-
- assert(cxx.has_link_argument(flag), flag + ' is required but not supported')
- add_project_link_arguments(flag, language: 'cpp')
-endforeach
+add_project_link_arguments(cc.get_supported_link_arguments(linker_flags), language: 'c')
+add_project_link_arguments(cxx.get_supported_link_arguments(linker_flags), language: 'cpp')
# Dependencies