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.

Sign up for GitHub

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

Jump to bottom

libarchive 3.7.6 #191588

Merged
merged 4 commits into from
Sep 25, 2024
Merged

libarchive 3.7.6 #191588

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
a6941f9
libarchive 3.7.6
BrewTestBot Sep 23, 2024
8570b67
lanraragi: revision bump (libarchive 3.7.6)
carlocab Sep 23, 2024
5aaed1b
lanraragi: update 0.9.21_2 bottle.
carlocab Sep 25, 2024
2bfbc29
libarchive: update 3.7.6 bottle.
carlocab Sep 25, 2024
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
10 changes: 9 additions & 1 deletion Formula/l/lanraragi.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
class Lanraragi < Formula

Check warning on line 1 in Formula/l/lanraragi.rb

View workflow job for this annotation

GitHub Actions / macOS 15-arm64

`brew linkage --cached --test --strict lanraragi` failed on macOS Sequoia (15) on Apple Silicon! 

  lzo

Check warning on line 1 in Formula/l/lanraragi.rb

View workflow job for this annotation

GitHub Actions / macOS 13-arm64

`brew linkage --cached --test --strict lanraragi` failed on macOS Ventura (13) on Apple Silicon! 

  lzo

Check warning on line 1 in Formula/l/lanraragi.rb

View workflow job for this annotation

GitHub Actions / macOS 14-arm64

`brew linkage --cached --test --strict lanraragi` failed on macOS Sonoma (14) on Apple Silicon! 

  lzo
desc "Web application for archival and reading of manga/doujinshi"
homepage "https://github.com/Difegue/LANraragi"
url "https://github.com/Difegue/LANraragi/archive/refs/tags/v.0.9.21.tar.gz"
sha256 "ed2d704d058389eb4c97d62080c64fa96fcc230be663ec8958f35764d229c463"
license "MIT"
revision 1
revision 2
head "https://github.com/Difegue/LANraragi.git", branch: "dev"

bottle do
Expand Down Expand Up @@ -72,6 +72,14 @@
bin.install "lanraragi"
libexec.install "redis.conf"
end

return if OS.linux? || Hardware::CPU.intel?

# FIXME: This installs its own `libarchive`, but we should use our own to begin with.
# As a workaround, install symlinks to our `libarchive` instead of the downloaded ones.
libarchive_install_dir = libexec/"lib/perl5/darwin-thread-multi-2level/auto/share/dist/Alien-Libarchive3/dynamic"
libarchive_install_dir.children.map(&:unlink)
ln_sf Formula["libarchive"].opt_lib.children, libarchive_install_dir
end

test do
Expand Down
17 changes: 10 additions & 7 deletions Formula/lib/libarchive.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
class Libarchive < Formula

Check notice on line 1 in Formula/lib/libarchive.rb

View workflow job for this annotation

GitHub Actions / macOS 15-arm64

Bottle cache hit 

Bottle for libarchive built at 7a0c819e3a5 (Merge cea0d28fd298db0fbbe69ebef99a9a1fcfd56ea9 into f475d17f5173428a8ef4e2d4d6388a6fd3c68c87, 2024-09-24)

Check notice on line 1 in Formula/lib/libarchive.rb

View workflow job for this annotation

GitHub Actions / macOS 13-arm64

Bottle cache hit 

Bottle for libarchive built at 7a0c819e3a5 (Merge cea0d28fd298db0fbbe69ebef99a9a1fcfd56ea9 into f475d17f5173428a8ef4e2d4d6388a6fd3c68c87, 2024-09-24)

Check notice on line 1 in Formula/lib/libarchive.rb

View workflow job for this annotation

GitHub Actions / macOS 14-x86_64

Bottle cache hit 

Bottle for libarchive built at 7a0c819e3a5 (Merge cea0d28fd298db0fbbe69ebef99a9a1fcfd56ea9 into f475d17f5173428a8ef4e2d4d6388a6fd3c68c87, 2024-09-24)

Check notice on line 1 in Formula/lib/libarchive.rb

View workflow job for this annotation

GitHub Actions / macOS 14-arm64

Bottle cache hit 

Bottle for libarchive built at 7a0c819e3a5 (Merge cea0d28fd298db0fbbe69ebef99a9a1fcfd56ea9 into f475d17f5173428a8ef4e2d4d6388a6fd3c68c87, 2024-09-24)

Check notice on line 1 in Formula/lib/libarchive.rb

View workflow job for this annotation

GitHub Actions / Linux

Bottle cache hit 

Bottle for libarchive built at 7a0c819e3a5 (Merge cea0d28fd298db0fbbe69ebef99a9a1fcfd56ea9 into f475d17f5173428a8ef4e2d4d6388a6fd3c68c87, 2024-09-24)

Check notice on line 1 in Formula/lib/libarchive.rb

View workflow job for this annotation

GitHub Actions / macOS 13-x86_64

Bottle cache hit 

Bottle for libarchive built at 7a0c819e3a5 (Merge cea0d28fd298db0fbbe69ebef99a9a1fcfd56ea9 into f475d17f5173428a8ef4e2d4d6388a6fd3c68c87, 2024-09-24)
desc "Multi-format archive and compression library"
homepage "https://www.libarchive.org"
url "https://www.libarchive.org/downloads/libarchive-3.7.5.tar.xz"
sha256 "ca74ff8f99dd40ab8a8274424d10a12a7ec3f4428dd35aee9fdda8bdb861b570"
url "https://www.libarchive.org/downloads/libarchive-3.7.6.tar.xz"
sha256 "0a2efdcb185da2eb1e7cd8421434cb9a6119f72417a13335cca378d476fd3ba0"
license "BSD-2-Clause"

livecheck do
Expand Down Expand Up @@ -40,14 +40,17 @@

system "make", "install"

# fixes https://github.com/libarchive/libarchive/issues/1819
if OS.mac?
inreplace lib/"pkgconfig/libarchive.pc", "Libs.private: ", "Libs.private: -liconv "
inreplace lib/"pkgconfig/libarchive.pc", "Requires.private: iconv", ""
end
# Avoid hardcoding Cellar paths in dependents.
inreplace lib/"pkgconfig/libarchive.pc", prefix.to_s, opt_prefix.to_s

return unless OS.mac?

# fixes https://github.com/libarchive/libarchive/issues/1819
inreplace lib/"pkgconfig/libarchive.pc" do |s|
s.gsub! "Libs.private: ", "Libs.private: -liconv "
s.gsub! "Requires.private: iconv", ""
end

# Just as apple does it.
ln_s bin/"bsdtar", bin/"tar"
ln_s bin/"bsdcpio", bin/"cpio"
Expand Down
Loading