diff --git a/Formula/gtk-doc.rb b/Formula/gtk-doc.rb index 78d911319c1..e9cc26afff7 100644 --- a/Formula/gtk-doc.rb +++ b/Formula/gtk-doc.rb @@ -1,12 +1,14 @@ class GtkDoc < Formula + include Language::Python::Virtualenv + desc "GTK+ documentation tool" homepage "https://gitlab.gnome.org/GNOME/gtk-doc" - url "https://download.gnome.org/sources/gtk-doc/1.32/gtk-doc-1.32.tar.xz" - sha256 "de0ef034fb17cb21ab0c635ec730d19746bce52984a6706e7bbec6fb5e0b907c" - revision 2 + url "https://download.gnome.org/sources/gtk-doc/1.33/gtk-doc-1.33.2.tar.xz" + sha256 "cc1b709a20eb030a278a1f9842a362e00402b7f834ae1df4c1998a723152bf43" + license "GPL-2.0-or-later" - # We use a common regex because gtk-doc doesn't use GNOME's "even-numbered - # minor is stable" version scheme. + # We use a common regex because gtk-doc doesn't use GNOME's + # "even-numbered minor is stable" version scheme. livecheck do url :stable regex(/gtk-doc[._-]v?(\d+(?:\.\d+)+)\.t/i) @@ -21,41 +23,49 @@ class GtkDoc < Formula sha256 cellar: :any_skip_relocation, high_sierra: "2e5f324a0c3e8aac532e8946fb00cc578d18184e8fb8d247329b7fbe252054b2" end - depends_on "itstool" => :build + depends_on "meson" => :build + depends_on "ninja" => :build depends_on "pkg-config" => :build depends_on "docbook" depends_on "docbook-xsl" - depends_on "gettext" depends_on "libxml2" depends_on "python@3.9" - depends_on "source-highlight" uses_from_macos "libxslt" + resource "anytree" do + url "https://files.pythonhosted.org/packages/d8/45/de59861abc8cb66e9e95c02b214be4d52900aa92ce34241a957dcf1d569d/anytree-2.8.0.tar.gz" + sha256 "3f0f93f355a91bc3e6245319bf4c1d50e3416cc7a35cc1133c1ff38306bbccab" + end + + resource "lxml" do + url "https://files.pythonhosted.org/packages/e5/21/a2e4517e3d216f0051687eea3d3317557bde68736f038a3b105ac3809247/lxml-4.6.3.tar.gz" + sha256 "39b78571b3b30645ac77b95f7c69d1bffc4cf8c3b157c435a34da72e78c82468" + end + resource "Pygments" do - url "https://files.pythonhosted.org/packages/7e/ae/26808275fc76bf2832deb10d3a3ed3107bc4de01b85dcccbe525f2cd6d1e/Pygments-2.4.2.tar.gz" - sha256 "881c4c157e45f30af185c1ffe8d549d48ac9127433f2c380c24b84572ad66297" + url "https://files.pythonhosted.org/packages/ba/6e/7a7c13c21d8a4a7f82ccbfe257a045890d4dbf18c023f985f565f97393e3/Pygments-2.9.0.tar.gz" + sha256 "a18f47b506a429f6f4b9df81bb02beab9ca21d0a5fee38ed15aef65f0545519f" end def install - # To avoid recording the shims path - ENV["PKG_CONFIG"] = Formula["pkg-config"].bin/"pkg-config" + # To avoid recording pkg-config shims path + ENV.prepend_path "PATH", Formula["pkg-config"].bin - xy = Language::Python.major_minor_version Formula["python@3.9"].opt_bin/"python3" - ENV.prepend_create_path "PYTHONPATH", libexec/"vendor/lib/python#{xy}/site-packages" - resource("Pygments").stage do - system Formula["python@3.9"].opt_bin/"python3", *Language::Python.setup_install_args(libexec/"vendor") + venv = virtualenv_create(libexec, "python3") + venv.pip_install resources + ENV.prepend_path "PATH", libexec/"bin" + + args = std_meson_args + %w[ + -Dtests=false + -Dyelp_manual=false + ] + + mkdir "build" do + system "meson", *args, ".." + system "ninja", "-v" + system "ninja", "install", "-v" end - - system "./configure", "--disable-debug", - "--disable-dependency-tracking", - "--prefix=#{prefix}", - "--with-highlight=source-highlight", - "--with-xml-catalog=#{etc}/xml/catalog" - system "make" - system "make", "install" - - bin.env_script_all_files(libexec/"bin", PYTHONPATH: ENV["PYTHONPATH"]) end test do diff --git a/audit_exceptions/gnome_devel_allowlist.json b/audit_exceptions/gnome_devel_allowlist.json index 4ebd67f4af5..b1471fc8fdf 100644 --- a/audit_exceptions/gnome_devel_allowlist.json +++ b/audit_exceptions/gnome_devel_allowlist.json @@ -1,4 +1,5 @@ { + "gtk-doc": "1.33", "gtk-mac-integration": "2.1", "libart": "2.3", "libepoxy": "1.5"