From: Duncaen <Duncaen@users.noreply.github.com>
To: ml@inbox.vuxu.org
Subject: [PR PATCH] Firefox 111
Date: Sat, 25 Mar 2023 01:58:49 +0100 [thread overview]
Message-ID: <gh-mailinglist-notifications-41a7ca26-5023-4802-975b-f1789d68868e-void-packages-43004@inbox.vuxu.org> (raw)
[-- Attachment #1: Type: text/plain, Size: 388 bytes --]
There is a new pull request by Duncaen against master on the void-packages repository
https://github.com/Duncaen/void-packages firefox-111
https://github.com/void-linux/void-packages/pull/43004
Firefox 111
[ci skip]
* [x] x86_64-glibc
* [ ] x86_64-musl
* [ ] aarch64-musl
* [ ] i686-glibc
A patch file from https://github.com/void-linux/void-packages/pull/43004.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-firefox-111-43004.patch --]
[-- Type: text/x-diff, Size: 228858 bytes --]
From 00468ee417752ee8841dd50e2cf1ba4db34fd02e Mon Sep 17 00:00:00 2001
From: Duncaen <duncaen@voidlinux.org>
Date: Sat, 25 Mar 2023 01:08:20 +0100
Subject: [PATCH 001/134] firefox: update to 111.0.1.
---
srcpkgs/firefox/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/firefox/template b/srcpkgs/firefox/template
index 784ad493d3dc..0f9c16f23d0a 100644
--- a/srcpkgs/firefox/template
+++ b/srcpkgs/firefox/template
@@ -3,7 +3,7 @@
# THIS PKG MUST BE SYNCHRONIZED WITH "srcpkgs/firefox-i18n".
#
pkgname=firefox
-version=109.0.1
+version=111.0.1
revision=1
build_helper="rust"
short_desc="Mozilla Firefox web browser"
@@ -11,7 +11,7 @@ maintainer="Duncaen <duncaen@voidlinux.org>"
license="MPL-2.0, GPL-2.0-or-later, LGPL-2.1-or-later"
homepage="https://www.mozilla.org/firefox/"
distfiles="${MOZILLA_SITE}/${pkgname}/releases/${version}/source/${pkgname}-${version}.source.tar.xz"
-checksum=5e43fdfb3923ee3a7ae7bc91ef3377a3fc6f8a0c1b87436c19b29458b0d731d9
+checksum=84a4f3aba62df6e0451cdd28f8f1e59840d77c4062311947b0e59325c2ebdce8
lib32disabled=yes
From 0ac40a00687509e1349675882934ea1ba5fb2f1d Mon Sep 17 00:00:00 2001
From: Marcin Puc <tranzystorek.io@protonmail.com>
Date: Sun, 18 Dec 2022 00:36:59 +0100
Subject: [PATCH 002/134] New package: llvm15-15.0.7
---
common/shlibs | 4 +-
srcpkgs/libllvm15 | 1 +
.../llvm15/files/llvm-Config-llvm-config.h | 9 +
...clang-001-fix-unwind-chain-inclusion.patch | 44 ++
.../patches/clang-002-add-musl-triples.patch | 115 +++++
.../clang-003-ppc64-dynamic-linker-path.patch | 13 +
.../patches/clang-004-ppc64-musl-elfv2.patch | 48 ++
.../compiler-rt-sanitizer-ppc64-musl.patch | 35 ++
srcpkgs/llvm15/patches/libcxx-musl.patch | 26 +
srcpkgs/llvm15/patches/libcxx-ppc.patch | 22 +
.../llvm15/patches/libcxx-ssp-nonshared.patch | 11 +
srcpkgs/llvm15/patches/libcxxabi-dl.patch | 25 +
srcpkgs/llvm15/patches/libcxxabi-musl.patch | 37 ++
srcpkgs/llvm15/patches/libomp-soname.patch | 12 +
srcpkgs/llvm15/patches/lldb-musl.patch | 40 ++
srcpkgs/llvm15/patches/llvm-001-musl.patch | 57 +++
.../patches/llvm-002-musl-ppc64-elfv2.patch | 30 ++
.../patches/llvm-003-ppc-secureplt.patch | 11 +
.../patches/llvm-004-override-opt.patch | 18 +
.../llvm15/patches/llvm-005-ppc-bigpic.patch | 36 ++
.../patches/llvm-006-aarch64-mf_exec.patch | 25 +
srcpkgs/llvm15/template | 450 ++++++++++++++++++
srcpkgs/llvm15/update | 3 +
23 files changed, 1071 insertions(+), 1 deletion(-)
create mode 120000 srcpkgs/libllvm15
create mode 100644 srcpkgs/llvm15/files/llvm-Config-llvm-config.h
create mode 100644 srcpkgs/llvm15/patches/clang-001-fix-unwind-chain-inclusion.patch
create mode 100644 srcpkgs/llvm15/patches/clang-002-add-musl-triples.patch
create mode 100644 srcpkgs/llvm15/patches/clang-003-ppc64-dynamic-linker-path.patch
create mode 100644 srcpkgs/llvm15/patches/clang-004-ppc64-musl-elfv2.patch
create mode 100644 srcpkgs/llvm15/patches/compiler-rt-sanitizer-ppc64-musl.patch
create mode 100644 srcpkgs/llvm15/patches/libcxx-musl.patch
create mode 100644 srcpkgs/llvm15/patches/libcxx-ppc.patch
create mode 100644 srcpkgs/llvm15/patches/libcxx-ssp-nonshared.patch
create mode 100644 srcpkgs/llvm15/patches/libcxxabi-dl.patch
create mode 100644 srcpkgs/llvm15/patches/libcxxabi-musl.patch
create mode 100644 srcpkgs/llvm15/patches/libomp-soname.patch
create mode 100644 srcpkgs/llvm15/patches/lldb-musl.patch
create mode 100644 srcpkgs/llvm15/patches/llvm-001-musl.patch
create mode 100644 srcpkgs/llvm15/patches/llvm-002-musl-ppc64-elfv2.patch
create mode 100644 srcpkgs/llvm15/patches/llvm-003-ppc-secureplt.patch
create mode 100644 srcpkgs/llvm15/patches/llvm-004-override-opt.patch
create mode 100644 srcpkgs/llvm15/patches/llvm-005-ppc-bigpic.patch
create mode 100644 srcpkgs/llvm15/patches/llvm-006-aarch64-mf_exec.patch
create mode 100644 srcpkgs/llvm15/template
create mode 100644 srcpkgs/llvm15/update
diff --git a/common/shlibs b/common/shlibs
index b8d161c2d932..07a6fa978493 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -718,7 +718,6 @@ libmca_common_dstore.so.1 libopenmpi-4.0.1_1
libmca_common_ompio.so.41 libopenmpi-3.0.1_1
libmca_common_monitoring.so.50 libopenmpi-3.1.2_1
libmpi.so.40 libopenmpi-3.0.1_1
-libomp.so libomp-12.0.1_4
libompitrace.so.40 libopenmpi-3.0.1_1
libopen-pal.so.40 libopenmpi-3.0.1_1
libopen-rte.so.40 libopenmpi-3.0.1_1
@@ -993,7 +992,10 @@ libclang.so.12 libclang-12.0.0_1
libclang-cpp.so.12 libclang-cpp-12.0.0_1
libLLVM-11.so libllvm11-11.0.0_1
libLLVM-12.so libllvm12-12.0.0_1
+libLLVM-15.so libllvm15-15.0.7_1
libLLVMSPIRVLib.so.12 SPIRV-LLVM-Translator-12.0.0_1
+libomp.so.5 libomp-15.0.7_1
+libomptarget.so.15 libomp-15.0.7_1
libisofs.so.6 libisofs-0.6.24_1
libmpack.so.0 libmpack-1.0.5_1
libGeoIP.so.1 libgeoip-1.4.8_1
diff --git a/srcpkgs/libllvm15 b/srcpkgs/libllvm15
new file mode 120000
index 000000000000..ad57a969b9f9
--- /dev/null
+++ b/srcpkgs/libllvm15
@@ -0,0 +1 @@
+llvm15
\ No newline at end of file
diff --git a/srcpkgs/llvm15/files/llvm-Config-llvm-config.h b/srcpkgs/llvm15/files/llvm-Config-llvm-config.h
new file mode 100644
index 000000000000..2fa08c9be696
--- /dev/null
+++ b/srcpkgs/llvm15/files/llvm-Config-llvm-config.h
@@ -0,0 +1,9 @@
+#include <bits/wordsize.h>
+
+#if __WORDSIZE == 32
+#include "llvm-config-32.h"
+#elif __WORDSIZE == 64
+#include "llvm-config-64.h"
+#else
+#error "Unknown word size"
+#endif
diff --git a/srcpkgs/llvm15/patches/clang-001-fix-unwind-chain-inclusion.patch b/srcpkgs/llvm15/patches/clang-001-fix-unwind-chain-inclusion.patch
new file mode 100644
index 000000000000..e4eaa7783e7a
--- /dev/null
+++ b/srcpkgs/llvm15/patches/clang-001-fix-unwind-chain-inclusion.patch
@@ -0,0 +1,44 @@
+From 352974169f0d2b5da3d5321f588f5e3b5941330e Mon Sep 17 00:00:00 2001
+From: Andrea Brancaleoni <miwaxe@gmail.com>
+Date: Tue, 8 Sep 2015 22:14:57 +0200
+Subject: [PATCH 2/7] fix unwind chain inclusion
+
+---
+ lib/Headers/unwind.h | 9 +++++----
+ 1 file changed, 5 insertions(+), 4 deletions(-)
+
+diff --git a/lib/Headers/unwind.h b/lib/Headers/unwind.h
+index 303d792..44e10cc 100644
+--- a/clang/lib/Headers/unwind.h
++++ b/clang/lib/Headers/unwind.h
+@@ -9,9 +9,6 @@
+
+ /* See "Data Definitions for libgcc_s" in the Linux Standard Base.*/
+
+-#ifndef __CLANG_UNWIND_H
+-#define __CLANG_UNWIND_H
+-
+ #if defined(__APPLE__) && __has_include_next(<unwind.h>)
+ /* Darwin (from 11.x on) provide an unwind.h. If that's available,
+ * use it. libunwind wraps some of its definitions in #ifdef _GNU_SOURCE,
+@@ -39,6 +36,9 @@
+ # endif
+ #else
+
++#ifndef __CLANG_UNWIND_H
++#define __CLANG_UNWIND_H
++
+ #include <stdint.h>
+
+ #ifdef __cplusplus
+@@ -322,6 +322,7 @@ _Unwind_Ptr _Unwind_GetTextRelBase(struct _Unwind_Context *);
+ }
+ #endif
+
++#endif /* __CLANG_UNWIND_H */
++
+ #endif
+
+-#endif /* __CLANG_UNWIND_H */
+--
+2.5.1
diff --git a/srcpkgs/llvm15/patches/clang-002-add-musl-triples.patch b/srcpkgs/llvm15/patches/clang-002-add-musl-triples.patch
new file mode 100644
index 000000000000..0ef4c7e75d6b
--- /dev/null
+++ b/srcpkgs/llvm15/patches/clang-002-add-musl-triples.patch
@@ -0,0 +1,115 @@
+--- a/clang/lib/Driver/ToolChains/Gnu.cpp
++++ b/clang/lib/Driver/ToolChains/Gnu.cpp
+@@ -2086,7 +2086,8 @@ void Generic_GCC::GCCInstallationDetector::AddDefaultGCCPrefixes(
+ static const char *const ARMHFTriples[] = {"arm-linux-gnueabihf",
+ "armv7hl-redhat-linux-gnueabi",
+ "armv6hl-suse-linux-gnueabi",
+- "armv7hl-suse-linux-gnueabi"};
++ "armv7hl-suse-linux-gnueabi",
++ "armv7l-linux-gnueabihf"};
+ static const char *const ARMebLibDirs[] = {"/lib"};
+ static const char *const ARMebTriples[] = {"armeb-linux-gnueabi",
+ "armeb-linux-androideabi"};
+@@ -2153,8 +2154,7 @@ void Generic_GCC::GCCInstallationDetector::AddDefaultGCCPrefixes(
+ "powerpc64-suse-linux", "powerpc-montavista-linuxspe"};
+ static const char *const PPCLELibDirs[] = {"/lib32", "/lib"};
+ static const char *const PPCLETriples[] = {"powerpcle-linux-gnu",
+- "powerpcle-unknown-linux-gnu",
+- "powerpcle-linux-musl"};
++ "powerpcle-unknown-linux-gnu"};
+
+ static const char *const PPC64LibDirs[] = {"/lib64", "/lib"};
+ static const char *const PPC64Triples[] = {
+@@ -2235,6 +2235,92 @@ void Generic_GCC::GCCInstallationDetector::AddDefaultGCCPrefixes(
+ return;
+ }
+
++ if (TargetTriple.isMusl()) {
++ static const char *const AArch64MuslTriples[] = {"aarch64-linux-musl"};
++ static const char *const ARMHFMuslTriples[] = {
++ "arm-linux-musleabihf", "armv7l-linux-musleabihf"
++ };
++ static const char *const ARMMuslTriples[] = {"arm-linux-musleabi"};
++ static const char *const X86_64MuslTriples[] = {"x86_64-linux-musl"};
++ static const char *const X86MuslTriples[] = {"i686-linux-musl"};
++ static const char *const MIPSMuslTriples[] = {
++ "mips-linux-musl", "mipsel-linux-musl",
++ "mipsel-linux-muslhf", "mips-linux-muslhf"
++ };
++ static const char *const PPCMuslTriples[] = {"powerpc-linux-musl"};
++ static const char *const PPCLEMuslTriples[] = {"powerpcle-linux-musl"};
++ static const char *const PPC64MuslTriples[] = {"powerpc64-linux-musl"};
++ static const char *const PPC64LEMuslTriples[] = {"powerpc64le-linux-musl"};
++ static const char *const RISCV64MuslTriples[] = {"riscv64-linux-musl"};
++
++ switch (TargetTriple.getArch()) {
++ case llvm::Triple::aarch64:
++ LibDirs.append(begin(AArch64LibDirs), end(AArch64LibDirs));
++ TripleAliases.append(begin(AArch64MuslTriples), end(AArch64MuslTriples));
++ BiarchLibDirs.append(begin(AArch64LibDirs), end(AArch64LibDirs));
++ BiarchTripleAliases.append(begin(AArch64MuslTriples), end(AArch64MuslTriples));
++ break;
++ case llvm::Triple::arm:
++ LibDirs.append(begin(ARMLibDirs), end(ARMLibDirs));
++ if (TargetTriple.getEnvironment() == llvm::Triple::MuslEABIHF) {
++ TripleAliases.append(begin(ARMHFMuslTriples), end(ARMHFMuslTriples));
++ } else {
++ TripleAliases.append(begin(ARMMuslTriples), end(ARMMuslTriples));
++ }
++ break;
++ case llvm::Triple::x86_64:
++ LibDirs.append(begin(X86_64LibDirs), end(X86_64LibDirs));
++ TripleAliases.append(begin(X86_64MuslTriples), end(X86_64MuslTriples));
++ BiarchLibDirs.append(begin(X86LibDirs), end(X86LibDirs));
++ BiarchTripleAliases.append(begin(X86MuslTriples), end(X86MuslTriples));
++ break;
++ case llvm::Triple::x86:
++ LibDirs.append(begin(X86LibDirs), end(X86LibDirs));
++ TripleAliases.append(begin(X86MuslTriples), end(X86MuslTriples));
++ BiarchLibDirs.append(begin(X86_64LibDirs), end(X86_64LibDirs));
++ BiarchTripleAliases.append(begin(X86_64MuslTriples), end(X86_64MuslTriples));
++ break;
++ case llvm::Triple::mips:
++ LibDirs.append(begin(MIPSLibDirs), end(MIPSLibDirs));
++ TripleAliases.append(begin(MIPSMuslTriples), end(MIPSMuslTriples));
++ break;
++ case llvm::Triple::ppc:
++ LibDirs.append(begin(PPCLibDirs), end(PPCLibDirs));
++ TripleAliases.append(begin(PPCMuslTriples), end(PPCMuslTriples));
++ BiarchLibDirs.append(begin(PPC64LibDirs), end(PPC64LibDirs));
++ BiarchTripleAliases.append(begin(PPC64MuslTriples), end(PPC64MuslTriples));
++ break;
++ case llvm::Triple::ppcle:
++ LibDirs.append(begin(PPCLELibDirs), end(PPCLELibDirs));
++ TripleAliases.append(begin(PPCLEMuslTriples), end(PPCLEMuslTriples));
++ BiarchLibDirs.append(begin(PPC64LELibDirs), end(PPC64LELibDirs));
++ BiarchTripleAliases.append(begin(PPC64LEMuslTriples), end(PPC64LEMuslTriples));
++ break;
++ case llvm::Triple::ppc64:
++ LibDirs.append(begin(PPC64LibDirs), end(PPC64LibDirs));
++ TripleAliases.append(begin(PPC64MuslTriples), end(PPC64MuslTriples));
++ BiarchLibDirs.append(begin(PPCLibDirs), end(PPCLibDirs));
++ BiarchTripleAliases.append(begin(PPCMuslTriples), end(PPCMuslTriples));
++ break;
++ case llvm::Triple::ppc64le:
++ LibDirs.append(begin(PPC64LELibDirs), end(PPC64LELibDirs));
++ TripleAliases.append(begin(PPC64LEMuslTriples), end(PPC64LEMuslTriples));
++ BiarchLibDirs.append(begin(PPCLELibDirs), end(PPCLELibDirs));
++ BiarchTripleAliases.append(begin(PPCLEMuslTriples), end(PPCLEMuslTriples));
++ break;
++ case llvm::Triple::riscv64:
++ LibDirs.append(begin(RISCV64LibDirs), end(RISCV64LibDirs));
++ TripleAliases.append(begin(RISCV64MuslTriples), end(RISCV64MuslTriples));
++ break;
++ default:
++ break;
++ }
++ TripleAliases.push_back(TargetTriple.str());
++ if (TargetTriple.str() != BiarchTriple.str())
++ BiarchTripleAliases.push_back(BiarchTriple.str());
++ return;
++ }
++
+ // Android targets should not use GNU/Linux tools or libraries.
+ if (TargetTriple.isAndroid()) {
+ static const char *const AArch64AndroidTriples[] = {
diff --git a/srcpkgs/llvm15/patches/clang-003-ppc64-dynamic-linker-path.patch b/srcpkgs/llvm15/patches/clang-003-ppc64-dynamic-linker-path.patch
new file mode 100644
index 000000000000..4ad6412d1e6c
--- /dev/null
+++ b/srcpkgs/llvm15/patches/clang-003-ppc64-dynamic-linker-path.patch
@@ -0,0 +1,13 @@
+--- a/clang/lib/Driver/ToolChains/Linux.cpp
++++ b/clang/lib/Driver/ToolChains/Linux.cpp
+@@ -504,10 +504,6 @@ std::string Linux::getDynamicLinker(const ArgList &Args) const {
+ Loader = "ld.so.1";
+ break;
+ case llvm::Triple::ppc64:
+- LibDir = "lib64";
+- Loader =
+- (tools::ppc::hasPPCAbiArg(Args, "elfv2")) ? "ld64.so.2" : "ld64.so.1";
+- break;
+ case llvm::Triple::ppc64le:
+ LibDir = "lib64";
+ Loader =
diff --git a/srcpkgs/llvm15/patches/clang-004-ppc64-musl-elfv2.patch b/srcpkgs/llvm15/patches/clang-004-ppc64-musl-elfv2.patch
new file mode 100644
index 000000000000..21fc8003c5f1
--- /dev/null
+++ b/srcpkgs/llvm15/patches/clang-004-ppc64-musl-elfv2.patch
@@ -0,0 +1,48 @@
+--- a/clang/lib/Basic/Targets/PPC.h
++++ b/clang/lib/Basic/Targets/PPC.h
+@@ -415,11 +415,10 @@ public:
+ LongDoubleFormat = &llvm::APFloat::IEEEdouble();
+ } else if ((Triple.getArch() == llvm::Triple::ppc64le)) {
+ DataLayout = "e-m:e-i64:64-n32:64";
+- ABI = "elfv2";
+ } else {
+ DataLayout = "E-m:e-i64:64-n32:64";
+- ABI = "elfv1";
+ }
++ ABI = "elfv2";
+
+ if (Triple.isOSFreeBSD() || Triple.isOSOpenBSD() || Triple.isMusl()) {
+ LongDoubleWidth = LongDoubleAlign = 64;
+--- a/clang/lib/CodeGen/TargetInfo.cpp
++++ b/clang/lib/CodeGen/TargetInfo.cpp
+@@ -10927,9 +10927,9 @@ const TargetCodeGenInfo &CodeGenModule::getTargetCodeGenInfo() {
+ return SetCGInfo(new AIXTargetCodeGenInfo(Types, /*Is64Bit*/ true));
+
+ if (Triple.isOSBinFormatELF()) {
+- PPC64_SVR4_ABIInfo::ABIKind Kind = PPC64_SVR4_ABIInfo::ELFv1;
+- if (getTarget().getABI() == "elfv2")
+- Kind = PPC64_SVR4_ABIInfo::ELFv2;
++ PPC64_SVR4_ABIInfo::ABIKind Kind = PPC64_SVR4_ABIInfo::ELFv2;
++ if (getTarget().getABI() == "elfv1")
++ Kind = PPC64_SVR4_ABIInfo::ELFv1;
+ bool IsSoftFloat = CodeGenOpts.FloatABI == "soft";
+
+ return SetCGInfo(
+--- a/clang/lib/Driver/ToolChains/Clang.cpp
++++ b/clang/lib/Driver/ToolChains/Clang.cpp
+@@ -1920,14 +1920,7 @@ void Clang::AddPPCTargetArgs(const ArgList &Args,
+ const llvm::Triple &T = getToolChain().getTriple();
+ if (T.isOSBinFormatELF()) {
+ switch (getToolChain().getArch()) {
+- case llvm::Triple::ppc64: {
+- if ((T.isOSFreeBSD() && T.getOSMajorVersion() >= 13) ||
+- T.isOSOpenBSD() || T.isMusl())
+- ABIName = "elfv2";
+- else
+- ABIName = "elfv1";
+- break;
+- }
++ case llvm::Triple::ppc64:
+ case llvm::Triple::ppc64le:
+ ABIName = "elfv2";
+ break;
diff --git a/srcpkgs/llvm15/patches/compiler-rt-sanitizer-ppc64-musl.patch b/srcpkgs/llvm15/patches/compiler-rt-sanitizer-ppc64-musl.patch
new file mode 100644
index 000000000000..360cfc1ba7f1
--- /dev/null
+++ b/srcpkgs/llvm15/patches/compiler-rt-sanitizer-ppc64-musl.patch
@@ -0,0 +1,35 @@
+--- a/compiler-rt/lib/sanitizer_common/sanitizer_linux.cpp
++++ b/compiler-rt/lib/sanitizer_common/sanitizer_linux.cpp
+@@ -74,6 +74,10 @@
+ #include <sys/utsname.h>
+ #endif
+
++#if SANITIZER_LINUX && defined(__powerpc__)
++#include <asm/ptrace.h>
++#endif
++
+ #if SANITIZER_LINUX && !SANITIZER_ANDROID
+ #include <sys/personality.h>
+ #endif
+--- a/compiler-rt/lib/sanitizer_common/sanitizer_platform_limits_posix.cpp
++++ b/compiler-rt/lib/sanitizer_common/sanitizer_platform_limits_posix.cpp
+@@ -94,7 +94,7 @@
+ # include <utime.h>
+ # include <sys/ptrace.h>
+ # if defined(__mips64) || defined(__aarch64__) || defined(__arm__) || \
+- defined(__hexagon__) || SANITIZER_RISCV64
++ defined(__hexagon__) || defined(__powerpc__) || SANITIZER_RISCV64
+ # include <asm/ptrace.h>
+ # ifdef __arm__
+ typedef struct user_fpregs elf_fpregset_t;
+--- a/compiler-rt/lib/sanitizer_common/sanitizer_stoptheworld_linux_libcdep.cpp
++++ b/compiler-rt/lib/sanitizer_common/sanitizer_stoptheworld_linux_libcdep.cpp
+@@ -31,7 +31,7 @@
+ #include <sys/types.h> // for pid_t
+ #include <sys/uio.h> // for iovec
+ #include <elf.h> // for NT_PRSTATUS
+-#if (defined(__aarch64__) || SANITIZER_RISCV64) && !SANITIZER_ANDROID
++#if (defined(__aarch64__) || defined(__powerpc__) || SANITIZER_RISCV64) && !SANITIZER_ANDROID
+ // GLIBC 2.20+ sys/user does not include asm/ptrace.h
+ # include <asm/ptrace.h>
+ #endif
diff --git a/srcpkgs/llvm15/patches/libcxx-musl.patch b/srcpkgs/llvm15/patches/libcxx-musl.patch
new file mode 100644
index 000000000000..bbd31ffc2cb1
--- /dev/null
+++ b/srcpkgs/llvm15/patches/libcxx-musl.patch
@@ -0,0 +1,26 @@
+--- a/libcxx/include/locale
++++ b/libcxx/include/locale
+@@ -742,7 +742,11 @@ __num_get_signed_integral(const char* __a, const char* __a_end,
+ typename remove_reference<decltype(errno)>::type __save_errno = errno;
+ errno = 0;
+ char *__p2;
++#if defined(__linux__) && !defined(__GLIBC__)
++ long long __ll = strtoll(__a, &__p2, __base);
++#else
+ long long __ll = strtoll_l(__a, &__p2, __base, _LIBCPP_GET_C_LOCALE);
++#endif
+ typename remove_reference<decltype(errno)>::type __current_errno = errno;
+ if (__current_errno == 0)
+ errno = __save_errno;
+@@ -782,7 +786,11 @@ __num_get_unsigned_integral(const char* __a, const char* __a_end,
+ typename remove_reference<decltype(errno)>::type __save_errno = errno;
+ errno = 0;
+ char *__p2;
++#if defined(__linux__) && !defined(__GLIBC__)
++ unsigned long long __ll = strtoull(__a, &__p2, __base);
++#else
+ unsigned long long __ll = strtoull_l(__a, &__p2, __base, _LIBCPP_GET_C_LOCALE);
++#endif
+ typename remove_reference<decltype(errno)>::type __current_errno = errno;
+ if (__current_errno == 0)
+ errno = __save_errno;
diff --git a/srcpkgs/llvm15/patches/libcxx-ppc.patch b/srcpkgs/llvm15/patches/libcxx-ppc.patch
new file mode 100644
index 000000000000..7a92f8004e1c
--- /dev/null
+++ b/srcpkgs/llvm15/patches/libcxx-ppc.patch
@@ -0,0 +1,22 @@
+This ensures `is_iec559` is defined correctly under all long double ABIs,
+including musl and its 64-bit long double. Also, `__ppc__` or `__ppc64__`
+is not defined on gcc.
+
+--- a/libcxx/include/limits
++++ b/libcxx/include/limits
+@@ -426,8 +426,14 @@ protected:
+ _LIBCPP_INLINE_VISIBILITY static _LIBCPP_CONSTEXPR type signaling_NaN() _NOEXCEPT {return __builtin_nansl("");}
+ _LIBCPP_INLINE_VISIBILITY static _LIBCPP_CONSTEXPR type denorm_min() _NOEXCEPT {return __LDBL_DENORM_MIN__;}
+
+-#if (defined(__ppc__) || defined(__ppc64__))
++#if defined(__powerpc__) || defined(__powerpc64__)
++#if (__LDBL_MAX_EXP__ > __DBL_MAX_EXP__) || (__LDBL_MANT_DIG__ == __DBL_MANT_DIG__)
++ /* IEEE 754 quadruple or double precision */
++ static _LIBCPP_CONSTEXPR const bool is_iec559 = true;
++#else
++ /* 128-bit IBM double-double */
+ static _LIBCPP_CONSTEXPR const bool is_iec559 = false;
++#endif
+ #else
+ static _LIBCPP_CONSTEXPR const bool is_iec559 = true;
+ #endif
diff --git a/srcpkgs/llvm15/patches/libcxx-ssp-nonshared.patch b/srcpkgs/llvm15/patches/libcxx-ssp-nonshared.patch
new file mode 100644
index 000000000000..70292beb2fcd
--- /dev/null
+++ b/srcpkgs/llvm15/patches/libcxx-ssp-nonshared.patch
@@ -0,0 +1,11 @@
+--- a/libcxx/CMakeLists.txt
++++ b/libcxx/CMakeLists.txt
+@@ -769,6 +769,8 @@ function(cxx_link_system_libraries target)
+ target_link_libraries(${target} PRIVATE atomic)
+ endif()
+
++#ssp target_link_libraries(${target} PRIVATE ssp_nonshared)
++
+ if (MINGW)
+ target_link_libraries(${target} PRIVATE "${MINGW_LIBRARIES}")
+ endif()
diff --git a/srcpkgs/llvm15/patches/libcxxabi-dl.patch b/srcpkgs/llvm15/patches/libcxxabi-dl.patch
new file mode 100644
index 000000000000..3a15f9db8c98
--- /dev/null
+++ b/srcpkgs/llvm15/patches/libcxxabi-dl.patch
@@ -0,0 +1,25 @@
+Also link to -ldl to prevent undefined references.
+
+--- a/libcxxabi/src/CMakeLists.txt
++++ b/libcxxabi/src/CMakeLists.txt
+@@ -73,6 +73,7 @@
+ endif()
+
+ add_library_flags_if(LIBCXXABI_HAS_C_LIB c)
++ add_library_flags_if(LIBCXXABI_HAS_C_LIB dl)
+ endif()
+
+ if (LIBCXXABI_USE_LLVM_UNWINDER)
+--- a/libcxx/CMakeLists.txt
++++ b/libcxx/CMakeLists.txt
+@@ -745,6 +745,10 @@
+ target_link_libraries(${target} PRIVATE m)
+ endif()
+
++ if (LIBCXX_HAS_C_LIB)
++ target_link_libraries(${target} PRIVATE dl)
++ endif()
++
+ if (LIBCXX_HAS_RT_LIB)
+ target_link_libraries(${target} PRIVATE rt)
+ endif()
diff --git a/srcpkgs/llvm15/patches/libcxxabi-musl.patch b/srcpkgs/llvm15/patches/libcxxabi-musl.patch
new file mode 100644
index 000000000000..55bf6f5aaa08
--- /dev/null
+++ b/srcpkgs/llvm15/patches/libcxxabi-musl.patch
@@ -0,0 +1,37 @@
+diff --git a/libcxx/include/__support/musl/xlocale.h b/libcxx/include/__support/musl/xlocale.h
+index e674a41fa..f546119b9 100644
+--- a/libcxx/include/__support/musl/xlocale.h
++++ b/libcxx/include/__support/musl/xlocale.h
+@@ -24,27 +24,27 @@
+ extern "C" {
+ #endif
+
+-inline _LIBCPP_HIDE_FROM_ABI long long
++static inline long long
+ strtoll_l(const char *__nptr, char **__endptr, int __base, locale_t) {
+ return ::strtoll(__nptr, __endptr, __base);
+ }
+
+-inline _LIBCPP_HIDE_FROM_ABI unsigned long long
++static inline unsigned long long
+ strtoull_l(const char *__nptr, char **__endptr, int __base, locale_t) {
+ return ::strtoull(__nptr, __endptr, __base);
+ }
+
+-inline _LIBCPP_HIDE_FROM_ABI long long
++static inline long long
+ wcstoll_l(const wchar_t *__nptr, wchar_t **__endptr, int __base, locale_t) {
+ return ::wcstoll(__nptr, __endptr, __base);
+ }
+
+-inline _LIBCPP_HIDE_FROM_ABI unsigned long long
++static inline unsigned long long
+ wcstoull_l(const wchar_t *__nptr, wchar_t **__endptr, int __base, locale_t) {
+ return ::wcstoull(__nptr, __endptr, __base);
+ }
+
+-inline _LIBCPP_HIDE_FROM_ABI long double
++static inline long double
+ wcstold_l(const wchar_t *__nptr, wchar_t **__endptr, locale_t) {
+ return ::wcstold(__nptr, __endptr);
+ }
diff --git a/srcpkgs/llvm15/patches/libomp-soname.patch b/srcpkgs/llvm15/patches/libomp-soname.patch
new file mode 100644
index 000000000000..9a622cd9254c
--- /dev/null
+++ b/srcpkgs/llvm15/patches/libomp-soname.patch
@@ -0,0 +1,12 @@
+diff --git a/openmp/runtime/src/CMakeLists.txt b/openmp/runtime/src/CMakeLists.txt
+index df1ca9d90..9d2c3b7b9 100644
+--- a/openmp/runtime/src/CMakeLists.txt
++++ b/openmp/runtime/src/CMakeLists.txt
+@@ -150,6 +150,7 @@ libomp_get_libflags(LIBOMP_CONFIGURED_LIBFLAGS)
+ # Build libomp library. Add LLVMSupport dependency if building in-tree with libomptarget profiling enabled.
+ if(OPENMP_STANDALONE_BUILD OR (NOT OPENMP_ENABLE_LIBOMP_PROFILING))
+ add_library(omp ${LIBOMP_LIBRARY_KIND} ${LIBOMP_SOURCE_FILES})
++ set_target_properties(omp PROPERTIES VERSION ${LIBOMP_VERSION_MAJOR} SOVERSION ${LIBOMP_VERSION_MAJOR})
+ # Linking command will include libraries in LIBOMP_CONFIGURED_LIBFLAGS
+ target_link_libraries(omp ${LIBOMP_CONFIGURED_LIBFLAGS} ${LIBOMP_DL_LIBS})
+ else()
diff --git a/srcpkgs/llvm15/patches/lldb-musl.patch b/srcpkgs/llvm15/patches/lldb-musl.patch
new file mode 100644
index 000000000000..026c5e1e61ba
--- /dev/null
+++ b/srcpkgs/llvm15/patches/lldb-musl.patch
@@ -0,0 +1,40 @@
+--- a/lldb/source/Plugins/Process/Linux/Procfs.h
++++ b/lldb/source/Plugins/Process/Linux/Procfs.h
+@@ -10,6 +10,7 @@
+ // sys/procfs.h on Android/Linux for all supported architectures.
+
+ #include <sys/ptrace.h>
++#include <asm/ptrace.h>
+
+ #include "lldb/lldb-types.h"
+
+@@ -17,23 +18,13 @@
+
+ #include <vector>
+
+-#ifdef __ANDROID__
+-#if defined(__arm64__) || defined(__aarch64__)
+-typedef unsigned long elf_greg_t;
+-typedef elf_greg_t
+- elf_gregset_t[(sizeof(struct user_pt_regs) / sizeof(elf_greg_t))];
+-typedef struct user_fpsimd_state elf_fpregset_t;
+-#ifndef NT_FPREGSET
+-#define NT_FPREGSET NT_PRFPREG
+-#endif // NT_FPREGSET
+-#elif defined(__mips__)
+-#ifndef NT_FPREGSET
+-#define NT_FPREGSET NT_PRFPREG
+-#endif // NT_FPREGSET
+-#endif
+-#else // __ANDROID__
++#if !defined(__GLIBC__) && defined(__powerpc__)
++#define pt_regs musl_pt_regs
++#include <sys/procfs.h>
++#undef pt_regs
++#else
+ #include <sys/procfs.h>
+-#endif // __ANDROID__
++#endif
+
+ namespace lldb_private {
+ namespace process_linux {
diff --git a/srcpkgs/llvm15/patches/llvm-001-musl.patch b/srcpkgs/llvm15/patches/llvm-001-musl.patch
new file mode 100644
index 000000000000..f2a3f8d62813
--- /dev/null
+++ b/srcpkgs/llvm15/patches/llvm-001-musl.patch
@@ -0,0 +1,57 @@
+From faca3fbd15d0c3108493c3c54cd93138e049ac43 Mon Sep 17 00:00:00 2001
+From: Andrea Brancaleoni <miwaxe@gmail.com>
+Date: Tue, 8 Sep 2015 22:03:02 +0200
+Subject: [PATCH 3/3] musl
+
+---
+ include/llvm/Analysis/TargetLibraryInfo.h | 9 +++++++++
+ lib/Support/DynamicLibrary.cpp | 2 +-
+ lib/Support/Unix/Signals.inc | 6 +++---
+ utils/unittest/googletest/src/gtest.cc | 1 +
+ 5 files changed, 17 insertions(+), 6 deletions(-)
+
+diff --git a/include/llvm/Analysis/TargetLibraryInfo.h b/include/llvm/Analysis/TargetLibraryInfo.h
+index 34a8a1e3..1214ece5 100644
+--- a/llvm/include/llvm/Analysis/TargetLibraryInfo.h
++++ b/llvm/include/llvm/Analysis/TargetLibraryInfo.h
+@@ -18,6 +18,15 @@
+ #include "llvm/IR/PassManager.h"
+ #include "llvm/Pass.h"
+
++#undef fopen64
++#undef fseeko64
++#undef fstat64
++#undef fstatvfs64
++#undef ftello64
++#undef lstat64
++#undef stat64
++#undef tmpfile64
++
+ namespace llvm {
+ template <typename T> class ArrayRef;
+ class Triple;
+diff --git a/lib/Support/Unix/DynamicLibrary.inc b/lib/Support/Unix/DynamicLibrary.inc
+index a2a37996..2f86c470 100644
+--- a/llvm/lib/Support/Unix/DynamicLibrary.inc
++++ b/llvm/lib/Support/Unix/DynamicLibrary.inc
+@@ -102,7 +102,7 @@ static void *DoSearch(const char* SymbolName) {
+
+ // This macro returns the address of a well-known, explicit symbol
+ #define EXPLICIT_SYMBOL(SYM) \
+- if (!strcmp(SymbolName, #SYM)) return &SYM
++ if (!strcmp(SymbolName, #SYM)) return (void *)&SYM
+
+ // Under glibc we have a weird situation. The stderr/out/in symbols are both
+ // macros and global variables because of standards requirements. So, we
+diff --git a/utils/unittest/googletest/src/gtest.cc b/utils/unittest/googletest/src/gtest.cc
+index d882ab2e..f1fb12d0 100644
+--- a/llvm/utils/unittest/googletest/src/gtest.cc
++++ b/llvm/utils/unittest/googletest/src/gtest.cc
+@@ -128,6 +128,7 @@
+
+ #if GTEST_CAN_STREAM_RESULTS_
+ # include <arpa/inet.h> // NOLINT
++# include <sys/socket.h> // NOLINT
+ # include <netdb.h> // NOLINT
+ # include <sys/socket.h> // NOLINT
+ # include <sys/types.h> // NOLINT
diff --git a/srcpkgs/llvm15/patches/llvm-002-musl-ppc64-elfv2.patch b/srcpkgs/llvm15/patches/llvm-002-musl-ppc64-elfv2.patch
new file mode 100644
index 000000000000..0071d964bd37
--- /dev/null
+++ b/srcpkgs/llvm15/patches/llvm-002-musl-ppc64-elfv2.patch
@@ -0,0 +1,30 @@
+This patches LLVM to use ELFv2 on ppc64 unconditionally unless overridden. We
+need this because unlike most distros we use ELFv2 for both glibc and musl
+on big endian ppc64.
+
+diff --git a/lib/Target/PowerPC/PPCTargetMachine.cpp b/lib/Target/PowerPC/PPCTargetMachine.cpp
+index 0634833e..b7cbc2e7 100644
+--- a/llvm/lib/Target/PowerPC/PPCTargetMachine.cpp
++++ b/llvm/lib/Target/PowerPC/PPCTargetMachine.cpp
+@@ -222,9 +222,8 @@ static PPCTargetMachine::PPCABI computeTargetABI(const Triple &TT,
+
+ switch (TT.getArch()) {
+ case Triple::ppc64le:
+- return PPCTargetMachine::PPC_ABI_ELFv2;
+ case Triple::ppc64:
+- return PPCTargetMachine::PPC_ABI_ELFv1;
++ return PPCTargetMachine::PPC_ABI_ELFv2;
+ default:
+ return PPCTargetMachine::PPC_ABI_UNKNOWN;
+ }
+diff --git a/test/CodeGen/PowerPC/ppc64-elf-abi.ll b/test/CodeGen/PowerPC/ppc64-elf-abi.ll
+index 8b1cf6b5..296a2afa 100644
+--- a/llvm/test/CodeGen/PowerPC/ppc64-elf-abi.ll
++++ b/llvm/test/CodeGen/PowerPC/ppc64-elf-abi.ll
+@@ -1,4 +1,5 @@
+-; RUN: llc -verify-machineinstrs -mtriple=powerpc64-unknown-linux-gnu < %s | FileCheck %s -check-prefix=CHECK-ELFv1
++; RUN: llc -verify-machineinstrs -mtriple=powerpc64-unknown-linux-gnu < %s | FileCheck %s -check-prefix=CHECK-ELFv2
++; RUN: llc -verify-machineinstrs -mtriple=powerpc64-unknown-linux-musl < %s | FileCheck %s -check-prefix=CHECK-ELFv2
+ ; RUN: llc -verify-machineinstrs -mtriple=powerpc64-unknown-linux-gnu -target-abi elfv1 < %s | FileCheck %s -check-prefix=CHECK-ELFv1
+ ; RUN: llc -verify-machineinstrs -mtriple=powerpc64-unknown-linux-gnu -target-abi elfv2 < %s | FileCheck %s -check-prefix=CHECK-ELFv2
+ ; RUN: llc -verify-machineinstrs -mtriple=powerpc64le-unknown-linux-gnu < %s | FileCheck %s -check-prefix=CHECK-ELFv2
diff --git a/srcpkgs/llvm15/patches/llvm-003-ppc-secureplt.patch b/srcpkgs/llvm15/patches/llvm-003-ppc-secureplt.patch
new file mode 100644
index 000000000000..b5d15974375d
--- /dev/null
+++ b/srcpkgs/llvm15/patches/llvm-003-ppc-secureplt.patch
@@ -0,0 +1,11 @@
+--- a/llvm/lib/Target/PowerPC/PPCSubtarget.cpp
++++ b/llvm/lib/Target/PowerPC/PPCSubtarget.cpp
+@@ -165,7 +165,7 @@ void PPCSubtarget::initSubtargetFeatures(StringRef CPU, StringRef FS) {
+
+ if ((TargetTriple.isOSFreeBSD() && TargetTriple.getOSMajorVersion() >= 13) ||
+ TargetTriple.isOSNetBSD() || TargetTriple.isOSOpenBSD() ||
+- TargetTriple.isMusl())
++ isTargetLinux())
+ SecurePlt = true;
+
+ if (HasSPE && IsPPC64)
diff --git a/srcpkgs/llvm15/patches/llvm-004-override-opt.patch b/srcpkgs/llvm15/patches/llvm-004-override-opt.patch
new file mode 100644
index 000000000000..51d0e4b31b32
--- /dev/null
+++ b/srcpkgs/llvm15/patches/llvm-004-override-opt.patch
@@ -0,0 +1,18 @@
+This allows us to override the optimization level as not all platforms can
+deal with -O3.
+
+--- a/llvm/CMakeLists.txt
++++ b/llvm/CMakeLists.txt
+@@ -918,6 +918,12 @@ if( MINGW AND NOT "${CMAKE_CXX_COMPILER_ID}" MATCHES "Clang" )
+ llvm_replace_compiler_option(CMAKE_CXX_FLAGS_RELEASE "-O3" "-O2")
+ endif()
+
++set(VOID_CXX_OPT_FLAGS "" CACHE STRING "Optimization level to use")
++
++if (NOT VOID_CXX_OPT_FLAGS STREQUAL "")
++ llvm_replace_compiler_option(CMAKE_CXX_FLAGS_RELEASE "-O3" "${VOID_CXX_OPT_FLAGS}")
++endif()
++
+ # Put this before tblgen. Else we have a circular dependence.
+ add_subdirectory(lib/Demangle)
+ add_subdirectory(lib/Support)
diff --git a/srcpkgs/llvm15/patches/llvm-005-ppc-bigpic.patch b/srcpkgs/llvm15/patches/llvm-005-ppc-bigpic.patch
new file mode 100644
index 000000000000..d332687b9d92
--- /dev/null
+++ b/srcpkgs/llvm15/patches/llvm-005-ppc-bigpic.patch
@@ -0,0 +1,36 @@
+From f3dbdd49c06bfafc1d6138094cf42889c14d38b6 Mon Sep 17 00:00:00 2001
+From: Samuel Holland <samuel@sholland.org>
+Date: Sun, 3 Nov 2019 10:57:27 -0600
+Subject: [PATCH] [LLVM][PowerPC] Assume BigPIC if no PIC level is specified
+
+---
+ llvm/lib/Target/PowerPC/PPCAsmPrinter.cpp | 2 +-
+ llvm/lib/Target/PowerPC/PPCMCInstLower.cpp | 2 +-
+ 2 files changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/lib/Target/PowerPC/PPCAsmPrinter.cpp b/lib/Target/PowerPC/PPCAsmPrinter.cpp
+index cce21f32..87ca5f9b 100644
+--- a/llvm/lib/Target/PowerPC/PPCAsmPrinter.cpp
++++ b/llvm/lib/Target/PowerPC/PPCAsmPrinter.cpp
+@@ -520,7 +520,7 @@ void PPCAsmPrinter::EmitTlsCall(const MachineInstr *MI,
+
+ // Add 32768 offset to the symbol so we follow up the latest GOT/PLT ABI.
+ if (Kind == MCSymbolRefExpr::VK_PLT && Subtarget->isSecurePlt() &&
+- M->getPICLevel() == PICLevel::BigPIC)
++ M->getPICLevel() != PICLevel::SmallPIC)
+ TlsRef = MCBinaryExpr::createAdd(
+ TlsRef, MCConstantExpr::create(32768, OutContext), OutContext);
+ const MachineOperand &MO = MI->getOperand(2);
+diff --git a/lib/Target/PowerPC/PPCMCInstLower.cpp b/lib/Target/PowerPC/PPCMCInstLower.cpp
+index 5cc180d7..a5b02565 100644
+--- a/llvm/lib/Target/PowerPC/PPCMCInstLower.cpp
++++ b/llvm/lib/Target/PowerPC/PPCMCInstLower.cpp
+@@ -117,7 +117,7 @@ static MCOperand GetSymbolRef(const MachineOperand &MO, const MCSymbol *Symbol,
+ const MCExpr *Expr = MCSymbolRefExpr::create(Symbol, RefKind, Ctx);
+ // If -msecure-plt -fPIC, add 32768 to symbol.
+ if (Subtarget->isSecurePlt() && TM.isPositionIndependent() &&
+- M->getPICLevel() == PICLevel::BigPIC &&
++ M->getPICLevel() != PICLevel::SmallPIC &&
+ MO.getTargetFlags() == PPCII::MO_PLT)
+ Expr =
+ MCBinaryExpr::createAdd(Expr, MCConstantExpr::create(32768, Ctx), Ctx);
diff --git a/srcpkgs/llvm15/patches/llvm-006-aarch64-mf_exec.patch b/srcpkgs/llvm15/patches/llvm-006-aarch64-mf_exec.patch
new file mode 100644
index 000000000000..a00abd216665
--- /dev/null
+++ b/srcpkgs/llvm15/patches/llvm-006-aarch64-mf_exec.patch
@@ -0,0 +1,25 @@
+Fix failures in AllocationTests/MappedMemoryTest.* on aarch64:
+
+ Failing Tests (8):
+ LLVM-Unit :: Support/./SupportTests/AllocationTests/MappedMemoryTest.AllocAndRelease/3
+ LLVM-Unit :: Support/./SupportTests/AllocationTests/MappedMemoryTest.DuplicateNear/3
+ LLVM-Unit :: Support/./SupportTests/AllocationTests/MappedMemoryTest.EnabledWrite/3
+ LLVM-Unit :: Support/./SupportTests/AllocationTests/MappedMemoryTest.MultipleAllocAndRelease/3
+ LLVM-Unit :: Support/./SupportTests/AllocationTests/MappedMemoryTest.SuccessiveNear/3
+ LLVM-Unit :: Support/./SupportTests/AllocationTests/MappedMemoryTest.UnalignedNear/3
+ LLVM-Unit :: Support/./SupportTests/AllocationTests/MappedMemoryTest.ZeroNear/3
+ LLVM-Unit :: Support/./SupportTests/AllocationTests/MappedMemoryTest.ZeroSizeNear/3
+
+Upstream-Issue: https://bugs.llvm.org/show_bug.cgi?id=14278#c10
+
+--- a/llvm/lib/Support/Unix/Memory.inc
++++ b/llvm/lib/Support/Unix/Memory.inc
+@@ -58,7 +58,7 @@ static int getPosixProtectionFlags(unsigned Flags) {
+ return PROT_READ | PROT_WRITE | PROT_EXEC;
+ case llvm::sys::Memory::MF_EXEC:
+ #if (defined(__FreeBSD__) || defined(__POWERPC__) || defined (__ppc__) || \
+- defined(_POWER) || defined(_ARCH_PPC))
++ defined(_POWER) || defined(_ARCH_PPC) || (defined(__linux__) && defined(__aarch64__)))
+ // On PowerPC, having an executable page that has no read permission
+ // can have unintended consequences. The function InvalidateInstruction-
+ // Cache uses instructions dcbf and icbi, both of which are treated by
diff --git a/srcpkgs/llvm15/template b/srcpkgs/llvm15/template
new file mode 100644
index 000000000000..adad30265bef
--- /dev/null
+++ b/srcpkgs/llvm15/template
@@ -0,0 +1,450 @@
+# Template file for 'llvm15'
+pkgname=llvm15
+version=15.0.7
+revision=1
+build_wrksrc=llvm
+build_style=cmake
+_ext_suffix=".cpython-${py3_ver/./}-linux-${XBPS_TARGET_LIBC/glibc/gnu}.so"
+configure_args="
+ -DCMAKE_BUILD_TYPE=Release -Wno-dev
+ -DENABLE_LINKER_BUILD_ID=YES
+ -DLLDB_USE_SYSTEM_SIX=YES
+ -DLIBCXX_CXX_ABI=libcxxabi
+ -DLIBCXX_ENABLE_STATIC_ABI_LIBRARY=YES
+ -DLIBCXXABI_USE_LLVM_UNWINDER=YES
+ -DLIBCXXABI_ENABLE_STATIC_UNWINDER=YES
+ -DLIBOMP_ENABLE_SHARED=YES
+ -DLIBOMP_INSTALL_ALIASES=NO
+ -DLLVM_INCLUDE_DOCS=YES
+ -DLLVM_BUILD_DOCS=YES
+ -DLLVM_ENABLE_SPHINX=YES
+ -DSPHINX_WARNINGS_AS_ERRORS=NO
+ -DLLVM_INSTALL_UTILS=YES
+ -DLLVM_BUILD_LLVM_DYLIB=YES
+ -DLLVM_LINK_LLVM_DYLIB=YES
+ -DLLVM_ENABLE_RTTI=YES
+ -DLLVM_ENABLE_FFI=YES
+ -DLLVM_BINUTILS_INCDIR=/usr/include
+ -DLLVM_ENABLE_PER_TARGET_RUNTIME_DIR=NO
+ -DLLDB_PYTHON_RELATIVE_PATH=lib/python${py3_ver}/site-packages
+ -DLLDB_PYTHON_EXE_RELATIVE_PATH=bin/python${py3_ver}
+ -DLLDB_PYTHON_EXT_SUFFIX=$_ext_suffix"
+hostmakedepends="perl python3 zlib-devel libffi-devel swig python3-Sphinx
+ python3-recommonmark python3-sphinx-automodapi"
+makedepends="python3-devel zlib-devel elfutils-devel libffi-devel libedit-devel
+ libxml2-devel binutils-devel libatomic-devel"
+depends="libllvm15>=${version}_${revision}"
+short_desc="Low Level Virtual Machine"
+maintainer="Orphaned <orphan@voidlinux.org>"
+license="Apache-2.0"
+homepage="https://www.llvm.org"
+distfiles="https://github.com/llvm/llvm-project/releases/download/llvmorg-${version}/llvm-project-${version}.src.tar.xz"
+checksum=8b5fcb24b4128cf04df1b0b9410ce8b1a729cb3c544e6da885d234280dedeac6
+lib32disabled=yes
+python_version=3
+
+if [ "$XBPS_TARGET_LIBC" = "musl" ]; then
+ configure_args+=" -DLIBCXX_HAS_MUSL_LIBC=YES
+ -DCOMPILER_RT_BUILD_GWP_ASAN=OFF"
+fi
+
+# "operand out of range" assembler failures
+case "$XBPS_TARGET_MACHINE" in
+ ppc64*) ;;
+ ppc*) configure_args+=" -DCLANG_ENABLE_CLANGD=OFF" ;;
+esac
+
+_enabled_projects="clang;clang-tools-extra;compiler-rt;libcxx;libcxxabi;libunwind;lld"
+
+_lldb_enable=yes
+_libomp_enable=no
+
+case "$XBPS_TARGET_MACHINE" in
+ ppc64le*) ;;
+ ppc*|i686*|riscv64*) _lldb_enable=no ;;
+esac
+
+case "$XBPS_TARGET_MACHINE" in
+ x86_64*|aarch64*|ppc64*) _libomp_enable=yes;;
+esac
+
+subpackages="clang-tools-extra"
+
+# must go before clang
+if [ "$_libomp_enable" = "yes" ]; then
+ _enabled_projects+=";openmp"
+ subpackages+=" libomp libomp-devel"
+ # because of cmake nonsense referencing libomptarget.so.*
+ depends+=" libomp>=${version}_${revision}"
+ if [ "$CROSS_BUILD" ]; then
+ # Seems to require a full host llvm/clang build
+ configure_args+=" -DLIBOMPTARGET_BUILD_CUDA_PLUGIN=OFF"
+ configure_args+=" -DLIBOMPTARGET_BUILD_AMDGPU_PLUGIN=OFF"
+ fi
+fi
+
+subpackages+=" clang clang-analyzer libclang libclang-cpp
+ llvm-libunwind llvm-libunwind-devel libcxx libcxx-devel
+ libcxxabi libcxxabi-devel libllvm15"
+
+if [ "$_lldb_enable" = "yes" ]; then
+ # XXX fails to cross compile due to python
+ _enabled_projects+=";lldb"
+ subpackages+=" lldb lldb-devel"
+fi
+
+subpackages+=" lld lld-devel"
+
+configure_args+=" -DLLVM_ENABLE_PROJECTS=${_enabled_projects}"
+
+post_patch() {
+ if [ "$_lldb_enable" = "yes" ]; then
+ if [ "$XBPS_TARGET_LIBC" = "musl" ]; then
+ vsed -i 's|__ptrace_request|int|g' \
+ ${wrksrc}/lldb/source/Plugins/Process/Linux/NativeProcessLinux.cpp
+ fi
+ # disable docs for lldb as they fail to generate
+ vsed -i '/add_subdirectory(docs)/d' \
+ ${wrksrc}/lldb/CMakeLists.txt
+ fi
+
+ # update config.guess for better platform detection
+ cp $XBPS_COMMONDIR/environment/configure/automake/config.guess \
+ ${wrksrc}/llvm/cmake
+
+ # fix linker failures on some archs
+ vsed -i 's,check_library_exists(gcc_s .*,set(LIBCXXABI_HAS_GCC_S_LIB ON),' \
+ ${wrksrc}/libcxxabi/cmake/config-ix.cmake
+ vsed -i 's,check_library_exists(gcc .*,set(LIBCXXABI_HAS_GCC_LIB ON),' \
+ ${wrksrc}/libcxxabi/cmake/config-ix.cmake
+
+ # need libssp_nonshared on some musl platforms (because of nodefaultlibs)
+ case "$XBPS_TARGET_MACHINE" in
+ ppc64*) ;;
+ ppc*-musl|i686-musl|mips*-musl)
+ vsed -i 's,^# Setup flags.$,add_library_flags(ssp_nonshared),' \
+ ${wrksrc}/libunwind/src/CMakeLists.txt
+ vsed -i 's,^# Setup flags.$,add_library_flags(ssp_nonshared),' \
+ ${wrksrc}/libcxxabi/src/CMakeLists.txt
+ vsed -i 's,#ssp,,' ${wrksrc}/libcxx/CMakeLists.txt
+ ;;
+ esac
+
+ case "$XBPS_TARGET_MACHINE" in
+ arm*-musl|i686-musl) # sanitizer code is broken since it duplicates some libc bits
+ vsed -i 's/set(COMPILER_RT_HAS_SANITIZER_COMMON TRUE)/set(COMPILER_RT_HAS_SANITIZER_COMMON FALSE)/' \
+ ${wrksrc}/compiler-rt/cmake/config-ix.cmake
+ ;;
+ esac
+}
+
+pre_configure() {
+ local triplet
+
+ # Vastly reduce size of debugging symbols:
+ CFLAGS=${CFLAGS/ -g/ -g1}
+ CXXFLAGS=${CXXFLAGS/ -g/ -g1}
+
+ # since gcc9, the build likes to blow up for ppc32 apparently because
+ # of clang being too large for a 24-bit relative call to the PLT, so
+ # optimize for size instead
+ case "$XBPS_TARGET_MACHINE" in
+ ppc64*) ;;
+ mips*-musl|ppc*) configure_args+=" -DVOID_CXX_OPT_FLAGS=-Os" ;;
+ esac
+
+ if [ "$CROSS_BUILD" ]; then
+ msg_normal "Building host tblgen\n"
+ mkdir -p build/HOST
+ cd build/HOST
+ CC="$BUILD_CC" CXX="$BUILD_CXX" CFLAGS="$BUILD_CFLAGS" \
+ CXXFLAGS="$BUILD_CXXFLAGS" LDFLAGS="$BUILD_LDFLAGS" \
+ cmake ../.. -DCMAKE_BUILD_TYPE=Release \
+ -DLLVM_ENABLE_PROJECTS=${_enabled_projects}
+ make ${makejobs} -C utils/TableGen
+ make ${makejobs} -C tools/clang/utils/TableGen
+ make ${makejobs} -C tools/clang/tools/extra/clang-tidy/misc/ConfusableTable
+ make ${makejobs} -C tools/clang/tools/extra/pseudo/gen
+ [ "$_lldb_enable" = "yes" ] && make ${makejobs} -C tools/lldb/utils/TableGen
+ configure_args+=" -DLLVM_TABLEGEN=${wrksrc}/llvm/build/HOST/bin/llvm-tblgen"
+ configure_args+=" -DCLANG_TABLEGEN=${wrksrc}/llvm/build/HOST/bin/clang-tblgen"
+ configure_args+=" -DCLANG_TIDY_CONFUSABLE_CHARS_GEN=${wrksrc}/llvm/build/HOST/bin/clang-tidy-confusable-chars-gen"
+ configure_args+=" -DCLANG_PSEUDO_GEN=${wrksrc}/llvm/build/HOST/bin/clang-pseudo-gen"
+ [ "$_lldb_enable" = "yes" ] && configure_args+=" -DLLDB_TABLEGEN=${wrksrc}/llvm/build/HOST/bin/lldb-tblgen"
+ cd ../..
+ fi
+
+ case "$XBPS_TARGET_MACHINE" in
+ i686*) _arch="X86";;
+ x86_64*) _arch="X86";;
+ armv5*) _arch="Armv5te";;
+ armv6*) _arch="Armv6";;
+ armv7*) _arch="Armv7";;
+ aarch64*) _arch="AArch64";;
+ mips*) _arch="Mips";;
+ ppc*) _arch="PowerPC";;
+ riscv64*) _arch="RISCV64";;
+ esac
+
+ triplet=${XBPS_CROSS_TRIPLET:-$XBPS_TRIPLET}
+
+ configure_args+=" -DLLVM_TARGET_ARCH=${_arch}"
+ configure_args+=" -DLLVM_HOST_TRIPLE=${triplet}"
+ configure_args+=" -DLLVM_DEFAULT_TARGET_TRIPLE=${triplet}"
+}
+
+do_install() {
+ cd build
+ cmake -DCMAKE_INSTALL_PREFIX=${DESTDIR}/usr -P cmake_install.cmake
+
+ # Required for multilib.
+ if [ "$XBPS_TARGET_MACHINE" = "x86_64" ]; then
+ for _header in llvm-config; do
+ mv ${DESTDIR}/usr/include/llvm/Config/${_header}{,-64}.h
+ vinstall ${FILESDIR}/llvm-Config-${_header}.h 644 \
+ usr/include/llvm/Config ${_header}.h
+ done
+ fi
+
+ # Remove llvm-config-host in cross builds.
+ if [ "$CROSS_BUILD" ]; then
+ rm -f ${DESTDIR}/usr/bin/llvm-config-host
+ fi
+
+ # Install libcxxabi headers
+ vinstall ${wrksrc}/libcxxabi/include/__cxxabi_config.h 644 usr/include
+ vinstall ${wrksrc}/libcxxabi/include/cxxabi.h 644 usr/include
+
+ # Install libunwind headers
+ vinstall ${wrksrc}/libunwind/include/__libunwind_config.h 644 usr/include
+ vinstall ${wrksrc}/libunwind/include/libunwind.h 644 usr/include
+ vinstall ${wrksrc}/libunwind/include/unwind.h 644 usr/include
+ vinstall ${wrksrc}/libunwind/include/mach-o/compact_unwind_encoding.h \
+ 644 usr/include/mach-o
+}
+
+clang-analyzer_package() {
+ pycompile_dirs="usr/share/scan-view"
+ depends="clang-${version}_${revision} python3 perl"
+ short_desc+=" - A source code analysis framework"
+ homepage="https://clang-analyzer.llvm.org/"
+ pkg_install() {
+ vmove "usr/bin/scan-*"
+ vmove "usr/libexec/*analyzer"
+ vmove "usr/share/scan-*"
+ vmove usr/share/man/man1/scan-build.1
+ }
+}
+
+clang-tools-extra_package() {
+ lib32disabled=yes
+ depends="clang-${version}_${revision} python3"
+ short_desc+=" - Extra Clang tools"
+ homepage="https://clang.llvm.org/extra/"
+ pkg_install() {
+ vmove usr/bin/clang-apply-replacements
+ vmove usr/bin/clang-change-namespace
+ vmove usr/bin/clang-doc
+ vmove usr/bin/clang-include-fixer
+ vmove usr/bin/clang-move
+ vmove usr/bin/clang-pseudo
+ vmove usr/bin/clang-query
+ vmove usr/bin/clang-reorder-fields
+ vmove usr/bin/clang-tidy
+ vmove usr/bin/clangd
+ vmove usr/bin/find-all-symbols
+ vmove usr/bin/hmaptool
+ vmove usr/bin/modularize
+ vmove usr/bin/pp-trace
+ vmove usr/include/clang-tidy
+ vmove "usr/lib/libclangApplyReplacements*"
+ vmove "usr/lib/libclangChangeNamespace*"
+ vmove "usr/lib/libclangDaemon*"
+ vmove "usr/lib/libclangDoc*"
+ vmove "usr/lib/libclangIncludeCleaner*"
+ vmove "usr/lib/libclangIncludeFixer*"
+ vmove "usr/lib/libclangMove*"
+ vmove "usr/lib/libclangPseudo*"
+ vmove "usr/lib/libclangReorderFields*"
+ vmove "usr/lib/libclangQuery*"
+ vmove "usr/lib/libclangTidy*"
+ vmove "usr/lib/libclangd*"
+ vmove "usr/lib/libfindAllSymbols*"
+ vmove "usr/share/clang/*find-all-symbols*"
+ vmove "usr/share/clang/*include-fixer*"
+ vmove "usr/share/clang/*tidy*"
+ vmove usr/share/doc/LLVM/clang-tools
+ vmove usr/share/man/man1/extraclangtools.1
+ }
+}
+
+clang_package() {
+ lib32disabled=yes
+ depends="libstdc++-devel libgcc-devel binutils ${XBPS_TARGET_LIBC}-devel
+ libclang-${version}_${revision}"
+ short_desc+=" - C language family frontend"
+ homepage="https://clang.llvm.org/"
+ pkg_install() {
+ vmove "usr/bin/*clang*"
+ vmove usr/bin/c-index-test
+ vmove usr/bin/diagtool
+ vmove usr/include/clang
+ vmove usr/include/clang-c
+ vmove usr/lib/clang
+ vmove usr/lib/cmake/clang
+ vmove "usr/lib/libclang*.a"
+ vmove "usr/lib/libclang*.so"
+ vmove usr/share/clang
+ vmove usr/share/doc/LLVM/clang
+ vmove usr/share/man/man1/clang.1
+ vmove usr/share/man/man1/diagtool.1
+ }
+}
+
+libclang_package() {
+ short_desc+=" - C frontend runtime library"
+ pkg_install() {
+ vmove "usr/lib/libclang.so.*"
+ }
+}
+
+libclang-cpp_package() {
+ short_desc+=" - C frontend runtime library (C++ interface)"
+ pkg_install() {
+ vmove "usr/lib/libclang-cpp.so.*"
+ }
+}
+
+lld_package() {
+ lib32disabled=yes
+ short_desc+=" - linker"
+ homepage="https://lld.llvm.org"
+ pkg_install() {
+ vmove "usr/bin/ld.lld*"
+ vmove "usr/bin/ld64.lld*"
+ vmove "usr/bin/lld*"
+ vmove usr/bin/wasm-ld
+ vmove usr/share/doc/LLVM/lld
+ }
+}
+
+lld-devel_package() {
+ lib32disabled=yes
+ short_desc+=" - linker - development files"
+ homepage="https://lld.llvm.org"
+ depends="lld>=${version}_${revision}"
+ pkg_install() {
+ vmove usr/include/lld
+ vmove usr/lib/cmake/lld
+ vmove "usr/lib/liblld*a"
+ }
+}
+
+lldb_package() {
+ lib32disabled=yes
+ depends+=" python3-six"
+ short_desc+=" - LLDB debugger"
+ homepage="https://lldb.llvm.org/"
+ pkg_install() {
+ vmove "usr/bin/*lldb*"
+ vmove "usr/lib/liblldb*so.*"
+ vmove usr/lib/python*
+ }
+}
+
+lldb-devel_package() {
+ lib32disabled=yes
+ depends="lldb>=${version}_${revision}"
+ short_desc+=" - LLDB debugger - development files"
+ pkg_install() {
+ vmove usr/include/lldb
+ vmove "usr/lib/liblldb*.so"
+ }
+}
+
+llvm-libunwind_package() {
+ short_desc+=" - libunwind"
+ pkg_install() {
+ vmove "usr/lib/libunwind.so.*"
+ }
+}
+
+llvm-libunwind-devel_package() {
+ short_desc+=" - libunwind - development files"
+ depends="llvm-libunwind>=${version}_${revision}"
+ conflicts="libunwind-devel>=0"
+ pkg_install() {
+ vmove usr/include/mach-o
+ vmove "usr/include/*unwind*"
+ vmove "usr/lib/libunwind.a"
+ vmove "usr/lib/libunwind.so"
+ vmove usr/share/doc/LLVM/libunwind
+ }
+}
+
+libcxxabi_package() {
+ short_desc+=" - low level support for libc++"
+ pkg_install() {
+ vmove "usr/lib/libc++abi.so.*"
+ }
+}
+
+libcxxabi-devel_package() {
+ short_desc+=" - low level support for libc++ - development files"
+ depends="libcxxabi>=${version}_${revision}"
+ pkg_install() {
+ vmove "usr/include/*cxxabi*"
+ vmove "usr/lib/libc++abi.so"
+ vmove "usr/lib/libc++abi.a"
+ }
+}
+
+libcxx_package() {
+ short_desc+=" - C++ standard library"
+ pkg_install() {
+ vmove "usr/lib/libc++.so.*"
+ }
+}
+
+libcxx-devel_package() {
+ short_desc+=" - C++ standard library - development files"
+ depends="libcxx>=${version}_${revision}"
+ pkg_install() {
+ vmove usr/include/c++
+ vmove "usr/lib/libc++.so"
+ vmove "usr/lib/libc++.a"
+ vmove "usr/lib/libc++experimental.a"
+ vmove usr/share/doc/LLVM/libcxx
+ }
+}
+
+libomp_package() {
+ short_desc+=" - Clang OpenMP support library"
+ pkg_install() {
+ vmove usr/lib/libarcher.so
+ vmove usr/lib/libompd.so
+ vmove "usr/lib/libomptarget.rtl.*.so"
+ vmove "usr/lib/libomp*.so.*"
+ }
+}
+
+libomp-devel_package() {
+ short_desc+=" - Clang OpenMP support library - development files"
+ depends="libomp>=${version}_${revision}"
+ pkg_install() {
+ vmove "usr/include/omp*.h"
+ vmove "usr/lib/clang/${version}/include/omp*.h"
+ vmove "usr/lib/libarcher*"
+ vmove "usr/lib/libomp*.so"
+ vmove usr/lib/cmake/openmp
+ vmove usr/share/doc/LLVM/openmp
+ vmove usr/share/man/man1/llvmopenmp.1
+ }
+}
+
+libllvm15_package() {
+ short_desc+=" - runtime library"
+ pkg_install() {
+ vmove "usr/lib/libLLVM-*.so*"
+ }
+}
diff --git a/srcpkgs/llvm15/update b/srcpkgs/llvm15/update
new file mode 100644
index 000000000000..e95cf26b3586
--- /dev/null
+++ b/srcpkgs/llvm15/update
@@ -0,0 +1,3 @@
+site="https://github.com/llvm/llvm-project/releases"
+pattern="llvmorg-\K(\d+.){2}\d+(-rc\d+)?"
+ignore="*-rc*"
From ca4b09a3843212ada51c2ada5dd44c21d4f403bb Mon Sep 17 00:00:00 2001
From: Marcin Puc <tranzystorek.io@protonmail.com>
Date: Sun, 18 Dec 2022 00:40:18 +0100
Subject: [PATCH 003/134] llvm: update to 15
---
common/shlibs | 6 +++---
srcpkgs/clang | 2 +-
srcpkgs/clang-analyzer | 2 +-
srcpkgs/clang-tools-extra | 2 +-
srcpkgs/libclang | 2 +-
srcpkgs/libclang-cpp | 2 +-
srcpkgs/libcxx | 2 +-
srcpkgs/libcxx-devel | 2 +-
srcpkgs/libcxxabi | 2 +-
srcpkgs/libcxxabi-devel | 2 +-
srcpkgs/libomp | 2 +-
srcpkgs/libomp-devel | 2 +-
srcpkgs/lld | 2 +-
srcpkgs/lld-devel | 2 +-
srcpkgs/lldb | 2 +-
srcpkgs/lldb-devel | 2 +-
srcpkgs/llvm-libunwind | 2 +-
srcpkgs/llvm-libunwind-devel | 2 +-
srcpkgs/llvm/template | 6 +++---
19 files changed, 23 insertions(+), 23 deletions(-)
diff --git a/common/shlibs b/common/shlibs
index 07a6fa978493..2bb8b25deccb 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -987,9 +987,9 @@ libuchardet.so.0 uchardet-0.0.6_1
libgtksourceviewmm-3.0.so.0 gtksourceviewmm-3.2.0_1
libyajl.so.2 yajl-2.0.1_1
libconfuse.so.2 confuse-3.2.1_1
-liblldb.so.12 lldb-12.0.0_1
-libclang.so.12 libclang-12.0.0_1
-libclang-cpp.so.12 libclang-cpp-12.0.0_1
+liblldb.so.15 lldb-15.0.7_1
+libclang.so.15 libclang-15.0.7_1
+libclang-cpp.so.15 libclang-cpp-15.0.7_1
libLLVM-11.so libllvm11-11.0.0_1
libLLVM-12.so libllvm12-12.0.0_1
libLLVM-15.so libllvm15-15.0.7_1
diff --git a/srcpkgs/clang b/srcpkgs/clang
index cd60fd7a981b..ad57a969b9f9 120000
--- a/srcpkgs/clang
+++ b/srcpkgs/clang
@@ -1 +1 @@
-llvm12
\ No newline at end of file
+llvm15
\ No newline at end of file
diff --git a/srcpkgs/clang-analyzer b/srcpkgs/clang-analyzer
index cd60fd7a981b..ad57a969b9f9 120000
--- a/srcpkgs/clang-analyzer
+++ b/srcpkgs/clang-analyzer
@@ -1 +1 @@
-llvm12
\ No newline at end of file
+llvm15
\ No newline at end of file
diff --git a/srcpkgs/clang-tools-extra b/srcpkgs/clang-tools-extra
index cd60fd7a981b..ad57a969b9f9 120000
--- a/srcpkgs/clang-tools-extra
+++ b/srcpkgs/clang-tools-extra
@@ -1 +1 @@
-llvm12
\ No newline at end of file
+llvm15
\ No newline at end of file
diff --git a/srcpkgs/libclang b/srcpkgs/libclang
index cd60fd7a981b..ad57a969b9f9 120000
--- a/srcpkgs/libclang
+++ b/srcpkgs/libclang
@@ -1 +1 @@
-llvm12
\ No newline at end of file
+llvm15
\ No newline at end of file
diff --git a/srcpkgs/libclang-cpp b/srcpkgs/libclang-cpp
index cd60fd7a981b..ad57a969b9f9 120000
--- a/srcpkgs/libclang-cpp
+++ b/srcpkgs/libclang-cpp
@@ -1 +1 @@
-llvm12
\ No newline at end of file
+llvm15
\ No newline at end of file
diff --git a/srcpkgs/libcxx b/srcpkgs/libcxx
index cd60fd7a981b..ad57a969b9f9 120000
--- a/srcpkgs/libcxx
+++ b/srcpkgs/libcxx
@@ -1 +1 @@
-llvm12
\ No newline at end of file
+llvm15
\ No newline at end of file
diff --git a/srcpkgs/libcxx-devel b/srcpkgs/libcxx-devel
index cd60fd7a981b..ad57a969b9f9 120000
--- a/srcpkgs/libcxx-devel
+++ b/srcpkgs/libcxx-devel
@@ -1 +1 @@
-llvm12
\ No newline at end of file
+llvm15
\ No newline at end of file
diff --git a/srcpkgs/libcxxabi b/srcpkgs/libcxxabi
index cd60fd7a981b..ad57a969b9f9 120000
--- a/srcpkgs/libcxxabi
+++ b/srcpkgs/libcxxabi
@@ -1 +1 @@
-llvm12
\ No newline at end of file
+llvm15
\ No newline at end of file
diff --git a/srcpkgs/libcxxabi-devel b/srcpkgs/libcxxabi-devel
index cd60fd7a981b..ad57a969b9f9 120000
--- a/srcpkgs/libcxxabi-devel
+++ b/srcpkgs/libcxxabi-devel
@@ -1 +1 @@
-llvm12
\ No newline at end of file
+llvm15
\ No newline at end of file
diff --git a/srcpkgs/libomp b/srcpkgs/libomp
index cd60fd7a981b..ad57a969b9f9 120000
--- a/srcpkgs/libomp
+++ b/srcpkgs/libomp
@@ -1 +1 @@
-llvm12
\ No newline at end of file
+llvm15
\ No newline at end of file
diff --git a/srcpkgs/libomp-devel b/srcpkgs/libomp-devel
index cd60fd7a981b..ad57a969b9f9 120000
--- a/srcpkgs/libomp-devel
+++ b/srcpkgs/libomp-devel
@@ -1 +1 @@
-llvm12
\ No newline at end of file
+llvm15
\ No newline at end of file
diff --git a/srcpkgs/lld b/srcpkgs/lld
index cd60fd7a981b..ad57a969b9f9 120000
--- a/srcpkgs/lld
+++ b/srcpkgs/lld
@@ -1 +1 @@
-llvm12
\ No newline at end of file
+llvm15
\ No newline at end of file
diff --git a/srcpkgs/lld-devel b/srcpkgs/lld-devel
index cd60fd7a981b..ad57a969b9f9 120000
--- a/srcpkgs/lld-devel
+++ b/srcpkgs/lld-devel
@@ -1 +1 @@
-llvm12
\ No newline at end of file
+llvm15
\ No newline at end of file
diff --git a/srcpkgs/lldb b/srcpkgs/lldb
index cd60fd7a981b..ad57a969b9f9 120000
--- a/srcpkgs/lldb
+++ b/srcpkgs/lldb
@@ -1 +1 @@
-llvm12
\ No newline at end of file
+llvm15
\ No newline at end of file
diff --git a/srcpkgs/lldb-devel b/srcpkgs/lldb-devel
index cd60fd7a981b..ad57a969b9f9 120000
--- a/srcpkgs/lldb-devel
+++ b/srcpkgs/lldb-devel
@@ -1 +1 @@
-llvm12
\ No newline at end of file
+llvm15
\ No newline at end of file
diff --git a/srcpkgs/llvm-libunwind b/srcpkgs/llvm-libunwind
index cd60fd7a981b..ad57a969b9f9 120000
--- a/srcpkgs/llvm-libunwind
+++ b/srcpkgs/llvm-libunwind
@@ -1 +1 @@
-llvm12
\ No newline at end of file
+llvm15
\ No newline at end of file
diff --git a/srcpkgs/llvm-libunwind-devel b/srcpkgs/llvm-libunwind-devel
index cd60fd7a981b..ad57a969b9f9 120000
--- a/srcpkgs/llvm-libunwind-devel
+++ b/srcpkgs/llvm-libunwind-devel
@@ -1 +1 @@
-llvm12
\ No newline at end of file
+llvm15
\ No newline at end of file
diff --git a/srcpkgs/llvm/template b/srcpkgs/llvm/template
index a92db6f94f9f..fc1c850bd26f 100644
--- a/srcpkgs/llvm/template
+++ b/srcpkgs/llvm/template
@@ -1,11 +1,11 @@
# Template file for 'llvm'
pkgname=llvm
-version=12.0.0
+version=15
revision=1
build_style=meta
-depends="llvm12"
-replaces="llvm11>=0 llvm10>=0 llvm9>=0 llvm8>=0 llvm7>=0 llvm6.0>=0 llvm3.9>=0"
+depends="llvm15"
short_desc="LLVM meta package"
maintainer="Enno Boland <gottox@voidlinux.org>"
license="Public Domain"
homepage="https://www.voidlinux.org"
+replaces="llvm12>=0 llvm11>=0 llvm10>=0 llvm9>=0 llvm8>=0 llvm7>=0 llvm6.0>=0 llvm3.9>=0"
From 05e5b4f368de9069ba8353829d0ab1956e09de1a Mon Sep 17 00:00:00 2001
From: Marcin Puc <tranzystorek.io@protonmail.com>
Date: Sun, 18 Dec 2022 12:20:08 +0100
Subject: [PATCH 004/134] llvm12: remove bumped subpackages
---
srcpkgs/llvm12/template | 264 +---------------------------------------
1 file changed, 1 insertion(+), 263 deletions(-)
diff --git a/srcpkgs/llvm12/template b/srcpkgs/llvm12/template
index f8ea3ba641ae..aea0b43cf573 100644
--- a/srcpkgs/llvm12/template
+++ b/srcpkgs/llvm12/template
@@ -50,55 +50,7 @@ case "$XBPS_TARGET_MACHINE" in
ppc*) configure_args+=" -DCLANG_ENABLE_CLANGD=OFF" ;;
esac
-_enabled_projects="clang;clang-tools-extra;compiler-rt;libcxx;libcxxabi;libunwind;lld"
-
-_lldb_enable=yes
-_libomp_enable=no
-
-case "$XBPS_TARGET_MACHINE" in
- ppc64le*) ;;
- ppc*|i686*) _lldb_enable=no ;;
-esac
-
-case "$XBPS_TARGET_MACHINE" in
- x86_64*|aarch64*|ppc64*) _libomp_enable=yes;;
-esac
-
-subpackages="clang-tools-extra"
-
-# must go before clang
-if [ "$_libomp_enable" = "yes" ]; then
- _enabled_projects+=";openmp"
- subpackages+=" libomp libomp-devel"
- # because of cmake nonsense referencing libomptarget.so.*
- depends+=" libomp>=${version}_${revision}"
-fi
-
-subpackages+=" clang clang-analyzer libclang libclang-cpp
- llvm-libunwind llvm-libunwind-devel libcxx libcxx-devel
- libcxxabi libcxxabi-devel libllvm12"
-
-if [ "$_lldb_enable" = "yes" ]; then
- # XXX fails to cross compile due to python
- _enabled_projects+=";lldb"
- subpackages+=" lldb lldb-devel"
-fi
-
-subpackages+=" lld lld-devel"
-
-configure_args+=" -DLLVM_ENABLE_PROJECTS=${_enabled_projects}"
-
post_patch() {
- if [ "$_lldb_enable" = "yes" ]; then
- if [ "$XBPS_TARGET_LIBC" = "musl" ]; then
- vsed -i 's|__ptrace_request|int|g' \
- ${wrksrc}/lldb/source/Plugins/Process/Linux/NativeProcessLinux.cpp
- fi
- # disable docs for lldb as they fail to generate
- vsed -i '/add_subdirectory(docs)/d' \
- ${wrksrc}/lldb/CMakeLists.txt
- fi
-
# update config.guess for better platform detection
cp $XBPS_COMMONDIR/environment/configure/automake/config.guess \
${wrksrc}/llvm/cmake
@@ -154,14 +106,12 @@ pre_configure() {
cd build/HOST
CC="$BUILD_CC" CXX="$BUILD_CXX" CFLAGS="$BUILD_CFLAGS" \
CXXFLAGS="$BUILD_CXXFLAGS" LDFLAGS="$BUILD_LDFLAGS" \
- cmake ../.. -DCMAKE_BUILD_TYPE=Release \
- -DLLVM_ENABLE_PROJECTS=${_enabled_projects}
+ cmake ../.. -DCMAKE_BUILD_TYPE=Release
make ${makejobs} -C utils/TableGen
make ${makejobs} -C tools/clang/utils/TableGen
[ "$_lldb_enable" = "yes" ] && make ${makejobs} -C tools/lldb/utils/TableGen
configure_args+=" -DLLVM_TABLEGEN=${wrksrc}/llvm/build/HOST/bin/llvm-tblgen"
configure_args+=" -DCLANG_TABLEGEN=${wrksrc}/llvm/build/HOST/bin/clang-tblgen"
- [ "$_lldb_enable" = "yes" ] && configure_args+=" -DLLDB_TABLEGEN=${wrksrc}/llvm/build/HOST/bin/lldb-tblgen"
cd ../..
fi
@@ -201,218 +151,6 @@ do_install() {
if [ "$CROSS_BUILD" ]; then
rm -f ${DESTDIR}/usr/bin/llvm-config-host
fi
-
- # Install libcxxabi headers
- vinstall ${wrksrc}/libcxxabi/include/__cxxabi_config.h 644 usr/include
- vinstall ${wrksrc}/libcxxabi/include/cxxabi.h 644 usr/include
-
- # Install libunwind headers
- vinstall ${wrksrc}/libunwind/include/__libunwind_config.h 644 usr/include
- vinstall ${wrksrc}/libunwind/include/libunwind.h 644 usr/include
- vinstall ${wrksrc}/libunwind/include/unwind.h 644 usr/include
- vinstall ${wrksrc}/libunwind/include/mach-o/compact_unwind_encoding.h \
- 644 usr/include/mach-o
-}
-
-clang-analyzer_package() {
- pycompile_dirs="usr/share/scan-view"
- depends="clang-${version}_${revision} python3 perl"
- short_desc+=" - A source code analysis framework"
- homepage="https://clang-analyzer.llvm.org/"
- pkg_install() {
- vmove usr/share/man/man1/scan-build.1
- vmove "/usr/bin/scan-*"
- vmove "/usr/share/scan-*"
- vmove "/usr/libexec/*analyzer"
- }
-}
-
-clang-tools-extra_package() {
- lib32disabled=yes
- depends="clang-${version}_${revision} python3"
- short_desc+=" - Extra Clang tools"
- homepage="https://clang.llvm.org/extra/"
- pkg_install() {
- vmove usr/include/clang-tidy
- vmove usr/bin/clang-apply-replacements
- vmove usr/bin/clang-query
- vmove usr/bin/clang-rename
- vmove usr/bin/clang-tidy
- vmove usr/bin/diagtool
- vmove usr/bin/find-all-symbols
- vmove usr/bin/hmaptool
- vmove usr/bin/modularize
- vmove usr/bin/pp-trace
- vmove usr/bin/sancov
- vmove "usr/lib/libclangApplyReplacements*"
- vmove "usr/lib/libclangQuery*"
- vmove "usr/lib/libclangTidy*"
- vmove "usr/share/clang/*tidy*"
- vmove usr/share/doc/clang-tools
- vmove usr/share/man/man1/extraclangtools.1
- vmove usr/share/man/man1/diagtool.1
- }
-}
-
-clang_package() {
- lib32disabled=yes
- depends="libstdc++-devel libgcc-devel binutils ${XBPS_TARGET_LIBC}-devel
- libclang-${version}_${revision}"
- short_desc+=" - C language family frontend"
- homepage="https://clang.llvm.org/"
- pkg_install() {
- vmove usr/include/clang
- vmove usr/include/clang-c
- vmove "usr/bin/*clang*"
- vmove usr/bin/c-index-test
- vmove usr/lib/clang
- vmove usr/lib/cmake/clang
- vmove "usr/lib/libclang*.a"
- vmove "usr/lib/libclang*.so"
- vmove usr/share/clang
- vmove usr/share/doc/clang
- vmove usr/share/man/man1/clang.1
- }
-}
-
-libclang_package() {
- short_desc+=" - C frontend runtime library"
- pkg_install() {
- vmove "usr/lib/libclang.so.*"
- }
-}
-
-libclang-cpp_package() {
- short_desc+=" - C frontend runtime library (C++ interface)"
- pkg_install() {
- vmove "usr/lib/libclang-cpp.so.*"
- }
-}
-
-lld_package() {
- lib32disabled=yes
- short_desc+=" - linker"
- homepage="https://lld.llvm.org"
- pkg_install() {
- vmove usr/bin/lld*
- vmove usr/bin/wasm-ld
- vmove usr/bin/ld.lld*
- vmove usr/bin/ld64.lld*
- vmove usr/share/doc/lld
- }
-}
-
-lld-devel_package() {
- lib32disabled=yes
- short_desc+=" - linker - development files"
- homepage="https://lld.llvm.org"
- depends="lld>=${version}_${revision}"
- pkg_install() {
- vmove usr/include/lld
- vmove usr/lib/cmake/lld
- vmove "usr/lib/liblld*a"
- }
-}
-
-lldb_package() {
- lib32disabled=yes
- depends+=" python3-six"
- short_desc+=" - LLDB debugger"
- homepage="https://lldb.llvm.org/"
- pkg_install() {
- vmove usr/bin/*lldb*
- vmove usr/lib/liblldb*so.*
- vmove /usr/lib/python*
- }
-}
-
-lldb-devel_package() {
- lib32disabled=yes
- depends="lldb>=${version}_${revision}"
- short_desc+=" - LLDB debugger - development files"
- pkg_install() {
- vmove usr/include/lldb
- vmove "usr/lib/liblldb*.so"
- }
-}
-
-llvm-libunwind_package() {
- short_desc+=" - libunwind"
- pkg_install() {
- vmove "usr/lib/libunwind.so.*"
- }
-}
-
-llvm-libunwind-devel_package() {
- short_desc+=" - libunwind - development files"
- depends="llvm-libunwind>=${version}_${revision}"
- conflicts="libunwind-devel>=0"
- pkg_install() {
- vmove usr/lib/libunwind.so
- vmove usr/lib/libunwind.a
- vmove "usr/include/*unwind*"
- vmove usr/include/mach-o
- vmove usr/share/doc/libunwind
- }
-}
-
-libcxxabi_package() {
- short_desc+=" - low level support for libc++"
- pkg_install() {
- vmove "usr/lib/libc++abi.so.*"
- }
-}
-
-libcxxabi-devel_package() {
- short_desc+=" - low level support for libc++ - development files"
- depends="libcxxabi>=${version}_${revision}"
- pkg_install() {
- vmove usr/lib/libc++abi.so
- vmove usr/lib/libc++abi.a
- vmove "usr/include/*cxxabi*"
- }
-}
-
-libcxx_package() {
- short_desc+=" - C++ standard library"
- pkg_install() {
- vmove "usr/lib/libc++.so.*"
- }
-}
-
-libcxx-devel_package() {
- short_desc+=" - C++ standard library - development files"
- depends="libcxx>=${version}_${revision}"
- pkg_install() {
- vmove usr/lib/libc++.so
- vmove usr/lib/libc++.a
- vmove usr/lib/libc++experimental.a
- vmove usr/include/c++
- vmove usr/share/doc/libcxx
- }
-}
-
-libomp_package() {
- short_desc+=" - Clang OpenMP support library"
- pkg_install() {
- vmove usr/lib/libomp.so
- vmove "usr/lib/libomptarget.rtl.*.so"
- vmove usr/lib/libarcher.so
- vmove "usr/lib/libomp*.so.*"
- }
-}
-
-libomp-devel_package() {
- short_desc+=" - Clang OpenMP support library - development files"
- depends="libomp>=${version}_${revision}"
- pkg_install() {
- vmove "usr/lib/libomp*.so"
- vmove "usr/lib/libarcher*"
- vmove "usr/include/omp*.h"
- vmove "usr/lib/clang/${version}/include/omp*.h"
- vmove usr/share/man/man1/llvmopenmp.1
- vmove usr/share/doc/openmp
- }
}
libllvm12_package() {
From de52d9184210a08bffcedcc409a0c4fb1e9b25b4 Mon Sep 17 00:00:00 2001
From: Marcin Puc <tranzystorek.io@protonmail.com>
Date: Thu, 5 Jan 2023 15:11:06 +0100
Subject: [PATCH 005/134] SPIRV-LLVM-Translator: update to 15.0.0
---
common/shlibs | 2 +-
srcpkgs/SPIRV-LLVM-Translator/template | 13 +++++++------
2 files changed, 8 insertions(+), 7 deletions(-)
diff --git a/common/shlibs b/common/shlibs
index 2bb8b25deccb..e5071f45c0c8 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -993,7 +993,7 @@ libclang-cpp.so.15 libclang-cpp-15.0.7_1
libLLVM-11.so libllvm11-11.0.0_1
libLLVM-12.so libllvm12-12.0.0_1
libLLVM-15.so libllvm15-15.0.7_1
-libLLVMSPIRVLib.so.12 SPIRV-LLVM-Translator-12.0.0_1
+libLLVMSPIRVLib.so.15 SPIRV-LLVM-Translator-15.0.0_1
libomp.so.5 libomp-15.0.7_1
libomptarget.so.15 libomp-15.0.7_1
libisofs.so.6 libisofs-0.6.24_1
diff --git a/srcpkgs/SPIRV-LLVM-Translator/template b/srcpkgs/SPIRV-LLVM-Translator/template
index a2754e58c0e8..bee99f9bcbb2 100644
--- a/srcpkgs/SPIRV-LLVM-Translator/template
+++ b/srcpkgs/SPIRV-LLVM-Translator/template
@@ -1,19 +1,20 @@
# Template file for 'SPIRV-LLVM-Translator'
pkgname=SPIRV-LLVM-Translator
-version=12.0.0
-revision=2
+version=15.0.0
+revision=1
build_style=cmake
make_build_args="llvm-spirv"
configure_args="-Wno-dev -DLLVM_LINK_LLVM_DYLIB=ON -DCMAKE_SKIP_RPATH=ON
- -DLLVM_SPIRV_INCLUDE_TESTS=OFF -DBUILD_SHARED_LIBS=ON"
+ -DLLVM_SPIRV_INCLUDE_TESTS=OFF -DBUILD_SHARED_LIBS=ON
+ -DLLVM_EXTERNAL_SPIRV_HEADERS_SOURCE_DIR=/usr"
hostmakedepends="clang llvm"
-makedepends="clang-tools-extra llvm"
+makedepends="clang-tools-extra llvm SPIRV-Headers"
short_desc="API and commands for processing SPIR-V modules"
maintainer="Orphaned <orphan@voidlinux.org>"
license="NCSA"
homepage="https://github.com/KhronosGroup/SPIRV-LLVM-Translator"
-distfiles="https://github.com/KhronosGroup/${pkgname}/archive/refs/tags/v${version}.tar.gz"
-checksum=6e4fad04203f25fcde4c308c53e9f59bd05a390978992db3212d4b63aff62108
+distfiles="https://github.com/KhronosGroup/SPIRV-LLVM-Translator/archive/refs/tags/v${version}.tar.gz"
+checksum=b1bebd77f72988758c00852e78c2ddc545815a612169a0cb377d021e2f846d88
post_install() {
vlicense LICENSE.TXT
From 27f76291703d51f198180fa3b7d69f01f8db08f2 Mon Sep 17 00:00:00 2001
From: Marcin Puc <tranzystorek.io@protonmail.com>
Date: Thu, 5 Jan 2023 14:27:03 +0100
Subject: [PATCH 006/134] mesa: rebuild for llvm15
---
srcpkgs/mesa/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/mesa/template b/srcpkgs/mesa/template
index d9ff0b2ff23d..132263d3599f 100644
--- a/srcpkgs/mesa/template
+++ b/srcpkgs/mesa/template
@@ -1,7 +1,7 @@
# Template file for 'mesa'
pkgname=mesa
version=22.3.5
-revision=1
+revision=2
build_style=meson
configure_args="-Dglvnd=true -Dshared-glapi=enabled -Dgbm=enabled -Degl=enabled
-Dosmesa=true -Dgles1=enabled -Dgles2=enabled -Dglx=dri -Ddri3=enabled
From 5979017193e04f199d5768ff304158b1ab020ba4 Mon Sep 17 00:00:00 2001
From: Marcin Puc <tranzystorek.io@protonmail.com>
Date: Thu, 5 Jan 2023 14:34:04 +0100
Subject: [PATCH 007/134] bcc: rebuild for llvm15
---
srcpkgs/bcc/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/bcc/template b/srcpkgs/bcc/template
index 7526580f17ed..bdbcff7227a0 100644
--- a/srcpkgs/bcc/template
+++ b/srcpkgs/bcc/template
@@ -1,7 +1,7 @@
# Template file for 'bcc'
pkgname=bcc
version=0.26.0
-revision=2
+revision=3
build_style=cmake
configure_args="-DREVISION=${version} -DENABLE_LLVM_SHARED=1"
hostmakedepends="flex python3-setuptools"
From 796ddd906ae5b86f814072c5703511b4a1cadb0d Mon Sep 17 00:00:00 2001
From: Marcin Puc <tranzystorek.io@protonmail.com>
Date: Thu, 5 Jan 2023 14:37:25 +0100
Subject: [PATCH 008/134] bpftrace: rebuild for llvm15
---
srcpkgs/bpftrace/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/bpftrace/template b/srcpkgs/bpftrace/template
index 574930427ad1..eb8e37994498 100644
--- a/srcpkgs/bpftrace/template
+++ b/srcpkgs/bpftrace/template
@@ -1,7 +1,7 @@
# Template file for 'bpftrace'
pkgname=bpftrace
version=0.17.0
-revision=2
+revision=3
archs="x86_64* aarch64* ppc64*"
build_style=cmake
configure_args="-DUSE_SYSTEM_BPF_BCC=ON -DBUILD_TESTING=OFF" # needs root to run
From 63ca68a14d1fee757bc5ee832b0f573bdb9f985c Mon Sep 17 00:00:00 2001
From: Marcin Puc <tranzystorek.io@protonmail.com>
Date: Thu, 5 Jan 2023 14:43:53 +0100
Subject: [PATCH 009/134] CastXML: rebuild for llvm15
---
srcpkgs/CastXML/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/CastXML/template b/srcpkgs/CastXML/template
index 00e82ac66b50..de0920900ae4 100644
--- a/srcpkgs/CastXML/template
+++ b/srcpkgs/CastXML/template
@@ -1,7 +1,7 @@
# Template file for 'CastXML'
pkgname=CastXML
version=0.5.1
-revision=1
+revision=2
build_style=cmake
configure_args="-DSPHINX_MAN=YES -DCastXML_INSTALL_MAN_DIR=share/man"
hostmakedepends="clang python3-Sphinx"
@@ -12,7 +12,7 @@ short_desc="C-family abstract syntax tree XML output tool"
maintainer="Evgeny Ermakov <evgeny.v.ermakov@gmail.com>"
license="Apache-2.0"
homepage="https://github.com/CastXML/CastXML"
-distfiles="https://github.com/CastXML/CastXML/archive/v${version}.tar.gz"
+distfiles="https://github.com/CastXML/CastXML/archive/refs/tags/v${version}.tar.gz"
checksum=a7b40b1530585672f9cf5d7a6b6dd29f20c06cd5edf34ef34c89a184a4d1a006
post_install() {
From fb2d634ce67090d323dd5bd2ba471c87e9b56133 Mon Sep 17 00:00:00 2001
From: Marcin Puc <tranzystorek.io@protonmail.com>
Date: Thu, 5 Jan 2023 14:48:55 +0100
Subject: [PATCH 010/134] ccls: rebuild for llvm15
---
srcpkgs/ccls/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/ccls/template b/srcpkgs/ccls/template
index 82fa61933878..ecc9f3e38a5d 100644
--- a/srcpkgs/ccls/template
+++ b/srcpkgs/ccls/template
@@ -1,7 +1,7 @@
# Template file for 'ccls'
pkgname=ccls
version=0.20220729
-revision=1
+revision=2
build_style=cmake
hostmakedepends="clang-tools-extra"
makedepends="clang-tools-extra libxml2-devel llvm ncurses-devel rapidjson zlib-devel"
From 465214a10af3a9c366957e26ad7cc126833c4413 Mon Sep 17 00:00:00 2001
From: Marcin Puc <tranzystorek.io@protonmail.com>
Date: Thu, 5 Jan 2023 14:52:14 +0100
Subject: [PATCH 011/134] include-what-you-use: update to 0.19
---
srcpkgs/include-what-you-use/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/include-what-you-use/template b/srcpkgs/include-what-you-use/template
index d3655709c20c..1a30bc04bb2d 100644
--- a/srcpkgs/include-what-you-use/template
+++ b/srcpkgs/include-what-you-use/template
@@ -1,6 +1,6 @@
# Template file for 'include-what-you-use'
pkgname=include-what-you-use
-version=0.16
+version=0.19
revision=1
build_style=cmake
configure_args="-DIWYU_LLVM_ROOT_PATH=${XBPS_CROSS_BASE}/usr "
@@ -11,7 +11,7 @@ maintainer="Leah Neukirchen <leah@vuxu.org>"
license="NCSA"
homepage="https://include-what-you-use.org/"
distfiles="https://include-what-you-use.org/downloads/${pkgname}-${version}.src.tar.gz"
-checksum=8d6fc9b255343bc1e5ec459e39512df1d51c60e03562985e0076036119ff5a1c
+checksum=2b10157b60ea08adc08e3896b4921c73fcadd5ec4eb652b29a34129d501e5ee0
python_version=3
post_install() {
From 64891bbe2efa0db80421822d7ba8e2532363b529 Mon Sep 17 00:00:00 2001
From: Marcin Puc <tranzystorek.io@protonmail.com>
Date: Fri, 6 Jan 2023 17:11:04 +0100
Subject: [PATCH 012/134] rtags: rebuild for llvm15
---
srcpkgs/rtags/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/rtags/template b/srcpkgs/rtags/template
index b496a1b0e721..9b161e690d76 100644
--- a/srcpkgs/rtags/template
+++ b/srcpkgs/rtags/template
@@ -1,7 +1,7 @@
# Template file for 'rtags'
pkgname=rtags
version=2.38
-revision=5
+revision=6
build_style=cmake
# Don't run tests in do_install, please.
configure_args="-DSKIP_CTEST=TRUE"
From 3788f7dfbdda72fb41ca4261700b841028eab150 Mon Sep 17 00:00:00 2001
From: Marcin Puc <tranzystorek.io@protonmail.com>
Date: Fri, 6 Jan 2023 17:14:14 +0100
Subject: [PATCH 013/134] juCi++: rebuild for llvm15
---
srcpkgs/juCi++/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/juCi++/template b/srcpkgs/juCi++/template
index c1969237f11d..416bde7cc4d0 100644
--- a/srcpkgs/juCi++/template
+++ b/srcpkgs/juCi++/template
@@ -1,7 +1,7 @@
# Template file for 'juCi++'
pkgname=juCi++
version=1.7.2
-revision=2
+revision=3
_libclangmm_commit="9704b9b6de0982a588fa41741157d5640afedf30"
_tiny_commit="839ff806dc447ff49af80f9a9eaa7949f770f8e5"
create_wrksrc=yes
From e1f5a6acc68600f767ff98f356cda25cbb47f6c8 Mon Sep 17 00:00:00 2001
From: Marcin Puc <tranzystorek.io@protonmail.com>
Date: Sat, 7 Jan 2023 11:31:14 +0100
Subject: [PATCH 014/134] qt5: rebuild for llvm15
---
srcpkgs/qt5/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/qt5/template b/srcpkgs/qt5/template
index f4f9f5b5344a..b517b49ead2d 100644
--- a/srcpkgs/qt5/template
+++ b/srcpkgs/qt5/template
@@ -5,7 +5,7 @@ pkgname=qt5
version=5.15.7+20221119
# commit f8c9fb304bc3e53b3aa07f962cd74e9160decccc
# base repo: https://invent.kde.org/qt/qt/qt5
-revision=1
+revision=2
build_style=meta
hostmakedepends="cmake clang flex perl glib-devel pkg-config
python re2c ruby which"
From b2c914f4566c9340b9de8b1a8dc0587c84c0c6c6 Mon Sep 17 00:00:00 2001
From: Marcin Puc <tranzystorek.io@protonmail.com>
Date: Mon, 9 Jan 2023 01:22:18 +0100
Subject: [PATCH 015/134] codelite: rebuild for llvm15
---
srcpkgs/codelite/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/codelite/template b/srcpkgs/codelite/template
index 6b8b007c8a43..c6115e0274ce 100644
--- a/srcpkgs/codelite/template
+++ b/srcpkgs/codelite/template
@@ -1,7 +1,7 @@
# Template file for 'codelite'
pkgname=codelite
version=16.0.0
-revision=2
+revision=3
create_wrksrc=yes
build_style=cmake
build_helper=cmake-wxWidgets-gtk3
From 923abc83902ba0e5873f64c64cf3f0b0ffa798e5 Mon Sep 17 00:00:00 2001
From: Marcin Puc <tranzystorek.io@protonmail.com>
Date: Mon, 9 Jan 2023 01:58:21 +0100
Subject: [PATCH 016/134] kdevelop: rebuild for llvm15
---
srcpkgs/kdevelop/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/kdevelop/template b/srcpkgs/kdevelop/template
index 69c9bba1b881..87bb6b2d43f7 100644
--- a/srcpkgs/kdevelop/template
+++ b/srcpkgs/kdevelop/template
@@ -1,7 +1,7 @@
# Template file for 'kdevelop'
pkgname=kdevelop
version=22.12.2
-revision=1
+revision=2
build_style=cmake
configure_args="-DBUILD_TESTING=OFF"
hostmakedepends="extra-cmake-modules qt5-qmake qt5-host-tools qt5-tools
From 4c474d867195be07d4c74b478a5dba2098f83fa9 Mon Sep 17 00:00:00 2001
From: Marcin Puc <tranzystorek.io@protonmail.com>
Date: Mon, 16 Jan 2023 14:43:47 +0100
Subject: [PATCH 017/134] zig: update to 0.10.1
---
.../0001-std.build-fix-handling-of-Dcpu.patch | 48 -------------------
srcpkgs/zig/template | 10 ++--
2 files changed, 6 insertions(+), 52 deletions(-)
delete mode 100644 srcpkgs/zig/patches/0001-std.build-fix-handling-of-Dcpu.patch
diff --git a/srcpkgs/zig/patches/0001-std.build-fix-handling-of-Dcpu.patch b/srcpkgs/zig/patches/0001-std.build-fix-handling-of-Dcpu.patch
deleted file mode 100644
index 4101f24459bb..000000000000
--- a/srcpkgs/zig/patches/0001-std.build-fix-handling-of-Dcpu.patch
+++ /dev/null
@@ -1,48 +0,0 @@
-From 1e8cdace7ad324a42228aeb5cd6eb8dd15429413 Mon Sep 17 00:00:00 2001
-From: Isaac Freund <ifreund@ifreund.xyz>
-Date: Tue, 21 Sep 2021 21:06:10 +0200
-Subject: [PATCH] std.build: fix handling of -Dcpu
-
-Currently -Dcpu is completely ignored if -Dtarget isn't passed as well.
-Further, -Dcpu=baseline is ignored even if -Dtarget=native is passed.
-
-This patch fixes these 2 issues, always respecting the -Dcpu option if
-present.
----
- lib/std/build.zig | 13 +++++++------
- 1 file changed, 7 insertions(+), 6 deletions(-)
-
-diff --git a/lib/std/build.zig b/lib/std/build.zig
-index 9b7ebb1f4..e398529f9 100644
---- a/lib/std/build.zig
-+++ b/lib/std/build.zig
-@@ -685,7 +685,11 @@ pub const Builder = struct {
- );
- const mcpu = self.option([]const u8, "cpu", "Target CPU");
-
-- const triple = maybe_triple orelse return args.default_target;
-+ if (maybe_triple == null and mcpu == null) {
-+ return args.default_target;
-+ }
-+
-+ const triple = maybe_triple orelse "native";
-
- var diags: CrossTarget.ParseOptions.Diagnostics = .{};
- const selected_target = CrossTarget.parse(.{
-@@ -2451,11 +2455,8 @@ pub const LibExeObjStep = struct {
-
- if (populated_cpu_features.eql(cross.cpu.features)) {
- // The CPU name alone is sufficient.
-- // If it is the baseline CPU, no command line args are required.
-- if (cross.cpu.model != std.Target.Cpu.baseline(cross.cpu.arch).model) {
-- try zig_args.append("-mcpu");
-- try zig_args.append(cross.cpu.model.name);
-- }
-+ try zig_args.append("-mcpu");
-+ try zig_args.append(cross.cpu.model.name);
- } else {
- var mcpu_buffer = std.ArrayList(u8).init(builder.allocator);
-
---
-2.33.1
-
diff --git a/srcpkgs/zig/template b/srcpkgs/zig/template
index 728c5a64e9df..9807f7ab206b 100644
--- a/srcpkgs/zig/template
+++ b/srcpkgs/zig/template
@@ -1,17 +1,19 @@
# Template file for 'zig'
pkgname=zig
-version=0.8.1
-revision=2
+version=0.10.1
+revision=1
archs="x86_64* aarch64*"
build_style=cmake
make_cmd=make
-makedepends="clang llvm12 lld-devel"
+# we add xml2, zstd, zlib and ncurses
+# because our lld is static-only and requires those to work
+makedepends="clang llvm15 lld-devel libxml2-devel libzstd-devel ncurses-devel zlib-devel"
short_desc="Programming language designed for robustness, optimality, and clarity"
maintainer="Isaac Freund <mail@isaacfreund.com>"
license="MIT"
homepage="https://ziglang.org"
distfiles="https://ziglang.org/download/${version}/zig-${version}.tar.xz"
-checksum=8c428e14a0a89cb7a15a6768424a37442292858cdb695e2eb503fa3c7bf47f1a
+checksum=69459bc804333df077d441ef052ffa143d53012b655a51f04cfef1414c04168c
nopie=yes
nocross=yes
From effcade809c037097952ec0f72ef08cd406aa59d Mon Sep 17 00:00:00 2001
From: Marcin Puc <tranzystorek.io@protonmail.com>
Date: Tue, 24 Jan 2023 14:03:51 +0100
Subject: [PATCH 018/134] river: update to 0.2.3
---
...ble-PIE-for-river-riverctl-rivertile.patch | 42 -------------------
srcpkgs/river/template | 10 ++---
2 files changed, 5 insertions(+), 47 deletions(-)
delete mode 100644 srcpkgs/river/patches/0001-Enable-PIE-for-river-riverctl-rivertile.patch
diff --git a/srcpkgs/river/patches/0001-Enable-PIE-for-river-riverctl-rivertile.patch b/srcpkgs/river/patches/0001-Enable-PIE-for-river-riverctl-rivertile.patch
deleted file mode 100644
index ecc68302db09..000000000000
--- a/srcpkgs/river/patches/0001-Enable-PIE-for-river-riverctl-rivertile.patch
+++ /dev/null
@@ -1,42 +0,0 @@
-From 759c1c7a915083f3da46960ff82fa2a3566a7065 Mon Sep 17 00:00:00 2001
-From: Isaac Freund <mail@isaacfreund.com>
-Date: Wed, 3 Nov 2021 14:21:35 +0100
-Subject: [PATCH] Enable PIE for river, riverctl, rivertile
-
-There is sadly not yet a standard way to do this exposed by the zig
-build system. See: https://github.com/ziglang/zig/issues/7201
----
- build.zig | 3 +++
- 1 file changed, 3 insertions(+)
-
-diff --git a/build.zig b/build.zig
-index d561f49..8ac9a4e 100644
---- a/build.zig
-+++ b/build.zig
-@@ -85,6 +85,7 @@ pub fn build(b: *zbs.Builder) !void {
- const river = b.addExecutable("river", "river/main.zig");
- river.setTarget(target);
- river.setBuildMode(mode);
-+ river.pie = true;
- river.addBuildOption(bool, "xwayland", xwayland);
- river.addBuildOption([:0]const u8, "version", full_version);
-
-@@ -97,6 +98,7 @@ pub fn build(b: *zbs.Builder) !void {
- const riverctl = b.addExecutable("riverctl", "riverctl/main.zig");
- riverctl.setTarget(target);
- riverctl.setBuildMode(mode);
-+ riverctl.pie = true;
- riverctl.addBuildOption([:0]const u8, "version", full_version);
-
- riverctl.step.dependOn(&scanner.step);
-@@ -114,6 +116,7 @@ pub fn build(b: *zbs.Builder) !void {
- const rivertile = b.addExecutable("rivertile", "rivertile/main.zig");
- rivertile.setTarget(target);
- rivertile.setBuildMode(mode);
-+ rivertile.pie = true;
- rivertile.addBuildOption([:0]const u8, "version", full_version);
-
- rivertile.step.dependOn(&scanner.step);
---
-2.33.1
-
diff --git a/srcpkgs/river/template b/srcpkgs/river/template
index 3906858d507e..431aa4bd8e8e 100644
--- a/srcpkgs/river/template
+++ b/srcpkgs/river/template
@@ -1,18 +1,18 @@
# Template file for 'river'
pkgname=river
-version=0.1.1
-revision=2
+version=0.2.3
+revision=1
build_style=zig-build
-configure_args="$(vopt_if xwayland -Dxwayland)"
+configure_args="$(vopt_if xwayland -Dxwayland) -Dpie"
hostmakedepends="pkg-config wayland-devel scdoc"
-makedepends="wlroots0.15-devel libevdev-devel"
+makedepends="wlroots-devel libevdev-devel"
depends="$(vopt_if xwayland xorg-server-xwayland)"
short_desc="Dynamic tiling Wayland compositor"
maintainer="Isaac Freund <mail@isaacfreund.com>"
license="GPL-3.0-or-later"
homepage="https://github.com/riverwm/river"
distfiles="${homepage}/releases/download/v${version}/river-${version}.tar.gz"
-checksum=2a0bcd4670ed9ebd39c279f2bf10803fc65c9f3ee2307ce40728df23ce914d18
+checksum=7acdd2b929e16a20006b4baf1f29e7a8dc7f70cf5747e1503a610a90d1637132
build_options="xwayland"
build_options_default="xwayland"
From 77dc974c5f1c12c78112dbb9a458562a77f42b31 Mon Sep 17 00:00:00 2001
From: Marcin Puc <tranzystorek.io@protonmail.com>
Date: Fri, 10 Feb 2023 17:25:32 +0100
Subject: [PATCH 019/134] libclc: update to 15.0.7
---
srcpkgs/libclc/template | 8 +++++---
1 file changed, 5 insertions(+), 3 deletions(-)
diff --git a/srcpkgs/libclc/template b/srcpkgs/libclc/template
index 779519fd666f..adb60f6ad1f1 100644
--- a/srcpkgs/libclc/template
+++ b/srcpkgs/libclc/template
@@ -1,9 +1,11 @@
# Template file for 'libclc'
pkgname=libclc
-version=12.0.0
+version=15.0.7
revision=1
build_style=cmake
-configure_args="-DCMAKE_INSTALL_PREFIX=/usr -DCMAKE_BUILD_TYPE=Release"
+# disable clspv (failing tests, we don't ship it)
+configure_args="-DCMAKE_INSTALL_PREFIX=/usr -DCMAKE_BUILD_TYPE=Release
+ -DLIBCLC_TARGETS_TO_BUILD=amdgcn--;amdgcn--amdhsa;r600--;nvptx--;nvptx64--;nvptx--nvidiacl;nvptx64--nvidiacl;spirv-mesa3d-;spirv64-mesa3d-"
hostmakedepends="cmake clang llvm python3 libedit-devel libffi-devel
ncurses-devel zlib-devel SPIRV-LLVM-Translator"
short_desc="Open implementation of the OpenCL C programming language"
@@ -11,7 +13,7 @@ maintainer="Orphaned <orphan@voidlinux.org>"
license="BSD-3-Clause, MIT"
homepage="https://libclc.llvm.org"
distfiles="https://github.com/llvm/llvm-project/releases/download/llvmorg-${version}/libclc-${version}.src.tar.xz"
-checksum=6b777ee2cd57da1b122f76c208463f620eef508f4128210c6b1a96bfb75c74dc
+checksum=35731fea7be224f21acf5bf3cd9f0ed058bf4ada5eceaf7f10ee96e139bd3389
replaces="libclc-git>=0"
do_configure() {
From 83bd298591800bb38602058cd858ffe80b1d7788 Mon Sep 17 00:00:00 2001
From: Marcin Puc <tranzystorek.io@protonmail.com>
Date: Fri, 10 Feb 2023 20:20:43 +0100
Subject: [PATCH 020/134] shiboken2: update to 5.15.7
---
srcpkgs/shiboken2/template | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/srcpkgs/shiboken2/template b/srcpkgs/shiboken2/template
index 9ceb8b313de7..084ecc3ba1e1 100644
--- a/srcpkgs/shiboken2/template
+++ b/srcpkgs/shiboken2/template
@@ -1,7 +1,7 @@
# Template file for 'shiboken2'
pkgname=shiboken2
-version=5.15.5
-revision=2
+version=5.15.7
+revision=1
_pkgname="pyside-setup-opensource-src-${version}"
build_wrksrc="sources/shiboken2"
build_style=cmake
@@ -14,7 +14,7 @@ maintainer="yopito <pierre.bourgin@free.fr>"
license="GPL-3.0-or-later"
homepage="https://wiki.qt.io/Qt_for_Python/Shiboken"
distfiles="https://download.qt.io/official_releases/QtForPython/pyside2/PySide2-${version}-src/${_pkgname}.tar.xz"
-checksum=3920a4fb353300260c9bc46ff70f1fb975c5e7efa22e9d51222588928ce19b33
+checksum=f61210ae24e6882d5d0ca0059229e5dc4f35e2bca92dd6caf96c0f41943a8294
python_version=3
export CLANG_INSTALL_DIR=${XBPS_CROSS_BASE}/usr
From 8536781236440b6294077afca9c63a36ef824d0f Mon Sep 17 00:00:00 2001
From: Marcin Puc <tranzystorek.io@protonmail.com>
Date: Thu, 16 Feb 2023 20:13:02 +0100
Subject: [PATCH 021/134] clazy: rebuild for llvm15
---
.../patches/0002-llvm15-compatibility.patch | 220 ++++++++++++++++++
srcpkgs/clazy/template | 2 +-
2 files changed, 221 insertions(+), 1 deletion(-)
create mode 100644 srcpkgs/clazy/patches/0002-llvm15-compatibility.patch
diff --git a/srcpkgs/clazy/patches/0002-llvm15-compatibility.patch b/srcpkgs/clazy/patches/0002-llvm15-compatibility.patch
new file mode 100644
index 000000000000..18213a66fca1
--- /dev/null
+++ b/srcpkgs/clazy/patches/0002-llvm15-compatibility.patch
@@ -0,0 +1,220 @@
+From 20fca52da739ebefa47e35f6b338bb99a0da3cfe Mon Sep 17 00:00:00 2001
+From: Cristian Adam <cristian.adam@qt.io>
+Date: Tue, 6 Sep 2022 16:30:02 +0200
+Subject: [PATCH] Build fixes for LLVM/Clang 15.0.0
+
+Change-Id: Icc39a0b1acffb5a6a4798b1259d8ad4e7dd47bc5
+---
+ CMakeLists.txt | 6 ++++++
+ src/PreProcessorVisitor.cpp | 2 +-
+ src/PreProcessorVisitor.h | 2 +-
+ src/SourceCompatibilityHelpers.h | 15 +++++++++++++++
+ src/Utils.cpp | 3 ++-
+ src/checkbase.cpp | 4 ++--
+ src/checkbase.h | 4 ++--
+ src/checks/manuallevel/qt6-fwd-fixes.cpp | 2 +-
+ src/checks/manuallevel/qt6-fwd-fixes.h | 2 +-
+ src/checks/manuallevel/qt6-header-fixes.cpp | 2 +-
+ src/checks/manuallevel/qt6-header-fixes.h | 2 +-
+ 11 files changed, 33 insertions(+), 11 deletions(-)
+
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 3c780b0d..100135af 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -114,6 +114,10 @@ else()
+ set(clang_tooling_refactoring_lib clangToolingRefactor)
+ endif()
+
++if (${LLVM_VERSION} VERSION_GREATER_EQUAL "15.0.0")
++ set(clang_support_lib clangSupport)
++endif()
++
+ macro(link_to_llvm name is_standalone)
+ if (CLAZY_LINK_CLANG_DYLIB)
+ target_link_libraries(${name} clang-cpp)
+@@ -131,6 +135,7 @@ macro(link_to_llvm name is_standalone)
+
+ target_link_libraries(${name} ${clang_lib})
+ endforeach()
++ target_link_libraries(${name} ${clang_support_lib})
+ target_link_libraries(${name} clangTooling)
+ target_link_libraries(${name} clangToolingCore)
+ target_link_libraries(${name} ${clang_tooling_refactoring_lib})
+@@ -302,6 +307,7 @@ else()
+ clangFrontendTool
+ clangRewrite
+ clangSerialization
++ ${clang_support_lib}
+ clangTooling
+ clangStaticAnalyzerCheckers
+ clangStaticAnalyzerCore
+diff --git a/src/PreProcessorVisitor.cpp b/src/PreProcessorVisitor.cpp
+index 5e63a131..5fdfe5f3 100644
+--- a/src/PreProcessorVisitor.cpp
++++ b/src/PreProcessorVisitor.cpp
+@@ -185,7 +185,7 @@ void PreProcessorVisitor::MacroExpands(const Token &MacroNameTok, const MacroDef
+
+ void PreProcessorVisitor::InclusionDirective (clang::SourceLocation, const clang::Token &,
+ clang::StringRef FileName, bool IsAngled, clang::CharSourceRange FilenameRange,
+- const clang::FileEntry *, clang::StringRef, clang::StringRef,
++ clazy::OptionalFileEntryRef, clang::StringRef, clang::StringRef,
+ const clang::Module *, clang::SrcMgr::CharacteristicKind)
+ {
+ if (m_ci.getPreprocessor().isInPrimaryFile() && !clazy::endsWith(FileName.str(), ".moc")) {
+diff --git a/src/PreProcessorVisitor.h b/src/PreProcessorVisitor.h
+index dc80ff36..1bb17a5e 100644
+--- a/src/PreProcessorVisitor.h
++++ b/src/PreProcessorVisitor.h
+@@ -71,7 +71,7 @@ class PreProcessorVisitor
+ clang::SourceRange range, const clang::MacroArgs *) override;
+ void InclusionDirective (clang::SourceLocation HashLoc, const clang::Token &IncludeTok,
+ clang::StringRef FileName, bool IsAngled, clang::CharSourceRange FilenameRange,
+- const clang::FileEntry *File, clang::StringRef SearchPath, clang::StringRef RelativePath,
++ clazy::OptionalFileEntryRef File, clang::StringRef SearchPath, clang::StringRef RelativePath,
+ const clang::Module *Imported, clang::SrcMgr::CharacteristicKind FileType) override;
+ private:
+ std::string getTokenSpelling(const clang::MacroDefinition &) const;
+diff --git a/src/SourceCompatibilityHelpers.h b/src/SourceCompatibilityHelpers.h
+index 4ea923a2..c1a23a4b 100644
+--- a/src/SourceCompatibilityHelpers.h
++++ b/src/SourceCompatibilityHelpers.h
+@@ -144,6 +144,21 @@ inline bool contains_lower(clang::StringRef haystack, clang::StringRef needle)
+ #endif
+ }
+
++#if LLVM_VERSION_MAJOR >= 15
++using OptionalFileEntryRef = clang::Optional<clang::FileEntryRef>;
++#else
++using OptionalFileEntryRef = const clang::FileEntry*;
++#endif
++
++inline bool isAscii(clang::StringLiteral *lt)
++{
++#if LLVM_VERSION_MAJOR >= 15
++ return lt->isOrdinary();
++#else
++ return lt->isAscii();
++#endif
++}
++
+ }
+
+ #endif
+diff --git a/src/Utils.cpp b/src/Utils.cpp
+index 3cdf7876..70e0577c 100644
+--- a/src/Utils.cpp
++++ b/src/Utils.cpp
+@@ -25,6 +25,7 @@
+ #include "Utils.h"
+ #include "StringUtils.h"
+ #include "HierarchyUtils.h"
++#include "SourceCompatibilityHelpers.h"
+ #include "StmtBodyRange.h"
+ #include "clazy_stl.h"
+
+@@ -670,7 +671,7 @@ const CXXRecordDecl *Utils::recordForMemberCall(CXXMemberCallExpr *call, string
+ bool Utils::isAscii(StringLiteral *lt)
+ {
+ // 'é' for some reason has isAscii() == true, so also call containsNonAsciiOrNull
+- return lt && lt->isAscii() && !lt->containsNonAsciiOrNull();
++ return lt && clazy::isAscii(lt) && !lt->containsNonAsciiOrNull();
+ }
+
+ bool Utils::isInDerefExpression(Stmt *s, ParentMap *map)
+diff --git a/src/checkbase.cpp b/src/checkbase.cpp
+index f5936dfd..dcc7c999 100644
+--- a/src/checkbase.cpp
++++ b/src/checkbase.cpp
+@@ -105,7 +105,7 @@ void ClazyPreprocessorCallbacks::MacroDefined(const Token ¯oNameTok, const M
+ }
+
+ void ClazyPreprocessorCallbacks::InclusionDirective(clang::SourceLocation HashLoc, const clang::Token &IncludeTok, clang::StringRef FileName, bool IsAngled,
+- clang::CharSourceRange FilenameRange, const clang::FileEntry *File, clang::StringRef SearchPath,
++ clang::CharSourceRange FilenameRange, clazy::OptionalFileEntryRef File, clang::StringRef SearchPath,
+ clang::StringRef RelativePath, const clang::Module *Imported, clang::SrcMgr::CharacteristicKind FileType)
+ {
+ check->VisitInclusionDirective(HashLoc, IncludeTok, FileName, IsAngled, FilenameRange, File, SearchPath, RelativePath, Imported, FileType);
+@@ -182,7 +182,7 @@ void CheckBase::VisitEndif(SourceLocation, SourceLocation)
+ }
+
+ void CheckBase::VisitInclusionDirective(clang::SourceLocation , const clang::Token &, clang::StringRef , bool ,
+- clang::CharSourceRange , const clang::FileEntry *, clang::StringRef ,
++ clang::CharSourceRange , clazy::OptionalFileEntryRef, clang::StringRef ,
+ clang::StringRef , const clang::Module *, clang::SrcMgr::CharacteristicKind )
+ {
+ // Overriden in derived classes
+diff --git a/src/checkbase.h b/src/checkbase.h
+index c5db2daf..02f6a6bf 100644
+--- a/src/checkbase.h
++++ b/src/checkbase.h
+@@ -91,7 +91,7 @@ class ClazyPreprocessorCallbacks
+ void Else(clang::SourceLocation loc, clang::SourceLocation ifLoc) override;
+ void Endif(clang::SourceLocation loc, clang::SourceLocation ifLoc) override;
+ void InclusionDirective(clang::SourceLocation HashLoc, const clang::Token &IncludeTok, clang::StringRef FileName, bool IsAngled,
+- clang::CharSourceRange FilenameRange, const clang::FileEntry *File, clang::StringRef SearchPath,
++ clang::CharSourceRange FilenameRange, clazy::OptionalFileEntryRef File, clang::StringRef SearchPath,
+ clang::StringRef RelativePath, const clang::Module *Imported, clang::SrcMgr::CharacteristicKind FileType) override;
+ private:
+ CheckBase *const check;
+@@ -151,7 +151,7 @@ class CheckBase
+ virtual void VisitElse(clang::SourceLocation loc, clang::SourceLocation ifLoc);
+ virtual void VisitEndif(clang::SourceLocation loc, clang::SourceLocation ifLoc);
+ virtual void VisitInclusionDirective(clang::SourceLocation HashLoc, const clang::Token &IncludeTok, clang::StringRef FileName, bool IsAngled,
+- clang::CharSourceRange FilenameRange, const clang::FileEntry *File, clang::StringRef SearchPath,
++ clang::CharSourceRange FilenameRange, clazy::OptionalFileEntryRef File, clang::StringRef SearchPath,
+ clang::StringRef RelativePath, const clang::Module *Imported, clang::SrcMgr::CharacteristicKind FileType);
+
+ void enablePreProcessorCallbacks();
+diff --git a/src/checks/manuallevel/qt6-fwd-fixes.cpp b/src/checks/manuallevel/qt6-fwd-fixes.cpp
+index 83bf81ee..c87d9ca0 100644
+--- a/src/checks/manuallevel/qt6-fwd-fixes.cpp
++++ b/src/checks/manuallevel/qt6-fwd-fixes.cpp
+@@ -166,7 +166,7 @@ void Qt6FwdFixes::VisitDecl(clang::Decl *decl)
+ }
+
+ void Qt6FwdFixes::VisitInclusionDirective(clang::SourceLocation HashLoc, const clang::Token &IncludeTok, clang::StringRef FileName, bool IsAngled,
+- clang::CharSourceRange FilenameRange, const clang::FileEntry *File, clang::StringRef SearchPath,
++ clang::CharSourceRange FilenameRange, clazy::OptionalFileEntryRef File, clang::StringRef SearchPath,
+ clang::StringRef RelativePath, const clang::Module *Imported, clang::SrcMgr::CharacteristicKind FileType)
+ {
+ auto current_file = m_sm.getFilename(HashLoc);
+diff --git a/src/checks/manuallevel/qt6-fwd-fixes.h b/src/checks/manuallevel/qt6-fwd-fixes.h
+index 37b59d95..bb928ba6 100644
+--- a/src/checks/manuallevel/qt6-fwd-fixes.h
++++ b/src/checks/manuallevel/qt6-fwd-fixes.h
+@@ -47,7 +47,7 @@ class Qt6FwdFixes
+ explicit Qt6FwdFixes(const std::string &name, ClazyContext *context);
+ void VisitDecl(clang::Decl *decl) override;
+ void VisitInclusionDirective(clang::SourceLocation HashLoc, const clang::Token &IncludeTok, clang::StringRef FileName, bool IsAngled,
+- clang::CharSourceRange FilenameRange, const clang::FileEntry *File, clang::StringRef SearchPath,
++ clang::CharSourceRange FilenameRange, clazy::OptionalFileEntryRef File, clang::StringRef SearchPath,
+ clang::StringRef RelativePath, const clang::Module *Imported, clang::SrcMgr::CharacteristicKind FileType) override;
+ bool m_including_qcontainerfwd = false;
+ std::set<clang::StringRef> m_qcontainerfwd_included_in_files;
+diff --git a/src/checks/manuallevel/qt6-header-fixes.cpp b/src/checks/manuallevel/qt6-header-fixes.cpp
+index d458b77c..aaa28093 100644
+--- a/src/checks/manuallevel/qt6-header-fixes.cpp
++++ b/src/checks/manuallevel/qt6-header-fixes.cpp
+@@ -270,7 +270,7 @@ Qt6HeaderFixes::Qt6HeaderFixes(const std::string &name, ClazyContext *context)
+ }
+
+ void Qt6HeaderFixes::VisitInclusionDirective(clang::SourceLocation HashLoc, const clang::Token &IncludeTok, clang::StringRef FileName, bool IsAngled,
+- clang::CharSourceRange FilenameRange, const clang::FileEntry *File, clang::StringRef SearchPath,
++ clang::CharSourceRange FilenameRange, clazy::OptionalFileEntryRef File, clang::StringRef SearchPath,
+ clang::StringRef RelativePath, const clang::Module *Imported, clang::SrcMgr::CharacteristicKind FileType)
+ {
+ if (shouldIgnoreFile(HashLoc))
+diff --git a/src/checks/manuallevel/qt6-header-fixes.h b/src/checks/manuallevel/qt6-header-fixes.h
+index ae09f7ad..8ffbb100 100644
+--- a/src/checks/manuallevel/qt6-header-fixes.h
++++ b/src/checks/manuallevel/qt6-header-fixes.h
+@@ -46,7 +46,7 @@ class Qt6HeaderFixes
+ public:
+ explicit Qt6HeaderFixes(const std::string &name, ClazyContext *context);
+ void VisitInclusionDirective(clang::SourceLocation HashLoc, const clang::Token &IncludeTok, clang::StringRef FileName, bool IsAngled,
+- clang::CharSourceRange FilenameRange, const clang::FileEntry *File, clang::StringRef SearchPath,
++ clang::CharSourceRange FilenameRange, clazy::OptionalFileEntryRef File, clang::StringRef SearchPath,
+ clang::StringRef RelativePath, const clang::Module *Imported, clang::SrcMgr::CharacteristicKind FileType) override;
+
+ };
diff --git a/srcpkgs/clazy/template b/srcpkgs/clazy/template
index 11f3bab55aef..f81de08ab836 100644
--- a/srcpkgs/clazy/template
+++ b/srcpkgs/clazy/template
@@ -1,7 +1,7 @@
# Template file for 'clazy'
pkgname=clazy
version=1.11
-revision=1
+revision=2
build_style=cmake
build_helper=qemu
hostmakedepends="llvm"
From c45302684fa30f8ae56a0eb2935e9fbb3931c394 Mon Sep 17 00:00:00 2001
From: Marcin Puc <tranzystorek.io@protonmail.com>
Date: Thu, 16 Feb 2023 23:42:00 +0100
Subject: [PATCH 022/134] ldc: update to 1.31.0
---
common/shlibs | 8 +--
...4260a848c8ebad5582e27ac1e09627cdfb17.patch | 57 -------------------
srcpkgs/ldc/template | 6 +-
3 files changed, 7 insertions(+), 64 deletions(-)
delete mode 100644 srcpkgs/ldc/patches/54544260a848c8ebad5582e27ac1e09627cdfb17.patch
diff --git a/common/shlibs b/common/shlibs
index e5071f45c0c8..1b68be307437 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -2197,10 +2197,10 @@ libFcitx5Config.so.6 libfcitx5-5.0.5_1
libFcitx5GClient.so.2 fcitx5-gtk-5.0.4_1
libFcitx5Qt5DBusAddons.so.1 fcitx5-qt5-5.0.3_1
libFcitx5Qt5WidgetsAddons.so.2 fcitx5-qt5-5.0.3_1
-libdruntime-ldc-debug-shared.so.100 ldc-runtime-1.30.0_1
-libdruntime-ldc-shared.so.100 ldc-runtime-1.30.0_1
-libphobos2-ldc-shared.so.100 ldc-runtime-1.30.0_1
-libphobos2-ldc-debug-shared.so.100 ldc-runtime-1.30.0_1
+libdruntime-ldc-debug-shared.so.101 ldc-runtime-1.31.0_1
+libdruntime-ldc-shared.so.101 ldc-runtime-1.31.0_1
+libphobos2-ldc-shared.so.101 ldc-runtime-1.31.0_1
+libphobos2-ldc-debug-shared.so.101 ldc-runtime-1.31.0_1
libmarblewidget-qt5.so.28 marble5-17.12.2_1
libastro.so.2 marble5-17.12.2_1
libparrot.so.6.9.0 parrot-6.9.0_1
diff --git a/srcpkgs/ldc/patches/54544260a848c8ebad5582e27ac1e09627cdfb17.patch b/srcpkgs/ldc/patches/54544260a848c8ebad5582e27ac1e09627cdfb17.patch
deleted file mode 100644
index 79694372bfaa..000000000000
--- a/srcpkgs/ldc/patches/54544260a848c8ebad5582e27ac1e09627cdfb17.patch
+++ /dev/null
@@ -1,57 +0,0 @@
-From 54544260a848c8ebad5582e27ac1e09627cdfb17 Mon Sep 17 00:00:00 2001
-From: Razvan Nitu <razvan.nitu1305@gmail.com>
-Date: Wed, 24 Aug 2022 13:54:15 +0300
-Subject: [PATCH] Port the fix for issue 23157 (#14378)
-
----
- druntime/src/core/sys/posix/sys/socket.d | 36 ++++++++++++++++++++++--
- 1 file changed, 33 insertions(+), 3 deletions(-)
-
-diff --git a/druntime/src/core/sys/posix/sys/socket.d b/druntime/src/core/sys/posix/sys/socket.d
-index 3a7b753adff..fc5dc5d1684 100644
---- a/runtime/druntime/src/core/sys/posix/sys/socket.d
-+++ b/runtime/druntime/src/core/sys/posix/sys/socket.d
-@@ -188,10 +188,40 @@ version (linux)
-
- extern (D) inout(ubyte)* CMSG_DATA( return scope inout(cmsghdr)* cmsg ) pure nothrow @nogc { return cast(ubyte*)( cmsg + 1 ); }
-
-- private inout(cmsghdr)* __cmsg_nxthdr(inout(msghdr)*, inout(cmsghdr)*) pure nothrow @nogc;
-- extern (D) inout(cmsghdr)* CMSG_NXTHDR(inout(msghdr)* msg, inout(cmsghdr)* cmsg) pure nothrow @nogc
-+ version (CRuntime_Musl)
- {
-- return __cmsg_nxthdr(msg, cmsg);
-+ extern (D)
-+ {
-+ private size_t __CMSG_LEN(inout(cmsghdr)* cmsg) pure nothrow @nogc
-+ {
-+ return (cmsg.cmsg_len + size_t.sizeof -1) & cast(size_t)(~(size_t.sizeof - 1));
-+ }
-+
-+ private inout(cmsghdr)* __CMSG_NEXT(inout(cmsghdr)* cmsg) pure nothrow @nogc
-+ {
-+ return cmsg + __CMSG_LEN(cmsg);
-+ }
-+
-+ private inout(msghdr)* __MHDR_END(inout(msghdr)* mhdr) pure nothrow @nogc
-+ {
-+ return cast(inout(msghdr)*)(mhdr.msg_control + mhdr.msg_controllen);
-+ }
-+
-+ inout(cmsghdr)* CMSG_NXTHDR(inout(msghdr)* msg, inout(cmsghdr)* cmsg) pure nothrow @nogc
-+ {
-+ return cmsg.cmsg_len < cmsghdr.sizeof ||
-+ __CMSG_LEN(cmsg) + cmsghdr.sizeof >= __MHDR_END(msg) - cast(inout(msghdr)*)(cmsg)
-+ ? cast(inout(cmsghdr)*) null : cast(inout(cmsghdr)*) __CMSG_NEXT(cmsg);
-+ }
-+ }
-+ }
-+ else
-+ {
-+ private inout(cmsghdr)* __cmsg_nxthdr(inout(msghdr)*, inout(cmsghdr)*) pure nothrow @nogc;
-+ extern (D) inout(cmsghdr)* CMSG_NXTHDR(inout(msghdr)* msg, inout(cmsghdr)* cmsg) pure nothrow @nogc
-+ {
-+ return __cmsg_nxthdr(msg, cmsg);
-+ }
- }
-
- extern (D) inout(cmsghdr)* CMSG_FIRSTHDR( inout(msghdr)* mhdr ) pure nothrow @nogc
diff --git a/srcpkgs/ldc/template b/srcpkgs/ldc/template
index 99d22682ce7a..f6d8b7ffbe98 100644
--- a/srcpkgs/ldc/template
+++ b/srcpkgs/ldc/template
@@ -1,6 +1,6 @@
# Template file for 'ldc'
pkgname=ldc
-version=1.30.0
+version=1.31.0
revision=1
build_style=cmake
configure_args="
@@ -11,7 +11,7 @@ configure_args="
-DCOMPILE_D_MODULES_SEPARATELY=ON
-DC_SYSTEM_LIBS='unwind;m;pthread;rt;dl'"
conf_files="/etc/ldc2.conf"
-hostmakedepends="dmd llvm12 perl pkg-config"
+hostmakedepends="dmd llvm15 perl pkg-config"
makedepends="libcurl-devel libffi-devel ncurses-devel zlib-devel
llvm-libunwind-devel"
depends="ldc-runtime llvm-libunwind-devel"
@@ -22,7 +22,7 @@ license="BSD-3-Clause, BSL-1.0"
homepage="https://wiki.dlang.org/LDC"
changelog="https://raw.githubusercontent.com/ldc-developers/ldc/master/CHANGELOG.md"
distfiles="https://github.com/ldc-developers/ldc/releases/download/v${version}/ldc-${version}-src.tar.gz"
-checksum=fdbb376f08242d917922a6a22a773980217fafa310046fc5d6459490af23dacd
+checksum=f1c8ece9e1e35806c3441bf24fbe666cddd8eef375592c19cd8fee4701cd5458
nopie=yes
nocross="dmd compilation fails on cross"
# tests timeout on musl; also require unpackaged python3-lit
From f6cd6964bd98c511b3a5471f8511fc008062c45f Mon Sep 17 00:00:00 2001
From: Marcin Puc <tranzystorek.io@protonmail.com>
Date: Thu, 16 Feb 2023 23:42:46 +0100
Subject: [PATCH 023/134] gtkd: rebuild for ldc 1.31
---
srcpkgs/gtkd/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/gtkd/template b/srcpkgs/gtkd/template
index e64a1f54fb96..6a75d69e19ce 100644
--- a/srcpkgs/gtkd/template
+++ b/srcpkgs/gtkd/template
@@ -1,7 +1,7 @@
# Template file for 'gtkd'
pkgname=gtkd
version=3.9.0
-revision=9
+revision=10
build_style=gnu-makefile
make_build_args="LDFLAGS='-linker=bfd' DC=ldc2"
make_build_target="shared-libs shared-gstreamer shared-vte shared-peas shared-gtkdgl"
From 674ed1372f26049c4bfbb649fe8ec17dc8bd1276 Mon Sep 17 00:00:00 2001
From: Marcin Puc <tranzystorek.io@protonmail.com>
Date: Thu, 16 Feb 2023 23:43:29 +0100
Subject: [PATCH 024/134] onedrive: rebuild for ldc 1.31
---
srcpkgs/onedrive/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/onedrive/template b/srcpkgs/onedrive/template
index 28163f334552..63e4f43a7fbd 100644
--- a/srcpkgs/onedrive/template
+++ b/srcpkgs/onedrive/template
@@ -1,7 +1,7 @@
# Template file for 'onedrive'
pkgname=onedrive
version=2.4.13
-revision=4
+revision=5
build_style=gnu-configure
configure_args="DC=ldc2"
hostmakedepends="ldc pkg-config"
From 5f17ff6037457cb9c4aac32c37ab406be59b96e1 Mon Sep 17 00:00:00 2001
From: Marcin Puc <tranzystorek.io@protonmail.com>
Date: Sat, 18 Feb 2023 20:33:19 +0100
Subject: [PATCH 025/134] qtcreator: rebuild for llvm15
---
srcpkgs/qtcreator/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/qtcreator/template b/srcpkgs/qtcreator/template
index 8eb1b7891f60..e8324b27077c 100644
--- a/srcpkgs/qtcreator/template
+++ b/srcpkgs/qtcreator/template
@@ -1,7 +1,7 @@
# Template file for 'qtcreator'
pkgname=qtcreator
version=9.0.1
-revision=1
+revision=2
build_style=cmake
configure_args="$(vopt_bool qbs BUILD_QBS) -DWITH_DOCS=ON -DBUILD_WITH_PCH=OFF"
hostmakedepends="clang llvm perl pkg-config python3 which
From ef9646f1c15b702b783029af23d3e8f2004ac360 Mon Sep 17 00:00:00 2001
From: Marcin Puc <tranzystorek.io@protonmail.com>
Date: Wed, 22 Feb 2023 13:33:41 +0100
Subject: [PATCH 026/134] tilix: rebuild for ldc 1.31
---
srcpkgs/tilix/patches/undead.patch | 21 +++++++++++++++++++++
srcpkgs/tilix/template | 15 ++++++++++++---
2 files changed, 33 insertions(+), 3 deletions(-)
create mode 100644 srcpkgs/tilix/patches/undead.patch
diff --git a/srcpkgs/tilix/patches/undead.patch b/srcpkgs/tilix/patches/undead.patch
new file mode 100644
index 000000000000..3bc40d69f269
--- /dev/null
+++ b/srcpkgs/tilix/patches/undead.patch
@@ -0,0 +1,21 @@
+--- a/source/gx/tilix/prefeditor/prefdialog.d
++++ b/source/gx/tilix/prefeditor/prefdialog.d
+@@ -957,7 +957,7 @@ private:
+ return;
+ }
+
+- import std.xml: DocumentParser, ElementParser, Element, XMLException;
++ import undead.xml: DocumentParser, ElementParser, Element, XMLException;
+
+ try {
+ DocumentParser parser = new DocumentParser(ui);
+--- a/meson.build
++++ b/meson.build
+@@ -91,6 +91,7 @@ tilix_sources = [
+ 'source/secretc/secrettypes.d',
+ 'source/x11/X.d',
+ 'source/x11/Xlib.d',
++ 'source/undead/xml.d',
+ 'source/app.d'
+ ]
+
diff --git a/srcpkgs/tilix/template b/srcpkgs/tilix/template
index 5689948babaa..74ccb4dd4592 100644
--- a/srcpkgs/tilix/template
+++ b/srcpkgs/tilix/template
@@ -1,7 +1,9 @@
# Template file for 'tilix'
pkgname=tilix
version=1.9.4
-revision=6
+revision=7
+_undead_version=1.1.8
+build_wrksrc="${pkgname}-${version}"
build_style=meson
configure_args="-Db_lto=false"
hostmakedepends="automake gettext-devel gdk-pixbuf glib-devel ldc po4a pkg-config
@@ -13,8 +15,15 @@ short_desc="Tiling terminal emulator for Linux"
maintainer="Enno Boland <gottox@voidlinux.org>"
license="MPL-2.0"
homepage="https://gnunn1.github.io/tilix-web/"
-distfiles="https://github.com/gnunn1/${pkgname}/archive/${version}.tar.gz"
-checksum=2a9482770391d11d5edc8351d426c700c2cc6c194a30391ef2ae25bb7095b59b
+distfiles="https://github.com/gnunn1/${pkgname}/archive/${version}.tar.gz
+ https://github.com/dlang/undeaD/archive/refs/tags/v${_undead_version}.tar.gz"
+checksum="2a9482770391d11d5edc8351d426c700c2cc6c194a30391ef2ae25bb7095b59b
+ 36a59b4740b147f4345caa26908f40a97fc7cc67dac6983c226369c59f909e92"
+patch_args="-d ${build_wrksrc} -Np1"
+
+post_extract() {
+ mv undeaD-${_undead_version}/src/undead ${build_wrksrc}/source/
+}
pre_configure() {
case "$XBPS_TARGET_MACHINE" in
From b81c7dde1c5097db0ee83e3b563df33f083c67e1 Mon Sep 17 00:00:00 2001
From: Marcin Puc <tranzystorek.io@protonmail.com>
Date: Wed, 1 Mar 2023 14:59:55 +0100
Subject: [PATCH 027/134] ispc: update to 1.19.0
---
srcpkgs/ispc/patches/cmake-build-type-none.patch | 13 +++++++++++++
srcpkgs/ispc/template | 12 ++++--------
2 files changed, 17 insertions(+), 8 deletions(-)
create mode 100644 srcpkgs/ispc/patches/cmake-build-type-none.patch
diff --git a/srcpkgs/ispc/patches/cmake-build-type-none.patch b/srcpkgs/ispc/patches/cmake-build-type-none.patch
new file mode 100644
index 000000000000..a962619d9335
--- /dev/null
+++ b/srcpkgs/ispc/patches/cmake-build-type-none.patch
@@ -0,0 +1,13 @@
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index c694166..405dc90 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -199,7 +199,7 @@ set(CMAKE_RUNTIME_OUTPUT_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/bin )
+
+ if(CMAKE_BUILD_TYPE)
+ # Validate build type
+- set(CONFIGURATION_TYPES "Debug;Release;RelWithDebInfo")
++ set(CONFIGURATION_TYPES "Debug;Release;RelWithDebInfo;None")
+
+ string(FIND "${CONFIGURATION_TYPES}" "${CMAKE_BUILD_TYPE}" MATCHED_CONFIG)
+ if (${MATCHED_CONFIG} EQUAL -1)
diff --git a/srcpkgs/ispc/template b/srcpkgs/ispc/template
index 2b06217d0aab..574a75bab7e6 100644
--- a/srcpkgs/ispc/template
+++ b/srcpkgs/ispc/template
@@ -1,18 +1,18 @@
# Template file for 'ispc'
pkgname=ispc
-version=1.18.1
+version=1.19.0
revision=1
archs="x86_64*"
build_style=cmake
-configure_args="-DISPC_NO_DUMPS=ON -DARM_ENABLED=OFF -DCMAKE_BUILD_TYPE=Release"
+configure_args="-DARM_ENABLED=OFF -DISPC_INCLUDE_EXAMPLES=OFF -DISPC_INCLUDE_RT=OFF"
hostmakedepends="clang clang-tools-extra python3 m4 bison flex llvm"
-makedepends="ncurses-devel ncurses-libtinfo-devel zlib-devel libomp-devel"
+makedepends="ncurses-devel ncurses-libtinfo-devel zlib-devel"
short_desc="Compiler for high-performance SIMD programming on the CPU"
maintainer="Andrea Brancaleoni <abc@pompel.me>"
license="BSD-3-Clause"
homepage="https://ispc.github.io"
distfiles="https://github.com/ispc/ispc/archive/v${version}.tar.gz"
-checksum=5b004c121e7a39c8654bb61930a240e4bd3e432a80d851c6281fae49f9aca7b7
+checksum=da1eccb8ead495b22d642340f3bab11fb64dd2223cd9cc92f0492f70b30f34b5
nocross=yes
nopie=yes
@@ -21,10 +21,6 @@ case "$XBPS_TARGET_MACHINE" in
x86_64) hostmakedepends+=" gcc-multilib";;
esac
-pre_build() {
- sed -i '/tinfo/d' CMakeLists.txt
-}
-
post_install() {
vlicense LICENSE.txt
}
From 6bd24ac640697070e81d7a3477a1f58e93f93bd1 Mon Sep 17 00:00:00 2001
From: Marcin Puc <tranzystorek.io@protonmail.com>
Date: Sun, 5 Feb 2023 14:04:51 +0100
Subject: [PATCH 028/134] rust-bootstrap: update to 1.68.0
---
.../files/generating-distfiles.md | 3 ++
srcpkgs/rust-bootstrap/template | 49 +++----------------
2 files changed, 11 insertions(+), 41 deletions(-)
diff --git a/srcpkgs/rust-bootstrap/files/generating-distfiles.md b/srcpkgs/rust-bootstrap/files/generating-distfiles.md
index ed5aa0da8596..36ee0ad230f2 100644
--- a/srcpkgs/rust-bootstrap/files/generating-distfiles.md
+++ b/srcpkgs/rust-bootstrap/files/generating-distfiles.md
@@ -6,6 +6,9 @@ so we have to generate distfiles for a few architectures as well, namely
`cargo-bootstrap`, as the `ppc` cargo binaries provided by upstream have
problems.
+Note: Void no longer officially supports PowerPC platforms,
+this guide is kept for historical reasons as well as for future reference.
+
### Set up appropriate masterdirs and remote-repositories
This guide assumes you're on an x86\_64 machine. If you're not, please adapt the
diff --git a/srcpkgs/rust-bootstrap/template b/srcpkgs/rust-bootstrap/template
index 539a4097ef3c..30f2d141daea 100644
--- a/srcpkgs/rust-bootstrap/template
+++ b/srcpkgs/rust-bootstrap/template
@@ -1,8 +1,7 @@
# Template file for 'rust-bootstrap'
pkgname=rust-bootstrap
-version=1.64.0
+version=1.68.0
revision=1
-create_wrksrc=yes
short_desc="Rust programming language bootstrap toolchain"
maintainer="Orphaned <orphan@voidlinux.org>"
license="MIT, Apache-2.0"
@@ -19,7 +18,7 @@ fi
_bootstrap_url="https://static.rust-lang.org/dist"
case "$XBPS_TARGET_MACHINE" in
- x86_64*|i686|ppc64le|ppc) ;;
+ x86_64*|i686) ;;
# See srcpkgs/rust-bootstrap/files/generating-distfiles.md for details
*) _bootstrap_url="https://repo-default.voidlinux.org/distfiles";;
esac
@@ -32,56 +31,24 @@ case "$XBPS_TARGET_MACHINE" in
${_bootstrap_url}/rustc-${version}-i686-unknown-linux-gnu.tar.xz
${_bootstrap_url}/rust-std-${version}-i686-unknown-linux-gnu.tar.xz"
checksum="
- 3d604e150c469461a64c17b6d26f96a5a3d6975246c92cd13ee9bc6e4df0aaeb
- c80c57df63517d6171c061e6c095b794593172a3abefa9b4202992706bda12e5"
+ e0044ed29eeacfcbf0d05736ac169ce46ea78f505977d24d9ddb0e9b0b8d1044
+ a6ea604be18d30e5c41e53bb41486d3bddc0c7289056895127d93ad6fb30691c"
;;
x86_64)
distfiles="
${_bootstrap_url}/rustc-${version}-x86_64-unknown-linux-gnu.tar.xz
${_bootstrap_url}/rust-std-${version}-x86_64-unknown-linux-gnu.tar.xz"
checksum="
- 1f5756a03119853b53358018c5b1592940a2354c3c9f84ee7faf684e3478f8f0
- 6ace34bcbba9557aa2fc3a0515c3da4a83ca24d7d45506c5e1b32f589fa38a8b"
+ 207ba4e6a0426a6bed226d8b51f2d1356515f824d00b1f52973da88ea6501b6d
+ 566f4e83e96e8e141d3444a09a014a3a69c786b3eef122389747eaaf4c1525b5"
;;
x86_64-musl)
distfiles="
${_bootstrap_url}/rustc-${version}-x86_64-unknown-linux-musl.tar.xz
${_bootstrap_url}/rust-std-${version}-x86_64-unknown-linux-musl.tar.xz"
checksum="
- 5177d749b5dcc74596e314b73c5f3f3eabed8b3e207f812f229fbf0682c162ae
- 29af13a882abbe797fadd43afcb75bce2e2304438db9e21a3e64a2e9100501fb"
- ;;
- ppc64le)
- distfiles="
- ${_bootstrap_url}/rustc-${version}-powerpc64le-unknown-linux-gnu.tar.xz
- ${_bootstrap_url}/rust-std-${version}-powerpc64le-unknown-linux-gnu.tar.xz"
- checksum="
- 11630fc51fffe722e52f649357b5948c24b5305cfb61a8114527234e054451c4
- ef697469b2a3ea8897f49b70e3be0c7aaca3f26fd3234812113e2e85cafac738"
- ;;
- ppc64le-musl)
- distfiles="
- ${_bootstrap_url}/rustc-${version}-powerpc64le-unknown-linux-musl.tar.xz
- ${_bootstrap_url}/rust-std-${version}-powerpc64le-unknown-linux-musl.tar.xz"
- checksum="
- 9ae19e0cdb883aa67dc3e4ef7afca88f99c8c5d176ed9175e2f7652122c7d1d8
- 825b8f680d9e6e3d6b1451586bb09efb0c1f7d844d6874738e040cf3d6b20663"
- ;;
- ppc64)
- distfiles="
- ${_bootstrap_url}/rustc-${version}-powerpc64-unknown-linux-gnu.tar.xz
- ${_bootstrap_url}/rust-std-${version}-powerpc64-unknown-linux-gnu.tar.xz"
- checksum="
- aae6418c71986a7f4ab7c7ab66d4f97531f0bdab50f14985c9403e2cff443de7
- 96485965f0a2dec274679cafbe4d39bd9e7c728824a6c5504f164ec9d5f57384"
- ;;
- ppc)
- distfiles="
- ${_bootstrap_url}/rustc-${version}-powerpc-unknown-linux-gnu.tar.xz
- ${_bootstrap_url}/rust-std-${version}-powerpc-unknown-linux-gnu.tar.xz"
- checksum="
- 5f4de96bff2937fc0a64a216604c7af765af94460a1f283330eddc610d91271b
- 6b29ebec4cd705760db634717cf6df68a9a377d52c25def30f5a2e2641a83279"
+ 7141d77e83becfb7e40da9cc0f08158e2bf338f3d7d2f40523bd96a99cc33849
+ 5109c26489ad6f316b8f5b953805b83c21f21f3a72b443704029f11ebe539b8e"
;;
*) broken="rust bootstrap binaries unavailable for ${XBPS_TARGET_MACHINE}";;
esac
From 666e5dfc1fe2c95e40d86511c457ea8c650a9e5f Mon Sep 17 00:00:00 2001
From: Marcin Puc <tranzystorek.io@protonmail.com>
Date: Sun, 5 Feb 2023 14:06:47 +0100
Subject: [PATCH 029/134] cargo-bootstrap: update to 1.68.0
---
srcpkgs/cargo-bootstrap/template | 26 +++++---------------------
1 file changed, 5 insertions(+), 21 deletions(-)
diff --git a/srcpkgs/cargo-bootstrap/template b/srcpkgs/cargo-bootstrap/template
index 9da646a63ade..cd20c921e5ce 100644
--- a/srcpkgs/cargo-bootstrap/template
+++ b/srcpkgs/cargo-bootstrap/template
@@ -1,6 +1,6 @@
# Template file for 'cargo-bootstrap'
pkgname=cargo-bootstrap
-version=1.64.0
+version=1.68.0
revision=1
short_desc="Bootstrap binaries of Rust package manager"
maintainer="Orphaned <orphan@voidlinux.org>"
@@ -18,7 +18,7 @@ _bootstrap_url="https://static.rust-lang.org/dist"
# updating the crates.io index)
# ppc64 is excluded because of ABI incompatibility
case "$XBPS_TARGET_MACHINE" in
- x86_64*|i686|ppc64le) ;;
+ x86_64*|i686) ;;
# See srcpkgs/rust-bootstrap/files/generating-distfiles.md for details
*) _bootstrap_url="https://repo-default.voidlinux.org/distfiles" ;;
esac
@@ -28,31 +28,15 @@ esac
case "$XBPS_TARGET_MACHINE" in
i686)
distfiles="${_bootstrap_url}/cargo-${version}-i686-unknown-linux-gnu.tar.xz"
- checksum="e2e20a16f5db52cd6b773c94225b03880743544ff2f317dd857cf0dceac6ab57"
+ checksum="5cff8c4edc54fcf64a8e14f35d6091ca601a6a3fcac0c00f08496547193743e1"
;;
x86_64)
distfiles="${_bootstrap_url}/cargo-${version}-x86_64-unknown-linux-gnu.tar.xz"
- checksum="21434d83a30ad3fa4e4831487c5574a20b07dd57d213b26e1246290c57d4ec41"
+ checksum="7a58b0c79303bec33c48f9218005002f282722582802c9936d10e4c8f8a8f998"
;;
x86_64-musl)
distfiles="${_bootstrap_url}/cargo-${version}-x86_64-unknown-linux-musl.tar.xz"
- checksum="01d06176fd894b9299ed4f5b78e87d78a9a25b9ba803d3f8c50b7a4ea21d8807"
- ;;
- ppc64le)
- distfiles="${_bootstrap_url}/cargo-${version}-powerpc64le-unknown-linux-gnu.tar.xz"
- checksum="ba7188b2c7890e61bf58d3aa9e94c323fec375f67cf03841bbcc0f6c800fe6ad"
- ;;
- ppc64le-musl)
- distfiles="${_bootstrap_url}/cargo-${version}-powerpc64le-unknown-linux-musl.tar.xz"
- checksum="1b54ab4793ac6c9c43ee9ee45677f403a9bba9c6610e8838c96ec194bcb4f261"
- ;;
- ppc64)
- distfiles="${_bootstrap_url}/cargo-${version}-powerpc64-unknown-linux-gnu.tar.xz"
- checksum="96ce39dac948333b8321d2bc3ac70982879b185d69267f3d580df3f9c662dd0d"
- ;;
- ppc)
- distfiles="${_bootstrap_url}/cargo-${version}-powerpc-unknown-linux-gnu.tar.xz"
- checksum="c7aa415b64b046626003fcafc76da90373adc8fc748f065fa8385dc19d3b3a2a"
+ checksum="9f33dfe385cb7825fa50e97a7437e16b0c99c8abc63875adf29b1a31ac2234df"
;;
*) broken="cargo bootstrap binaries unavailable for ${XBPS_TARGET_MACHINE}";;
esac
From bdaba1bc40214bddd3bf196ff342625af9461148 Mon Sep 17 00:00:00 2001
From: Marcin Puc <tranzystorek.io@protonmail.com>
Date: Sun, 5 Feb 2023 14:11:22 +0100
Subject: [PATCH 030/134] rust: update to 1.68.0
---
...dlib-and-musl_root-from-musl-targets.patch | 93 ++---
...e-ELFv2-ABI-on-all-powerpc64-targets.patch | 41 +-
...le-initial-exec-TLS-model-on-powerpc.patch | 19 +-
.../patches/0015-initial-ppcle-port.patch | 379 ------------------
srcpkgs/rust/template | 8 +-
5 files changed, 44 insertions(+), 496 deletions(-)
delete mode 100644 srcpkgs/rust/patches/0015-initial-ppcle-port.patch
diff --git a/srcpkgs/rust/patches/0002-Remove-nostdlib-and-musl_root-from-musl-targets.patch b/srcpkgs/rust/patches/0002-Remove-nostdlib-and-musl_root-from-musl-targets.patch
index c156945b8111..c84c1c4f483d 100644
--- a/srcpkgs/rust/patches/0002-Remove-nostdlib-and-musl_root-from-musl-targets.patch
+++ b/srcpkgs/rust/patches/0002-Remove-nostdlib-and-musl_root-from-musl-targets.patch
@@ -1,30 +1,12 @@
-From 7219ba1c9accbad9b530d312fd9a9f69330c93da Mon Sep 17 00:00:00 2001
-From: Samuel Holland <samuel@sholland.org>
-Date: Sun, 3 May 2020 17:53:33 +0200
-Subject: [PATCH 02/15] Remove -nostdlib and musl_root from musl targets
-
-extended by various void contributors to match our musl setup
----
- compiler/rustc_target/src/spec/crt_objects.rs | 22 ----------
- .../rustc_target/src/spec/linux_musl_base.rs | 7 ---
- config.toml.example | 8 ----
- src/bootstrap/cc_detect.rs | 25 +----------
- src/bootstrap/compile.rs | 43 +------------------
- src/bootstrap/config.rs | 9 ----
- src/bootstrap/configure.py | 28 ------------
- src/bootstrap/lib.rs | 19 --------
- src/bootstrap/sanity.rs | 23 ----------
- 9 files changed, 3 insertions(+), 181 deletions(-)
-
diff --git a/compiler/rustc_target/src/spec/crt_objects.rs b/compiler/rustc_target/src/spec/crt_objects.rs
-index 52ac3622e..f35e5b9d8 100644
+index c126390f5..7aef73d3b 100644
--- a/compiler/rustc_target/src/spec/crt_objects.rs
+++ b/compiler/rustc_target/src/spec/crt_objects.rs
@@ -63,28 +63,6 @@ pub(super) fn all(obj: &'static str) -> CrtObjects {
])
}
--pub(super) fn pre_musl_fallback() -> CrtObjects {
+-pub(super) fn pre_musl_self_contained() -> CrtObjects {
- new(&[
- (LinkOutputKind::DynamicNoPicExe, &["crt1.o", "crti.o", "crtbegin.o"]),
- (LinkOutputKind::DynamicPicExe, &["Scrt1.o", "crti.o", "crtbeginS.o"]),
@@ -35,7 +17,7 @@ index 52ac3622e..f35e5b9d8 100644
- ])
-}
-
--pub(super) fn post_musl_fallback() -> CrtObjects {
+-pub(super) fn post_musl_self_contained() -> CrtObjects {
- new(&[
- (LinkOutputKind::DynamicNoPicExe, &["crtend.o", "crtn.o"]),
- (LinkOutputKind::DynamicPicExe, &["crtendS.o", "crtn.o"]),
@@ -46,24 +28,24 @@ index 52ac3622e..f35e5b9d8 100644
- ])
-}
-
- pub(super) fn pre_mingw_fallback() -> CrtObjects {
+ pub(super) fn pre_mingw_self_contained() -> CrtObjects {
new(&[
(LinkOutputKind::DynamicNoPicExe, &["crt2.o", "rsbegin.o"]),
diff --git a/compiler/rustc_target/src/spec/linux_musl_base.rs b/compiler/rustc_target/src/spec/linux_musl_base.rs
-index 207a87ab0..88f807a58 100644
+index 61553e71b..88f807a58 100644
--- a/compiler/rustc_target/src/spec/linux_musl_base.rs
+++ b/compiler/rustc_target/src/spec/linux_musl_base.rs
@@ -1,16 +1,9 @@
--use crate::spec::crt_objects::{self, CrtObjectsFallback};
+-use crate::spec::crt_objects::{self, LinkSelfContainedDefault};
use crate::spec::TargetOptions;
pub fn opts() -> TargetOptions {
let mut base = super::linux_base::opts();
base.env = "musl".into();
-- base.pre_link_objects_fallback = crt_objects::pre_musl_fallback();
-- base.post_link_objects_fallback = crt_objects::post_musl_fallback();
-- base.crt_objects_fallback = Some(CrtObjectsFallback::Musl);
+- base.pre_link_objects_self_contained = crt_objects::pre_musl_self_contained();
+- base.post_link_objects_self_contained = crt_objects::post_musl_self_contained();
+- base.link_self_contained = LinkSelfContainedDefault::Musl;
-
- // These targets statically link libc by default
- base.crt_static_default = true;
@@ -71,11 +53,11 @@ index 207a87ab0..88f807a58 100644
base
}
diff --git a/config.toml.example b/config.toml.example
-index b3284050f..62ac07f87 100644
+index ca54cbd2d..beec9bb04 100644
--- a/config.toml.example
+++ b/config.toml.example
-@@ -523,14 +523,6 @@ changelog-seen = 2
- # supplementary build information, like distro-specific package versions.
+@@ -540,14 +540,6 @@ changelog-seen = 2
+ # behavior -- this may lead to miscompilations or other bugs.
#description = <none> (string)
-# The root location of the musl installation directory. The library directory
@@ -90,10 +72,10 @@ index b3284050f..62ac07f87 100644
# platforms to ensure that the compiler is usable by default from the build
# directory (as it links to a number of dynamic libraries). This may not be
diff --git a/src/bootstrap/cc_detect.rs b/src/bootstrap/cc_detect.rs
-index dca782c29..8eb35ea43 100644
+index 7128d542a..668245f3c 100644
--- a/src/bootstrap/cc_detect.rs
+++ b/src/bootstrap/cc_detect.rs
-@@ -97,7 +97,7 @@ pub fn find(build: &mut Build) {
+@@ -101,7 +101,7 @@ pub fn find(build: &mut Build) {
if let Some(cc) = config.and_then(|c| c.cc.as_ref()) {
cfg.compiler(cc);
} else {
@@ -102,7 +84,7 @@ index dca782c29..8eb35ea43 100644
}
let compiler = cfg.get_compiler();
-@@ -125,7 +125,7 @@ pub fn find(build: &mut Build) {
+@@ -122,7 +122,7 @@ pub fn find(build: &mut Build) {
cfg.compiler(cxx);
true
} else if build.hosts.contains(&target) || build.build == target {
@@ -111,7 +93,7 @@ index dca782c29..8eb35ea43 100644
true
} else {
// Use an auto-detected compiler (or one configured via `CXX_target_triple` env vars).
-@@ -161,7 +161,6 @@ fn set_compiler(
+@@ -158,7 +158,6 @@ fn set_compiler(
compiler: Language,
target: TargetSelection,
config: Option<&Target>,
@@ -119,7 +101,7 @@ index dca782c29..8eb35ea43 100644
) {
match &*target.triple {
// When compiling for android we may have the NDK configured in the
-@@ -204,26 +203,6 @@ fn set_compiler(
+@@ -194,26 +193,6 @@ fn set_compiler(
}
}
@@ -147,10 +129,10 @@ index dca782c29..8eb35ea43 100644
}
}
diff --git a/src/bootstrap/compile.rs b/src/bootstrap/compile.rs
-index b4807d1ab..ce483bf6b 100644
+index 0deed3f99..0bddac5d1 100644
--- a/src/bootstrap/compile.rs
+++ b/src/bootstrap/compile.rs
-@@ -200,39 +200,7 @@ fn copy_self_contained_objects(
+@@ -228,39 +228,7 @@ fn copy_self_contained_objects(
let mut target_deps = vec![];
// Copies the libc and CRT objects.
@@ -191,7 +173,7 @@ index b4807d1ab..ce483bf6b 100644
let srcdir = builder
.wasi_root(target)
.unwrap_or_else(|| {
-@@ -316,15 +284,6 @@ pub fn std_cargo(builder: &Builder<'_>, target: TargetSelection, stage: u32, car
+@@ -344,15 +312,6 @@ pub fn std_cargo(builder: &Builder<'_>, target: TargetSelection, stage: u32, car
.arg("--manifest-path")
.arg(builder.src.join("library/test/Cargo.toml"));
@@ -208,10 +190,10 @@ index b4807d1ab..ce483bf6b 100644
if let Some(p) = builder.wasi_root(target) {
let root = format!("native={}/lib/wasm32-wasi", p.to_str().unwrap());
diff --git a/src/bootstrap/config.rs b/src/bootstrap/config.rs
-index 146077419..18a764689 100644
+index d8c15c76e..53f95e49b 100644
--- a/src/bootstrap/config.rs
+++ b/src/bootstrap/config.rs
-@@ -186,7 +186,6 @@ pub struct Config {
+@@ -200,7 +200,6 @@ pub struct Config {
pub missing_tools: bool,
// Fallback musl-root for all targets
@@ -219,7 +201,7 @@ index 146077419..18a764689 100644
pub prefix: Option<PathBuf>,
pub sysconfdir: Option<PathBuf>,
pub datadir: Option<PathBuf>,
-@@ -400,8 +399,6 @@ pub struct Target {
+@@ -440,8 +439,6 @@ pub struct Target {
pub sanitizers: Option<bool>,
pub profiler: Option<bool>,
pub crt_static: Option<bool>,
@@ -228,7 +210,7 @@ index 146077419..18a764689 100644
pub wasi_root: Option<PathBuf>,
pub qemu_rootfs: Option<PathBuf>,
pub no_std: bool,
-@@ -689,7 +686,6 @@ define_config! {
+@@ -734,7 +731,6 @@ define_config! {
default_linker: Option<String> = "default-linker",
channel: Option<String> = "channel",
description: Option<String> = "description",
@@ -236,7 +218,7 @@ index 146077419..18a764689 100644
rpath: Option<bool> = "rpath",
verbose_tests: Option<bool> = "verbose-tests",
optimize_tests: Option<bool> = "optimize-tests",
-@@ -734,8 +730,6 @@ define_config! {
+@@ -781,8 +777,6 @@ define_config! {
sanitizers: Option<bool> = "sanitizers",
profiler: Option<bool> = "profiler",
crt_static: Option<bool> = "crt-static",
@@ -245,7 +227,7 @@ index 146077419..18a764689 100644
wasi_root: Option<String> = "wasi-root",
qemu_rootfs: Option<String> = "qemu-rootfs",
no_std: Option<bool> = "no-std",
-@@ -1107,7 +1101,6 @@ impl Config {
+@@ -1187,7 +1181,6 @@ impl Config {
set(&mut config.llvm_tools_enabled, rust.llvm_tools);
config.rustc_parallel = rust.parallel_compiler.unwrap_or(false);
config.rustc_default_linker = rust.default_linker;
@@ -253,7 +235,7 @@ index 146077419..18a764689 100644
config.save_toolstates = rust.save_toolstates.map(PathBuf::from);
set(&mut config.deny_warnings, flags.deny_warnings.or(rust.deny_warnings));
set(&mut config.backtrace_on_ice, rust.backtrace_on_ice);
-@@ -1164,8 +1157,6 @@ impl Config {
+@@ -1251,8 +1244,6 @@ impl Config {
target.ranlib = cfg.ranlib.map(PathBuf::from);
target.linker = cfg.linker.map(PathBuf::from);
target.crt_static = cfg.crt_static;
@@ -263,10 +245,10 @@ index 146077419..18a764689 100644
target.qemu_rootfs = cfg.qemu_rootfs.map(PathBuf::from);
target.sanitizers = cfg.sanitizers;
diff --git a/src/bootstrap/configure.py b/src/bootstrap/configure.py
-index 2fc036082..91737e0ea 100755
+index 6b139decb..a2e19b8f4 100755
--- a/src/bootstrap/configure.py
+++ b/src/bootstrap/configure.py
-@@ -114,34 +114,6 @@ v("aarch64-linux-android-ndk", "target.aarch64-linux-android.android-ndk",
+@@ -112,34 +112,6 @@ v("aarch64-linux-android-ndk", "target.aarch64-linux-android.android-ndk",
"aarch64-linux-android NDK standalone path")
v("x86_64-linux-android-ndk", "target.x86_64-linux-android.android-ndk",
"x86_64-linux-android NDK standalone path")
@@ -302,10 +284,10 @@ index 2fc036082..91737e0ea 100755
"rootfs in qemu testing, you probably don't want to use this")
v("qemu-aarch64-rootfs", "target.aarch64-unknown-linux-gnu.qemu-rootfs",
diff --git a/src/bootstrap/lib.rs b/src/bootstrap/lib.rs
-index b603ae90a..0a7012dbd 100644
+index 3ed534523..c7c7a75f0 100644
--- a/src/bootstrap/lib.rs
+++ b/src/bootstrap/lib.rs
-@@ -1153,25 +1153,6 @@ impl Build {
+@@ -1181,25 +1181,6 @@ impl Build {
}
}
@@ -332,7 +314,7 @@ index b603ae90a..0a7012dbd 100644
fn wasi_root(&self, target: TargetSelection) -> Option<&Path> {
self.config.target_config.get(&target).and_then(|t| t.wasi_root.as_ref()).map(|p| &**p)
diff --git a/src/bootstrap/sanity.rs b/src/bootstrap/sanity.rs
-index 64c5dd7ae..b8f9104ea 100644
+index 8a40b0f64..59e11d304 100644
--- a/src/bootstrap/sanity.rs
+++ b/src/bootstrap/sanity.rs
@@ -11,7 +11,6 @@
@@ -343,7 +325,7 @@ index 64c5dd7ae..b8f9104ea 100644
use std::path::PathBuf;
use std::process::Command;
-@@ -190,28 +189,6 @@ than building it.
+@@ -205,28 +204,6 @@ than building it.
}
}
@@ -369,9 +351,6 @@ index 64c5dd7ae..b8f9104ea 100644
- }
- }
-
- if need_cmake && target.contains("msvc") {
- // There are three builds of cmake on windows: MSVC, MinGW, and
- // Cygwin. The Cygwin build does not have generators for Visual
---
-2.37.2
-
+ // Some environments don't want or need these tools, such as when testing Miri.
+ // FIXME: it would be better to refactor this code to split necessary setup from pure sanity
+ // checks, and have a regular flag for skipping the latter. Also see
diff --git a/srcpkgs/rust/patches/0011-Use-ELFv2-ABI-on-all-powerpc64-targets.patch b/srcpkgs/rust/patches/0011-Use-ELFv2-ABI-on-all-powerpc64-targets.patch
index 347ee613983d..3813cc0d97c7 100644
--- a/srcpkgs/rust/patches/0011-Use-ELFv2-ABI-on-all-powerpc64-targets.patch
+++ b/srcpkgs/rust/patches/0011-Use-ELFv2-ABI-on-all-powerpc64-targets.patch
@@ -1,19 +1,5 @@
-From de93abe8a0d9dc7878a48f61b9e3ae4a923020f6 Mon Sep 17 00:00:00 2001
-From: q66 <daniel@octaforge.org>
-Date: Sun, 3 May 2020 18:08:09 +0200
-Subject: [PATCH 11/15] Use ELFv2 ABI on all powerpc64 targets
-
-This patches librustc_target so that ELFv2 is used everywhere, matching our
-LLVM. While this is not perfect (it does not allow rustc to compile legacy
-binaries), rustc never requests specific ABI from llvm in the first place,
-so at least match the environment we have.
----
- compiler/rustc_target/src/abi/call/powerpc64.rs | 9 +--------
- .../rustc_target/src/spec/powerpc64_unknown_linux_gnu.rs | 6 +-----
- 2 files changed, 2 insertions(+), 13 deletions(-)
-
diff --git a/compiler/rustc_target/src/abi/call/powerpc64.rs b/compiler/rustc_target/src/abi/call/powerpc64.rs
-index c22ef9c8f..932172b2f 100644
+index 359bb8fc0..414c70cea 100644
--- a/compiler/rustc_target/src/abi/call/powerpc64.rs
+++ b/compiler/rustc_target/src/abi/call/powerpc64.rs
@@ -119,14 +119,7 @@ where
@@ -32,28 +18,3 @@ index c22ef9c8f..932172b2f 100644
if !fn_abi.ret.is_ignore() {
classify_ret(cx, &mut fn_abi.ret, abi);
-diff --git a/compiler/rustc_target/src/spec/powerpc64_unknown_linux_gnu.rs b/compiler/rustc_target/src/spec/powerpc64_unknown_linux_gnu.rs
-index 24d5d187e..aa594b02e 100644
---- a/compiler/rustc_target/src/spec/powerpc64_unknown_linux_gnu.rs
-+++ b/compiler/rustc_target/src/spec/powerpc64_unknown_linux_gnu.rs
-@@ -1,5 +1,5 @@
- use crate::abi::Endian;
--use crate::spec::{LinkerFlavor, RelroLevel, Target, TargetOptions};
-+use crate::spec::{LinkerFlavor, Target, TargetOptions};
-
- pub fn target() -> Target {
- let mut base = super::linux_gnu_base::opts();
-@@ -7,10 +7,6 @@ pub fn target() -> Target {
- base.pre_link_args.entry(LinkerFlavor::Gcc).or_default().push("-m64".into());
- base.max_atomic_width = Some(64);
-
-- // ld.so in at least RHEL6 on ppc64 has a bug related to BIND_NOW, so only enable partial RELRO
-- // for now. https://github.com/rust-lang/rust/pull/43170#issuecomment-315411474
-- base.relro_level = RelroLevel::Partial;
--
- Target {
- llvm_target: "powerpc64-unknown-linux-gnu".into(),
- pointer_width: 64,
---
-2.37.2
-
diff --git a/srcpkgs/rust/patches/0012-bootstrap-Disable-initial-exec-TLS-model-on-powerpc.patch b/srcpkgs/rust/patches/0012-bootstrap-Disable-initial-exec-TLS-model-on-powerpc.patch
index 7b1ba46b1f2b..1ca8871d0066 100644
--- a/srcpkgs/rust/patches/0012-bootstrap-Disable-initial-exec-TLS-model-on-powerpc.patch
+++ b/srcpkgs/rust/patches/0012-bootstrap-Disable-initial-exec-TLS-model-on-powerpc.patch
@@ -1,26 +1,13 @@
-From 4b803b211f765f6c6b18223e23670dbf754a980f Mon Sep 17 00:00:00 2001
-From: John Paul Adrian Glaubitz <glaubitz@physik.fu-berlin.de>
-Date: Sat, 29 May 2021 12:38:46 +0000
-Subject: [PATCH 12/15] bootstrap: Disable initial-exec TLS model on powerpc
-
-Fixes #81334.
----
- src/bootstrap/builder.rs | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
diff --git a/src/bootstrap/builder.rs b/src/bootstrap/builder.rs
-index 554dd4188..6a02a225c 100644
+index 8b144f146..acfa7cf04 100644
--- a/src/bootstrap/builder.rs
+++ b/src/bootstrap/builder.rs
-@@ -1844,7 +1844,7 @@ impl<'a> Builder<'a> {
+@@ -1856,7 +1856,7 @@ impl<'a> Builder<'a> {
// efficient initial-exec TLS model. This doesn't work with `dlopen`,
// so we can't use it by default in general, but we can use it for tools
// and our own internal libraries.
- if !mode.must_support_dlopen() && !target.triple.starts_with("powerpc-") {
+ if !mode.must_support_dlopen() && !target.triple.starts_with("powerpc-") && !target.triple.starts_with("powerpcle-") {
- rustflags.arg("-Ztls-model=initial-exec");
+ cargo.env("RUSTC_TLS_MODEL_INITIAL_EXEC", "1");
}
---
-2.37.2
-
diff --git a/srcpkgs/rust/patches/0015-initial-ppcle-port.patch b/srcpkgs/rust/patches/0015-initial-ppcle-port.patch
deleted file mode 100644
index dd6b72e21bcb..000000000000
--- a/srcpkgs/rust/patches/0015-initial-ppcle-port.patch
+++ /dev/null
@@ -1,379 +0,0 @@
-From 2b3b4a11dd75ff43e0f1f12de395d0ce29f8555f Mon Sep 17 00:00:00 2001
-From: Daniel Kolesa <daniel@octaforge.org>
-Date: Sat, 3 Jul 2021 21:02:03 +0200
-Subject: [PATCH 15/15] initial ppcle port
-
----
- compiler/rustc_middle/src/ty/layout.rs | 5 ++++-
- compiler/rustc_target/src/spec/mod.rs | 2 ++
- .../src/spec/powerpcle_unknown_linux_gnu.rs | 15 +++++++++++++++
- .../src/spec/powerpcle_unknown_linux_musl.rs | 15 +++++++++++++++
- src/bootstrap/bootstrap.py | 2 ++
- .../codegen/abi-main-signature-16bit-c-int.rs | 1 +
- src/test/codegen/global_asm.rs | 1 +
- src/test/codegen/global_asm_include.rs | 1 +
- src/test/codegen/global_asm_x2.rs | 1 +
- src/test/codegen/repr-transparent-aggregates-1.rs | 1 +
- src/test/codegen/repr-transparent-aggregates-2.rs | 1 +
- src/test/codegen/stack-probes.rs | 1 +
- .../run-make-fulldeps/atomic-lock-free/Makefile | 2 ++
- src/test/ui/abi/stack-probes-lto.rs | 1 +
- src/test/ui/abi/stack-probes.rs | 1 +
- src/test/ui/target-feature/gate.rs | 1 +
- src/test/ui/target-feature/invalid-attribute.rs | 1 +
- src/tools/compiletest/src/util.rs | 1 +
- vendor/cc/src/lib.rs | 1 +
- vendor/target-lexicon/src/targets.rs | 7 +++++++
- vendor/tikv-jemallocator/benches/roundtrip.rs | 3 ++-
- vendor/tikv-jemallocator/src/lib.rs | 3 ++-
- 22 files changed, 64 insertions(+), 3 deletions(-)
- create mode 100644 compiler/rustc_target/src/spec/powerpcle_unknown_linux_gnu.rs
- create mode 100644 compiler/rustc_target/src/spec/powerpcle_unknown_linux_musl.rs
-
-diff --git a/compiler/rustc_middle/src/ty/layout.rs b/compiler/rustc_middle/src/ty/layout.rs
-index 3b05e42a5..66420f507 100644
---- a/compiler/rustc_middle/src/ty/layout.rs
-+++ b/compiler/rustc_middle/src/ty/layout.rs
-@@ -3205,6 +3205,8 @@ impl<'tcx> LayoutCx<'tcx, TyCtxt<'tcx>> {
- target.os == "linux" && target.arch == "sparc64" && target_env_gnu_like;
- let linux_powerpc_gnu_like =
- target.os == "linux" && target.arch == "powerpc" && target_env_gnu_like;
-+ let linux_powerpcle_gnu_like =
-+ target.os == "linux" && target.arch == "powerpcle" && target_env_gnu_like;
- use SpecAbi::*;
- let rust_abi = matches!(sig.abi, RustIntrinsic | PlatformIntrinsic | Rust | RustCall);
-
-@@ -3311,7 +3313,8 @@ impl<'tcx> LayoutCx<'tcx, TyCtxt<'tcx>> {
- || (!win_x64_gnu
- && !linux_s390x_gnu_like
- && !linux_sparc64_gnu_like
-- && !linux_powerpc_gnu_like)
-+ && !linux_powerpc_gnu_like
-+ && !linux_powerpcle_gnu_like)
- {
- arg.mode = PassMode::Ignore;
- }
-diff --git a/compiler/rustc_target/src/spec/mod.rs b/compiler/rustc_target/src/spec/mod.rs
-index da0589cdd..2db403913 100644
---- a/compiler/rustc_target/src/spec/mod.rs
-+++ b/compiler/rustc_target/src/spec/mod.rs
-@@ -831,6 +831,8 @@ supported_targets! {
- ("powerpc-unknown-linux-gnu", powerpc_unknown_linux_gnu),
- ("powerpc-unknown-linux-gnuspe", powerpc_unknown_linux_gnuspe),
- ("powerpc-unknown-linux-musl", powerpc_unknown_linux_musl),
-+ ("powerpcle-unknown-linux-gnu", powerpcle_unknown_linux_gnu),
-+ ("powerpcle-unknown-linux-musl", powerpcle_unknown_linux_musl),
- ("powerpc64-unknown-linux-gnu", powerpc64_unknown_linux_gnu),
- ("powerpc64-unknown-linux-musl", powerpc64_unknown_linux_musl),
- ("powerpc64le-unknown-linux-gnu", powerpc64le_unknown_linux_gnu),
-diff --git a/compiler/rustc_target/src/spec/powerpcle_unknown_linux_gnu.rs b/compiler/rustc_target/src/spec/powerpcle_unknown_linux_gnu.rs
-new file mode 100644
-index 000000000..b7148a2fc
---- /dev/null
-+++ b/compiler/rustc_target/src/spec/powerpcle_unknown_linux_gnu.rs
-@@ -0,0 +1,15 @@
-+use crate::spec::{LinkerFlavor, Target, TargetOptions};
-+
-+pub fn target() -> Target {
-+ let mut base = super::linux_gnu_base::opts();
-+ base.pre_link_args.entry(LinkerFlavor::Gcc).or_default().push("-m32".into());
-+ base.max_atomic_width = Some(32);
-+
-+ Target {
-+ llvm_target: "powerpcle-unknown-linux-gnu".into(),
-+ pointer_width: 32,
-+ data_layout: "e-m:e-p:32:32-i64:64-n32".into(),
-+ arch: "powerpc".into(),
-+ options: TargetOptions { mcount: "_mcount".into(), ..base },
-+ }
-+}
-diff --git a/compiler/rustc_target/src/spec/powerpcle_unknown_linux_musl.rs b/compiler/rustc_target/src/spec/powerpcle_unknown_linux_musl.rs
-new file mode 100644
-index 000000000..a826b6e47
---- /dev/null
-+++ b/compiler/rustc_target/src/spec/powerpcle_unknown_linux_musl.rs
-@@ -0,0 +1,15 @@
-+use crate::spec::{LinkerFlavor, Target, TargetOptions};
-+
-+pub fn target() -> Target {
-+ let mut base = super::linux_musl_base::opts();
-+ base.pre_link_args.entry(LinkerFlavor::Gcc).or_default().push("-m32".into());
-+ base.max_atomic_width = Some(32);
-+
-+ Target {
-+ llvm_target: "powerpcle-unknown-linux-musl".into(),
-+ pointer_width: 32,
-+ data_layout: "e-m:e-p:32:32-i64:64-n32".into(),
-+ arch: "powerpc".into(),
-+ options: TargetOptions { mcount: "_mcount".into(), ..base },
-+ }
-+}
-diff --git a/src/bootstrap/bootstrap.py b/src/bootstrap/bootstrap.py
-index 3501fd901..a28f456d3 100644
---- a/src/bootstrap/bootstrap.py
-+++ b/src/bootstrap/bootstrap.py
-@@ -339,9 +339,11 @@ def default_build_triple(verbose):
- 'i786': 'i686',
- 'm68k': 'm68k',
- 'powerpc': 'powerpc',
-+ 'powerpcle': 'powerpcle',
- 'powerpc64': 'powerpc64',
- 'powerpc64le': 'powerpc64le',
- 'ppc': 'powerpc',
-+ 'ppcle': 'powerpcle',
- 'ppc64': 'powerpc64',
- 'ppc64le': 'powerpc64le',
- 'riscv64': 'riscv64gc',
-diff --git a/src/test/codegen/abi-main-signature-16bit-c-int.rs b/src/test/codegen/abi-main-signature-16bit-c-int.rs
-index 4ed491dfb..82ec7755d 100644
---- a/src/test/codegen/abi-main-signature-16bit-c-int.rs
-+++ b/src/test/codegen/abi-main-signature-16bit-c-int.rs
-@@ -9,6 +9,7 @@
- // ignore-mips
- // ignore-mips64
- // ignore-powerpc
-+// ignore-powerpcle
- // ignore-powerpc64
- // ignore-riscv64
- // ignore-s390x
-diff --git a/src/test/codegen/global_asm.rs b/src/test/codegen/global_asm.rs
-index fab84868f..104d93d01 100644
---- a/src/test/codegen/global_asm.rs
-+++ b/src/test/codegen/global_asm.rs
-@@ -12,6 +12,7 @@
- // ignore-powerpc64
- // ignore-powerpc64le
- // ignore-powerpc
-+// ignore-powerpcle
- // ignore-r600
- // ignore-amdgcn
- // ignore-sparc
-diff --git a/src/test/codegen/global_asm_include.rs b/src/test/codegen/global_asm_include.rs
-index 02ee91645..13f303332 100644
---- a/src/test/codegen/global_asm_include.rs
-+++ b/src/test/codegen/global_asm_include.rs
-@@ -12,6 +12,7 @@
- // ignore-powerpc64
- // ignore-powerpc64le
- // ignore-powerpc
-+// ignore-powerpcle
- // ignore-r600
- // ignore-amdgcn
- // ignore-sparc
-diff --git a/src/test/codegen/global_asm_x2.rs b/src/test/codegen/global_asm_x2.rs
-index bdcf0ea84..1e2ff8b8d 100644
---- a/src/test/codegen/global_asm_x2.rs
-+++ b/src/test/codegen/global_asm_x2.rs
-@@ -12,6 +12,7 @@
- // ignore-powerpc64
- // ignore-powerpc64le
- // ignore-powerpc
-+// ignore-powerpcle
- // ignore-r600
- // ignore-amdgcn
- // ignore-sparc
-diff --git a/src/test/codegen/repr-transparent-aggregates-1.rs b/src/test/codegen/repr-transparent-aggregates-1.rs
-index 9d18c5f03..8e69d2afd 100644
---- a/src/test/codegen/repr-transparent-aggregates-1.rs
-+++ b/src/test/codegen/repr-transparent-aggregates-1.rs
-@@ -6,6 +6,7 @@
- // ignore-mips
- // ignore-mips64
- // ignore-powerpc
-+// ignore-powerpcle
- // ignore-powerpc64
- // ignore-riscv64 see codegen/riscv-abi
- // ignore-windows
-diff --git a/src/test/codegen/repr-transparent-aggregates-2.rs b/src/test/codegen/repr-transparent-aggregates-2.rs
-index b68e8e9eb..97c509b1b 100644
---- a/src/test/codegen/repr-transparent-aggregates-2.rs
-+++ b/src/test/codegen/repr-transparent-aggregates-2.rs
-@@ -5,6 +5,7 @@
- // ignore-emscripten
- // ignore-mips64
- // ignore-powerpc
-+// ignore-powerpcle
- // ignore-powerpc64
- // ignore-powerpc64le
- // ignore-riscv64 see codegen/riscv-abi
-diff --git a/src/test/codegen/stack-probes.rs b/src/test/codegen/stack-probes.rs
-index 9bd351df3..29073eb56 100644
---- a/src/test/codegen/stack-probes.rs
-+++ b/src/test/codegen/stack-probes.rs
-@@ -3,6 +3,7 @@
- // ignore-mips
- // ignore-mips64
- // ignore-powerpc
-+// ignore-powerpcle
- // ignore-powerpc64
- // ignore-powerpc64le
- // ignore-riscv64
-diff --git a/src/test/run-make-fulldeps/atomic-lock-free/Makefile b/src/test/run-make-fulldeps/atomic-lock-free/Makefile
-index 9e8b4fabf..402d37a45 100644
---- a/src/test/run-make-fulldeps/atomic-lock-free/Makefile
-+++ b/src/test/run-make-fulldeps/atomic-lock-free/Makefile
-@@ -36,6 +36,8 @@ ifeq ($(filter powerpc,$(LLVM_COMPONENTS)),powerpc)
- nm "$(TMPDIR)/libatomic_lock_free.rlib" | $(CGREP) -v __atomic_fetch_add
- $(RUSTC) --target=powerpc-unknown-linux-gnuspe atomic_lock_free.rs
- nm "$(TMPDIR)/libatomic_lock_free.rlib" | $(CGREP) -v __atomic_fetch_add
-+ $(RUSTC) --target=powerpcle-unknown-linux-gnu atomic_lock_free.rs
-+ nm "$(TMPDIR)/libatomic_lock_free.rlib" | $(CGREP) -v __atomic_fetch_add
- $(RUSTC) --target=powerpc64-unknown-linux-gnu atomic_lock_free.rs
- nm "$(TMPDIR)/libatomic_lock_free.rlib" | $(CGREP) -v __atomic_fetch_add
- $(RUSTC) --target=powerpc64le-unknown-linux-gnu atomic_lock_free.rs
-diff --git a/src/test/ui/abi/stack-probes-lto.rs b/src/test/ui/abi/stack-probes-lto.rs
-index 90df1f3f5..8c6dda8b8 100644
---- a/src/test/ui/abi/stack-probes-lto.rs
-+++ b/src/test/ui/abi/stack-probes-lto.rs
-@@ -4,6 +4,7 @@
- // ignore-mips
- // ignore-mips64
- // ignore-powerpc
-+// ignore-powerpcle
- // ignore-s390x
- // ignore-sparc
- // ignore-sparc64
-diff --git a/src/test/ui/abi/stack-probes.rs b/src/test/ui/abi/stack-probes.rs
-index e998dd0f8..9472e5387 100644
---- a/src/test/ui/abi/stack-probes.rs
-+++ b/src/test/ui/abi/stack-probes.rs
-@@ -4,6 +4,7 @@
- // ignore-mips
- // ignore-mips64
- // ignore-powerpc
-+// ignore-powerpcle
- // ignore-s390x
- // ignore-sparc
- // ignore-sparc64
-diff --git a/src/test/ui/target-feature/gate.rs b/src/test/ui/target-feature/gate.rs
-index 2382c98f8..e6fe855d7 100644
---- a/src/test/ui/target-feature/gate.rs
-+++ b/src/test/ui/target-feature/gate.rs
-@@ -5,6 +5,7 @@
- // ignore-mips
- // ignore-mips64
- // ignore-powerpc
-+// ignore-powerpcle
- // ignore-powerpc64
- // ignore-powerpc64le
- // ignore-riscv64
-diff --git a/src/test/ui/target-feature/invalid-attribute.rs b/src/test/ui/target-feature/invalid-attribute.rs
-index ad1b6e96b..122d59a57 100644
---- a/src/test/ui/target-feature/invalid-attribute.rs
-+++ b/src/test/ui/target-feature/invalid-attribute.rs
-@@ -5,6 +5,7 @@
- // ignore-mips
- // ignore-mips64
- // ignore-powerpc
-+// ignore-powerpcle
- // ignore-powerpc64
- // ignore-powerpc64le
- // ignore-riscv64
-diff --git a/src/tools/compiletest/src/util.rs b/src/tools/compiletest/src/util.rs
-index 215af347f..a1c7e4c6a 100644
---- a/src/tools/compiletest/src/util.rs
-+++ b/src/tools/compiletest/src/util.rs
-@@ -71,6 +71,7 @@ const ARCH_TABLE: &[(&str, &str)] = &[
- ("msp430", "msp430"),
- ("nvptx64", "nvptx64"),
- ("powerpc", "powerpc"),
-+ ("powerpcle", "powerpc"),
- ("powerpc64", "powerpc64"),
- ("powerpc64le", "powerpc64"),
- ("riscv64gc", "riscv64"),
-diff --git a/vendor/cc/src/lib.rs b/vendor/cc/src/lib.rs
-index e3a2b98b0..0236729fd 100644
---- a/vendor/cc/src/lib.rs
-+++ b/vendor/cc/src/lib.rs
-@@ -2594,6 +2594,7 @@ impl Build {
- "powerpc-unknown-linux-gnu" => Some("powerpc-linux-gnu"),
- "powerpc-unknown-linux-gnuspe" => Some("powerpc-linux-gnuspe"),
- "powerpc-unknown-netbsd" => Some("powerpc--netbsd"),
-+ "powerpcle-unknown-linux-gnu" => Some("powerpcle-linux-gnu"),
- "powerpc64-unknown-linux-gnu" => Some("powerpc-linux-gnu"),
- "powerpc64le-unknown-linux-gnu" => Some("powerpc64le-linux-gnu"),
- "riscv32i-unknown-none-elf" => self.find_working_gnu_prefix(&[
-diff --git a/vendor/target-lexicon/src/targets.rs b/vendor/target-lexicon/src/targets.rs
-index 22cc95cc3..46167e34e 100644
---- a/vendor/target-lexicon/src/targets.rs
-+++ b/vendor/target-lexicon/src/targets.rs
-@@ -29,6 +29,7 @@ pub enum Architecture {
- Msp430,
- Nvptx64,
- Powerpc,
-+ Powerpcle,
- Powerpc64,
- Powerpc64le,
- Riscv32(Riscv32Architecture),
-@@ -533,6 +534,7 @@ impl Architecture {
- | Mips64(Mips64Architecture::Mipsisa64r6el)
- | Msp430
- | Nvptx64
-+ | Powerpcle
- | Powerpc64le
- | Riscv32(_)
- | Riscv64(_)
-@@ -574,6 +576,7 @@ impl Architecture {
- | M68k
- | Mips32(_)
- | Powerpc
-+ | Powerpcle
- | XTensa => Ok(PointerWidth::U32),
- AmdGcn
- | Bpfeb
-@@ -763,6 +766,7 @@ impl fmt::Display for Architecture {
- Msp430 => f.write_str("msp430"),
- Nvptx64 => f.write_str("nvptx64"),
- Powerpc => f.write_str("powerpc"),
-+ Powerpcle => f.write_str("powerpcle"),
- Powerpc64 => f.write_str("powerpc64"),
- Powerpc64le => f.write_str("powerpc64le"),
- Riscv32(riscv32) => riscv32.fmt(f),
-@@ -943,6 +947,7 @@ impl FromStr for Architecture {
- "msp430" => Msp430,
- "nvptx64" => Nvptx64,
- "powerpc" => Powerpc,
-+ "powerpcle" => Powerpcle,
- "powerpc64" => Powerpc64,
- "powerpc64le" => Powerpc64le,
- "s390x" => S390x,
-@@ -1445,6 +1450,8 @@ mod tests {
- "powerpc-unknown-openbsd",
- "powerpc-wrs-vxworks",
- "powerpc-wrs-vxworks-spe",
-+ "powerpcle-unknown-linux-gnu",
-+ "powerpcle-unknown-linux-musl",
- "powerpc64-unknown-freebsd",
- "powerpc64-unknown-linux-gnu",
- "powerpc64-unknown-linux-musl",
-diff --git a/vendor/tikv-jemallocator/benches/roundtrip.rs b/vendor/tikv-jemallocator/benches/roundtrip.rs
-index 767abe8d4..704bf955a 100644
---- a/vendor/tikv-jemallocator/benches/roundtrip.rs
-+++ b/vendor/tikv-jemallocator/benches/roundtrip.rs
-@@ -22,7 +22,8 @@ static A: Jemalloc = Jemalloc;
- target_arch = "arm",
- target_arch = "mips",
- target_arch = "mipsel",
-- target_arch = "powerpc"
-+ target_arch = "powerpc",
-+ target_arch = "powerpcle",
- )))]
- const MIN_ALIGN: usize = 8;
- #[cfg(all(any(
-diff --git a/vendor/tikv-jemallocator/src/lib.rs b/vendor/tikv-jemallocator/src/lib.rs
-index 4a9397331..4cf47c05d 100644
---- a/vendor/tikv-jemallocator/src/lib.rs
-+++ b/vendor/tikv-jemallocator/src/lib.rs
-@@ -46,7 +46,8 @@ use libc::{c_int, c_void};
- target_arch = "arm",
- target_arch = "mips",
- target_arch = "mipsel",
-- target_arch = "powerpc"
-+ target_arch = "powerpc",
-+ target_arch = "powerpcle",
- )))]
- const ALIGNOF_MAX_ALIGN_T: usize = 8;
- #[cfg(all(any(
---
-2.37.2
-
diff --git a/srcpkgs/rust/template b/srcpkgs/rust/template
index 8e639c486470..4a5dfcfcb4f2 100644
--- a/srcpkgs/rust/template
+++ b/srcpkgs/rust/template
@@ -8,17 +8,17 @@
# uploaded to https://repo-default.voidlinux.org/distfiles/
#
pkgname=rust
-version=1.64.0
+version=1.68.0
revision=1
hostmakedepends="cmake curl pkg-config python3 tar cargo-bootstrap"
-makedepends="libffi-devel ncurses-devel libxml2-devel zlib-devel llvm12"
+makedepends="libffi-devel ncurses-devel libxml2-devel zlib-devel llvm15"
depends="rust-std"
short_desc="Safe, concurrent, practical systems language"
maintainer="Enno Boland <gottox@voidlinux.org>"
license="MIT, Apache-2.0"
homepage="https://www.rust-lang.org/"
distfiles="https://static.rust-lang.org/dist/rustc-${version}-src.tar.gz"
-checksum=b3cd9f481e1a2901bf6f3808d30c69cc4ea80d93c4cc4e2ed52258b180381205
+checksum=eaf4d8b19f23a232a4770fb53ab5e7acdedec11da1d02b0e5d491ca92ca96d62
lib32disabled=yes
make_check=no # CBA for now
@@ -33,7 +33,7 @@ if [ "$XBPS_TARGET_LIBC" = "musl" ]; then
fi
if [ "$CROSS_BUILD" ]; then
- hostmakedepends+=" rust llvm12"
+ hostmakedepends+=" rust llvm15"
# These are required for building the buildhost's stage0/1
hostmakedepends+=" libffi-devel libxml2-devel ncurses-devel zlib-devel"
else
From 2f1a557282d5a5447628195ca13d89063f01f040 Mon Sep 17 00:00:00 2001
From: Marcin Puc <tranzystorek.io@protonmail.com>
Date: Sun, 5 Feb 2023 14:14:16 +0100
Subject: [PATCH 031/134] cargo: update to 1.68.0
---
srcpkgs/cargo/patches/crossbeam-ppcle.patch | 11 ---------
srcpkgs/cargo/template | 25 ++++-----------------
2 files changed, 4 insertions(+), 32 deletions(-)
delete mode 100644 srcpkgs/cargo/patches/crossbeam-ppcle.patch
diff --git a/srcpkgs/cargo/patches/crossbeam-ppcle.patch b/srcpkgs/cargo/patches/crossbeam-ppcle.patch
deleted file mode 100644
index 36d9256e1071..000000000000
--- a/srcpkgs/cargo/patches/crossbeam-ppcle.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- a/crossbeam-utils/no_atomic.rs
-+++ b/crossbeam-utils/no_atomic.rs
-@@ -33,6 +33,8 @@ const NO_ATOMIC_64: &[&str] = &[
- "powerpc-unknown-linux-gnu",
- "powerpc-unknown-linux-gnuspe",
- "powerpc-unknown-linux-musl",
-+ "powerpcle-unknown-linux-gnu",
-+ "powerpcle-unknown-linux-musl",
- "powerpc-unknown-netbsd",
- "powerpc-unknown-openbsd",
- "powerpc-wrs-vxworks",
diff --git a/srcpkgs/cargo/template b/srcpkgs/cargo/template
index e557bbe20805..538f74762065 100644
--- a/srcpkgs/cargo/template
+++ b/srcpkgs/cargo/template
@@ -1,8 +1,8 @@
# Template file for 'cargo'
pkgname=cargo
-version=1.64.0
+version=1.68.0
revision=1
-create_wrksrc=yes
+_cargo_revision=0.69.0
build_helper=rust
hostmakedepends="cargo-bootstrap rust python3 curl cmake pkg-config zlib-devel"
makedepends="rust libcurl-devel openssl-devel"
@@ -11,10 +11,8 @@ short_desc="Rust package manager"
maintainer="Enno Boland <gottox@voidlinux.org>"
license="MIT, Apache-2.0"
homepage="https://crates.io/"
-distfiles="https://github.com/rust-lang/cargo/archive/rust-${version}.tar.gz
- https://github.com/crossbeam-rs/crossbeam/archive/refs/tags/crossbeam-utils-0.8.8.tar.gz"
-checksum="8363ee37e1ff85c7322f0619087b1230f43852dcb26316627a1a703ed20ea4b7
- 52c451910203cd9002cc4b85cff95f45c6ba245392801e80d7898ca5c3c3ab29"
+distfiles="https://github.com/rust-lang/cargo/archive/refs/tags/${_cargo_revision}.tar.gz"
+checksum=46aa35098777fff0101a373c0f20260443d6f7b55ed8b34769f1aacc18a95ba9
replaces="cargo-tree>=0"
build_options="static bindist"
@@ -28,21 +26,6 @@ if [ -z "$_build_static" ]; then
makedepends+=" libgit2-devel"
fi
-post_extract() {
- mv cargo-rust-${version}/* .
- mv crossbeam-crossbeam-utils-* crossbeam-utils
-}
-
-post_patch() {
- rm crossbeam-utils/crossbeam-utils/no_atomic.rs
- cp crossbeam-utils/no_atomic.rs crossbeam-utils/crossbeam-utils
-
- cat >> Cargo.toml <<- EOF
- [patch.crates-io]
- crossbeam-utils = { path = './crossbeam-utils/crossbeam-utils' }
- EOF
-}
-
do_build() {
local cargs
From dc3db3a350c23009b4533c75da8ab626f41dc3bc Mon Sep 17 00:00:00 2001
From: Marcin Puc <tranzystorek.io@protonmail.com>
Date: Sun, 5 Feb 2023 14:15:20 +0100
Subject: [PATCH 032/134] cargo-auditable-bootstrap: rebuild for rust 1.68
---
srcpkgs/cargo-auditable-bootstrap/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/cargo-auditable-bootstrap/template b/srcpkgs/cargo-auditable-bootstrap/template
index 4efd32137b91..43f861a36f3a 100644
--- a/srcpkgs/cargo-auditable-bootstrap/template
+++ b/srcpkgs/cargo-auditable-bootstrap/template
@@ -2,7 +2,7 @@
# Keep synced with cargo-auditable
pkgname=cargo-auditable-bootstrap
version=0.6.0
-revision=1
+revision=2
build_wrksrc=cargo-auditable
build_style=cargo
# Required for bootstrapping purposes
From 891c36ec4ca4bf56eeed5e6987975064349572fa Mon Sep 17 00:00:00 2001
From: Marcin Puc <tranzystorek.io@protonmail.com>
Date: Sun, 5 Feb 2023 14:16:29 +0100
Subject: [PATCH 033/134] cargo-auditable: rebuild for rust 1.68
---
srcpkgs/cargo-auditable/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/cargo-auditable/template b/srcpkgs/cargo-auditable/template
index d9302394725b..17780db11a5a 100644
--- a/srcpkgs/cargo-auditable/template
+++ b/srcpkgs/cargo-auditable/template
@@ -2,7 +2,7 @@
# Keep synced with cargo-auditable-bootstrap
pkgname=cargo-auditable
version=0.6.0
-revision=1
+revision=2
build_wrksrc=cargo-auditable
build_style=cargo
hostmakedepends="cargo-auditable-bootstrap"
From b87968a6b5201c469529120cd31279e7da207019 Mon Sep 17 00:00:00 2001
From: Duncaen <duncaen@voidlinux.org>
Date: Sat, 25 Mar 2023 01:14:44 +0100
Subject: [PATCH 034/134] icu: update to 72.1.
---
common/shlibs | 12 ++++++------
srcpkgs/icu/template | 4 ++--
2 files changed, 8 insertions(+), 8 deletions(-)
diff --git a/common/shlibs b/common/shlibs
index 1b68be307437..c2f1daff55a0 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -527,12 +527,12 @@ libkImageAnnotator.so.0 kImageAnnotator-0.4.1_1
libkColorPicker.so.0 kColorPicker-0.1.5_1
libbabl-0.1.so.0 babl-0.1.16_1
libbamf3.so.2 bamf-0.5.1_1
-libicuio.so.71 icu-libs-71.1_1
-libicui18n.so.71 icu-libs-71.1_1
-libicudata.so.71 icu-libs-71.1_1
-libicutu.so.71 icu-libs-71.1_1
-libicuuc.so.71 icu-libs-71.1_1
-libicutest.so.71 icu-libs-71.1_1
+libicuio.so.72 icu-libs-72.1_1
+libicui18n.so.72 icu-libs-72.1_1
+libicudata.so.72 icu-libs-72.1_1
+libicutu.so.72 icu-libs-72.1_1
+libicuuc.so.72 icu-libs-72.1_1
+libicutest.so.72 icu-libs-72.1_1
libaspell.so.15 libaspell-0.60.8_2
libpspell.so.15 libaspell-0.60.8_2
libenchant-2.so.2 enchant2-2.2.3_1
diff --git a/srcpkgs/icu/template b/srcpkgs/icu/template
index 584a8bf5f759..7c7a2801e3db 100644
--- a/srcpkgs/icu/template
+++ b/srcpkgs/icu/template
@@ -2,7 +2,7 @@
# NOTE: Please convert this package to support progressive updates with the
# next soname bump.
pkgname=icu
-version=71.1
+version=72.1
revision=1
build_wrksrc=source
build_style=gnu-configure
@@ -15,7 +15,7 @@ maintainer="Randy McCaskill <randy@mccaskill.us>"
license="ICU"
homepage="https://home.unicode.org/"
distfiles="https://github.com/unicode-org/icu/releases/download/release-${version//./-}/icu4c-${version//./_}-src.tgz"
-checksum=67a7e6e51f61faf1306b6935333e13b2c48abd8da6d2f46ce6adca24b1e21ebf
+checksum=a2d2d38217092a7ed56635e34467f92f976b370e20182ad325edea6681a71d68
CFLAGS=-fPIC
CXXFLAGS=-fPIC
From 7bd0a40fb5358ffeb8076089e7b4e296ce52ddff Mon Sep 17 00:00:00 2001
From: Duncaen <duncaen@voidlinux.org>
Date: Sat, 25 Mar 2023 01:38:08 +0100
Subject: [PATCH 035/134] 0ad: rebuild for icu-72.1_1
---
srcpkgs/0ad/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/0ad/template b/srcpkgs/0ad/template
index 75036995575a..8ad54317f15e 100644
--- a/srcpkgs/0ad/template
+++ b/srcpkgs/0ad/template
@@ -1,7 +1,7 @@
# Template file for '0ad'
pkgname=0ad
version=0.0.26
-revision=3
+revision=4
archs="x86_64* i686* aarch64* armv7l* ppc64le*"
hostmakedepends="pkg-config perl cmake python3 rust cargo yasm tar clang"
makedepends="SDL2-devel boost-devel gloox-devel libcurl-devel libenet-devel
From 09e1b667c9439f7f4598c4323ae42bce4f9615f9 Mon Sep 17 00:00:00 2001
From: Duncaen <duncaen@voidlinux.org>
Date: Sat, 25 Mar 2023 01:38:53 +0100
Subject: [PATCH 036/134] Aegisub: rebuild for icu-72.1_1
---
srcpkgs/Aegisub/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/Aegisub/template b/srcpkgs/Aegisub/template
index 2facc08a6362..64f141ed6dd6 100644
--- a/srcpkgs/Aegisub/template
+++ b/srcpkgs/Aegisub/template
@@ -1,7 +1,7 @@
# Template file for 'Aegisub'
pkgname=Aegisub
version=3.3.2
-revision=6
+revision=7
build_style=cmake
build_helper=cmake-wxWidgets-gtk3
cmake_builddir="BUILD"
From a3851a92f369fe9c141bbc4389553d443662b41b Mon Sep 17 00:00:00 2001
From: Duncaen <duncaen@voidlinux.org>
Date: Sat, 25 Mar 2023 01:38:53 +0100
Subject: [PATCH 037/134] OpenRCT2: rebuild for icu-72.1_1
---
srcpkgs/OpenRCT2/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/OpenRCT2/template b/srcpkgs/OpenRCT2/template
index 4201a9ca64ea..21994131f7c6 100644
--- a/srcpkgs/OpenRCT2/template
+++ b/srcpkgs/OpenRCT2/template
@@ -3,7 +3,7 @@
# and https://github.com/void-linux/void-packages/issues/1014#issuecomment-417372421
pkgname=OpenRCT2
version=0.4.3
-revision=1
+revision=2
# versions pulled from https://raw.githubusercontent.com/OpenRCT2/OpenRCT2/v${version}/CMakeLists.txt
_objects_version=1.3.7
_titles_version=0.4.0
From 40be9b2bbd47f00ffb1456a509d5963fd4c9fa2d Mon Sep 17 00:00:00 2001
From: Duncaen <duncaen@voidlinux.org>
Date: Sat, 25 Mar 2023 01:38:53 +0100
Subject: [PATCH 038/134] R: rebuild for icu-72.1_1
---
srcpkgs/R/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/R/template b/srcpkgs/R/template
index 1a64b1677bbe..1f968ec1f24c 100644
--- a/srcpkgs/R/template
+++ b/srcpkgs/R/template
@@ -1,7 +1,7 @@
# Template file for 'R'
pkgname=R
version=4.2.2
-revision=1
+revision=2
build_style=gnu-configure
configure_args="--docdir=/usr/share/doc/R rdocdir=/usr/share/doc/R
--with-blas$(vopt_if openblas '=openblas') --with-lapack
From ee501faa1477fe5d2554a1dd938390e9f8c98c1e Mon Sep 17 00:00:00 2001
From: Duncaen <duncaen@voidlinux.org>
Date: Sat, 25 Mar 2023 01:38:53 +0100
Subject: [PATCH 039/134] R-cran-stringi: rebuild for icu-72.1_1
---
srcpkgs/R-cran-stringi/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/R-cran-stringi/template b/srcpkgs/R-cran-stringi/template
index fcc057cfd205..556f555bd82e 100644
--- a/srcpkgs/R-cran-stringi/template
+++ b/srcpkgs/R-cran-stringi/template
@@ -1,7 +1,7 @@
# Template file for 'R-cran-stringi'
pkgname=R-cran-stringi
version=1.7.3
-revision=3
+revision=4
build_style=R-cran
makedepends="pkg-config icu-devel"
short_desc="Character String Processing Facilities"
From 45935602d02b1b52e54a67ef7d6f3024dec0836e Mon Sep 17 00:00:00 2001
From: Duncaen <duncaen@voidlinux.org>
Date: Sat, 25 Mar 2023 01:38:54 +0100
Subject: [PATCH 040/134] an: rebuild for icu-72.1_1
---
srcpkgs/an/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/an/template b/srcpkgs/an/template
index a03ef758fad3..7eea017502fa 100644
--- a/srcpkgs/an/template
+++ b/srcpkgs/an/template
@@ -1,7 +1,7 @@
# Template file for 'an'
pkgname=an
version=1.2
-revision=10
+revision=11
build_style=gnu-makefile
makedepends="icu-devel"
depends="words-en"
From a592aa0b5a599113eff602bf5ed6d1abb32f87c3 Mon Sep 17 00:00:00 2001
From: Duncaen <duncaen@voidlinux.org>
Date: Sat, 25 Mar 2023 01:38:54 +0100
Subject: [PATCH 041/134] boost: rebuild for icu-72.1_1
---
srcpkgs/boost/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/boost/template b/srcpkgs/boost/template
index fcd7bfa013e2..339ae920ed34 100644
--- a/srcpkgs/boost/template
+++ b/srcpkgs/boost/template
@@ -1,7 +1,7 @@
# Template file for 'boost'
pkgname=boost
version=1.81.0
-revision=1
+revision=2
_version=${version/beta/b}
hostmakedepends="which bzip2-devel icu-devel python3-devel pkg-config openmpi"
makedepends="zlib-devel bzip2-devel icu-devel python3-devel liblzma-devel
From 096a56a2a585d97fed7ee5fbe94f040711aa2495 Mon Sep 17 00:00:00 2001
From: Duncaen <duncaen@voidlinux.org>
Date: Sat, 25 Mar 2023 01:38:54 +0100
Subject: [PATCH 042/134] brltty: rebuild for icu-72.1_1
---
srcpkgs/brltty/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/brltty/template b/srcpkgs/brltty/template
index 2ea4b17f1263..44b39d26439e 100644
--- a/srcpkgs/brltty/template
+++ b/srcpkgs/brltty/template
@@ -1,7 +1,7 @@
# Template file for 'brltty'
pkgname=brltty
version=6.4
-revision=7
+revision=8
build_style=gnu-configure
build_helper=python3
configure_args="--enable-gpm --with-screen-driver=lx,sc
From 841df7a11da97e114dc8db13fbaead43ae9b205b Mon Sep 17 00:00:00 2001
From: Duncaen <duncaen@voidlinux.org>
Date: Sat, 25 Mar 2023 01:38:54 +0100
Subject: [PATCH 043/134] calibre: rebuild for icu-72.1_1
---
srcpkgs/calibre/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/calibre/template b/srcpkgs/calibre/template
index 0f0733b7a575..052b1b4a5a4c 100644
--- a/srcpkgs/calibre/template
+++ b/srcpkgs/calibre/template
@@ -1,7 +1,7 @@
# Template file for 'calibre'
pkgname=calibre
version=6.13.0
-revision=2
+revision=3
build_wrksrc=calibre
build_style=python3-module
pycompile_dirs="/usr/lib/calibre/"
From c58b149e94b312327f87ab2a897acca5044a4cd3 Mon Sep 17 00:00:00 2001
From: Duncaen <duncaen@voidlinux.org>
Date: Sat, 25 Mar 2023 01:38:54 +0100
Subject: [PATCH 044/134] clamav: rebuild for icu-72.1_1
---
srcpkgs/clamav/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/clamav/template b/srcpkgs/clamav/template
index 98dcf3750ad2..65237deb1413 100644
--- a/srcpkgs/clamav/template
+++ b/srcpkgs/clamav/template
@@ -1,7 +1,7 @@
# Template file for 'clamav'
pkgname=clamav
version=0.103.8
-revision=1
+revision=2
build_style=gnu-configure
# XXX: system llvm is too new (< 3.7 required)
# Shipped llvm does not build with gcc>=6
From 0b153fcc9ed61eb5a8ff7829cffc8bd17f7c278c Mon Sep 17 00:00:00 2001
From: Duncaen <duncaen@voidlinux.org>
Date: Sat, 25 Mar 2023 01:38:54 +0100
Subject: [PATCH 045/134] darktable: rebuild for icu-72.1_1
---
srcpkgs/darktable/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/darktable/template b/srcpkgs/darktable/template
index ed5e4b1b67b7..a14c44fa87d0 100644
--- a/srcpkgs/darktable/template
+++ b/srcpkgs/darktable/template
@@ -1,7 +1,7 @@
# Template file for 'darktable'
pkgname=darktable
version=4.2.1
-revision=1
+revision=2
# upstream only supports these archs:
archs="x86_64* aarch64* ppc64le*"
build_style=cmake
From fc3f1dfc215b3c3b975bf0f46a6e17ba60b7ae52 Mon Sep 17 00:00:00 2001
From: Duncaen <duncaen@voidlinux.org>
Date: Sat, 25 Mar 2023 01:38:54 +0100
Subject: [PATCH 046/134] dino: rebuild for icu-72.1_1
---
srcpkgs/dino/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/dino/template b/srcpkgs/dino/template
index c78b237f48e0..7a32986b692e 100644
--- a/srcpkgs/dino/template
+++ b/srcpkgs/dino/template
@@ -1,7 +1,7 @@
# Template file for 'dino'
pkgname=dino
version=0.4.2
-revision=1
+revision=2
build_style=cmake
configure_args="-DDINO_PLUGIN_ENABLED_notification-sound=ON -DUSE_SOUP3=ON"
hostmakedepends="cmake ninja gettext unzip pkg-config vala glib-devel"
From 25c5b52001ee374673b6abf953b76e4c5056673a Mon Sep 17 00:00:00 2001
From: Duncaen <duncaen@voidlinux.org>
Date: Sat, 25 Mar 2023 01:38:55 +0100
Subject: [PATCH 047/134] dwdiff: rebuild for icu-72.1_1
---
srcpkgs/dwdiff/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/dwdiff/template b/srcpkgs/dwdiff/template
index 77fc8e1cf2fa..8d980fe9ec16 100644
--- a/srcpkgs/dwdiff/template
+++ b/srcpkgs/dwdiff/template
@@ -1,7 +1,7 @@
# Template file for 'dwdiff'
pkgname=dwdiff
version=2.1.4
-revision=4
+revision=5
build_style=gnu-configure
hostmakedepends="gettext pkg-config"
makedepends="icu-devel"
From b9092f9f8683dec685bbf9c2e81c95f4be5389db Mon Sep 17 00:00:00 2001
From: Duncaen <duncaen@voidlinux.org>
Date: Sat, 25 Mar 2023 01:38:55 +0100
Subject: [PATCH 048/134] evolution-data-server: rebuild for icu-72.1_1
---
srcpkgs/evolution-data-server/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/evolution-data-server/template b/srcpkgs/evolution-data-server/template
index bf1db288cd12..35f4f0b009c7 100644
--- a/srcpkgs/evolution-data-server/template
+++ b/srcpkgs/evolution-data-server/template
@@ -1,7 +1,7 @@
# Template file for 'evolution-data-server'
pkgname=evolution-data-server
version=3.46.3
-revision=1
+revision=2
build_style=cmake
build_helper="gir qemu"
configure_args=" -DSYSCONF_INSTALL_DIR=/etc
From 8aa73e6195e9f9c6686d96dc8b47900f7c40e858 Mon Sep 17 00:00:00 2001
From: Duncaen <duncaen@voidlinux.org>
Date: Sat, 25 Mar 2023 01:38:55 +0100
Subject: [PATCH 049/134] firefox: rebuild for icu-72.1_1
---
srcpkgs/firefox/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/firefox/template b/srcpkgs/firefox/template
index 0f9c16f23d0a..109b3a1b8f0e 100644
--- a/srcpkgs/firefox/template
+++ b/srcpkgs/firefox/template
@@ -4,7 +4,7 @@
#
pkgname=firefox
version=111.0.1
-revision=1
+revision=2
build_helper="rust"
short_desc="Mozilla Firefox web browser"
maintainer="Duncaen <duncaen@voidlinux.org>"
From af8f4a4a225b2949741431fb3ad0f2ffa64269dc Mon Sep 17 00:00:00 2001
From: Duncaen <duncaen@voidlinux.org>
Date: Sat, 25 Mar 2023 01:38:55 +0100
Subject: [PATCH 050/134] firefox-esr: rebuild for icu-72.1_1
---
srcpkgs/firefox-esr/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/firefox-esr/template b/srcpkgs/firefox-esr/template
index 99ebf3d75e04..9ca2decc4cdd 100644
--- a/srcpkgs/firefox-esr/template
+++ b/srcpkgs/firefox-esr/template
@@ -4,7 +4,7 @@
#
pkgname=firefox-esr
version=102.3.0
-revision=1
+revision=2
build_helper="rust"
short_desc="Mozilla Firefox web browser - Extended Support Release"
maintainer="Orphaned <orphan@voidlinux.org>"
From fb8028652ebfdae7ceab5cd939195e054de0fe7c Mon Sep 17 00:00:00 2001
From: Duncaen <duncaen@voidlinux.org>
Date: Sat, 25 Mar 2023 01:38:55 +0100
Subject: [PATCH 051/134] freeciv: rebuild for icu-72.1_1
---
srcpkgs/freeciv/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/freeciv/template b/srcpkgs/freeciv/template
index 9a3c961a9b12..01067c53f119 100644
--- a/srcpkgs/freeciv/template
+++ b/srcpkgs/freeciv/template
@@ -1,7 +1,7 @@
# Template file for 'freeciv'
pkgname=freeciv
version=3.0.3
-revision=2
+revision=3
build_style=gnu-configure
configure_args="--disable-static --enable-fcdb=sqlite3 --enable-fcmp=all"
hostmakedepends="pkg-config"
From d45f5aebdb23bc516992a9c6231112d0916eac05 Mon Sep 17 00:00:00 2001
From: Duncaen <duncaen@voidlinux.org>
Date: Sat, 25 Mar 2023 01:38:55 +0100
Subject: [PATCH 052/134] fsearch: rebuild for icu-72.1_1
---
srcpkgs/fsearch/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/fsearch/template b/srcpkgs/fsearch/template
index 53f51d648aa4..5b01ca37f4f9 100644
--- a/srcpkgs/fsearch/template
+++ b/srcpkgs/fsearch/template
@@ -1,7 +1,7 @@
# Template file for 'fsearch'
pkgname=fsearch
version=0.2.2
-revision=1
+revision=2
build_style=meson
hostmakedepends="gettext glib-devel pkg-config"
makedepends="gtk+3-devel pcre2-devel"
From ee828d593c1db65c8bc3bdfebb885b9d23aeebbd Mon Sep 17 00:00:00 2001
From: Duncaen <duncaen@voidlinux.org>
Date: Sat, 25 Mar 2023 01:38:56 +0100
Subject: [PATCH 053/134] geary: rebuild for icu-72.1_1
---
srcpkgs/geary/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/geary/template b/srcpkgs/geary/template
index 4be416e38a48..a1804b4b65e5 100644
--- a/srcpkgs/geary/template
+++ b/srcpkgs/geary/template
@@ -1,7 +1,7 @@
# Template file for 'geary'
pkgname=geary
version=43.0
-revision=1
+revision=2
build_helper="gir"
build_style=meson
configure_args="-Dprofile=release -Dcontractor=enabled"
From fccfb3ef4f45fd8ab3e3226777f1f8f709e8b865 Mon Sep 17 00:00:00 2001
From: Duncaen <duncaen@voidlinux.org>
Date: Sat, 25 Mar 2023 01:38:56 +0100
Subject: [PATCH 054/134] gnome-builder: rebuild for icu-72.1_1
---
srcpkgs/gnome-builder/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/gnome-builder/template b/srcpkgs/gnome-builder/template
index b89928e1c7e4..a92360e98674 100644
--- a/srcpkgs/gnome-builder/template
+++ b/srcpkgs/gnome-builder/template
@@ -1,7 +1,7 @@
# Template file for 'gnome-builder'
pkgname=gnome-builder
version=43.4
-revision=1
+revision=2
build_style=meson
build_helper=qemu
configure_args="-Dhelp=true -Dnetwork_tests=false"
From bd5f79045a8ceb2fa33291336e9d4c75937129ad Mon Sep 17 00:00:00 2001
From: Duncaen <duncaen@voidlinux.org>
Date: Sat, 25 Mar 2023 01:38:56 +0100
Subject: [PATCH 055/134] gnome-text-editor: rebuild for icu-72.1_1
---
srcpkgs/gnome-text-editor/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/gnome-text-editor/template b/srcpkgs/gnome-text-editor/template
index 067333d055e8..335cfcce50db 100644
--- a/srcpkgs/gnome-text-editor/template
+++ b/srcpkgs/gnome-text-editor/template
@@ -1,7 +1,7 @@
# Template file for 'gnome-text-editor'
pkgname=gnome-text-editor
version=43.2
-revision=1
+revision=2
build_style=meson
hostmakedepends="pkg-config gettext itstool glib-devel
gtk-update-icon-cache desktop-file-utils"
From acbdde32ef6fd6df851cf4fc02fabffd30eb102b Mon Sep 17 00:00:00 2001
From: Duncaen <duncaen@voidlinux.org>
Date: Sat, 25 Mar 2023 01:38:56 +0100
Subject: [PATCH 056/134] gnucash: rebuild for icu-72.1_1
---
srcpkgs/gnucash/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/gnucash/template b/srcpkgs/gnucash/template
index aebccbadc567..3b3d1a4390e2 100644
--- a/srcpkgs/gnucash/template
+++ b/srcpkgs/gnucash/template
@@ -1,7 +1,7 @@
# Template file for 'gnucash'
pkgname=gnucash
version=4.13
-revision=1
+revision=2
build_style=cmake
make_check_target=check
configure_args="-DWITH_SQL=0 -DWITH_PYTHON=1"
From e96f10c5692898c7f862c9f6d0433bec9840607d Mon Sep 17 00:00:00 2001
From: Duncaen <duncaen@voidlinux.org>
Date: Sat, 25 Mar 2023 01:38:56 +0100
Subject: [PATCH 057/134] gnustep-base: rebuild for icu-72.1_1
---
srcpkgs/gnustep-base/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/gnustep-base/template b/srcpkgs/gnustep-base/template
index 647eb3c75427..be29b6c7a132 100644
--- a/srcpkgs/gnustep-base/template
+++ b/srcpkgs/gnustep-base/template
@@ -1,7 +1,7 @@
# Template file for 'gnustep-base'
pkgname=gnustep-base
version=1.29.0
-revision=1
+revision=2
build_style=gnu-configure
hostmakedepends="gnustep-make gcc-objc pkg-config which"
makedepends="libobjc-devel libffi-devel libxml2-devel gnutls-devel
From 29a173787b0576512de28e0b6af7babbec2c1c4d Mon Sep 17 00:00:00 2001
From: Duncaen <duncaen@voidlinux.org>
Date: Sat, 25 Mar 2023 01:38:56 +0100
Subject: [PATCH 058/134] gnustep-gui: rebuild for icu-72.1_1
---
srcpkgs/gnustep-gui/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/gnustep-gui/template b/srcpkgs/gnustep-gui/template
index 76fb960ed7ce..051fb120db7c 100644
--- a/srcpkgs/gnustep-gui/template
+++ b/srcpkgs/gnustep-gui/template
@@ -1,7 +1,7 @@
# Template file for 'gnustep-gui'
pkgname=gnustep-gui
version=0.30.0
-revision=1
+revision=2
build_style=gnu-configure
hostmakedepends="gnustep-make pkg-config tar"
makedepends="gnustep-base-devel libjpeg-turbo-devel tiff-devel libpng-devel
From b5218edcd6df7778ad73e581b2d87455ea4faee0 Mon Sep 17 00:00:00 2001
From: Duncaen <duncaen@voidlinux.org>
Date: Sat, 25 Mar 2023 01:38:57 +0100
Subject: [PATCH 059/134] gspell: rebuild for icu-72.1_1
---
srcpkgs/gspell/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/gspell/template b/srcpkgs/gspell/template
index 8023ec79544d..751a09c4f129 100644
--- a/srcpkgs/gspell/template
+++ b/srcpkgs/gspell/template
@@ -1,7 +1,7 @@
# Template file for 'gspell'
pkgname=gspell
version=1.12.0
-revision=1
+revision=2
build_style=gnu-configure
build_helper="gir"
configure_args="--disable-static $(vopt_enable gir introspection)
From f49c459b5ebcdac57fa88a8964026e0cfe50ce2c Mon Sep 17 00:00:00 2001
From: Duncaen <duncaen@voidlinux.org>
Date: Sat, 25 Mar 2023 01:38:57 +0100
Subject: [PATCH 060/134] harfbuzz: rebuild for icu-72.1_1
---
srcpkgs/harfbuzz/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/harfbuzz/template b/srcpkgs/harfbuzz/template
index 2fc515698f92..cedcabf1cf8d 100644
--- a/srcpkgs/harfbuzz/template
+++ b/srcpkgs/harfbuzz/template
@@ -1,7 +1,7 @@
# Template file for 'harfbuzz'
pkgname=harfbuzz
version=5.1.0
-revision=2
+revision=3
build_style=meson
build_helper="gir qemu"
configure_args="-Dglib=enabled -Dfreetype=enabled -Dcairo=enabled -Dicu=enabled
From abf79109aee6cf03d2da55a0c9a8671b1aeb2112 Mon Sep 17 00:00:00 2001
From: Duncaen <duncaen@voidlinux.org>
Date: Sat, 25 Mar 2023 01:38:57 +0100
Subject: [PATCH 061/134] icu4lua: rebuild for icu-72.1_1
---
srcpkgs/icu4lua/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/icu4lua/template b/srcpkgs/icu4lua/template
index 9fc0d8aaa44f..a63d0362e179 100644
--- a/srcpkgs/icu4lua/template
+++ b/srcpkgs/icu4lua/template
@@ -1,7 +1,7 @@
# Template file for 'icu4lua'
pkgname=icu4lua
version=0.2B
-revision=12
+revision=13
create_wrksrc=yes
build_style=gnu-makefile
hostmakedepends="pkg-config unzip"
From 355b9837c6d87bcb29a4cdeee3bfedf329cf72b7 Mon Sep 17 00:00:00 2001
From: Duncaen <duncaen@voidlinux.org>
Date: Sat, 25 Mar 2023 01:38:57 +0100
Subject: [PATCH 062/134] imv: rebuild for icu-72.1_1
---
srcpkgs/imv/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/imv/template b/srcpkgs/imv/template
index 97ec386b6939..e22fa71027fd 100644
--- a/srcpkgs/imv/template
+++ b/srcpkgs/imv/template
@@ -1,7 +1,7 @@
# Template file for 'imv'
pkgname=imv
version=4.4.0
-revision=2
+revision=3
build_style=meson
# don't define NDEBUG since assert(3) is used to detect error conditions
# (e.g.: https://git.sr.ht/~exec64/imv/tree/v4.4.0/item/src/x11_window.c#L109
From c61d9b6ecfdd74e5bce3e82b6b2a03eb4fe78080 Mon Sep 17 00:00:00 2001
From: Duncaen <duncaen@voidlinux.org>
Date: Sat, 25 Mar 2023 01:38:57 +0100
Subject: [PATCH 063/134] kdb: rebuild for icu-72.1_1
---
srcpkgs/kdb/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/kdb/template b/srcpkgs/kdb/template
index 1f9bd6bf6612..f1afe4147173 100644
--- a/srcpkgs/kdb/template
+++ b/srcpkgs/kdb/template
@@ -1,7 +1,7 @@
# Template file for 'kdb'
pkgname=kdb
version=3.2.0
-revision=8
+revision=9
build_style=cmake
hostmakedepends="extra-cmake-modules doxygen pkg-config kcoreaddons"
makedepends="kcoreaddons-devel postgresql-libs-devel libmariadbclient-devel
From 9cd1439efdcc16b43138db36daec6d5f8b358090 Mon Sep 17 00:00:00 2001
From: Duncaen <duncaen@voidlinux.org>
Date: Sat, 25 Mar 2023 01:38:57 +0100
Subject: [PATCH 064/134] kdeplasma-addons5: rebuild for icu-72.1_1
---
srcpkgs/kdeplasma-addons5/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/kdeplasma-addons5/template b/srcpkgs/kdeplasma-addons5/template
index 400f2431ff29..c2f74d0596aa 100644
--- a/srcpkgs/kdeplasma-addons5/template
+++ b/srcpkgs/kdeplasma-addons5/template
@@ -1,7 +1,7 @@
# Template file for 'kdeplasma-addons5'
pkgname=kdeplasma-addons5
version=5.27.2
-revision=1
+revision=2
build_style=cmake
configure_args="-DBUILD_TESTING=OFF -DKF5_HOST_TOOLING=/usr/lib/cmake"
hostmakedepends="extra-cmake-modules qt5-qmake qt5-host-tools pkg-config
From d026f7279326c8f9a9b34a2e9bd814153444b15d Mon Sep 17 00:00:00 2001
From: Duncaen <duncaen@voidlinux.org>
Date: Sat, 25 Mar 2023 01:38:57 +0100
Subject: [PATCH 065/134] kiwix-lib: rebuild for icu-72.1_1
---
srcpkgs/kiwix-lib/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/kiwix-lib/template b/srcpkgs/kiwix-lib/template
index 368a82b6bcfd..f05fe442241e 100644
--- a/srcpkgs/kiwix-lib/template
+++ b/srcpkgs/kiwix-lib/template
@@ -1,7 +1,7 @@
# Template file for 'kiwix-lib'
pkgname=kiwix-lib
version=9.4.1
-revision=4
+revision=5
build_style=meson
hostmakedepends="pkg-config"
makedepends="icu-devel libzim-devel pugixml-devel xapian-core-devel
From c3724e2608302879638af665261df3752263cdbd Mon Sep 17 00:00:00 2001
From: Duncaen <duncaen@voidlinux.org>
Date: Sat, 25 Mar 2023 01:38:58 +0100
Subject: [PATCH 066/134] konsole: rebuild for icu-72.1_1
---
srcpkgs/konsole/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/konsole/template b/srcpkgs/konsole/template
index 986487c916aa..21b5a2f6190c 100644
--- a/srcpkgs/konsole/template
+++ b/srcpkgs/konsole/template
@@ -1,7 +1,7 @@
# Template file for 'konsole'
pkgname=konsole
version=22.12.1
-revision=1
+revision=2
build_style=cmake
configure_args="-DBUILD_TESTING=OFF -GNinja"
hostmakedepends="pkg-config extra-cmake-modules kcoreaddons qt5-devel
From 73ac065edd07fadc51aa737d8c683570efcd226f Mon Sep 17 00:00:00 2001
From: Duncaen <duncaen@voidlinux.org>
Date: Sat, 25 Mar 2023 01:38:58 +0100
Subject: [PATCH 067/134] libbitcoin-blockchain: rebuild for icu-72.1_1
---
srcpkgs/libbitcoin-blockchain/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/libbitcoin-blockchain/template b/srcpkgs/libbitcoin-blockchain/template
index cc735c2ce2ce..5127fd26bc64 100644
--- a/srcpkgs/libbitcoin-blockchain/template
+++ b/srcpkgs/libbitcoin-blockchain/template
@@ -1,7 +1,7 @@
# Template file for 'libbitcoin-blockchain'
pkgname=libbitcoin-blockchain
version=3.6.0
-revision=8
+revision=9
archs="aarch64* ppc64* x86_64*"
build_style=gnu-configure
configure_args="--with-boost-libdir=${XBPS_CROSS_BASE}/usr/lib
From 3dc5a7f90116d775ff53da160343013e6dfdab2a Mon Sep 17 00:00:00 2001
From: Duncaen <duncaen@voidlinux.org>
Date: Sat, 25 Mar 2023 01:38:58 +0100
Subject: [PATCH 068/134] libbitcoin-client: rebuild for icu-72.1_1
---
srcpkgs/libbitcoin-client/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/libbitcoin-client/template b/srcpkgs/libbitcoin-client/template
index 9b3d474846c9..423b6d8d8109 100644
--- a/srcpkgs/libbitcoin-client/template
+++ b/srcpkgs/libbitcoin-client/template
@@ -1,7 +1,7 @@
# Template file for 'libbitcoin-client'
pkgname=libbitcoin-client
version=3.6.0
-revision=8
+revision=9
build_style=gnu-configure
configure_args="--with-boost-libdir=${XBPS_CROSS_BASE}/usr/lib
--with-boost=${XBPS_CROSS_BASE}/usr --with-gnu-ld --without-examples"
From 9cafa6f49e286cbb57666613251fd12ef2b614c6 Mon Sep 17 00:00:00 2001
From: Duncaen <duncaen@voidlinux.org>
Date: Sat, 25 Mar 2023 01:38:58 +0100
Subject: [PATCH 069/134] libbitcoin-database: rebuild for icu-72.1_1
---
srcpkgs/libbitcoin-database/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/libbitcoin-database/template b/srcpkgs/libbitcoin-database/template
index 37c029d09a60..78ccb8e6ea40 100644
--- a/srcpkgs/libbitcoin-database/template
+++ b/srcpkgs/libbitcoin-database/template
@@ -1,7 +1,7 @@
# Template file for 'libbitcoin-database'
pkgname=libbitcoin-database
version=3.6.0
-revision=8
+revision=9
archs="aarch64* ppc64* x86_64*"
build_style=gnu-configure
configure_args="--with-boost-libdir=${XBPS_CROSS_BASE}/usr/lib
From 5ce44c3b460ec874c4a20d4ef39201b361b7bbc8 Mon Sep 17 00:00:00 2001
From: Duncaen <duncaen@voidlinux.org>
Date: Sat, 25 Mar 2023 01:38:58 +0100
Subject: [PATCH 070/134] libbitcoin-explorer: rebuild for icu-72.1_1
---
srcpkgs/libbitcoin-explorer/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/libbitcoin-explorer/template b/srcpkgs/libbitcoin-explorer/template
index d03405a27350..13bf082be10b 100644
--- a/srcpkgs/libbitcoin-explorer/template
+++ b/srcpkgs/libbitcoin-explorer/template
@@ -1,7 +1,7 @@
# Template file for 'libbitcoin-explorer'
pkgname=libbitcoin-explorer
version=3.6.0
-revision=8
+revision=9
build_style=gnu-configure
configure_args="--with-bash-completiondir=/usr/share/bash-completion/completions
--with-boost-libdir=${XBPS_CROSS_BASE}/usr/lib
From 7c745ca380e573b2b61d959f7614943908b34d85 Mon Sep 17 00:00:00 2001
From: Duncaen <duncaen@voidlinux.org>
Date: Sat, 25 Mar 2023 01:38:58 +0100
Subject: [PATCH 071/134] libbitcoin-network: rebuild for icu-72.1_1
---
srcpkgs/libbitcoin-network/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/libbitcoin-network/template b/srcpkgs/libbitcoin-network/template
index 9e60a742ea9c..81964af81a3f 100644
--- a/srcpkgs/libbitcoin-network/template
+++ b/srcpkgs/libbitcoin-network/template
@@ -1,7 +1,7 @@
# Template file for 'libbitcoin-network'
pkgname=libbitcoin-network
version=3.6.0
-revision=8
+revision=9
build_style=gnu-configure
configure_args="--with-boost-libdir=${XBPS_CROSS_BASE}/usr/lib
--with-boost=${XBPS_CROSS_BASE}/usr --with-gnu-ld"
From 3f82165db8577a55d5d8dbbf4a6295637e8418e4 Mon Sep 17 00:00:00 2001
From: Duncaen <duncaen@voidlinux.org>
Date: Sat, 25 Mar 2023 01:38:59 +0100
Subject: [PATCH 072/134] libbitcoin-node: rebuild for icu-72.1_1
---
srcpkgs/libbitcoin-node/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/libbitcoin-node/template b/srcpkgs/libbitcoin-node/template
index 2fb8c1f7ce2b..07a4051a038e 100644
--- a/srcpkgs/libbitcoin-node/template
+++ b/srcpkgs/libbitcoin-node/template
@@ -1,7 +1,7 @@
# Template file for 'libbitcoin-node'
pkgname=libbitcoin-node
version=3.6.0
-revision=8
+revision=9
archs="aarch64* ppc64* x86_64*"
build_style=gnu-configure
configure_args="--with-bash-completiondir=/usr/share/bash-completion/completions
From f7aa7a5385ad8c6477b731fd1dc33f00a006749d Mon Sep 17 00:00:00 2001
From: Duncaen <duncaen@voidlinux.org>
Date: Sat, 25 Mar 2023 01:38:59 +0100
Subject: [PATCH 073/134] libbitcoin-protocol: rebuild for icu-72.1_1
---
srcpkgs/libbitcoin-protocol/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/libbitcoin-protocol/template b/srcpkgs/libbitcoin-protocol/template
index 972f1bc4e0df..fcd902174bf4 100644
--- a/srcpkgs/libbitcoin-protocol/template
+++ b/srcpkgs/libbitcoin-protocol/template
@@ -1,7 +1,7 @@
# Template file for 'libbitcoin-protocol'
pkgname=libbitcoin-protocol
version=3.6.0
-revision=8
+revision=9
build_style=gnu-configure
configure_args="--with-boost-libdir=${XBPS_CROSS_BASE}/usr/lib
--with-boost=${XBPS_CROSS_BASE}/usr --with-gnu-ld"
From cecc976948f26cdd74da64eeff2eb7547a0f0c9d Mon Sep 17 00:00:00 2001
From: Duncaen <duncaen@voidlinux.org>
Date: Sat, 25 Mar 2023 01:38:59 +0100
Subject: [PATCH 074/134] libbitcoin-server: rebuild for icu-72.1_1
---
srcpkgs/libbitcoin-server/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/libbitcoin-server/template b/srcpkgs/libbitcoin-server/template
index 3329b969d0fb..e2b5d9550f57 100644
--- a/srcpkgs/libbitcoin-server/template
+++ b/srcpkgs/libbitcoin-server/template
@@ -1,7 +1,7 @@
# Template file for 'libbitcoin-server'
pkgname=libbitcoin-server
version=3.6.0
-revision=8
+revision=9
archs="aarch64* ppc64* x86_64*"
build_style=gnu-configure
configure_args="--with-bash-completiondir=/usr/share/bash-completion/completions
From 93da874ce8c9e6504c265323c1c8981cba96f74a Mon Sep 17 00:00:00 2001
From: Duncaen <duncaen@voidlinux.org>
Date: Sat, 25 Mar 2023 01:38:59 +0100
Subject: [PATCH 075/134] libbitcoin-system: rebuild for icu-72.1_1
---
srcpkgs/libbitcoin-system/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/libbitcoin-system/template b/srcpkgs/libbitcoin-system/template
index 89c20c88b2a6..81e1bf29918b 100644
--- a/srcpkgs/libbitcoin-system/template
+++ b/srcpkgs/libbitcoin-system/template
@@ -1,7 +1,7 @@
# Template file for 'libbitcoin-system'
pkgname=libbitcoin-system
version=3.6.0
-revision=8
+revision=9
build_style=gnu-configure
configure_args="--with-boost-libdir=${XBPS_CROSS_BASE}/usr/lib
--with-boost=${XBPS_CROSS_BASE}/usr --with-gnu-ld --with-icu --with-png
From 6109ff459380ad26f81a44af84b6efd0314de6b5 Mon Sep 17 00:00:00 2001
From: Duncaen <duncaen@voidlinux.org>
Date: Sat, 25 Mar 2023 01:38:59 +0100
Subject: [PATCH 076/134] libcdr: rebuild for icu-72.1_1
---
srcpkgs/libcdr/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/libcdr/template b/srcpkgs/libcdr/template
index d490cc760bfc..c0057aada95f 100644
--- a/srcpkgs/libcdr/template
+++ b/srcpkgs/libcdr/template
@@ -1,7 +1,7 @@
# Template file for 'libcdr'
pkgname=libcdr
version=0.1.7
-revision=4
+revision=5
build_style=gnu-configure
configure_args="--disable-debug"
hostmakedepends="pkg-config"
From 90b453a68d62d35fa3a64fc3d32a010b75b7d35a Mon Sep 17 00:00:00 2001
From: Duncaen <duncaen@voidlinux.org>
Date: Sat, 25 Mar 2023 01:38:59 +0100
Subject: [PATCH 077/134] libe-book: rebuild for icu-72.1_1
---
srcpkgs/libe-book/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/libe-book/template b/srcpkgs/libe-book/template
index a6cc63b5272c..f9a17bdc72a7 100644
--- a/srcpkgs/libe-book/template
+++ b/srcpkgs/libe-book/template
@@ -1,7 +1,7 @@
# Template file for 'libe-book'
pkgname=libe-book
version=0.1.3
-revision=11
+revision=12
build_style=gnu-configure
configure_args="--disable-werror"
hostmakedepends="automake libtool gperf doxygen pkg-config"
From 0d6ae791984fa7e374415e64f4fcaa9a4805e51d Mon Sep 17 00:00:00 2001
From: Duncaen <duncaen@voidlinux.org>
Date: Sat, 25 Mar 2023 01:38:59 +0100
Subject: [PATCH 078/134] libical: rebuild for icu-72.1_1
---
srcpkgs/libical/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/libical/template b/srcpkgs/libical/template
index 641cfc9aa625..937c9613c4d3 100644
--- a/srcpkgs/libical/template
+++ b/srcpkgs/libical/template
@@ -1,7 +1,7 @@
# Template file for 'libical'
pkgname=libical
version=3.0.16
-revision=1
+revision=2
build_style=cmake
build_helper="gir qemu"
configure_args="-DICAL_BUILD_DOCS=false
From 33fd43b9da0112b7f31cd054d12311129994bf1f Mon Sep 17 00:00:00 2001
From: Duncaen <duncaen@voidlinux.org>
Date: Sat, 25 Mar 2023 01:39:00 +0100
Subject: [PATCH 079/134] liblcf: rebuild for icu-72.1_1
---
srcpkgs/liblcf/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/liblcf/template b/srcpkgs/liblcf/template
index 02a752e617e3..35f3a24c8036 100644
--- a/srcpkgs/liblcf/template
+++ b/srcpkgs/liblcf/template
@@ -1,7 +1,7 @@
# Template file for 'liblcf'
pkgname=liblcf
version=0.6.2
-revision=4
+revision=5
build_style=gnu-configure
hostmakedepends="pkg-config autoconf automake libtool"
makedepends="expat-devel icu-devel"
From 77025b441b29650eb32a7061d2d37bd2cad97fd3 Mon Sep 17 00:00:00 2001
From: Duncaen <duncaen@voidlinux.org>
Date: Sat, 25 Mar 2023 01:39:00 +0100
Subject: [PATCH 080/134] libmspub: rebuild for icu-72.1_1
---
srcpkgs/libmspub/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/libmspub/template b/srcpkgs/libmspub/template
index 946153be3dcb..5b4ff7331eb4 100644
--- a/srcpkgs/libmspub/template
+++ b/srcpkgs/libmspub/template
@@ -1,7 +1,7 @@
# Template file for 'libmspub'
pkgname=libmspub
version=0.1.4
-revision=9
+revision=10
build_style=gnu-configure
hostmakedepends="pkg-config"
makedepends="icu-devel boost-devel librevenge-devel zlib-devel"
From ac3a9e2a0309c8b9d269dfa1bc1ff3fc1aca422e Mon Sep 17 00:00:00 2001
From: Duncaen <duncaen@voidlinux.org>
Date: Sat, 25 Mar 2023 01:39:00 +0100
Subject: [PATCH 081/134] libphonenumber: rebuild for icu-72.1_1
---
srcpkgs/libphonenumber/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/libphonenumber/template b/srcpkgs/libphonenumber/template
index cd2832a7b3cf..767c0ec9a7a7 100644
--- a/srcpkgs/libphonenumber/template
+++ b/srcpkgs/libphonenumber/template
@@ -1,7 +1,7 @@
# Template file for 'libphonenumber'
pkgname=libphonenumber
version=8.12.39
-revision=9
+revision=10
build_wrksrc=cpp
build_style=cmake
build_helper=qemu
From bb376bfa8e08b4d570c9e34b0120098a69b213d8 Mon Sep 17 00:00:00 2001
From: Duncaen <duncaen@voidlinux.org>
Date: Sat, 25 Mar 2023 01:39:00 +0100
Subject: [PATCH 082/134] libpsl: rebuild for icu-72.1_1
---
srcpkgs/libpsl/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/libpsl/template b/srcpkgs/libpsl/template
index 095bac4e29a0..a57c428b9e58 100644
--- a/srcpkgs/libpsl/template
+++ b/srcpkgs/libpsl/template
@@ -1,7 +1,7 @@
# Template file for 'libpsl'
pkgname=libpsl
version=0.21.1
-revision=4
+revision=5
build_style=gnu-configure
hostmakedepends="pkg-config python3"
makedepends="icu-devel"
From b64bcad8af774fcd7b89b594b2408a49dd3ac560 Mon Sep 17 00:00:00 2001
From: Duncaen <duncaen@voidlinux.org>
Date: Sat, 25 Mar 2023 01:39:00 +0100
Subject: [PATCH 083/134] libqalculate: rebuild for icu-72.1_1
---
srcpkgs/libqalculate/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/libqalculate/template b/srcpkgs/libqalculate/template
index 0c043fbaf9c6..beec5e4a96d5 100644
--- a/srcpkgs/libqalculate/template
+++ b/srcpkgs/libqalculate/template
@@ -2,7 +2,7 @@
# NOTE: keep this package synchronized with 'qalculate-gtk' and 'qalculate-qt'
pkgname=libqalculate
version=4.5.1
-revision=1
+revision=2
build_style=gnu-configure
hostmakedepends="intltool pkg-config doxygen"
makedepends="libxml2-devel cln-devel readline-devel libcurl-devel icu-devel
From 791a042425467e88b51536324698873f65625303 Mon Sep 17 00:00:00 2001
From: Duncaen <duncaen@voidlinux.org>
Date: Sat, 25 Mar 2023 01:39:00 +0100
Subject: [PATCH 084/134] libqxp: rebuild for icu-72.1_1
---
srcpkgs/libqxp/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/libqxp/template b/srcpkgs/libqxp/template
index 14245f506953..78e24b95ed3a 100644
--- a/srcpkgs/libqxp/template
+++ b/srcpkgs/libqxp/template
@@ -1,7 +1,7 @@
# Template file for 'libqxp'
pkgname=libqxp
version=0.0.2
-revision=7
+revision=8
build_style=gnu-configure
hostmakedepends="pkg-config"
makedepends="boost-devel librevenge-devel icu-devel"
From e60515604f340db7e0cfcdfd303830dbbecf5679 Mon Sep 17 00:00:00 2001
From: Duncaen <duncaen@voidlinux.org>
Date: Sat, 25 Mar 2023 01:39:01 +0100
Subject: [PATCH 085/134] libreoffice: rebuild for icu-72.1_1
---
srcpkgs/libreoffice/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/libreoffice/template b/srcpkgs/libreoffice/template
index 11e023847f1e..ebc76272d6d8 100644
--- a/srcpkgs/libreoffice/template
+++ b/srcpkgs/libreoffice/template
@@ -1,7 +1,7 @@
# Template file for 'libreoffice'
pkgname=libreoffice
version=7.4.3.2
-revision=1
+revision=2
build_style=meta
make_build_target="build"
nocross="Several dependencies are nocross=yes"
From 662dd199d05cb205cf44717b7ed0abc150fc5884 Mon Sep 17 00:00:00 2001
From: Duncaen <duncaen@voidlinux.org>
Date: Sat, 25 Mar 2023 01:39:01 +0100
Subject: [PATCH 086/134] libvisio: rebuild for icu-72.1_1
---
srcpkgs/libvisio/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/libvisio/template b/srcpkgs/libvisio/template
index e566ad1c9e4b..77dbf5cf02e4 100644
--- a/srcpkgs/libvisio/template
+++ b/srcpkgs/libvisio/template
@@ -1,7 +1,7 @@
# Template file for 'libvisio'
pkgname=libvisio
version=0.1.7
-revision=5
+revision=6
build_style=gnu-configure
hostmakedepends="gperf pkg-config perl"
makedepends="boost-devel librevenge-devel libxml2-devel icu-devel"
From b98e6fafd53d1b567592e98a391fa9d8fe5a790c Mon Sep 17 00:00:00 2001
From: Duncaen <duncaen@voidlinux.org>
Date: Sat, 25 Mar 2023 01:39:01 +0100
Subject: [PATCH 087/134] libxml2: rebuild for icu-72.1_1
---
srcpkgs/libxml2/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/libxml2/template b/srcpkgs/libxml2/template
index ae0a2497218b..b29b99c10b36 100644
--- a/srcpkgs/libxml2/template
+++ b/srcpkgs/libxml2/template
@@ -1,7 +1,7 @@
# Template file for 'libxml2'
pkgname=libxml2
version=2.9.13
-revision=4
+revision=5
build_style=gnu-configure
configure_args="--with-threads --with-history --with-icu"
hostmakedepends="gettext pkg-config python3"
From d20b0e236b5a3a523c1dcc2e1602ce7b435ba171 Mon Sep 17 00:00:00 2001
From: Duncaen <duncaen@voidlinux.org>
Date: Sat, 25 Mar 2023 01:39:01 +0100
Subject: [PATCH 088/134] libzim: rebuild for icu-72.1_1
---
srcpkgs/libzim/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/libzim/template b/srcpkgs/libzim/template
index 8f22c1601914..242334046c1d 100644
--- a/srcpkgs/libzim/template
+++ b/srcpkgs/libzim/template
@@ -1,7 +1,7 @@
# Template file for 'libzim'
pkgname=libzim
version=6.3.2
-revision=3
+revision=4
build_style=meson
hostmakedepends="pkg-config git"
makedepends="liblzma-devel $(vopt_if zlib zlib-devel)
From c0a950f4e52ea6947656f9789b52dcc8b1498909 Mon Sep 17 00:00:00 2001
From: Duncaen <duncaen@voidlinux.org>
Date: Sat, 25 Mar 2023 01:39:01 +0100
Subject: [PATCH 089/134] maim: rebuild for icu-72.1_1
---
srcpkgs/maim/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/maim/template b/srcpkgs/maim/template
index 5df088be5f9d..70e05e06c539 100644
--- a/srcpkgs/maim/template
+++ b/srcpkgs/maim/template
@@ -1,7 +1,7 @@
# Template file for 'maim'
pkgname=maim
version=5.7.4
-revision=5
+revision=6
build_style=cmake
hostmakedepends="pkg-config"
makedepends="MesaLib-devel glm icu-devel libXcomposite-devel libXrandr-devel
From 8f44d3ce51ecd788413a14ec0c7b6492054bd6fc Mon Sep 17 00:00:00 2001
From: Duncaen <duncaen@voidlinux.org>
Date: Sat, 25 Mar 2023 01:39:01 +0100
Subject: [PATCH 090/134] modsecurity: rebuild for icu-72.1_1
---
srcpkgs/modsecurity/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/modsecurity/template b/srcpkgs/modsecurity/template
index f23246f12dcb..00774d754cf3 100644
--- a/srcpkgs/modsecurity/template
+++ b/srcpkgs/modsecurity/template
@@ -1,7 +1,7 @@
# Template file for 'modsecurity'
pkgname=modsecurity
version=3.0.4
-revision=5
+revision=6
build_style=gnu-configure
configure_args="--enable-standalone-module --enable-htaccess-config"
hostmakedepends="pkg-config"
From 6a28ae5fa099934a4f94d31fb05d218955292524 Mon Sep 17 00:00:00 2001
From: Duncaen <duncaen@voidlinux.org>
Date: Sat, 25 Mar 2023 01:39:02 +0100
Subject: [PATCH 091/134] mozjs102: rebuild for icu-72.1_1
---
srcpkgs/mozjs102/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/mozjs102/template b/srcpkgs/mozjs102/template
index ff43ef23f4a3..8c9f93a5b37a 100644
--- a/srcpkgs/mozjs102/template
+++ b/srcpkgs/mozjs102/template
@@ -1,7 +1,7 @@
# Template file for 'mozjs102'
pkgname=mozjs102
version=102.8.0
-revision=1
+revision=2
build_wrksrc=js/src
build_style=gnu-configure
build_helper=rust
From 66c2704d47b6c9e36fe58af6af1cd8a5ab11e33f Mon Sep 17 00:00:00 2001
From: Duncaen <duncaen@voidlinux.org>
Date: Sat, 25 Mar 2023 01:39:02 +0100
Subject: [PATCH 092/134] mozjs78: rebuild for icu-72.1_1
---
srcpkgs/mozjs78/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/mozjs78/template b/srcpkgs/mozjs78/template
index 6b96fdaadb7d..91142647baeb 100644
--- a/srcpkgs/mozjs78/template
+++ b/srcpkgs/mozjs78/template
@@ -1,7 +1,7 @@
# Template file for 'mozjs78'
pkgname=mozjs78
version=78.9.0
-revision=6
+revision=7
build_wrksrc=js/src
build_style=gnu-configure
build_helper=rust
From d1098737c351510c48d4199e56998f10fb53d990 Mon Sep 17 00:00:00 2001
From: Duncaen <duncaen@voidlinux.org>
Date: Sat, 25 Mar 2023 01:39:02 +0100
Subject: [PATCH 093/134] mpd: rebuild for icu-72.1_1
---
srcpkgs/mpd/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/mpd/template b/srcpkgs/mpd/template
index 63701b7d56b1..df35e751ea60 100644
--- a/srcpkgs/mpd/template
+++ b/srcpkgs/mpd/template
@@ -1,7 +1,7 @@
# Template file for 'mpd'
pkgname=mpd
version=0.23.12
-revision=1
+revision=2
build_style=meson
configure_args="-Dopus=enabled -Dmikmod=enabled -Dneighbor=true
-Dsoundcloud=enabled -Dpipe=true -Dtwolame=enabled -Dbzip2=enabled
From a5ad745a0fbbe555d5ccd46279fced2e73f568fa Mon Sep 17 00:00:00 2001
From: Duncaen <duncaen@voidlinux.org>
Date: Sat, 25 Mar 2023 01:39:02 +0100
Subject: [PATCH 094/134] ncmpcpp: rebuild for icu-72.1_1
---
srcpkgs/ncmpcpp/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/ncmpcpp/template b/srcpkgs/ncmpcpp/template
index 559620005d15..e9958d9043ba 100644
--- a/srcpkgs/ncmpcpp/template
+++ b/srcpkgs/ncmpcpp/template
@@ -1,7 +1,7 @@
# Template file for 'ncmpcpp'
pkgname=ncmpcpp
version=0.9.2
-revision=7
+revision=8
build_style=gnu-configure
configure_args=" BOOST_LIB_SUFFIX= --enable-clock --enable-outputs
--enable-unicode --enable-visualizer --with-curl --with-taglib --with-fftw"
From 3ba9cdef1169b4d47e360c5c7c2a910c4bc1e14c Mon Sep 17 00:00:00 2001
From: Duncaen <duncaen@voidlinux.org>
Date: Sat, 25 Mar 2023 01:39:02 +0100
Subject: [PATCH 095/134] nodejs: rebuild for icu-72.1_1
---
srcpkgs/nodejs/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/nodejs/template b/srcpkgs/nodejs/template
index 0fee0a8ec725..a53792a6544f 100644
--- a/srcpkgs/nodejs/template
+++ b/srcpkgs/nodejs/template
@@ -1,7 +1,7 @@
# Template file for 'nodejs'
pkgname=nodejs
version=16.19.0
-revision=1
+revision=2
# Need these for host v8 for torque, see https://github.com/nodejs/node/pull/21079
hostmakedepends="which pkg-config python3 libatomic-devel zlib-devel
$(vopt_if icu icu-devel) $(vopt_if ssl openssl-devel) $(vopt_if libuv libuv-devel)
From 565f7dbd4268af506bd0b11d8166eaaf38e991e0 Mon Sep 17 00:00:00 2001
From: Duncaen <duncaen@voidlinux.org>
Date: Sat, 25 Mar 2023 01:39:02 +0100
Subject: [PATCH 096/134] nodejs-lts: rebuild for icu-72.1_1
---
srcpkgs/nodejs-lts/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/nodejs-lts/template b/srcpkgs/nodejs-lts/template
index 5420e8524442..d88dca8e6ee5 100644
--- a/srcpkgs/nodejs-lts/template
+++ b/srcpkgs/nodejs-lts/template
@@ -1,7 +1,7 @@
# Template file for 'nodejs-lts'
pkgname=nodejs-lts
version=12.22.10
-revision=2
+revision=3
# Need these for host v8 for torque, see https://github.com/nodejs/node/pull/21079
hostmakedepends="pkg-config python libatomic-devel zlib-devel which
$(vopt_if icu icu-devel) $(vopt_if ssl openssl-devel) $(vopt_if libuv libuv-devel)
From aafbf7bc63415f308459085137b4a9f45daae363 Mon Sep 17 00:00:00 2001
From: Duncaen <duncaen@voidlinux.org>
Date: Sat, 25 Mar 2023 01:39:02 +0100
Subject: [PATCH 097/134] nuspell: rebuild for icu-72.1_1
---
srcpkgs/nuspell/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/nuspell/template b/srcpkgs/nuspell/template
index e2be5d819844..42502c90088f 100644
--- a/srcpkgs/nuspell/template
+++ b/srcpkgs/nuspell/template
@@ -1,7 +1,7 @@
# Template file for 'nuspell'
pkgname=nuspell
version=5.0.1
-revision=3
+revision=4
build_style=cmake
configure_args="-DBUILD_SHARED_LIBS=ON"
makedepends="icu-devel"
From e47a87e973e385ad98ce6578db3f0668607d2129 Mon Sep 17 00:00:00 2001
From: Duncaen <duncaen@voidlinux.org>
Date: Sat, 25 Mar 2023 01:39:03 +0100
Subject: [PATCH 098/134] openttd: rebuild for icu-72.1_1
---
srcpkgs/openttd/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/openttd/template b/srcpkgs/openttd/template
index cdecbd7c365b..e4d44db980fb 100644
--- a/srcpkgs/openttd/template
+++ b/srcpkgs/openttd/template
@@ -1,7 +1,7 @@
# Template file for 'openttd'
pkgname=openttd
version=1.10.3
-revision=5
+revision=6
_gfxver=0.6.0
_sfxver=0.2.3
create_wrksrc=yes
From a8b2533210cd421248b4456c64461a95a230f549 Mon Sep 17 00:00:00 2001
From: Duncaen <duncaen@voidlinux.org>
Date: Sat, 25 Mar 2023 01:39:03 +0100
Subject: [PATCH 099/134] peaclock: rebuild for icu-72.1_1
---
srcpkgs/peaclock/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/peaclock/template b/srcpkgs/peaclock/template
index c99dd92e8568..76b7fd1aebf4 100644
--- a/srcpkgs/peaclock/template
+++ b/srcpkgs/peaclock/template
@@ -1,7 +1,7 @@
# Template file for 'peaclock'
pkgname=peaclock
version=0.4.3
-revision=4
+revision=5
build_style=cmake
makedepends="icu-devel"
short_desc="Colourful binary clock for the terminal"
From 8ace92b6c68a201c224cc63ca1941218c482954d Mon Sep 17 00:00:00 2001
From: Duncaen <duncaen@voidlinux.org>
Date: Sat, 25 Mar 2023 01:39:03 +0100
Subject: [PATCH 100/134] perl-XML-LibXML: rebuild for icu-72.1_1
---
srcpkgs/perl-XML-LibXML/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/perl-XML-LibXML/template b/srcpkgs/perl-XML-LibXML/template
index a8f68e4fcccd..f8ff1fd13a4d 100644
--- a/srcpkgs/perl-XML-LibXML/template
+++ b/srcpkgs/perl-XML-LibXML/template
@@ -1,7 +1,7 @@
# Template file for 'perl-XML-LibXML'
pkgname=perl-XML-LibXML
version=2.0134
-revision=10
+revision=11
build_style=perl-module
hostmakedepends="perl"
makedepends="${hostmakedepends} libxml2-devel perl-XML-SAX perl-XML-NamespaceSupport"
From dc5924d7ce97bc54388a10cc0e93dbdfec1263be Mon Sep 17 00:00:00 2001
From: Duncaen <duncaen@voidlinux.org>
Date: Sat, 25 Mar 2023 01:39:03 +0100
Subject: [PATCH 101/134] php8.0: rebuild for icu-72.1_1
---
srcpkgs/php8.0/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/php8.0/template b/srcpkgs/php8.0/template
index 1832c402db73..be2dec51141e 100644
--- a/srcpkgs/php8.0/template
+++ b/srcpkgs/php8.0/template
@@ -1,7 +1,7 @@
# Template file for 'php8.0'
pkgname=php8.0
version=8.0.28
-revision=1
+revision=2
_php_version=8.0
hostmakedepends="bison pkg-config apache-devel"
makedepends="apache-devel enchant2-devel freetds-devel freetype-devel gdbm-devel
From e39b1fba5b39c2e32241ea979752b452c8973534 Mon Sep 17 00:00:00 2001
From: Duncaen <duncaen@voidlinux.org>
Date: Sat, 25 Mar 2023 01:39:03 +0100
Subject: [PATCH 102/134] php8.1: rebuild for icu-72.1_1
---
srcpkgs/php8.1/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/php8.1/template b/srcpkgs/php8.1/template
index 1019105be246..0403f358ffbe 100644
--- a/srcpkgs/php8.1/template
+++ b/srcpkgs/php8.1/template
@@ -1,7 +1,7 @@
# Template file for 'php8.1'
pkgname=php8.1
version=8.1.16
-revision=1
+revision=2
_php_version=8.1
hostmakedepends="bison pkg-config apache-devel"
makedepends="apache-devel enchant2-devel freetds-devel freetype-devel gdbm-devel
From 91032246989fa1f2d171c518b013fc611f140908 Mon Sep 17 00:00:00 2001
From: Duncaen <duncaen@voidlinux.org>
Date: Sat, 25 Mar 2023 01:39:03 +0100
Subject: [PATCH 103/134] php8.2: rebuild for icu-72.1_1
---
srcpkgs/php8.2/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/php8.2/template b/srcpkgs/php8.2/template
index 7820d187ea23..090e3b67da3f 100644
--- a/srcpkgs/php8.2/template
+++ b/srcpkgs/php8.2/template
@@ -1,7 +1,7 @@
# Template file for 'php8.2'
pkgname=php8.2
version=8.2.3
-revision=1
+revision=2
_php_version=8.2
hostmakedepends="bison pkg-config apache-devel"
makedepends="apache-devel enchant2-devel freetds-devel freetype-devel gdbm-devel
From deb70ec1fec88b3f47bc073e0dec88d6f6d29a1d Mon Sep 17 00:00:00 2001
From: Duncaen <duncaen@voidlinux.org>
Date: Sat, 25 Mar 2023 01:39:04 +0100
Subject: [PATCH 104/134] plasma-workspace: rebuild for icu-72.1_1
---
srcpkgs/plasma-workspace/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/plasma-workspace/template b/srcpkgs/plasma-workspace/template
index 28a2356f2393..64022d6dcb38 100644
--- a/srcpkgs/plasma-workspace/template
+++ b/srcpkgs/plasma-workspace/template
@@ -1,7 +1,7 @@
# Template file for 'plasma-workspace'
pkgname=plasma-workspace
version=5.27.2
-revision=1
+revision=2
build_style=cmake
configure_args="-DBUILD_TESTING=OFF
-DWaylandScanner_EXECUTABLE=/usr/bin/wayland-scanner
From 5c20f4e4cd43315753b9c81365dc3ad22a1b1f00 Mon Sep 17 00:00:00 2001
From: Duncaen <duncaen@voidlinux.org>
Date: Sat, 25 Mar 2023 01:39:04 +0100
Subject: [PATCH 105/134] poedit: rebuild for icu-72.1_1
---
srcpkgs/poedit/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/poedit/template b/srcpkgs/poedit/template
index d55ac39c7ee0..813e7af7f95e 100644
--- a/srcpkgs/poedit/template
+++ b/srcpkgs/poedit/template
@@ -1,7 +1,7 @@
# Template file for 'poedit'
pkgname=poedit
version=3.2.2
-revision=1
+revision=2
build_style=gnu-configure
configure_args="--with-wx-config=wx-config-gtk3"
hostmakedepends="pkg-config"
From e0c86c19dbc0eab7f90ca64b2a399235a6ad4c67 Mon Sep 17 00:00:00 2001
From: Duncaen <duncaen@voidlinux.org>
Date: Sat, 25 Mar 2023 01:39:04 +0100
Subject: [PATCH 106/134] postfix: rebuild for icu-72.1_1
---
srcpkgs/postfix/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/postfix/template b/srcpkgs/postfix/template
index b1c2cd4e8090..997a242b9191 100644
--- a/srcpkgs/postfix/template
+++ b/srcpkgs/postfix/template
@@ -1,7 +1,7 @@
# Template file for 'postfix'
pkgname=postfix
version=3.7.4
-revision=1
+revision=2
hostmakedepends="perl m4"
makedepends="icu-devel libldap-devel libmariadbclient-devel pcre2-devel
postgresql-libs-devel sqlite-devel"
From 26b40f5fe8653eeda76ffcd3c9d4497117746901 Mon Sep 17 00:00:00 2001
From: Duncaen <duncaen@voidlinux.org>
Date: Sat, 25 Mar 2023 01:39:04 +0100
Subject: [PATCH 107/134] prosody: rebuild for icu-72.1_1
---
srcpkgs/prosody/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/prosody/template b/srcpkgs/prosody/template
index f87aa8362755..c93905bea5cd 100644
--- a/srcpkgs/prosody/template
+++ b/srcpkgs/prosody/template
@@ -1,7 +1,7 @@
# Template file for 'prosody'
pkgname=prosody
version=0.12.1
-revision=1
+revision=2
build_style=configure
configure_args="
--ostype=linux
From c67bf84b1e74543aa160c79e4f03bcd2ff65eb1f Mon Sep 17 00:00:00 2001
From: Duncaen <duncaen@voidlinux.org>
Date: Sat, 25 Mar 2023 01:39:04 +0100
Subject: [PATCH 108/134] python3-PyICU: rebuild for icu-72.1_1
---
srcpkgs/python3-PyICU/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/python3-PyICU/template b/srcpkgs/python3-PyICU/template
index 3d83d299dae5..d78acc5426e9 100644
--- a/srcpkgs/python3-PyICU/template
+++ b/srcpkgs/python3-PyICU/template
@@ -1,7 +1,7 @@
# Template file for 'python3-PyICU'
pkgname=python3-PyICU
version=2.9
-revision=3
+revision=4
build_style=python3-module
hostmakedepends="python3-setuptools"
makedepends="python3-devel icu-devel"
From ffbcce4de18d359524d1cfda3ce2683f63f23fe9 Mon Sep 17 00:00:00 2001
From: Duncaen <duncaen@voidlinux.org>
Date: Sat, 25 Mar 2023 01:39:04 +0100
Subject: [PATCH 109/134] qt5: rebuild for icu-72.1_1
---
srcpkgs/qt5/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/qt5/template b/srcpkgs/qt5/template
index b517b49ead2d..87d250b9b38d 100644
--- a/srcpkgs/qt5/template
+++ b/srcpkgs/qt5/template
@@ -5,7 +5,7 @@ pkgname=qt5
version=5.15.7+20221119
# commit f8c9fb304bc3e53b3aa07f962cd74e9160decccc
# base repo: https://invent.kde.org/qt/qt/qt5
-revision=2
+revision=3
build_style=meta
hostmakedepends="cmake clang flex perl glib-devel pkg-config
python re2c ruby which"
From 5ec7eac0657d0bd2ff3972cd54ad893d9dc7da83 Mon Sep 17 00:00:00 2001
From: Duncaen <duncaen@voidlinux.org>
Date: Sat, 25 Mar 2023 01:39:05 +0100
Subject: [PATCH 110/134] qt5-webengine: rebuild for icu-72.1_1
---
srcpkgs/qt5-webengine/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/qt5-webengine/template b/srcpkgs/qt5-webengine/template
index f9d78eced929..0a71484208bc 100644
--- a/srcpkgs/qt5-webengine/template
+++ b/srcpkgs/qt5-webengine/template
@@ -1,7 +1,7 @@
# Template file for 'qt5-webengine'
pkgname=qt5-webengine
version=5.15.11
-revision=1
+revision=2
_version="${version}-lts"
_chromium_commit=be349eaf62e77955791d7bf29f893f1e8a37daf4
archs="x86_64* i686* armv[67]* ppc64* aarch64*"
From 6a7eccd39547fcd2af20f4f820269c0c7d470aa4 Mon Sep 17 00:00:00 2001
From: Duncaen <duncaen@voidlinux.org>
Date: Sat, 25 Mar 2023 01:39:05 +0100
Subject: [PATCH 111/134] qt5-webkit: rebuild for icu-72.1_1
---
srcpkgs/qt5-webkit/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/qt5-webkit/template b/srcpkgs/qt5-webkit/template
index 721f869b980f..249902bb9d62 100644
--- a/srcpkgs/qt5-webkit/template
+++ b/srcpkgs/qt5-webkit/template
@@ -1,7 +1,7 @@
# Template file for 'qt5-webkit'
pkgname=qt5-webkit
version=5.212.0
-revision=14
+revision=15
_snap=1586819898
_v=${version%.*}
build_style=cmake
From 3d9117577874050b1a35213559ee358aae590cfd Mon Sep 17 00:00:00 2001
From: Duncaen <duncaen@voidlinux.org>
Date: Sat, 25 Mar 2023 01:39:05 +0100
Subject: [PATCH 112/134] qt6-base: rebuild for icu-72.1_1
---
srcpkgs/qt6-base/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/qt6-base/template b/srcpkgs/qt6-base/template
index 024393134eef..dfde60bdb438 100644
--- a/srcpkgs/qt6-base/template
+++ b/srcpkgs/qt6-base/template
@@ -1,7 +1,7 @@
# Template file for 'qt6-base'
pkgname=qt6-base
version=6.4.2
-revision=2
+revision=3
build_style=cmake
configure_args="-DINSTALL_DATADIR=share/qt6
-DINSTALL_ARCHDATADIR=lib/qt6
From ee6497a2f18b9ae43f2c1e996e11a6c516fc76a7 Mon Sep 17 00:00:00 2001
From: Duncaen <duncaen@voidlinux.org>
Date: Sat, 25 Mar 2023 01:39:05 +0100
Subject: [PATCH 113/134] qt6-qt5compat: rebuild for icu-72.1_1
---
srcpkgs/qt6-qt5compat/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/qt6-qt5compat/template b/srcpkgs/qt6-qt5compat/template
index 7dfee2a8748d..ed167695b5cd 100644
--- a/srcpkgs/qt6-qt5compat/template
+++ b/srcpkgs/qt6-qt5compat/template
@@ -1,7 +1,7 @@
# Template file for 'qt6-qt5compat'
pkgname=qt6-qt5compat
version=6.4.2
-revision=1
+revision=2
build_style=cmake
configure_args="-DQT_FEATURE_textcodec=ON -DQT_FEATURE_codecs=ON
-DQT_FEATURE_iconv=ON -DQT_FEATURE_big_codecs=ON"
From 439e44d05ce676b71ddfb0db0289419330af5a46 Mon Sep 17 00:00:00 2001
From: Duncaen <duncaen@voidlinux.org>
Date: Sat, 25 Mar 2023 01:39:05 +0100
Subject: [PATCH 114/134] qt6-webengine: rebuild for icu-72.1_1
---
srcpkgs/qt6-webengine/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/qt6-webengine/template b/srcpkgs/qt6-webengine/template
index 99012732b53a..96846feaee83 100644
--- a/srcpkgs/qt6-webengine/template
+++ b/srcpkgs/qt6-webengine/template
@@ -1,7 +1,7 @@
# Template file for 'qt6-webengine'
pkgname=qt6-webengine
version=6.4.2
-revision=1
+revision=2
build_style=cmake
configure_args="
-DQT_FEATURE_webengine_system_ffmpeg=ON
From 455b882ce72f21b037cccc5eb5ed37255ffa7c29 Mon Sep 17 00:00:00 2001
From: Duncaen <duncaen@voidlinux.org>
Date: Sat, 25 Mar 2023 01:39:05 +0100
Subject: [PATCH 115/134] rspamd: rebuild for icu-72.1_1
---
srcpkgs/rspamd/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/rspamd/template b/srcpkgs/rspamd/template
index ed43d65a691c..44d3eb142951 100644
--- a/srcpkgs/rspamd/template
+++ b/srcpkgs/rspamd/template
@@ -1,7 +1,7 @@
# Template file for 'rspamd'
pkgname=rspamd
version=1.9.4
-revision=8
+revision=9
archs="x86_64* i686* aarch64* armv[67]* ppc64*"
build_style=cmake
configure_args="-DRSPAMD_USER=rspamd -DCONFDIR=/etc/rspamd
From 49fbbdffc9d4f1e981c8934355bb4f50492a6e67 Mon Sep 17 00:00:00 2001
From: Duncaen <duncaen@voidlinux.org>
Date: Sat, 25 Mar 2023 01:39:05 +0100
Subject: [PATCH 116/134] scribus: rebuild for icu-72.1_1
---
srcpkgs/scribus/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/scribus/template b/srcpkgs/scribus/template
index 63cefeb7693d..856a43e43aa5 100644
--- a/srcpkgs/scribus/template
+++ b/srcpkgs/scribus/template
@@ -1,7 +1,7 @@
# Template file for 'scribus'
pkgname=scribus
version=1.5.8
-revision=5
+revision=6
build_style=cmake
configure_args="-DCMAKE_SKIP_RPATH=TRUE -DQT_PREFIX=${XBPS_CROSS_BASE}/usr
-DWANT_GRAPHICSMAGICK=1 -DWANT_CPP17=ON"
From dccea84c2b90d0839667fdcc6561d6b810d8d625 Mon Sep 17 00:00:00 2001
From: Duncaen <duncaen@voidlinux.org>
Date: Sat, 25 Mar 2023 01:39:06 +0100
Subject: [PATCH 117/134] sile: rebuild for icu-72.1_1
---
srcpkgs/sile/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/sile/template b/srcpkgs/sile/template
index d1b02196e58e..93279cb59f38 100644
--- a/srcpkgs/sile/template
+++ b/srcpkgs/sile/template
@@ -1,7 +1,7 @@
# Template file for 'sile'
pkgname=sile
version=0.9.5.1
-revision=7
+revision=8
build_style=gnu-configure
hostmakedepends="pkg-config"
makedepends="harfbuzz-devel lua51-devel lua51-lpeg lua51-luaexpat
From c1b91c06186b3c026b4860ffb8801c74794e7c49 Mon Sep 17 00:00:00 2001
From: Duncaen <duncaen@voidlinux.org>
Date: Sat, 25 Mar 2023 01:39:06 +0100
Subject: [PATCH 118/134] slop: rebuild for icu-72.1_1
---
srcpkgs/slop/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/slop/template b/srcpkgs/slop/template
index f99cb0294e09..ff9a02db3826 100644
--- a/srcpkgs/slop/template
+++ b/srcpkgs/slop/template
@@ -1,7 +1,7 @@
# Template file for 'slop'
pkgname=slop
version=7.6
-revision=2
+revision=3
build_style=cmake
hostmakedepends="pkg-config"
makedepends="glew-devel glm icu-devel libXrender-devel"
From d2729d1773c4e5c0056476d9608ef4f538118f49 Mon Sep 17 00:00:00 2001
From: Duncaen <duncaen@voidlinux.org>
Date: Sat, 25 Mar 2023 01:39:06 +0100
Subject: [PATCH 119/134] strawberry: rebuild for icu-72.1_1
---
srcpkgs/strawberry/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/strawberry/template b/srcpkgs/strawberry/template
index 4c0ddfcbacc3..8e934c8a26bc 100644
--- a/srcpkgs/strawberry/template
+++ b/srcpkgs/strawberry/template
@@ -1,7 +1,7 @@
# Template file for 'strawberry'
pkgname=strawberry
version=1.0.9
-revision=1
+revision=2
build_style=cmake
hostmakedepends="pkg-config protobuf gettext"
makedepends="alsa-lib-devel boost-devel gnutls-devel fftw-devel
From 7cd0c0b4afa14a3edb9243605463f5f398f92823 Mon Sep 17 00:00:00 2001
From: Duncaen <duncaen@voidlinux.org>
Date: Sat, 25 Mar 2023 01:39:06 +0100
Subject: [PATCH 120/134] sword: rebuild for icu-72.1_1
---
srcpkgs/sword/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/sword/template b/srcpkgs/sword/template
index c87a9c0a55ef..7eef5b8be663 100644
--- a/srcpkgs/sword/template
+++ b/srcpkgs/sword/template
@@ -1,7 +1,7 @@
# Template file for 'sword'
pkgname=sword
version=1.8.1
-revision=9
+revision=10
build_style=gnu-configure
configure_args="--without-conf --with-icuregex"
hostmakedepends="libtool automake pkg-config"
From 20cfbe4734706052b1ea7c6efea7e4325b9fd788 Mon Sep 17 00:00:00 2001
From: Duncaen <duncaen@voidlinux.org>
Date: Sat, 25 Mar 2023 01:39:06 +0100
Subject: [PATCH 121/134] tectonic: rebuild for icu-72.1_1
---
srcpkgs/tectonic/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/tectonic/template b/srcpkgs/tectonic/template
index 26cf6ddcb983..30a37226eb1e 100644
--- a/srcpkgs/tectonic/template
+++ b/srcpkgs/tectonic/template
@@ -1,7 +1,7 @@
# Template file for 'tectonic'
pkgname=tectonic
version=0.12.0
-revision=1
+revision=2
build_style=cargo
configure_args="--features=external-harfbuzz"
hostmakedepends="pkg-config"
From 617251f2127087267417c477cce6b034600c4237 Mon Sep 17 00:00:00 2001
From: Duncaen <duncaen@voidlinux.org>
Date: Sat, 25 Mar 2023 01:39:06 +0100
Subject: [PATCH 122/134] tepl: rebuild for icu-72.1_1
---
srcpkgs/tepl/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/tepl/template b/srcpkgs/tepl/template
index b1d165557184..7e8c5ba0ffd5 100644
--- a/srcpkgs/tepl/template
+++ b/srcpkgs/tepl/template
@@ -1,7 +1,7 @@
# Template file for 'tepl'
pkgname=tepl
version=6.4.0
-revision=1
+revision=2
build_style=meson
build_helper=gir
configure_args="$(vopt_bool gir gobject_introspection) $(vopt_bool gtk_doc gtk_doc)"
From e5369b2cc4c6fb0e47259f11b1de6f2bbe6b30ca Mon Sep 17 00:00:00 2001
From: Duncaen <duncaen@voidlinux.org>
Date: Sat, 25 Mar 2023 01:39:07 +0100
Subject: [PATCH 123/134] tesseract-ocr: rebuild for icu-72.1_1
---
srcpkgs/tesseract-ocr/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/tesseract-ocr/template b/srcpkgs/tesseract-ocr/template
index 394f82aea2a8..9a1de9581262 100644
--- a/srcpkgs/tesseract-ocr/template
+++ b/srcpkgs/tesseract-ocr/template
@@ -1,7 +1,7 @@
# Template file for 'tesseract-ocr'
pkgname=tesseract-ocr
version=4.1.1
-revision=7
+revision=8
_tessdataver=4.0.0
create_wrksrc=yes
build_style=gnu-configure
From 9323cb40fb9ae5e96acfe1720ca1d0c257436399 Mon Sep 17 00:00:00 2001
From: Duncaen <duncaen@voidlinux.org>
Date: Sat, 25 Mar 2023 01:39:07 +0100
Subject: [PATCH 124/134] texlive: rebuild for icu-72.1_1
---
srcpkgs/texlive/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/texlive/template b/srcpkgs/texlive/template
index 880d21061505..3ed852196cc5 100644
--- a/srcpkgs/texlive/template
+++ b/srcpkgs/texlive/template
@@ -1,7 +1,7 @@
# Template file for 'texlive'
pkgname=texlive
version=20210325
-revision=4
+revision=5
build_wrksrc="build"
build_style=gnu-configure
configure_script="../configure"
From cee8084bedfed1be07ee1938e0b1934d447d7733 Mon Sep 17 00:00:00 2001
From: Duncaen <duncaen@voidlinux.org>
Date: Sat, 25 Mar 2023 01:39:07 +0100
Subject: [PATCH 125/134] thunderbird: rebuild for icu-72.1_1
---
srcpkgs/thunderbird/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/thunderbird/template b/srcpkgs/thunderbird/template
index 84b53fb8fe1f..ec3fa3d4c35f 100644
--- a/srcpkgs/thunderbird/template
+++ b/srcpkgs/thunderbird/template
@@ -4,7 +4,7 @@
#
pkgname=thunderbird
version=102.6.1
-revision=2
+revision=3
build_helper="rust"
short_desc="Standalone Mail/News reader"
maintainer="Érico Nogueira <ericonr@disroot.org>"
From 1c66f857c08a8264442413c6740ea353a738a6f1 Mon Sep 17 00:00:00 2001
From: Duncaen <duncaen@voidlinux.org>
Date: Sat, 25 Mar 2023 01:39:07 +0100
Subject: [PATCH 126/134] tracker: rebuild for icu-72.1_1
---
srcpkgs/tracker/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/tracker/template b/srcpkgs/tracker/template
index df004713e155..d491f144e3f1 100644
--- a/srcpkgs/tracker/template
+++ b/srcpkgs/tracker/template
@@ -1,7 +1,7 @@
# Template file for 'tracker'
pkgname=tracker
version=3.4.2
-revision=1
+revision=2
build_style=meson
build_helper="gir"
configure_args="-Ddocs=false -Dman=true -Dstemmer=disabled
From c5b39ffe11cde57b28da13fbb64e8c05cda44dc0 Mon Sep 17 00:00:00 2001
From: Duncaen <duncaen@voidlinux.org>
Date: Sat, 25 Mar 2023 01:39:07 +0100
Subject: [PATCH 127/134] tracker-miners: rebuild for icu-72.1_1
---
srcpkgs/tracker-miners/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/tracker-miners/template b/srcpkgs/tracker-miners/template
index 3e7966c2b4a9..285425ba1851 100644
--- a/srcpkgs/tracker-miners/template
+++ b/srcpkgs/tracker-miners/template
@@ -1,7 +1,7 @@
# Template file for 'tracker-miners'
pkgname=tracker-miners
version=3.4.3
-revision=1
+revision=2
build_style=meson
build_helper=qemu
# missing libgrss for miner_rss
From 3ba60ae53ba9ef8897c3ffcb44d6a81d5fda3ed4 Mon Sep 17 00:00:00 2001
From: Duncaen <duncaen@voidlinux.org>
Date: Sat, 25 Mar 2023 01:39:07 +0100
Subject: [PATCH 128/134] unar: rebuild for icu-72.1_1
---
srcpkgs/unar/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/unar/template b/srcpkgs/unar/template
index d614b4943a5e..460c65022c68 100644
--- a/srcpkgs/unar/template
+++ b/srcpkgs/unar/template
@@ -1,7 +1,7 @@
# Template file for 'unar'
pkgname=unar
version=1.10.7
-revision=11
+revision=12
archs="~*-musl" # regexec incompatible
build_wrksrc="XADMaster"
build_style=gnu-makefile
From c24630790faec79f25d13446afd2a3f2042b4f9e Mon Sep 17 00:00:00 2001
From: Duncaen <duncaen@voidlinux.org>
Date: Sat, 25 Mar 2023 01:39:08 +0100
Subject: [PATCH 129/134] vte3: rebuild for icu-72.1_1
---
srcpkgs/vte3/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/vte3/template b/srcpkgs/vte3/template
index 59db10c819f0..b15539a721a9 100644
--- a/srcpkgs/vte3/template
+++ b/srcpkgs/vte3/template
@@ -1,7 +1,7 @@
# Template file for 'vte3'
pkgname=vte3
version=0.72.0
-revision=1
+revision=2
build_style=meson
build_helper="gir"
configure_args="-Db_ndebug=false -Db_lto=false -D_systemd=false
From 61d8ec852a0a8c210627bc4e16f439c52cead77d Mon Sep 17 00:00:00 2001
From: Duncaen <duncaen@voidlinux.org>
Date: Sat, 25 Mar 2023 01:39:08 +0100
Subject: [PATCH 130/134] webkit2gtk: rebuild for icu-72.1_1
---
srcpkgs/webkit2gtk/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/webkit2gtk/template b/srcpkgs/webkit2gtk/template
index b836b379592a..fc167cbc586d 100644
--- a/srcpkgs/webkit2gtk/template
+++ b/srcpkgs/webkit2gtk/template
@@ -1,7 +1,7 @@
# Template file for 'webkit2gtk'
pkgname=webkit2gtk
version=2.38.3
-revision=1
+revision=2
build_style=cmake
build_helper="gir"
configure_args="-DPORT=GTK -DUSE_LD_GOLD=OFF
From 19497ed2c89aea52291b0a7344d9f1448189a517 Mon Sep 17 00:00:00 2001
From: Duncaen <duncaen@voidlinux.org>
Date: Sat, 25 Mar 2023 01:39:08 +0100
Subject: [PATCH 131/134] widelands: rebuild for icu-72.1_1
---
srcpkgs/widelands/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/widelands/template b/srcpkgs/widelands/template
index ee6f5a214a46..8a2706efbf63 100644
--- a/srcpkgs/widelands/template
+++ b/srcpkgs/widelands/template
@@ -4,7 +4,7 @@ pkgname=widelands
reverts="21_5 21_4 21_3 21_2 21_1 20_4 20_3 20_2 20_1 19_10 19_9 19_8 19_7 19_6
19_5 19_4 19_3 19_2 19_1 18_5 18_4 18_3 18_2 18_1"
version=1.1
-revision=1
+revision=2
build_style=cmake
configure_args="-DOPENGL_INCLUDE_DIR=${XBPS_CROSS_BASE}/usr/include
-DOPTION_BUILD_WEBSITE_TOOLS=OFF -DWL_INSTALL_BASEDIR=/usr/share/widelands
From 816f6ac592f3b92cec6fa2108356d0b8daa01d8e Mon Sep 17 00:00:00 2001
From: Duncaen <duncaen@voidlinux.org>
Date: Sat, 25 Mar 2023 01:39:08 +0100
Subject: [PATCH 132/134] xerces-c: rebuild for icu-72.1_1
---
srcpkgs/xerces-c/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/xerces-c/template b/srcpkgs/xerces-c/template
index 18ed832daa08..47c57b22d354 100644
--- a/srcpkgs/xerces-c/template
+++ b/srcpkgs/xerces-c/template
@@ -1,7 +1,7 @@
# Template file for 'xerces-c'
pkgname=xerces-c
version=3.2.3
-revision=6
+revision=7
build_style=gnu-configure
hostmakedepends="automake libtool pkg-config"
makedepends="libcurl-devel icu-devel"
From b1057f95a19afbe075ac0881d09bb39097954187 Mon Sep 17 00:00:00 2001
From: Duncaen <duncaen@voidlinux.org>
Date: Sat, 25 Mar 2023 01:39:08 +0100
Subject: [PATCH 133/134] yaz: rebuild for icu-72.1_1
---
srcpkgs/yaz/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/yaz/template b/srcpkgs/yaz/template
index a96c1256d974..1716a6e6c9bf 100644
--- a/srcpkgs/yaz/template
+++ b/srcpkgs/yaz/template
@@ -1,7 +1,7 @@
# Template file for 'yaz'
pkgname=yaz
version=5.30.3
-revision=4
+revision=5
build_style=gnu-configure
configure_args="--enable-shared --with-memcached --with-xml2 --with-xslt
--with-icu --with-gnutls"
From bae07652fe8aa20190ac3c80abf12d0ef70205a7 Mon Sep 17 00:00:00 2001
From: Duncaen <duncaen@voidlinux.org>
Date: Sat, 25 Mar 2023 01:39:08 +0100
Subject: [PATCH 134/134] znc: rebuild for icu-72.1_1
---
srcpkgs/znc/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/znc/template b/srcpkgs/znc/template
index 6d197347303c..c279d4a655b9 100644
--- a/srcpkgs/znc/template
+++ b/srcpkgs/znc/template
@@ -1,7 +1,7 @@
# Template file for 'znc'
pkgname=znc
version=1.8.2
-revision=13
+revision=14
build_style=gnu-configure
configure_args="
--enable-python
next reply other threads:[~2023-03-25 0:58 UTC|newest]
Thread overview: 11+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-03-25 0:58 Duncaen [this message]
2023-04-02 22:58 ` [PR PATCH] [Updated] " Duncaen
2023-04-02 23:52 ` Duncaen
2023-04-03 8:40 ` Johnnynator
2023-04-03 11:25 ` [PR PATCH] [Updated] " Duncaen
2023-04-03 12:26 ` Duncaen
2023-04-03 22:54 ` Duncaen
2023-04-04 13:38 ` Duncaen
2023-04-04 14:14 ` Duncaen
2023-04-04 22:59 ` Duncaen
2023-04-04 23:00 ` [PR PATCH] [Merged]: " Duncaen
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=gh-mailinglist-notifications-41a7ca26-5023-4802-975b-f1789d68868e-void-packages-43004@inbox.vuxu.org \
--to=duncaen@users.noreply.github.com \
--cc=ml@inbox.vuxu.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).