From aaaefdb1ac8012225fa760faea2a4c82e6d020c8 Mon Sep 17 00:00:00 2001 From: eatradish Date: Sun, 7 Jan 2024 11:25:21 +0800 Subject: [PATCH 1/2] lychee: update to 0.14.0 --- app-web/lychee/spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app-web/lychee/spec b/app-web/lychee/spec index 57c94608fac..42e44a2f31e 100644 --- a/app-web/lychee/spec +++ b/app-web/lychee/spec @@ -1,4 +1,4 @@ -VER="0.13.0" +VER="0.14.0" SRCS="git::commit=v$VER::https://github.com/lycheeverse/lychee" CHKSUMS="SKIP" CHKUPDATE="anitya::id=370221" From 3a6a2421c6e4c24a8f378f9e339e51456448f337 Mon Sep 17 00:00:00 2001 From: eatradish Date: Sun, 7 Jan 2024 12:16:07 +0800 Subject: [PATCH 2/2] lychee: fix secondary arch build --- app-web/lychee/autobuild/defines | 6 +++ .../0001-fix-secondary-arch-build.patch | 50 +++++++++++++++++++ 2 files changed, 56 insertions(+) create mode 100644 app-web/lychee/autobuild/patches/0001-fix-secondary-arch-build.patch diff --git a/app-web/lychee/autobuild/defines b/app-web/lychee/autobuild/defines index 7068bf38649..a0c6b3a15b8 100644 --- a/app-web/lychee/autobuild/defines +++ b/app-web/lychee/autobuild/defines @@ -6,3 +6,9 @@ PKGSEC="web" USECLANG=1 ABSPLITDBG=0 + +# ld.lld does not support loongson3 and mips64r6el +USECLANG__LOONGSON3=0 +USECLANG__MIPS64R6EL=0 +NOLTO__LOONGSON3=1 +NOLTO__MIPS64R6EL=1 diff --git a/app-web/lychee/autobuild/patches/0001-fix-secondary-arch-build.patch b/app-web/lychee/autobuild/patches/0001-fix-secondary-arch-build.patch new file mode 100644 index 00000000000..26393bf64c6 --- /dev/null +++ b/app-web/lychee/autobuild/patches/0001-fix-secondary-arch-build.patch @@ -0,0 +1,50 @@ +From bc38a6c787c43472984f58f74a04b8e24c10cd37 Mon Sep 17 00:00:00 2001 +From: eatradish +Date: Sun, 7 Jan 2024 12:29:35 +0800 +Subject: [PATCH] fix secondary arch build + +--- + Cargo.lock | 4 +--- + lychee-lib/Cargo.toml | 2 +- + 2 files changed, 2 insertions(+), 4 deletions(-) + +diff --git a/Cargo.lock b/Cargo.lock +index c1cf52a..7a38268 100644 +--- a/Cargo.lock ++++ b/Cargo.lock +@@ -1865,9 +1865,7 @@ dependencies = [ + "futures-util", + "http 0.2.11", + "hyper 0.14.27", +- "log", + "rustls", +- "rustls-native-certs", + "tokio", + "tokio-rustls", + ] +@@ -2533,8 +2531,8 @@ dependencies = [ + "http 0.2.11", + "http-body 0.4.5", + "hyper 0.14.27", +- "hyper-rustls", + "hyper-timeout", ++ "hyper-tls", + "jsonwebtoken", + "once_cell", + "percent-encoding", +diff --git a/lychee-lib/Cargo.toml b/lychee-lib/Cargo.toml +index b539ba4..1e8f0f3 100644 +--- a/lychee-lib/Cargo.toml ++++ b/lychee-lib/Cargo.toml +@@ -32,7 +32,7 @@ ip_network = "0.4.1" + jwalk = "0.8.1" + linkify = "0.10.0" + log = "0.4.20" +-octocrab = "0.32.0" ++octocrab = { version = "0.32.0", default-features = false, features = ["follow-redirect", "retry", "opentls", "timeout", "tracing"] } + once_cell = "1.19.0" + openssl-sys = { version = "0.9.98", optional = true } + path-clean = "1.0.1" +-- +2.39.1 +