From 43d3256c64fcfbd06be19dafccc007d503c0471d Mon Sep 17 00:00:00 2001 From: Caleb Maclennan Date: Fri, 15 Nov 2024 13:14:53 +0300 Subject: [PATCH 1/4] sile: 0.15.8 --- Formula/s/sile.rb | 22 +++++++++------------- 1 file changed, 9 insertions(+), 13 deletions(-) diff --git a/Formula/s/sile.rb b/Formula/s/sile.rb index 2cf8a3d1e3cc9..9a17dcefeb074 100644 --- a/Formula/s/sile.rb +++ b/Formula/s/sile.rb @@ -1,10 +1,10 @@ class Sile < Formula desc "Modern typesetting system inspired by TeX" homepage "https://sile-typesetter.org" - url "https://github.com/sile-typesetter/sile/releases/download/v0.15.5/sile-0.15.5.tar.zst" - sha256 "d20137b02d16302d287670fd285ad28ac3b8d3af916460aa6bc8cbff9321b9f9" + url "https://github.com/sile-typesetter/sile/releases/download/v0.15.8/sile-0.15.8.tar.zst" + sha256 "64c17abafd5b1ef30419a81b000998870c1b081b6372d55bc31df9c3b83f0f6a" license "MIT" - revision 3 + revision 1 bottle do sha256 cellar: :any, arm64_sequoia: "840aacf2bbfbac9fd5fc325774bf97b5b8f856744ac4d586b21818e2739409c6" @@ -45,8 +45,8 @@ class Sile < Formula end resource "compat53" do - url "https://luarocks.org/manifests/lunarmodules/compat53-0.12-1.rockspec" - sha256 "880cdad8d1789a0756f2023d2c98f36d94e6d2c1cc507190b4f9883420435746" + url "https://luarocks.org/manifests/lunarmodules/compat53-0.14.3-1.rockspec" + sha256 "16218188112c20e9afa9e9057f753d29d7affb10fe3fb2ac74cab17c6de9a030" end resource "linenoise" do @@ -110,8 +110,8 @@ class Sile < Formula # depends on luafilesystem resource "penlight" do - url "https://luarocks.org/manifests/tieske/penlight-1.13.1-1.src.rock" - sha256 "fa028f7057cad49cdb84acdd9fe362f090734329ceca8cc6abb2d95d43b91835" + url "https://luarocks.org/manifests/tieske/penlight-1.14.0-2.src.rock" + sha256 "f36affa14fb43e208a59f2e96d214f774b957bcd05d9c07ec52b39eac7f4a05d" end # depends on penlight @@ -143,10 +143,6 @@ class Sile < Formula end def install - # Workaround for ICU 76+. - # Issue ref: https://github.com/sile-typesetter/sile/issues/2152 - inreplace "configure", '"icu-uc icu-io"', '"icu-uc icu-i18n icu-io"' if build.stable? - lua = Formula["luajit"] luaversion = "5.1" luapath = libexec/"vendor" @@ -182,17 +178,17 @@ def install r.stage do rock = Pathname.pwd.children(false).first unpack_dir = Utils.safe_popen_read("luarocks", "unpack", rock).split("\n")[-2] - spec = "#{r.name}-#{r.version}.rockspec" cd(unpack_dir) { system "luarocks", "make", *luarocks_args, spec } end end - configure_args = %w[ + configure_args = %W[ FCMATCH=true --disable-silent-rules --with-system-luarocks --with-system-lua-sources + --with-vendored-luarocks-dir=#{luapath} ] system "./bootstrap.sh" if build.head? From 228085af61ba3c745b524248780135558d582a7e Mon Sep 17 00:00:00 2001 From: Caleb Maclennan Date: Thu, 12 Dec 2024 13:11:06 +0300 Subject: [PATCH 2/4] fixup! sile: 0.15.8 --- Formula/s/sile.rb | 3 +++ 1 file changed, 3 insertions(+) diff --git a/Formula/s/sile.rb b/Formula/s/sile.rb index 9a17dcefeb074..2b2bba4969e35 100644 --- a/Formula/s/sile.rb +++ b/Formula/s/sile.rb @@ -143,6 +143,9 @@ class Sile < Formula end def install + # Workaround upstream darwin detection not picking up on e.g. aarch64-apple-darwin22.6.0 + inreplace "configure", "darwin*", "*darwin*" if build.stable? + lua = Formula["luajit"] luaversion = "5.1" luapath = libexec/"vendor" From 3962d2f622c01dca6e4c72a3075890adc088f810 Mon Sep 17 00:00:00 2001 From: Caleb Maclennan Date: Fri, 13 Dec 2024 15:53:44 +0300 Subject: [PATCH 3/4] fixup! sile: 0.15.8 --- Formula/s/sile.rb | 24 +++++++++++++++--------- 1 file changed, 15 insertions(+), 9 deletions(-) diff --git a/Formula/s/sile.rb b/Formula/s/sile.rb index 2b2bba4969e35..1b41715dfd180 100644 --- a/Formula/s/sile.rb +++ b/Formula/s/sile.rb @@ -15,15 +15,12 @@ class Sile < Formula sha256 cellar: :any_skip_relocation, x86_64_linux: "dbd247ab127cc9f68e3f25e4404974e1ec87e074af1210fb19240bde79dd4ff1" end - head do - url "https://github.com/sile-typesetter/sile.git", branch: "master" - - depends_on "autoconf" => :build - depends_on "automake" => :build - depends_on "libtool" => :build - end + url "https://github.com/sile-typesetter/sile.git", branch: "master" if build.head? + depends_on "autoconf" => :build + depends_on "automake" => :build depends_on "jq" => :build + depends_on "libtool" => :build depends_on "pkgconf" => :build depends_on "poppler" => :build depends_on "rust" => :build @@ -143,8 +140,15 @@ class Sile < Formula end def install - # Workaround upstream darwin detection not picking up on e.g. aarch64-apple-darwin22.6.0 - inreplace "configure", "darwin*", "*darwin*" if build.stable? + # Workaround upstream Darwin detection not triggering autoreconf + stable do + # !OS.linux? + inreplace "Makefile.in", "rusile.so", "rusile.dylib" + inreplace "Makefile.in", "rusile_so", "rusile_dylib" + inreplace "aminclude.am", "rusile.so", "rusile.dylib" + inreplace "aminclude.am", "rusile_so", "rusile_dylib" + system "autoreconf", "-fiv" + end lua = Formula["luajit"] luaversion = "5.1" @@ -196,6 +200,8 @@ def install system "./bootstrap.sh" if build.head? system "./configure", *configure_args, *std_configure_args + system "grep", "-R", "SHARED_LIB_EXT" + system "grep", "-R", "librusile" system "make" system "make", "install" end From 94cefa1d00ebe9ad8a92f92b0e2a1ec4cad8d656 Mon Sep 17 00:00:00 2001 From: Caleb Maclennan Date: Sat, 14 Dec 2024 17:20:16 +0300 Subject: [PATCH 4/4] fixup! fixup! sile: 0.15.8 --- Formula/s/sile.rb | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/Formula/s/sile.rb b/Formula/s/sile.rb index 1b41715dfd180..49964e4041ded 100644 --- a/Formula/s/sile.rb +++ b/Formula/s/sile.rb @@ -141,12 +141,13 @@ class Sile < Formula def install # Workaround upstream Darwin detection not triggering autoreconf - stable do - # !OS.linux? - inreplace "Makefile.in", "rusile.so", "rusile.dylib" - inreplace "Makefile.in", "rusile_so", "rusile_dylib" - inreplace "aminclude.am", "rusile.so", "rusile.dylib" - inreplace "aminclude.am", "rusile_so", "rusile_dylib" + if build.stable? && !OS.linux? + # inreplace "Makefile.in", "rusile_so", "rusile_dylib" + # inreplace "Makefile.in", "rusile.so", "rusile.dylib" + # inreplace "aminclude.am", "rusile_so", "rusile_dylib" + # inreplace "aminclude.am", "rusile.so", "rusile.dylib" + inreplace "configure.ac", "AC_CANONICAL_TARGET", "AC_CANONICAL_HOST" + inreplace "configure.ac", "target_os", "host_os" system "autoreconf", "-fiv" end