From 557f986c8934a5a15e21194ba9d275518872366c Mon Sep 17 00:00:00 2001 From: Marcin Puc Date: Sun, 18 Dec 2022 00:36:59 +0100 Subject: [PATCH 001/138] New package: llvm15-15.0.7 --- common/shlibs | 3 + 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 | 442 ++++++++++++++++++ srcpkgs/llvm15/update | 3 + 23 files changed, 1063 insertions(+) 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 2028226606bc..f8da02805ce0 100644 --- a/common/shlibs +++ b/common/shlibs @@ -991,6 +991,9 @@ 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 libLLVMSPIRVLib.so.12 SPIRV-LLVM-Translator-12.0.0_1 +libLLVM-15.so libllvm15-15.0.7_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 + +#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 +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() + /* 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 + + #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 + #endif + ++#if SANITIZER_LINUX && defined(__powerpc__) ++#include ++#endif ++ + #if SANITIZER_LINUX && !SANITIZER_ANDROID + #include + #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 + # include + # if defined(__mips64) || defined(__aarch64__) || defined(__arm__) || \ +- defined(__hexagon__) || SANITIZER_RISCV64 ++ defined(__hexagon__) || defined(__powerpc__) || SANITIZER_RISCV64 + # include + # 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 // for pid_t + #include // for iovec + #include // 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 + #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::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::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::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::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 ++#include + + #include "lldb/lldb-types.h" + +@@ -17,23 +18,13 @@ + + #include + +-#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 ++#undef pt_regs ++#else + #include +-#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 +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 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 // NOLINT ++# include // NOLINT + # include // NOLINT + # include // NOLINT + # include // 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 +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..4d2777451e24 --- /dev/null +++ b/srcpkgs/llvm15/template @@ -0,0 +1,442 @@ +# 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 " +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-doc + vmove usr/bin/clang-include-fixer + vmove usr/bin/clang-query + vmove usr/bin/clang-rename + vmove usr/bin/clang-reorder-fields + vmove usr/bin/clang-tidy + vmove usr/bin/clangd + 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/include/clang-tidy + vmove "usr/lib/libclangApplyReplacements*" + vmove "usr/lib/libclangDoc*" + vmove "usr/lib/libclangIncludeFixer*" + vmove "usr/lib/libclangReorderFields*" + vmove "usr/lib/libclangQuery*" + vmove "usr/lib/libclangTidy*" + vmove "usr/share/clang/*include-fixer*" + vmove "usr/share/clang/*rename*" + vmove "usr/share/clang/*tidy*" + vmove usr/share/doc/LLVM/clang-tools + vmove usr/share/man/man1/diagtool.1 + 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/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 + } +} + +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 87db12de448e397ca61d993d7b41e2653f68f2cf Mon Sep 17 00:00:00 2001 From: Marcin Puc Date: Sun, 18 Dec 2022 00:40:18 +0100 Subject: [PATCH 002/138] 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 f8da02805ce0..e7258d15c26e 100644 --- a/common/shlibs +++ b/common/shlibs @@ -985,9 +985,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 libLLVMSPIRVLib.so.12 SPIRV-LLVM-Translator-12.0.0_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 " 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 4317a7158e1eb416f35426fe890670e69ab03850 Mon Sep 17 00:00:00 2001 From: Marcin Puc Date: Sun, 18 Dec 2022 12:20:08 +0100 Subject: [PATCH 003/138] 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 a5f39537143bc7a61aa30ab4591e962eda455568 Mon Sep 17 00:00:00 2001 From: Marcin Puc Date: Thu, 5 Jan 2023 14:27:03 +0100 Subject: [PATCH 004/138] 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 8857e8ea4eece78ae49ee553c0ff42e475e1fb46 Mon Sep 17 00:00:00 2001 From: Marcin Puc Date: Thu, 5 Jan 2023 14:34:04 +0100 Subject: [PATCH 005/138] 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 1ee761afa190b6f86e47ea6f05c4e39f86766ee2 Mon Sep 17 00:00:00 2001 From: Marcin Puc Date: Thu, 5 Jan 2023 14:37:25 +0100 Subject: [PATCH 006/138] 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 952682662128..2f01dbf69530 100644 --- a/srcpkgs/bpftrace/template +++ b/srcpkgs/bpftrace/template @@ -1,7 +1,7 @@ # Template file for 'bpftrace' pkgname=bpftrace version=0.17.0 -revision=1 +revision=2 archs="x86_64* aarch64* ppc64*" build_style=cmake configure_args="-DUSE_SYSTEM_BPF_BCC=ON -DBUILD_TESTING=OFF" # needs root to run From a57785907a945509bdfc34380a8e7527850a96ce Mon Sep 17 00:00:00 2001 From: Marcin Puc Date: Thu, 5 Jan 2023 14:43:53 +0100 Subject: [PATCH 007/138] CastXML: rebuild for llvm15 --- srcpkgs/CastXML/template | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/srcpkgs/CastXML/template b/srcpkgs/CastXML/template index 5d7d9503658c..28c424c78073 100644 --- a/srcpkgs/CastXML/template +++ b/srcpkgs/CastXML/template @@ -1,7 +1,7 @@ # Template file for 'CastXML' pkgname=CastXML version=0.4.6 -revision=1 +revision=2 build_style=cmake configure_args="-DSPHINX_MAN=YES -DCastXML_INSTALL_MAN_DIR=share/man" hostmakedepends="clang python3-Sphinx" @@ -12,8 +12,8 @@ short_desc="C-family abstract syntax tree XML output tool" maintainer="Evgeny Ermakov " license="Apache-2.0" homepage="https://github.com/CastXML/CastXML" -distfiles="https://github.com/CastXML/CastXML/archive/v${version}.tar.gz" -checksum=8dcdbc1f23a130e4bdb0b09f57c30761a02a346b4db4037555048af2a293d66a +distfiles="https://github.com/CastXML/CastXML/archive/refs/tags/v${version}.tar.gz" +checksum=bb9024ec9ea5082e0d527f19bf3c2df79f1699f54b6cec168c024e727b32e6d1 post_install() { rm -r ${DESTDIR}/usr/share/castxml/clang/include From 8c0018d267e2c751dda6f450971c9fa85b33062d Mon Sep 17 00:00:00 2001 From: Marcin Puc Date: Thu, 5 Jan 2023 14:48:55 +0100 Subject: [PATCH 008/138] 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 83a4b76cc555000049f2be06d66cbf7656d54b8c Mon Sep 17 00:00:00 2001 From: Marcin Puc Date: Thu, 5 Jan 2023 14:52:14 +0100 Subject: [PATCH 009/138] 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 " 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 16f1f300c5c5bc310a8fa85f56e083b03d3a3a18 Mon Sep 17 00:00:00 2001 From: Marcin Puc Date: Thu, 5 Jan 2023 15:11:06 +0100 Subject: [PATCH 010/138] 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 e7258d15c26e..3afa17ce34d4 100644 --- a/common/shlibs +++ b/common/shlibs @@ -990,7 +990,7 @@ 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 -libLLVMSPIRVLib.so.12 SPIRV-LLVM-Translator-12.0.0_1 +libLLVMSPIRVLib.so.15 SPIRV-LLVM-Translator-15.0.0_1 libLLVM-15.so libllvm15-15.0.7_1 libomp.so.5 libomp-15.0.7_1 libomptarget.so.15 libomp-15.0.7_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 " 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 6e0035470f35ed7fd619566af39d9a0592830213 Mon Sep 17 00:00:00 2001 From: Marcin Puc Date: Fri, 6 Jan 2023 17:11:04 +0100 Subject: [PATCH 011/138] 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 aa6113b807fa9118cca0fa4fd5021559e666376b Mon Sep 17 00:00:00 2001 From: Marcin Puc Date: Fri, 6 Jan 2023 17:14:14 +0100 Subject: [PATCH 012/138] 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 af5fbda4e46402d626d673014c01026b677acdbf Mon Sep 17 00:00:00 2001 From: Marcin Puc Date: Sat, 7 Jan 2023 11:31:14 +0100 Subject: [PATCH 013/138] 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 3f15878823614dc52d41e73b309a9a5c44183f84 Mon Sep 17 00:00:00 2001 From: Marcin Puc Date: Mon, 9 Jan 2023 01:22:18 +0100 Subject: [PATCH 014/138] 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 b01f2e527605b03c38d5ea279c86928c21b6ddc3 Mon Sep 17 00:00:00 2001 From: Marcin Puc Date: Mon, 9 Jan 2023 01:58:21 +0100 Subject: [PATCH 015/138] 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 5eb275583138..c32ee5240a44 100644 --- a/srcpkgs/kdevelop/template +++ b/srcpkgs/kdevelop/template @@ -1,7 +1,7 @@ # Template file for 'kdevelop' pkgname=kdevelop version=22.12.1 -revision=1 +revision=2 build_style=cmake configure_args="-DBUILD_TESTING=OFF" hostmakedepends="extra-cmake-modules qt5-qmake qt5-host-tools qt5-tools From bbd688115da0e4f2da49021f85335da91b28c2dd Mon Sep 17 00:00:00 2001 From: Marcin Puc Date: Mon, 16 Jan 2023 14:43:47 +0100 Subject: [PATCH 016/138] 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 -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 " 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 dadc52f254b20ac3ac9484f8739eb21eaf9f5eac Mon Sep 17 00:00:00 2001 From: Marcin Puc Date: Tue, 24 Jan 2023 14:03:51 +0100 Subject: [PATCH 017/138] 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 -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 " 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 1c9a6c8ea43f729f15de8eaf3848e08e87d9f95d Mon Sep 17 00:00:00 2001 From: Marcin Puc Date: Fri, 10 Feb 2023 17:25:32 +0100 Subject: [PATCH 018/138] 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 " 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 6eb0fe21765515fd75275bbb33f1f01954bfe897 Mon Sep 17 00:00:00 2001 From: Marcin Puc Date: Fri, 10 Feb 2023 20:20:43 +0100 Subject: [PATCH 019/138] 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 " 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 486acd3b36ae429e58fde7d7903e5c967651f164 Mon Sep 17 00:00:00 2001 From: Marcin Puc Date: Thu, 16 Feb 2023 20:13:02 +0100 Subject: [PATCH 020/138] 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 +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; ++#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 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 e4b9372592d2a5c805a01335545a029f873d0e91 Mon Sep 17 00:00:00 2001 From: Marcin Puc Date: Thu, 16 Feb 2023 23:42:00 +0100 Subject: [PATCH 021/138] 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 3afa17ce34d4..9b34746bb881 100644 --- a/common/shlibs +++ b/common/shlibs @@ -2188,10 +2188,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 -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 0e46a340fb2119fa1f53272041f5bdb9056c290b Mon Sep 17 00:00:00 2001 From: Marcin Puc Date: Thu, 16 Feb 2023 23:42:46 +0100 Subject: [PATCH 022/138] 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 4bae3654fa1dde140fb388e9d3eef6397ccaa5b0 Mon Sep 17 00:00:00 2001 From: Marcin Puc Date: Thu, 16 Feb 2023 23:43:29 +0100 Subject: [PATCH 023/138] 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 db4b54382581a25ba17552703bfe90792a7e06c1 Mon Sep 17 00:00:00 2001 From: Marcin Puc Date: Sat, 18 Feb 2023 20:33:19 +0100 Subject: [PATCH 024/138] 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 e42840bf6fe4..b1dffd304198 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 -DQT_HOST_PATH=/usr/ -DQT_HOST_PATH_CMAKE_DIR=/usr/lib64/cmake/Qt6" From cc6c1fce26e9e8376d66c13b16818b7eb53692da Mon Sep 17 00:00:00 2001 From: Marcin Puc Date: Sun, 5 Feb 2023 14:04:51 +0100 Subject: [PATCH 025/138] rust-bootstrap: update to 1.67.1 --- .../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..e7d9adfd1700 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.67.1 revision=1 -create_wrksrc=yes short_desc="Rust programming language bootstrap toolchain" maintainer="Orphaned " 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" + 0c77fde6daa80825f8cb81a5525c99db238a3ab4f0b226470964062e74603dd6 + aab2d7aa76793e78c9c8810e93ed8978f6422843b1277e9c60337b0f943a4409" ;; 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" + e27ec0c6d1a2b2b38e5258904c3741ddb246bff5715aa95e595f818aa77f7bee + f4dc8468dfc1dbd86f865b10f06e0e4b4e76f5a3a1cc27317a520ab1660844e9" ;; 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" + 55fa8c61c767d23357075162ebd8c2be7297f2127e683c40d5db53ebcf6a737f + 89741cd2ac00c3a3f565bcccdf442cc1f9ec58ea419f1f0d09e911be0ff86c87" ;; *) broken="rust bootstrap binaries unavailable for ${XBPS_TARGET_MACHINE}";; esac From 0da9baa8bc6cf0e8ff08e0ef06a23809489804f3 Mon Sep 17 00:00:00 2001 From: Marcin Puc Date: Sun, 5 Feb 2023 14:06:47 +0100 Subject: [PATCH 026/138] cargo-bootstrap: update to 1.67.1 --- 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..4e406d29a64d 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.67.1 revision=1 short_desc="Bootstrap binaries of Rust package manager" maintainer="Orphaned " @@ -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="36db46e19e8573ea113c38d88f66def5fad848721b3c6dd69361f197b7a02f80" ;; x86_64) distfiles="${_bootstrap_url}/cargo-${version}-x86_64-unknown-linux-gnu.tar.xz" - checksum="21434d83a30ad3fa4e4831487c5574a20b07dd57d213b26e1246290c57d4ec41" + checksum="e744dad75de8419e7fea530c29bd56cf931b4d4de62eb4bd442bfac7b54e61ed" ;; 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="e5097075b92c31002bf585831362fa08a15b073730323aaa50bb09ba2ea3646a" ;; *) broken="cargo bootstrap binaries unavailable for ${XBPS_TARGET_MACHINE}";; esac From 07f6b70a8b06541b159baa05e505eb18238e3b1e Mon Sep 17 00:00:00 2001 From: Marcin Puc Date: Sun, 5 Feb 2023 14:11:22 +0100 Subject: [PATCH 027/138] rust: update to 1.67.1 --- ...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 -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 = (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, pub sysconfdir: Option, pub datadir: Option, -@@ -400,8 +399,6 @@ pub struct Target { +@@ -440,8 +439,6 @@ pub struct Target { pub sanitizers: Option, pub profiler: Option, pub crt_static: Option, @@ -228,7 +210,7 @@ index 146077419..18a764689 100644 pub wasi_root: Option, pub qemu_rootfs: Option, pub no_std: bool, -@@ -689,7 +686,6 @@ define_config! { +@@ -734,7 +731,6 @@ define_config! { default_linker: Option = "default-linker", channel: Option = "channel", description: Option = "description", @@ -236,7 +218,7 @@ index 146077419..18a764689 100644 rpath: Option = "rpath", verbose_tests: Option = "verbose-tests", optimize_tests: Option = "optimize-tests", -@@ -734,8 +730,6 @@ define_config! { +@@ -781,8 +777,6 @@ define_config! { sanitizers: Option = "sanitizers", profiler: Option = "profiler", crt_static: Option = "crt-static", @@ -245,7 +227,7 @@ index 146077419..18a764689 100644 wasi_root: Option = "wasi-root", qemu_rootfs: Option = "qemu-rootfs", no_std: Option = "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 -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 -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 -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..6fd9fbcf1844 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.67.1 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 " 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=46483d3e5de85a3bd46f8e7a3ae1837496391067dbe713a25d3cf051b3d9ff6e 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 a641187d4858f33f4d02e349224a6bcb922291a4 Mon Sep 17 00:00:00 2001 From: Marcin Puc Date: Sun, 5 Feb 2023 14:14:16 +0100 Subject: [PATCH 028/138] cargo: update to 1.67.1 --- 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..b94fe334d980 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.67.1 revision=1 -create_wrksrc=yes +_cargo_revision=0.68.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 " 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=b60b794dfdca61dfad106dbbb9c7c2c077c1a4bd505b90988057be5fd1ae99b7 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 9c5a3bda1dbf2206cdf692075ccd8806f872877b Mon Sep 17 00:00:00 2001 From: Marcin Puc Date: Sun, 5 Feb 2023 14:15:20 +0100 Subject: [PATCH 029/138] cargo-auditable-bootstrap: rebuild for rust 1.67 --- 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 349ee8f9537df923fa77fb856e7262b4a816a869 Mon Sep 17 00:00:00 2001 From: Marcin Puc Date: Sun, 5 Feb 2023 14:16:29 +0100 Subject: [PATCH 030/138] cargo-auditable: rebuild for rust 1.67 --- 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 297872943a9cb9bdd6c053cb130caf5bc9a250f1 Mon Sep 17 00:00:00 2001 From: Duncaen Date: Wed, 15 Feb 2023 16:49:11 +0100 Subject: [PATCH 031/138] icu: update to 72.1. --- common/shlibs | 12 ++++++------ srcpkgs/icu/template | 6 +++--- 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/common/shlibs b/common/shlibs index 9b34746bb881..3a5c12aa1296 100644 --- a/common/shlibs +++ b/common/shlibs @@ -526,12 +526,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..915a4d4df3c2 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 @@ -11,11 +11,11 @@ configure_args="--with-data-packaging=archive --enable-static" hostmakedepends="pkg-config" checkdepends="diffutils python3" short_desc="Robust and fully-featured Unicode libraries" -maintainer="Randy McCaskill " +maintainer="Duncaen " 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 e6f4dfd9e057b79d567248659c72f991e04da663 Mon Sep 17 00:00:00 2001 From: Duncaen Date: Wed, 15 Feb 2023 15:24:25 +0100 Subject: [PATCH 032/138] firefox: update to 110.0. --- srcpkgs/firefox/patches/ppc32-fix-build.patch | 36 ------------ srcpkgs/firefox/patches/ppc64-webrtc.patch | 22 -------- srcpkgs/firefox/patches/sqlite-ppc.patch | 55 ------------------- srcpkgs/firefox/template | 4 +- 4 files changed, 2 insertions(+), 115 deletions(-) delete mode 100644 srcpkgs/firefox/patches/ppc32-fix-build.patch delete mode 100644 srcpkgs/firefox/patches/ppc64-webrtc.patch delete mode 100644 srcpkgs/firefox/patches/sqlite-ppc.patch diff --git a/srcpkgs/firefox/patches/ppc32-fix-build.patch b/srcpkgs/firefox/patches/ppc32-fix-build.patch deleted file mode 100644 index b26a46cfe835..000000000000 --- a/srcpkgs/firefox/patches/ppc32-fix-build.patch +++ /dev/null @@ -1,36 +0,0 @@ -This is not a complete/correct patch, but it makes firefox build. For now -mostly for tracking, so a real fix can be made, but right now it still -segfaults on start. - -Ref: https://hg.mozilla.org/mozilla-central/rev/08339a56f3ae -Ref: https://hg.mozilla.org/mozilla-central/rev/d16fcad6aa60 -Ref: https://hg.mozilla.org/mozilla-central/rev/ab87611d012e -Ref: https://hg.mozilla.org/mozilla-central/file/tip/xpcom/reflect/xptcall/md/unix/xptcinvoke_ppc_linux.cpp - ---- a/xpcom/reflect/xptcall/xptcall.h -+++ b/xpcom/reflect/xptcall/xptcall.h -@@ -71,6 +71,11 @@ struct nsXPTCVariant { - ExtendedVal ext; - }; - -+#if defined(__powerpc__) && !defined(__powerpc64__) -+ // this field is still necessary on ppc32, as an address -+ // to it is taken certain places in xptcall -+ void *ptr; -+#endif - nsXPTType type; - uint8_t flags; - -@@ -91,7 +96,12 @@ struct nsXPTCVariant { - }; - - void ClearFlags() { flags = 0; } -+#if defined(__powerpc__) && !defined(__powerpc64__) -+ void SetIndirect() { ptr = &val; flags |= IS_INDIRECT; } -+ bool IsPtrData() const { return IsIndirect(); } -+#else - void SetIndirect() { flags |= IS_INDIRECT; } -+#endif - - bool IsIndirect() const { return 0 != (flags & IS_INDIRECT); } - diff --git a/srcpkgs/firefox/patches/ppc64-webrtc.patch b/srcpkgs/firefox/patches/ppc64-webrtc.patch deleted file mode 100644 index dad58e04c3c8..000000000000 --- a/srcpkgs/firefox/patches/ppc64-webrtc.patch +++ /dev/null @@ -1,22 +0,0 @@ -commit 214967e5cea61ff49fb21810e8d8c755db84f682 -Author: Daniel Kolesa -Date: Tue Oct 4 11:53:06 2022 +0200 - - fix libwebrtc on ppc64 - -diff --git a/third_party/libwebrtc/moz.build b/third_party/libwebrtc/moz.build -index 8579f8b..d9ca79d 100644 ---- a/third_party/libwebrtc/moz.build -+++ b/third_party/libwebrtc/moz.build -@@ -520,7 +520,10 @@ if CONFIG["CPU_ARCH"] == "ppc64" and CONFIG["OS_TARGET"] == "Linux": - "/third_party/libwebrtc/api/audio_codecs/isac/audio_decoder_isac_float_gn", - "/third_party/libwebrtc/api/audio_codecs/isac/audio_encoder_isac_float_gn", - "/third_party/libwebrtc/modules/audio_coding/isac_c_gn", -- "/third_party/libwebrtc/modules/audio_coding/isac_gn" -+ "/third_party/libwebrtc/modules/audio_coding/isac_gn", -+ "/third_party/libwebrtc/modules/desktop_capture/desktop_capture_generic_gn", -+ "/third_party/libwebrtc/modules/desktop_capture/desktop_capture_gn", -+ "/third_party/libwebrtc/modules/desktop_capture/primitives_gn" - ] - - if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Linux": diff --git a/srcpkgs/firefox/patches/sqlite-ppc.patch b/srcpkgs/firefox/patches/sqlite-ppc.patch deleted file mode 100644 index 51f7faa618dd..000000000000 --- a/srcpkgs/firefox/patches/sqlite-ppc.patch +++ /dev/null @@ -1,55 +0,0 @@ -From 67157b1aa7da0a146b7d2d5abb9237eea1f434ec Mon Sep 17 00:00:00 2001 -From: Daniel Kolesa -Date: Fri, 23 Sep 2022 02:38:29 +0200 -Subject: [PATCH] fix sqlite3 on ppc with clang - -The __ppc__ macro is always defined on clang but not gcc, which -results in sqlite mistakenly thinking that ppc64le with clang -is big endian. - -Also disable some inline assembly stuff on ppc that is never used -with gcc and probably was never tested with modern machines. ---- - third_party/sqlite3/src/sqlite3.c | 10 +++++----- - 1 file changed, 5 insertions(+), 5 deletions(-) - -diff --git a/third_party/sqlite3/src/sqlite3.c b/third_party/sqlite3/src/sqlite3.c -index 4f3dc68..9017062 100644 ---- a/third_party/sqlite3/src/sqlite3.c -+++ b/third_party/sqlite3/src/sqlite3.c -@@ -14317,9 +14317,9 @@ typedef INT16_TYPE LogEst; - # if defined(i386) || defined(__i386__) || defined(_M_IX86) || \ - defined(__x86_64) || defined(__x86_64__) || defined(_M_X64) || \ - defined(_M_AMD64) || defined(_M_ARM) || defined(__x86) || \ -- defined(__ARMEL__) || defined(__AARCH64EL__) || defined(_M_ARM64) -+ defined(__ARMEL__) || defined(__AARCH64EL__) || defined(_M_ARM64) || defined(__LITTLE_ENDIAN__) - # define SQLITE_BYTEORDER 1234 --# elif defined(sparc) || defined(__ppc__) || \ -+# elif defined(sparc) || defined(__BIG_ENDIAN__) || \ - defined(__ARMEB__) || defined(__AARCH64EB__) - # define SQLITE_BYTEORDER 4321 - # else -@@ -20713,7 +20713,7 @@ SQLITE_PRIVATE const char **sqlite3CompileOptions(int *pnOpt); - return val; - } - --#elif !defined(__STRICT_ANSI__) && (defined(__GNUC__) && defined(__ppc__)) -+#elif 0 - - __inline__ sqlite_uint64 sqlite3Hwtime(void){ - unsigned long long retval; -@@ -196385,9 +196385,9 @@ struct RtreeMatchArg { - #if defined(i386) || defined(__i386__) || defined(_M_IX86) || \ - defined(__x86_64) || defined(__x86_64__) || defined(_M_X64) || \ - defined(_M_AMD64) || defined(_M_ARM) || defined(__x86) || \ -- defined(__arm__) -+ defined(__arm__) || defined(__LITTLE_ENDIAN__) - # define SQLITE_BYTEORDER 1234 --#elif defined(sparc) || defined(__ppc__) -+#elif defined(sparc) || defined(__BIG_ENDIAN__) - # define SQLITE_BYTEORDER 4321 - #else - # define SQLITE_BYTEORDER 0 /* 0 means "unknown at compile-time" */ --- -2.37.3 - diff --git a/srcpkgs/firefox/template b/srcpkgs/firefox/template index 784ad493d3dc..e0b4e2187023 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=110.0 revision=1 build_helper="rust" short_desc="Mozilla Firefox web browser" @@ -11,7 +11,7 @@ maintainer="Duncaen " 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=d3882492190e4fdcfa142772cf35de5403effb011d24357b315d643ed9168a39 lib32disabled=yes From ab2764f327c6c1226e86ab80490a2cca9d0f9fe1 Mon Sep 17 00:00:00 2001 From: Duncaen Date: Wed, 15 Feb 2023 15:24:32 +0100 Subject: [PATCH 033/138] firefox-i18n: update to 110.0. --- srcpkgs/firefox-i18n/template | 194 +++++++++++++++++----------------- 1 file changed, 97 insertions(+), 97 deletions(-) diff --git a/srcpkgs/firefox-i18n/template b/srcpkgs/firefox-i18n/template index 6037a395ef00..2521fe9f2715 100644 --- a/srcpkgs/firefox-i18n/template +++ b/srcpkgs/firefox-i18n/template @@ -1,6 +1,6 @@ # Template file for 'firefox-i18n' pkgname=firefox-i18n -version=109.0.1 +version=110.0 revision=1 build_style=meta short_desc="Firefox language packs" @@ -140,99 +140,99 @@ _pkgtmpl() { } } -checksum="c90871f30511a1fd0239f111314df72d62bc97e0318b27b142a69061a690a433 - 2ea425bb991cb7dcade08235bd6337541f428d81d47c6457c3e689fe2670187b - 391f11d828886b664313f396e9a2c37d9f84d870e44da4a20e6429f894993a3d - 0d16e860af4bf4469964a5e33e4b5955b279810c01f24b48a148caec33135999 - f8169b1d0ea00a97f76170fd7fbf2f9c9410d5f5b7f76617898607afc8721659 - f707aca4430030232dcb10db16b4e6f260eb1b190bf887c3e14f5a42f958f788 - 8ca13bfee4ef7ecfbe56bddd39b380861a8917548ef40f845a10ef07f518b540 - 7e92713edc65ff8220d225de0295e2e053b2ac109b9b5d1a62c4b2e6aef500b2 - ac491c3d5762375af224ed8d3b7a3e87457d52dee8556a42984743f3664da47a - 43d5d15c31ff4469fb9623874fada0661e7d2d58778e83d6d387c2fbdaa62d4c - b7c27cedb4ad120bc7d96f4b780575a47774c104296dfb1044f087b0dfbb4cb8 - db76502d94ae5428ce8649909d86b71af419e4d7911b60336b9336c0f336458b - a910a6b8fe220a3288405118cc58cf46072074beb338ed1de76ecea9b0b17483 - e3039d85930fc2c3c91d433d910ffcf7d795a3c49a98c47a85fe7d492735cc8a - 62d29d77de557b0d5db21668c340ebb3126adf005e355c05efd688c45a9c9778 - bf5435e2d4f30e7b2f2dfebbea72756ec0dd3d9c8d86e3ee783f9c5b0fbf5eab - de17150a12ef38ad96b413b4ea0adf6c22f9cc43acea864d147a52c343b6da48 - 4d2f9ca150a09693860572ef3e506371eac9119380aa6fc69b4f8d765d19a47b - 0bdb31f365ed3faaa448655e9c84a7d45954967aeb3511dfb7ad9348e7ac8897 - 529ab9871fd66b722500130acd4f443e04004e26af6047de6e90e48350d99a3a - efde26d2d7fb8f90d1d3b66ccd2d07d73aa1a68bb95982ca48af3d7e4b4ff59d - 563d588231f3cf0a2f2e8cfdb67f2d18cf10ab104c3c4cae158d3cb76f01a945 - 1cecfc411164d5346221166fa6b97e61dbf049559e71a3f3b8bb4ed0168ae700 - 2ae0ba26271ac4343eea9641676c1ca8938d580aa236266053535f4700daecef - edb82e33ce05e8d47f11e1ea183e6263e13bde4911494ea4df7330dcae72ca7d - aaf0a8b6b75e3b9b6ecb0910b00d6b331c850a0bb70dbf991150bffde4701cf9 - af2e6bf160245b581afebaec182775ebef30a59bd0403bb1f6d40113d4e67c3c - ecb112af96e7a78281de6c2b8993fcf2e1a1ac553c858ec74b5071e6056c95e3 - a2a2e3c75b493f76217374d285c39699b74199179c3147f15594655eddbeacac - 3cffa707743048855fab402484fd844deb82cd95a8798ecef12d2f1bcaf1b749 - e512b0fe890cfeed3239d4ff6420dad4167f319e2a438c3518676b6b5af3a2ad - fb8fb5d905546e005085c060bb8a25f0a7bb6b7c32a5823276053119b95e6441 - fbbf692126bfda1f640a66a3edd17accad2c62ef8cb9baf4f5722c910c4a5aca - e7efacde88f46fb5bae91751060e5af1279c8fac262a86100d22f5be9afac1a0 - 92c701bb04ce94474ac2a00353f5fb7bba5420dd652364f5a62e2f2a939fe2e6 - 043ac88c26986fe7c2086a87bd4e9399ad285025b313e5de1c80d5d401dde007 - ba26a369aebcda2005ce250a2bd6ef7b420e482b604cfccb8c92b3492be7357f - 7c3209849d76f092c4cb506cbbf732659e36832e93638661b72b7df3038b10b1 - f842a3b899296e7702449ebeef2aa145cd6bd19c11a3db3be44b1a1e735c297c - 740ab17e96fb20527965c68ec615fa9343b880caf992c48af78627ff53eac8ef - d6eb4f0c9fed7c5e20d7569562e812b0a93a978204e02133a86c615dc304740c - 1900d17b2c1fd0710a5bddd6a75e929a7a0fef1775c6392488648f09ec12a2f5 - 84b06e36ead8be66b8b1f86e01ad97c3267111aa0167fca92dbecf3ab7196022 - d6d2f95652d0245d475b6af4f638cb55140cc2a95a024000dd9428ea6981a06c - 1772f1f7a2ec0eaf19fa1beb9157d310d2ed8d18ea40faabcf84b27c377a90c2 - 2471f410586f3e77827d3eb9d7f04e8d1965f6c2c2986f5fd500e62d1d2eb142 - bda9f2307c199bf5073d087064feecf62cc536234f183b006bd472eb9894f508 - a39834727af982049cafd5638cfd5b03ea562a9d4567a0c6daa70bd283304560 - 850e06f39c51b3a41a766d431146baba25f903f3b375c57008d77910138861bb - 10fbc7cf3d74104601ae466b74be3925b94b54e42d37045d15a6a1ee219ccdfe - 02ec6d50bd6712bf3c34289d9352e0d95b934fdd835b7eb3957b1f058a93e2bc - ef3f2d5d7fa0c6edbc2ad039365cae0c284f3bbbc93bcba022d5ba66ccb8efb4 - 9e9d43d3dc13a5d8086c3b967623fcd0ecc7cb40fb43206fbf108a21319398b9 - 38a4f89f8acef81ca3971a12935e6eb099d7581ff9124db1424bb97482671e5b - 8eaeafc8260c983a8f34632f47ef47bca3d31aae8f06555f52268b6104426936 - 7443367dc616d890912c2bde79524f9860017aacae895b7be11128ddf0466d39 - 7cfe2388f3e207beafe83db99f5594d4e70fdbabeab6994f2e55b876bdab41bb - 5699823a1d0fa7670098db710d4e8e834234942f63890151b44c114c2871beaa - 08c85e71b090fc211add94883390d01899d0dcc592e9a6e9582b575cb875356e - b949c2430efd9ce30a198b0d02e33af14543e4f4785c2c17841eca572b5991db - 555d87901dc5c22eeb12b7a2704be3d8274556c387e88d46ee1cf3bf18a343c5 - 4135f74736662a7bb40739d48cad652a478faf9a3971bc8a0748103d12ea0322 - 93bc0c2b0bdd31c7e8e3563864721fd94ab01f6a4e7b36e339a925c865405836 - 9bb9d2fda645d64503462731d0898216ca0f1a93e2e05b5b4ccc259462263637 - da128795d8db727470ac1c4e7d283b6282a3cc40e35429b0ce5987ef6f4839f3 - 02bbdb6c1951963e2210d2908c8ae654d1c72d73712306f4c9b17a5c481c2889 - f3db9018d715ee0bc97c77467c688628a9286b164d011f61bdf2409181191a3c - 16101575d453cd58e2846c450d47589ccbe7a027fce8dc19006bdc98245ac80d - a77f8bec90e54255b15552fdea11d212c9763faed791149a30fa1715f46ff8a0 - bfe4150c164c8aedab2246193616a4fe8417537214314b6a7c27f69e7064e0ef - 3ba92a02eeba86382200fa44e2e9fad0e4ab6783c2520ac4849123ed125afd28 - 1936604c7c7dc78f2cd902a1f1ba9c575a5776f07121cada36d0db56105535ce - 89413f13098a132fcd9ab5230edcf03cd0f428c265f18d94567130319624faf6 - d727e9851dd06d0e8396f5cc8b0b973ddb55d28b72666f8f1b2ae7fa91241190 - 9890803e3b50de7ebcb88942086ba7d44c698b5019485f756203be7b071e045f - bfcc6b394403ccafedf0eb2194c8bd3634bdc9fba88ca7875605149df1d7cb95 - d254fd7ec27d2a611f8e1cf39ee3b9b8d54b73bb7befc465e5e06f29c211fc1d - 25c6db9cea3fb8b23dfac272b1e6f980e0837ea923e7053f9ec50ad46b6ae388 - 5acc2a35206fb82f7c11ffb44586c4eeb3bfda67bae9cd56b68c903c706867a1 - 4eecaf6e949bc4db33bf9600c1728448d05ca57c241ec9bcf02bfa57416b22ff - e99e561e1540a2fd31581466c31495dfac606d85d25bab0ded5efc04f3937808 - 936fd25b5980f7c074569c0870b872162188cf7bd542f2b2da7079a8e5c1e879 - ebd12ebbb2acd170ed74f926815062fb869085721ebb80512f8b5b7fedb635d5 - 38ae1ae06591304f88a2d894f7cdf1f67f18fe7cf6a9aa425df833b725990621 - f0e83b35ffa3aa603e383a2846298a11d2dd4654b4566c8d3e5d49dd24a8e863 - bfdb2af98916f2968a37c8755c7ba49fc1644ddd4c08f8d9615a0dcdd6b1a4d2 - afd6b1d2f1ad6e0e4bcd206280950950e6a198694a0e6f741520be9cc286578f - 4d494351034b77005180260e2b1259f83f13ec8ffad12a1b64e151b8616f4acd - edb93b9dd44e96ac38d292f5d1a9112db152ed2495add62ac24b9a25132c9c2f - 864f9faef65d2afbc7955fbf96bdd55de7900865ca5b2e4870351b16d55f6327 - 32205ee0538e995dff05036ab6d0958b16ac18ca850d952f32a1de2723196896 - d34fe9233dde445e57b5d3a635c74a7404a4bfd58c15caf06983d4e90fc08016 - 8876206a3affa3892ccf37d356a2bdaf13ef9c6e6b3b28fe9dae902aff77b3b7 - c22dd129f70a222882fae0f8ce839a925b8102259f9c5a28399f8f6eb5b76b54 - 0eb523bb0d18195e4db17560311450453f47e5d3ddb8df22dbba3328030a1d39 - 4f6933bd681561a6c252549ac813bd9c28c25239e1899150289bf88c1109758f" +checksum="5cb11f306c5ccfd9d7f2be0651508ea36d4eb8cdc6640ac65992a4e23033edc7 + 4a0d032ca672fb2bb67b5f55e8d1f092babccd1ada2285edad54f14d3408d0d0 + 6b51b56738efb5ddfbc513a93ec587cba14ef9744dc9ce96b38999f9bb3b0300 + 5915ea23b66c16b7ca36e96e9bea9e40cc4d494ad3e41c990ebe9d7bd681a776 + 871e5f9791dcd808821b4b050b8b323ce6797ff684642cb61d55444ead93f7e6 + 83da8cef3b9e36ea2501850fe78714f5d81666c022935f1fa1585d911bc91f94 + 29161a627cfd6a733986eff4b08a4d7ab8839bde9149240fc5bf713daae9bf82 + e3b6b6a7789b23738f6fb01a077b55f4314b4f9bf91467be3ff552270d561024 + ca735bb2860244e79b295e5f2aee50acd811007aef5fdbe5812610c541f120f6 + f6d7517306eed9cb1302f7ce5582ef3669af624637abc71816460261dc409280 + 1e8b50d122ebb3878486b615e99d1bd426e285e3f60e4115eb38b3679cab0072 + b6d60a1c6f76c7516ad1cd931be4b655a2cfd052bb03fc9149fe8c2777117632 + 1d89f22c7facaadd2b87f45d98f38700c0aa65ea3937fd4a1bb001e7e5553509 + ea584f9fd2f6c95ac0a85fc9cb836d79177229ad1f493712d6bd23c671a41905 + dcdf18b0cbf7ee4e1d28a5d687cb9c535b4549b34a3f1ce7376c0ba186a52821 + 34386b5358a6482d51dcb4165da7d339930f7acf30f3cda888e371833fd4b9e7 + 48cb07c8189454e44f7359dd541e9750548cc4e372bf300b1ab1537893ac61e0 + c2833cf83cd0fd7972d849e1ade4f47c4bd384ebcc31bbd78845c0519c9fd235 + 0423add4d89155e11be23e92b23e08ee645776183a1224716a74f7be53fe99cc + 6f9320290cafccaf592f5add64034fa3edeb96d08e7d46cdf392b7e00c3b0053 + 45493b9af2e2164e70ecf853e9a4f0b8d43deafc1b4327d5d611d3af4a86028c + 7e7bc2558666ffd707549f3b207f9e52e1ae25fa6910c68f76d905021cbe662f + ddaf890ac9dd3dae8e9a81c6b74c4d651f78f0e47e30ca1c15807b6fdebf6195 + 7edab8304ce636b0c00f281c9d9187b2681f08fd0fcf1e4425c49ccdf7806aaf + 07c2272a61419c0c701cc112f1a282e45f6f88e08774bc1bc36d2fe3ed1e7b5b + 24278ac7ec4a992d3dab1f91e0f838e6e642508223b25e557d3a859d6615602a + e3e77f64021b55a48abd7564d508951bb865e713b61f7c8c69dc789613b7f2ea + 7fca785a9833f13f57620bac3b217fe54b838c819d236653eb66edba307f3cd0 + 19e3e24a0120f68fe5f368ba01d7787afed4d3e6ca0ee545d217a2205d19baf7 + d21055bdc15565919597bc15d2e997d15398f8ef0ffe51d2f74f82623979e5a3 + 0eaa8feac825fc432f812b6bec0e4829cac22824adc2dab5a039f308b9c6cdc8 + 35b7b87aa6e181f67593d6ea69e38dbc43a210db44653cef0806e054864283bb + 41b975e18995362fe549346bb69f8c2d8db803a1d47468eb5d887458952bfb5b + e48caca3fa4f91e9a0632e37e7a0ad36b7037cce0c8692dd03d21022975f26c5 + 090894c2c9be66b554d93afd8a9b6f844c68b78f3d59bb7ef655d8795b12f118 + a91da5d704707452a4ff150ae24b438f3dbbd7ca28115859e49becc33dff9ec4 + b56b9c09e8ca669efddeab5ce3917671b8ecfa2c123231008d88bf5b3f5181ca + 6b1520658d4692e9f22495eb328b27434cb6616a56c82bc4ffb0e97641b4af6a + 97fd93debe8103bbe376d453269e73da07dfd692f6f819f40f877fa6741f2403 + 27f6384c389bc1c95fdfd9948e7995f0d951eb40f92d9b7a73c58fd07a24e62c + 7d66137b792994c6c97051e52b173914c53d9f8360e934d13d0d37e00d75c33a + 1b719b56906c49da76fb3c0d64697aad6e76815f8e0da34604f7733804e88025 + f67d96cf31c40df0c38f8323a50b9e09255ce63b6520e2f80f1012833fb68b37 + 00bada6c6dbc9d685164e6d27b2b65d05feae12c9c1cc4f4ee07a4e93f16ef3c + 2b66fbc47e0da0375103a4593726a8d968b97e693ac882ffb0cf9c16c558eba7 + 09358af89ccbf4fcb84e86a684d6e7045ab535898d75c270b8fbf706e37f6fed + a0512c8a15024ac2c686ab7bf84087a93a4a795d144c969d3f5a9eb32d93ee11 + 6140d4a3054a6efa494d766213c1cc1f0068c864f7ded5204d1eed1323d1185e + 5ffcb662e15a0bceb230265e3e6a2ed50e53deb7ca8cbee21cb4d04e3066365d + 1c86886ab6813f6f62b13c2520f8612d9c29366987d2be99da5fcc36080587d1 + 7b364bd0d96a84b541bea2d11220f4b40b63cb00cd75bd9f99b464851abb9383 + 5ec2a50262cb6b47eb02b3389239f6d133e2c24d74d35be95a9d6f3267358744 + ec256128f23c37507112594a065017f42659a5d163c4430bddcd9631f2de83a6 + 59e6c093e5a071cce73b3ebde1298dee07cf929f47a592176904975ed85762aa + 6bcb86369a87e96bdb1588b592a57f67b5b297e29c3a8c646f34efb1b666f4bb + 5d04512332873fb6be0db926b42395bca6132c3a3b73b2610a48a1e95507b80d + a89102d7b2ea5a9dac77cb1f7df1d4828eda54d3a9749de8d024366299785d20 + 2ec92ee964dff3ca2181e274038de1bd35c46d46f72fd84e4c405ba438068ed7 + bfd91eae2598197049bf122b376e6beb770042a3400cee0fb162290c0e33ee8a + af325bef472fcfdcc6349809734a442e4b0dd0d432d3fe6b8291097795fd08b9 + 206f58173e7cf3b27dfbad8623b3746b740349c75eff34517e17e530c8c2e569 + eed0f1e411eb137c271a29cab3839633c5178d74acd9d0b8a9023f65ccd1ce76 + ced9d1112b8407451b32766785067450718523f6c17fd86df273fe3b34163f83 + ef45cdce64a597e70849330934dd1e2fcbb7379b5c5f9f0466901aaca3cbff7b + 07680fe4a5bd087be2618f8898da419aec13b25fa751f7533b3a4a36b817bf63 + 390e5444034621a22488de14f42b13eca3bc4ece05cf9c36c2b96c60360c7b5d + 5b1aa7396f44fcb326d28dff8b8c6bd1469e5c5d357ef732f179f9c20ac3f4f3 + 2d12634d3c65fbe83656295bab4814b33387b2230298ec78b799cb9a2382bbd9 + 5a6c3744b91f89ba6416b43a4e8b5e085affaa373a701cc7652eba1889e2f221 + ba47011aa9062419c797fdc01b5459ce3f8c313e13b3b6549d62cc03f03cad68 + 2ac5f031c55387bfccc9a42c51781b7dc94ab8d95e0a06e903781f615508d7ba + 73e9261a460698a02a2611965f5dad622c9c754c905deed6fb83b2d76a97a768 + e34c317460d23c4c8e377c70318f3d9b67151e79345925cc68736cef210ef7aa + 3c709386adc3beefcd233d501194331bda13106889038c0030d92c272baa1bcc + da83a64e3f8aca43138eba5aa6d270ff5e41588ad11e9650c0d8bd8000571ab8 + fcaef9c7fa261c037db2319ff6061b7b6986a4bdbd75291efc494a98b1da8235 + 4bc43250642ec499c9a1253db5ce36087b38ac44ae0888c8a0f0a45b7e571bbf + 249f2d7a2c69b160278855d3f5be9357dadc923e45d7eaa475495a0c5b8771c7 + 532f446340dcd9eef1dc15f0c19e07af71bd9811a97e4716f4dd3fcc4a632633 + 7ff056721fc2c017f8e0973863f3a6d3259c0ef235222141f6b77a7cfb89b0d2 + e566a6b4db322ec70a504ab6105457f6944c55175344b5dbb8eb2e311ceef656 + 91308fa6536b26f69b0a7fcc58419c55530a74726b257996fc27157aa6f01264 + fe12ac4c2bff7639c0b81ae857f7f250343ebf84ebf4203e24d9041ed631715b + 5f099a955d6ffacedabc124e6294fd76c43a098e462e4392c4693b6ada4b6ebd + 06272f735f364743147f38c8700b23e57ca3a87264f46b33dfc7a22f63f78366 + 804b0d5c50979bbce9b8f63e1578f24598ca5fa073cbcf9060f834bd7199f3e1 + 49782f35ab520e200177c2ad7cc539f151f0243e8652f3768e46aeb5fd9b7420 + 06538895253aa4756b83a07ea4500c5bc6778719f08f12dca34b654b9361c954 + e6c5f09672dcd2e2b56f4b033581466b15bb9de4a2604ef4c76fa35df4ed81b6 + 5eb06861dea1dd75c0b02f96c5069d7eb836979a997b87910d0d62f3fd3be305 + 5602c02f5bbaf27ea1c22d297a88746c4f50addff5f0ef7629e813c2b98f665d + 01581259aedb6ad34c5b85ba0d53aec9a05605b1f1b17c52f523960d6e227de8 + 4e2ea17b41003f640c383e3c35d2bbeafc6580e2f854430efa7475a242d79ec2 + 031d051a89011042ebaec8565fc798b8b23e58e546012f385faf3e3bc8be24f6 + 2bf682f884f935bf34e8829fb449c25fb8873388d94e758b1e9d08f1b5ed024b + 1a8dba5333e8f7492b41a23c4c2cfb00593c1fa54073142df58f5afeda08356c" From ff8bc61d44a277c7bac80432235d4aa72d5ec013 Mon Sep 17 00:00:00 2001 From: Duncaen Date: Wed, 15 Feb 2023 16:48:15 +0100 Subject: [PATCH 034/138] 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 fe1d30a699bb77a9937ae3725abe229821c1de3b Mon Sep 17 00:00:00 2001 From: Duncaen Date: Wed, 15 Feb 2023 16:48:44 +0100 Subject: [PATCH 035/138] 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 018b88d9f5893769e2a96d972ecfe9f0cca1e6de Mon Sep 17 00:00:00 2001 From: Duncaen Date: Wed, 15 Feb 2023 16:48:44 +0100 Subject: [PATCH 036/138] 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 82cdcc6d67cb3094454c4ffb75dbc26d6ce5b090 Mon Sep 17 00:00:00 2001 From: Duncaen Date: Wed, 15 Feb 2023 16:48:45 +0100 Subject: [PATCH 037/138] 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 fc71373ec85c6069f37904f5293c2bc87cd37b1c Mon Sep 17 00:00:00 2001 From: Duncaen Date: Wed, 15 Feb 2023 16:48:45 +0100 Subject: [PATCH 038/138] 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 f764f49078aea1cee5839bf9dd73ce520b7e20f2 Mon Sep 17 00:00:00 2001 From: Duncaen Date: Wed, 15 Feb 2023 16:48:45 +0100 Subject: [PATCH 039/138] 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 9df1c0fa7404cdb974fb5ac889a18a7ae7367523 Mon Sep 17 00:00:00 2001 From: Duncaen Date: Wed, 15 Feb 2023 16:48:45 +0100 Subject: [PATCH 040/138] 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 7e2ac98e1802d58136dfa6b1a9392507af9ee777 Mon Sep 17 00:00:00 2001 From: Duncaen Date: Wed, 15 Feb 2023 16:48:45 +0100 Subject: [PATCH 041/138] 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 e87d95cf773cfc00f1617ecbfe4a79598a560054 Mon Sep 17 00:00:00 2001 From: Duncaen Date: Wed, 15 Feb 2023 16:48:45 +0100 Subject: [PATCH 042/138] 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 49c132d0c187..1fc7e74b4151 100644 --- a/srcpkgs/calibre/template +++ b/srcpkgs/calibre/template @@ -1,7 +1,7 @@ # Template file for 'calibre' pkgname=calibre version=5.44.0 -revision=2 +revision=3 build_style=python3-module pycompile_dirs="/usr/lib/calibre/" hostmakedepends="pkg-config python3-BeautifulSoup4 python3-Pillow python3-PyQt5-svg From d3474d2c0679f1c522f9c2eaab32f8e036af8f5f Mon Sep 17 00:00:00 2001 From: Duncaen Date: Wed, 15 Feb 2023 16:48:45 +0100 Subject: [PATCH 043/138] 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 6fbc98e326cf..a582b78aa168 100644 --- a/srcpkgs/clamav/template +++ b/srcpkgs/clamav/template @@ -1,7 +1,7 @@ # Template file for 'clamav' pkgname=clamav version=0.103.4 -revision=3 +revision=4 build_style=gnu-configure # XXX: system llvm is too new (< 3.7 required) # Shipped llvm does not build with gcc>=6 From 5cf3c2c46bb995c0a85556293a88178388a8bcbd Mon Sep 17 00:00:00 2001 From: Duncaen Date: Wed, 15 Feb 2023 16:48:46 +0100 Subject: [PATCH 044/138] 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 3432a567382f..5e9fece91b4f 100644 --- a/srcpkgs/darktable/template +++ b/srcpkgs/darktable/template @@ -1,7 +1,7 @@ # Template file for 'darktable' pkgname=darktable version=4.2.0 -revision=1 +revision=2 # upstream only supports these archs: archs="x86_64* aarch64* ppc64le*" build_style=cmake From fbf9f7b95349edea1d92bd54955995e06e108355 Mon Sep 17 00:00:00 2001 From: Duncaen Date: Wed, 15 Feb 2023 16:48:46 +0100 Subject: [PATCH 045/138] 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 1b1542906d7c..c2feee3b1508 100644 --- a/srcpkgs/dino/template +++ b/srcpkgs/dino/template @@ -1,7 +1,7 @@ # Template file for 'dino' pkgname=dino version=0.4.0 -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 6a7863c402697adc9ad9071b91e05f7e26e70c64 Mon Sep 17 00:00:00 2001 From: Duncaen Date: Wed, 15 Feb 2023 16:48:46 +0100 Subject: [PATCH 046/138] 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 9c6c82039914963061ba81b78f376179c6320941 Mon Sep 17 00:00:00 2001 From: Duncaen Date: Wed, 15 Feb 2023 16:48:46 +0100 Subject: [PATCH 047/138] 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 b1c658153c327708afba5f0b6619e64bd314ed43 Mon Sep 17 00:00:00 2001 From: Duncaen Date: Wed, 15 Feb 2023 16:48:46 +0100 Subject: [PATCH 048/138] 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 1148daa92302072a59364460c9617ded54cd0c7b Mon Sep 17 00:00:00 2001 From: Duncaen Date: Wed, 15 Feb 2023 16:48:47 +0100 Subject: [PATCH 049/138] 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 ebf92311921d2b854a8e79aa640a5acd6258d83f Mon Sep 17 00:00:00 2001 From: Duncaen Date: Wed, 15 Feb 2023 16:48:47 +0100 Subject: [PATCH 050/138] 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 bc80d56af6f24d91e5513ecefb8d942c40ab9765 Mon Sep 17 00:00:00 2001 From: Duncaen Date: Wed, 15 Feb 2023 16:48:47 +0100 Subject: [PATCH 051/138] 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 40e7798fb2158afdda7f36335270210553b86db3 Mon Sep 17 00:00:00 2001 From: Duncaen Date: Wed, 15 Feb 2023 16:48:47 +0100 Subject: [PATCH 052/138] 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 578a2b06d8d213d8283911733693663a2599b4a9 Mon Sep 17 00:00:00 2001 From: Duncaen Date: Wed, 15 Feb 2023 16:48:47 +0100 Subject: [PATCH 053/138] 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 2b12cb4e1aa0aa98b8ec8b1ff9a5c8e306b248eb Mon Sep 17 00:00:00 2001 From: Duncaen Date: Wed, 15 Feb 2023 16:48:47 +0100 Subject: [PATCH 054/138] 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 4558e05aaf9e36ed6c9e48d026686be49c04216c Mon Sep 17 00:00:00 2001 From: Duncaen Date: Wed, 15 Feb 2023 16:48:48 +0100 Subject: [PATCH 055/138] 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 bc231a5c6b58ee601f20796ed249dd02dbc90dd2 Mon Sep 17 00:00:00 2001 From: Duncaen Date: Wed, 15 Feb 2023 16:48:48 +0100 Subject: [PATCH 056/138] 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 5723b31f258ea2820072c4fdcb389feaf501ed77 Mon Sep 17 00:00:00 2001 From: Duncaen Date: Wed, 15 Feb 2023 16:48:48 +0100 Subject: [PATCH 057/138] 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 f757ff1f75ac505b1637b2c34552dc20393d3689 Mon Sep 17 00:00:00 2001 From: Duncaen Date: Wed, 15 Feb 2023 16:48:48 +0100 Subject: [PATCH 058/138] 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 10845caeabb26a7427d26bda5e6b799cbd918ee8 Mon Sep 17 00:00:00 2001 From: Duncaen Date: Wed, 15 Feb 2023 16:48:48 +0100 Subject: [PATCH 059/138] 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 1599b72f2b43..923e25842d26 100644 --- a/srcpkgs/imv/template +++ b/srcpkgs/imv/template @@ -1,7 +1,7 @@ # Template file for 'imv' pkgname=imv version=4.4.0 -revision=1 +revision=2 build_style=meson hostmakedepends="asciidoc pkg-config cmake" makedepends="cmocka-devel freeimage-devel glu-devel librsvg-devel libheif-devel libxkbcommon-devel From 846ad05e7807e5bafc36384606a372936ad15bff Mon Sep 17 00:00:00 2001 From: Duncaen Date: Wed, 15 Feb 2023 16:48:48 +0100 Subject: [PATCH 060/138] 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 abda2d560a8bfb51cae2f2f477067f310c1f0bbb Mon Sep 17 00:00:00 2001 From: Duncaen Date: Wed, 15 Feb 2023 16:48:48 +0100 Subject: [PATCH 061/138] 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 54dcf90ad3a1..874b0413a822 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.0 -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 e180210a0d6e00459620270f35e04b1a4ba330d8 Mon Sep 17 00:00:00 2001 From: Duncaen Date: Wed, 15 Feb 2023 16:48:49 +0100 Subject: [PATCH 062/138] 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 10c2f9faa28bcddf0209b97c8c58a3f4a52e4684 Mon Sep 17 00:00:00 2001 From: Duncaen Date: Wed, 15 Feb 2023 16:48:49 +0100 Subject: [PATCH 063/138] 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 5e35f6820b63add4a6e09376ecc05e7b7a2e6ef0 Mon Sep 17 00:00:00 2001 From: Duncaen Date: Wed, 15 Feb 2023 16:48:49 +0100 Subject: [PATCH 064/138] 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 4ba594ffffc80dbd81303680957bc1bc3b8a5786 Mon Sep 17 00:00:00 2001 From: Duncaen Date: Wed, 15 Feb 2023 16:48:49 +0100 Subject: [PATCH 065/138] 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 bb7d61c25102eac587f24f931d0de2cd9b3a1ea2 Mon Sep 17 00:00:00 2001 From: Duncaen Date: Wed, 15 Feb 2023 16:48:49 +0100 Subject: [PATCH 066/138] 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 416b0e6c8cfd3051b07165c8535096641e105ee3 Mon Sep 17 00:00:00 2001 From: Duncaen Date: Wed, 15 Feb 2023 16:48:49 +0100 Subject: [PATCH 067/138] 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 20fffec46dda7b24284fd66a9963acbe375b8288 Mon Sep 17 00:00:00 2001 From: Duncaen Date: Wed, 15 Feb 2023 16:48:49 +0100 Subject: [PATCH 068/138] 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 b60810507440a232636c0161d7c6534b4019cc2c Mon Sep 17 00:00:00 2001 From: Duncaen Date: Wed, 15 Feb 2023 16:48:50 +0100 Subject: [PATCH 069/138] 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 d34831d9e7fa052bb6de8016c122472f6dfbefa9 Mon Sep 17 00:00:00 2001 From: Duncaen Date: Wed, 15 Feb 2023 16:48:50 +0100 Subject: [PATCH 070/138] 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 e7289554e48be913dea8b0a5fa9e25ca7b3c0ef1 Mon Sep 17 00:00:00 2001 From: Duncaen Date: Wed, 15 Feb 2023 16:48:50 +0100 Subject: [PATCH 071/138] 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 425b41e0bdf97dcbbd2d0c69c490c1d05ae292ee Mon Sep 17 00:00:00 2001 From: Duncaen Date: Wed, 15 Feb 2023 16:48:50 +0100 Subject: [PATCH 072/138] 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 0d142a97712e2065f6ba3953949dcbdf6c5186ee Mon Sep 17 00:00:00 2001 From: Duncaen Date: Wed, 15 Feb 2023 16:48:50 +0100 Subject: [PATCH 073/138] 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 0290a4cd3f7dac2abd38ab019c62f2699176f4d6 Mon Sep 17 00:00:00 2001 From: Duncaen Date: Wed, 15 Feb 2023 16:48:50 +0100 Subject: [PATCH 074/138] 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 543e511bcad854539467da4fe3f28274a7f796c4 Mon Sep 17 00:00:00 2001 From: Duncaen Date: Wed, 15 Feb 2023 16:48:50 +0100 Subject: [PATCH 075/138] 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 4a13f009beffb090e1f46e76da5daa831e86f5bb Mon Sep 17 00:00:00 2001 From: Duncaen Date: Wed, 15 Feb 2023 16:48:51 +0100 Subject: [PATCH 076/138] 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 7baec1148d5d68deedc202456a965b023f88ceba Mon Sep 17 00:00:00 2001 From: Duncaen Date: Wed, 15 Feb 2023 16:48:51 +0100 Subject: [PATCH 077/138] 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 65f002a97e513be3935ed89c25c9a729032bb42b Mon Sep 17 00:00:00 2001 From: Duncaen Date: Wed, 15 Feb 2023 16:48:51 +0100 Subject: [PATCH 078/138] 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 ccae5a855c21cf8fbc1d0f4f21340983c2a3fac9 Mon Sep 17 00:00:00 2001 From: Duncaen Date: Wed, 15 Feb 2023 16:48:51 +0100 Subject: [PATCH 079/138] 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 85ee9932b841f74b9f4cf4aed4fa18bfd26771e4 Mon Sep 17 00:00:00 2001 From: Duncaen Date: Wed, 15 Feb 2023 16:48:51 +0100 Subject: [PATCH 080/138] 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 6c85a5706c0191fb2e1e9968beace8b8ae43c4f3 Mon Sep 17 00:00:00 2001 From: Duncaen Date: Wed, 15 Feb 2023 16:48:51 +0100 Subject: [PATCH 081/138] 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 20549d2adb471b08cacd0950e044d8b12f3dfe7e Mon Sep 17 00:00:00 2001 From: Duncaen Date: Wed, 15 Feb 2023 16:48:51 +0100 Subject: [PATCH 082/138] 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 00a2dd18caf58ed93b95a8b179f5d643ede5216f Mon Sep 17 00:00:00 2001 From: Duncaen Date: Wed, 15 Feb 2023 16:48:52 +0100 Subject: [PATCH 083/138] 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 cecafe3b16a522cc2603f987fadf35e37ed46a50 Mon Sep 17 00:00:00 2001 From: Duncaen Date: Wed, 15 Feb 2023 16:48:52 +0100 Subject: [PATCH 084/138] 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 a1d5625ce65f5b575c149b0f71c4d3b55598ebb9 Mon Sep 17 00:00:00 2001 From: Duncaen Date: Wed, 15 Feb 2023 16:48:52 +0100 Subject: [PATCH 085/138] 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 4433458cde7601c6a969966cb00af6980a09aba0 Mon Sep 17 00:00:00 2001 From: Duncaen Date: Wed, 15 Feb 2023 16:48:52 +0100 Subject: [PATCH 086/138] 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 92b235842cfd68c3063307f89810ebcfd05d620f Mon Sep 17 00:00:00 2001 From: Duncaen Date: Wed, 15 Feb 2023 16:48:52 +0100 Subject: [PATCH 087/138] 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 5800ede82d44862643f6f90ba3e6bc9df2712902 Mon Sep 17 00:00:00 2001 From: Duncaen Date: Wed, 15 Feb 2023 16:48:52 +0100 Subject: [PATCH 088/138] 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 da745d4303249b2097460d392b7f2f2718a4f801 Mon Sep 17 00:00:00 2001 From: Duncaen Date: Wed, 15 Feb 2023 16:48:52 +0100 Subject: [PATCH 089/138] 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 84e18e91b15e96f9ad51ca2b96fa924d49f80b28 Mon Sep 17 00:00:00 2001 From: Duncaen Date: Wed, 15 Feb 2023 16:48:53 +0100 Subject: [PATCH 090/138] 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 a3d330754d608de4c2698c8c9ada769b43f81662 Mon Sep 17 00:00:00 2001 From: Duncaen Date: Wed, 15 Feb 2023 16:48:53 +0100 Subject: [PATCH 091/138] 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 62046cc7dd9bafcd888298e5f16544fa937c295c Mon Sep 17 00:00:00 2001 From: Duncaen Date: Wed, 15 Feb 2023 16:48:53 +0100 Subject: [PATCH 092/138] 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 50d8b34e06628dbaee978eb3d654257bca3c206c Mon Sep 17 00:00:00 2001 From: Duncaen Date: Wed, 15 Feb 2023 16:48:53 +0100 Subject: [PATCH 093/138] 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 3e64d1c5324699a7f07c4c5c6800d30da61d906c Mon Sep 17 00:00:00 2001 From: Duncaen Date: Wed, 15 Feb 2023 16:48:53 +0100 Subject: [PATCH 094/138] 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 8516b74f16da7d6b4147a89e75b0809a6fa20018 Mon Sep 17 00:00:00 2001 From: Duncaen Date: Wed, 15 Feb 2023 16:48:53 +0100 Subject: [PATCH 095/138] 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 2b627bc2b72e430afd29464210cccfdcd806a419 Mon Sep 17 00:00:00 2001 From: Duncaen Date: Wed, 15 Feb 2023 16:48:53 +0100 Subject: [PATCH 096/138] 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 7d7db49beac012a166d19e2623bc0ace668aaaf0 Mon Sep 17 00:00:00 2001 From: Duncaen Date: Wed, 15 Feb 2023 16:48:54 +0100 Subject: [PATCH 097/138] 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 88df3e4322073fe86f49751335d02f9f8742be01 Mon Sep 17 00:00:00 2001 From: Duncaen Date: Wed, 15 Feb 2023 16:48:54 +0100 Subject: [PATCH 098/138] php: rebuild for icu-72.1_1 --- srcpkgs/php/template | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/srcpkgs/php/template b/srcpkgs/php/template index 39e4d161b648..e9c6f6024631 100644 --- a/srcpkgs/php/template +++ b/srcpkgs/php/template @@ -1,7 +1,7 @@ # Template file for 'php' pkgname=php version=7.4.33 -revision=1 +revision=2 hostmakedepends="bison pkg-config apache-devel" makedepends="apache-devel enchant2-devel freetds-devel freetype-devel gdbm-devel gmp-devel libcurl-devel libjpeg-turbo-devel libmariadbclient-devel From 9a493e7bed86c0f1c47f4b39ff45397eea59ab36 Mon Sep 17 00:00:00 2001 From: Duncaen Date: Wed, 15 Feb 2023 16:48:54 +0100 Subject: [PATCH 099/138] 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 74c50da0e46f..1c215d1f841a 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.25 -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 2a3ce0519a68c3bb8032f321e85b8a1ae71604c3 Mon Sep 17 00:00:00 2001 From: Duncaen Date: Wed, 15 Feb 2023 16:48:54 +0100 Subject: [PATCH 100/138] 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 f19688b52f6c..f14414697e79 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.12 -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 8ff506bfcb330a8fef11b0558c779177d96dc1f8 Mon Sep 17 00:00:00 2001 From: Duncaen Date: Wed, 15 Feb 2023 16:48:54 +0100 Subject: [PATCH 101/138] 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 6b2189ba24c8..3d0fc915844f 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.0 -revision=1 +revision=2 build_style=cmake configure_args="-DBUILD_TESTING=OFF -DWaylandScanner_EXECUTABLE=/usr/bin/wayland-scanner From 0f64491331a48acfff2e1ced1b0f1c2bd010c6f5 Mon Sep 17 00:00:00 2001 From: Duncaen Date: Wed, 15 Feb 2023 16:48:54 +0100 Subject: [PATCH 102/138] 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 a8f02e3e6089..99796b40b8cf 100644 --- a/srcpkgs/poedit/template +++ b/srcpkgs/poedit/template @@ -1,7 +1,7 @@ # Template file for 'poedit' pkgname=poedit version=3.0.1 -revision=5 +revision=6 build_style=gnu-configure configure_args="--with-wx-config=wx-config-gtk3" hostmakedepends="pkg-config" From cd70b6b5d04d6aee76f3b66555ee3e2e6482b53a Mon Sep 17 00:00:00 2001 From: Duncaen Date: Wed, 15 Feb 2023 16:48:54 +0100 Subject: [PATCH 103/138] 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 62a504fef74d37fe1568429bfc495fa3093ce6c4 Mon Sep 17 00:00:00 2001 From: Duncaen Date: Wed, 15 Feb 2023 16:48:55 +0100 Subject: [PATCH 104/138] 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 1ef875e34d1aa00c0a5ccb734825cdd7d4772edc Mon Sep 17 00:00:00 2001 From: Duncaen Date: Wed, 15 Feb 2023 16:48:55 +0100 Subject: [PATCH 105/138] 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 9334ff68f8cf8859fa8d22400b20f1bdbf5d85e6 Mon Sep 17 00:00:00 2001 From: Duncaen Date: Wed, 15 Feb 2023 16:48:55 +0100 Subject: [PATCH 106/138] 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 58f5748efbe53c24dcac4fa6b38cbe297baada3c Mon Sep 17 00:00:00 2001 From: Duncaen Date: Wed, 15 Feb 2023 16:48:55 +0100 Subject: [PATCH 107/138] 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 0be0954538f1e85205e885535cb5b32b27e76a62 Mon Sep 17 00:00:00 2001 From: Duncaen Date: Wed, 15 Feb 2023 16:48:55 +0100 Subject: [PATCH 108/138] 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 d3940e5ee3abf1018c12d495a26bf1e6595d58da Mon Sep 17 00:00:00 2001 From: Duncaen Date: Wed, 15 Feb 2023 16:48:55 +0100 Subject: [PATCH 109/138] 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 c2d6443dddad..901b0062bae8 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.0 -revision=1 +revision=2 build_style=cmake configure_args="-DINSTALL_DATADIR=share/qt6 -DINSTALL_ARCHDATADIR=lib/qt6 From 854e9e10138c105e106a2fb20abf9f7b7400d7d4 Mon Sep 17 00:00:00 2001 From: Duncaen Date: Wed, 15 Feb 2023 16:48:55 +0100 Subject: [PATCH 110/138] 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 82c735a9893e..23a4d5817177 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.0 -revision=1 +revision=2 build_style=cmake hostmakedepends="qt6-base-devel qt6-declarative-devel perl pkg-config" makedepends="qt6-base-devel qt6-declarative-devel qt6-shadertools-devel" From 10d3057a5b81be25353d5d34eb971a2f1702c78e Mon Sep 17 00:00:00 2001 From: Duncaen Date: Wed, 15 Feb 2023 16:48:56 +0100 Subject: [PATCH 111/138] 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 01dde11204841f3755b0678239b7777829039b1c Mon Sep 17 00:00:00 2001 From: Duncaen Date: Wed, 15 Feb 2023 16:48:56 +0100 Subject: [PATCH 112/138] 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 23bb7eb10e74ef7f2358e4dac3451c6683eac3bc Mon Sep 17 00:00:00 2001 From: Duncaen Date: Wed, 15 Feb 2023 16:48:56 +0100 Subject: [PATCH 113/138] 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 02c59f83c3502382e877b49cac9ccf8d965b6ddf Mon Sep 17 00:00:00 2001 From: Duncaen Date: Wed, 15 Feb 2023 16:48:56 +0100 Subject: [PATCH 114/138] 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 6286166ccc840677ab865f613e25e4c88728a01f Mon Sep 17 00:00:00 2001 From: Duncaen Date: Wed, 15 Feb 2023 16:48:56 +0100 Subject: [PATCH 115/138] 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 23849b28eb7b..312c802598a3 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 29a43a9c419e016baf9b995f892dfb4eb3775bc6 Mon Sep 17 00:00:00 2001 From: Duncaen Date: Wed, 15 Feb 2023 16:48:56 +0100 Subject: [PATCH 116/138] 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 833da49455315ae51fb9e54c6d8bfe9e0bcac85f Mon Sep 17 00:00:00 2001 From: Duncaen Date: Wed, 15 Feb 2023 16:48:57 +0100 Subject: [PATCH 117/138] 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 3b3cb6c09e30399aaf5b7b542853bbd2e02572f8 Mon Sep 17 00:00:00 2001 From: Duncaen Date: Wed, 15 Feb 2023 16:48:57 +0100 Subject: [PATCH 118/138] 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 d00d31bfd000b123ae7d43a385af376f7bf34411 Mon Sep 17 00:00:00 2001 From: Duncaen Date: Wed, 15 Feb 2023 16:48:57 +0100 Subject: [PATCH 119/138] 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 011d22853c1d4cde133cb2921b5b3e0cc57801e9 Mon Sep 17 00:00:00 2001 From: Duncaen Date: Wed, 15 Feb 2023 16:48:57 +0100 Subject: [PATCH 120/138] 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 9138b651c7f55b657532f3d7d7d3b85c5da2c0d8 Mon Sep 17 00:00:00 2001 From: Duncaen Date: Wed, 15 Feb 2023 16:48:57 +0100 Subject: [PATCH 121/138] 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 " From 516c5ebc8bcc8d817a1688bc29a0522b002fe672 Mon Sep 17 00:00:00 2001 From: Duncaen Date: Wed, 15 Feb 2023 16:48:57 +0100 Subject: [PATCH 122/138] 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 c48a29d5550307462b0ec64062b2097a73ed096c Mon Sep 17 00:00:00 2001 From: Duncaen Date: Wed, 15 Feb 2023 16:48:57 +0100 Subject: [PATCH 123/138] 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 37094e068160ae9fb235a2faa150190f97855fa7 Mon Sep 17 00:00:00 2001 From: Duncaen Date: Wed, 15 Feb 2023 16:48:58 +0100 Subject: [PATCH 124/138] 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 bfeee302a80a..6afa33ed4b98 100644 --- a/srcpkgs/unar/template +++ b/srcpkgs/unar/template @@ -1,7 +1,7 @@ # Template file for 'unar' pkgname=unar version=1.10.7 -revision=10 +revision=11 archs="~*-musl" # regexec incompatible build_wrksrc="XADMaster" build_style=gnu-makefile From bc2c4380ae7f72978d40ac55136118c3a8a32d3c Mon Sep 17 00:00:00 2001 From: Duncaen Date: Wed, 15 Feb 2023 16:48:58 +0100 Subject: [PATCH 125/138] 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 29f4bd6a9594..dc0fa900c614 100644 --- a/srcpkgs/vte3/template +++ b/srcpkgs/vte3/template @@ -1,7 +1,7 @@ # Template file for 'vte3' pkgname=vte3 version=0.70.1 -revision=2 +revision=3 build_style=meson build_helper="gir" configure_args="-Db_ndebug=false -Db_lto=false -D_systemd=false From c8e239f946847909a01818fcfccd1e146b8d6fa6 Mon Sep 17 00:00:00 2001 From: Duncaen Date: Wed, 15 Feb 2023 16:48:58 +0100 Subject: [PATCH 126/138] 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 490ecb483e25f03e60be73bf4a5225c011db9037 Mon Sep 17 00:00:00 2001 From: Duncaen Date: Wed, 15 Feb 2023 16:48:58 +0100 Subject: [PATCH 127/138] 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 f5c57f6bb7d7cdcff94bafb4df16d04b5f60e66a Mon Sep 17 00:00:00 2001 From: Duncaen Date: Wed, 15 Feb 2023 16:48:58 +0100 Subject: [PATCH 128/138] 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 7d54762ad5161541bc49b1b5be32667255f80f7d Mon Sep 17 00:00:00 2001 From: Duncaen Date: Wed, 15 Feb 2023 16:48:58 +0100 Subject: [PATCH 129/138] 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 592f81491839381c8619067b3152038f5eca02e0 Mon Sep 17 00:00:00 2001 From: Duncaen Date: Wed, 15 Feb 2023 16:48:58 +0100 Subject: [PATCH 130/138] 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 From ffc829b3744c53d9ac4cb18da2adebe4ad6d0664 Mon Sep 17 00:00:00 2001 From: Duncaen Date: Wed, 15 Feb 2023 17:02:04 +0100 Subject: [PATCH 131/138] harfbuzz: update to 7.0.0. --- common/shlibs | 1 + ...046cf311718665496d0516495e9c139221ba.patch | 23 +++++++++++++++ .../harfbuzz/patches/fix-char-signed.patch | 29 ------------------- srcpkgs/harfbuzz/template | 6 ++-- 4 files changed, 27 insertions(+), 32 deletions(-) create mode 100644 srcpkgs/harfbuzz/patches/40fa046cf311718665496d0516495e9c139221ba.patch delete mode 100644 srcpkgs/harfbuzz/patches/fix-char-signed.patch diff --git a/common/shlibs b/common/shlibs index 3a5c12aa1296..34b747a6918d 100644 --- a/common/shlibs +++ b/common/shlibs @@ -1168,6 +1168,7 @@ librygel-ruih-2.0.so.1 librygel-0.26.0_1 librygel-server-2.6.so.2 librygel-0.26.0_1 librygel-db-2.6.so.2 librygel-0.28.0_1 libharfbuzz.so.0 libharfbuzz-5.1.0_1 +libharfbuzz-cairo.so.0 libharfbuzz-7.0.0_1 libharfbuzz-icu.so.0 libharfbuzz-5.1.0_1 libharfbuzz-subset.so.0 libharfbuzz-5.1.0_1 libharfbuzz-gobject.so.0 libharfbuzz-5.1.0_1 diff --git a/srcpkgs/harfbuzz/patches/40fa046cf311718665496d0516495e9c139221ba.patch b/srcpkgs/harfbuzz/patches/40fa046cf311718665496d0516495e9c139221ba.patch new file mode 100644 index 000000000000..07cac8fe06b4 --- /dev/null +++ b/srcpkgs/harfbuzz/patches/40fa046cf311718665496d0516495e9c139221ba.patch @@ -0,0 +1,23 @@ +From 40fa046cf311718665496d0516495e9c139221ba Mon Sep 17 00:00:00 2001 +From: Behdad Esfahbod +Date: Sun, 12 Feb 2023 10:54:07 -0700 +Subject: [PATCH] [hb-info] Declare a variable unused + +Fixes https://github.com/harfbuzz/harfbuzz/issues/4115 +--- + util/hb-info.cc | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/util/hb-info.cc b/util/hb-info.cc +index b3a8b35ebe3..e514f905533 100644 +--- a/util/hb-info.cc ++++ b/util/hb-info.cc +@@ -846,7 +846,7 @@ struct info_t : + hb_set_next (unicodes, &u);) + { + hb_codepoint_t gid = 0; +- bool b = hb_font_get_variation_glyph (font, u, vs, &gid); ++ HB_UNUSED bool b = hb_font_get_variation_glyph (font, u, vs, &gid); + assert (b); + + char glyphname[64]; diff --git a/srcpkgs/harfbuzz/patches/fix-char-signed.patch b/srcpkgs/harfbuzz/patches/fix-char-signed.patch deleted file mode 100644 index affcbc57dc55..000000000000 --- a/srcpkgs/harfbuzz/patches/fix-char-signed.patch +++ /dev/null @@ -1,29 +0,0 @@ -Patch-Source: https://github.com/harfbuzz/harfbuzz/pull/3771 -From 81fe35159e4fdc5ca2c9436cc9ad2750bda64203 Mon Sep 17 00:00:00 2001 -From: psykose -Date: Mon, 1 Aug 2022 07:45:25 +0000 -Subject: [PATCH] [repacker] fix signedness of char in tests - ---- - src/test-repacker.cc | 4 ++-- - 1 file changed, 2 insertions(+), 2 deletions(-) - -diff --git a/src/test-repacker.cc b/src/test-repacker.cc -index 053c0c603..1b7e1f08b 100644 ---- a/src/test-repacker.cc -+++ b/src/test-repacker.cc -@@ -112,9 +112,9 @@ static void start_lookup (int8_t type, - hb_serialize_context_t* c) - { - char lookup[] = { -- 0, type, // type -+ 0, (char)type, // type - 0, 0, // flag -- 0, num_subtables, // num subtables -+ 0, (char)num_subtables, // num subtables - }; - - start_object (lookup, 6, c); --- -2.37.1 - diff --git a/srcpkgs/harfbuzz/template b/srcpkgs/harfbuzz/template index cedcabf1cf8d..783b9857c6c7 100644 --- a/srcpkgs/harfbuzz/template +++ b/srcpkgs/harfbuzz/template @@ -1,7 +1,7 @@ # Template file for 'harfbuzz' pkgname=harfbuzz -version=5.1.0 -revision=3 +version=7.0.0 +revision=1 build_style=meson build_helper="gir qemu" configure_args="-Dglib=enabled -Dfreetype=enabled -Dcairo=enabled -Dicu=enabled @@ -14,7 +14,7 @@ license="MIT" homepage="http://www.freedesktop.org/wiki/Software/HarfBuzz/" changelog="https://github.com/harfbuzz/harfbuzz/raw/main/NEWS" distfiles="https://github.com/harfbuzz/harfbuzz/releases/download/${version}/harfbuzz-${version}.tar.xz" -checksum=2edb95db668781aaa8d60959d21be2ff80085f31b12053cdd660d9a50ce84f05 +checksum=7b4685b7066c5c6b8dc6cd7b02f63c554fb8cc1c4ddcfc44bc284efa3c20cf28 libharfbuzz_package() { short_desc+=" - runtime library" From 3a839a9ee69f141d062954182c3f77d07284a45d Mon Sep 17 00:00:00 2001 From: Zapeth Date: Wed, 18 Jan 2023 11:15:29 +0000 Subject: [PATCH 132/138] firefox-esr-i18n: update to 102.8.0 Co-authored-by: Duncaen --- srcpkgs/firefox-esr-i18n-ca-valencia | 1 + srcpkgs/firefox-esr-i18n-sco | 1 + srcpkgs/firefox-esr-i18n-szl | 1 + srcpkgs/firefox-esr-i18n-tl | 1 + srcpkgs/firefox-esr-i18n-trs | 1 + srcpkgs/firefox-esr-i18n/template | 198 ++++++++++++++------------- 6 files changed, 109 insertions(+), 94 deletions(-) create mode 120000 srcpkgs/firefox-esr-i18n-ca-valencia create mode 120000 srcpkgs/firefox-esr-i18n-sco create mode 120000 srcpkgs/firefox-esr-i18n-szl create mode 120000 srcpkgs/firefox-esr-i18n-tl create mode 120000 srcpkgs/firefox-esr-i18n-trs diff --git a/srcpkgs/firefox-esr-i18n-ca-valencia b/srcpkgs/firefox-esr-i18n-ca-valencia new file mode 120000 index 000000000000..0707c37f205d --- /dev/null +++ b/srcpkgs/firefox-esr-i18n-ca-valencia @@ -0,0 +1 @@ +firefox-esr-i18n \ No newline at end of file diff --git a/srcpkgs/firefox-esr-i18n-sco b/srcpkgs/firefox-esr-i18n-sco new file mode 120000 index 000000000000..0707c37f205d --- /dev/null +++ b/srcpkgs/firefox-esr-i18n-sco @@ -0,0 +1 @@ +firefox-esr-i18n \ No newline at end of file diff --git a/srcpkgs/firefox-esr-i18n-szl b/srcpkgs/firefox-esr-i18n-szl new file mode 120000 index 000000000000..0707c37f205d --- /dev/null +++ b/srcpkgs/firefox-esr-i18n-szl @@ -0,0 +1 @@ +firefox-esr-i18n \ No newline at end of file diff --git a/srcpkgs/firefox-esr-i18n-tl b/srcpkgs/firefox-esr-i18n-tl new file mode 120000 index 000000000000..0707c37f205d --- /dev/null +++ b/srcpkgs/firefox-esr-i18n-tl @@ -0,0 +1 @@ +firefox-esr-i18n \ No newline at end of file diff --git a/srcpkgs/firefox-esr-i18n-trs b/srcpkgs/firefox-esr-i18n-trs new file mode 120000 index 000000000000..0707c37f205d --- /dev/null +++ b/srcpkgs/firefox-esr-i18n-trs @@ -0,0 +1 @@ +firefox-esr-i18n \ No newline at end of file diff --git a/srcpkgs/firefox-esr-i18n/template b/srcpkgs/firefox-esr-i18n/template index c4e43c47dffd..5b476f296bcc 100644 --- a/srcpkgs/firefox-esr-i18n/template +++ b/srcpkgs/firefox-esr-i18n/template @@ -1,6 +1,6 @@ # Template file for 'firefox-esr-i18n' pkgname=firefox-esr-i18n -version=102.3.0 +version=102.8.0 revision=1 build_style=meta short_desc="Firefox ESR language packs" @@ -26,6 +26,7 @@ _languages=( 'bn "Bengali"' 'br "Breton"' 'bs "Bosnian"' + 'ca-valencia "Català (Valencià)"' 'ca "Catalan"' 'cak "Kaqchikel"' 'cs "Czech"' @@ -90,6 +91,7 @@ _languages=( 'rm "Romansh"' 'ro "Romanian"' 'ru "Russian"' + 'sco "Scots"' 'si "Sinhala"' 'sk "Slovak"' 'sl "Slovenian"' @@ -97,10 +99,13 @@ _languages=( 'sq "Albanian"' 'sr "Serbian"' 'sv-SE "Swedish"' + 'szl "Ślōnski"' 'ta "Tamil"' 'te "Telugu"' 'th "Thai"' + 'tl "Tagalog (PH)"' 'tr "Turkish"' + 'trs "Triqui (Oaxaca)"' 'uk "Ukrainian"' 'ur "Urdu"' 'uz "Uzbek"' @@ -135,96 +140,101 @@ _pkgtmpl() { } } -checksum="93dd0334d275731ea4f867500111fe38058e338b31591f8cee74133a55ff4d46 - fa0d0c3852e338171b763dd0d42543f72a0f2a0da1e329a317fd40ad4f046ab0 - f92fa0c86aae4911212d219d03cecf2243e781e166dbebb87e2b9872832458d4 - da30027303889ab80755f0d5cdecc4c8d31d4fd9be435fb8dc579fd715741027 - 710aa262aad3591203387d08c23aebfe862d64722be77f8fb768d6eaef4d6f09 - 167aa89e3706c5c1e54694c76a7d6e10babf5da1953cd1bd499483fcf2209cc4 - 1ebdaf2a6645a573dff3ad5307a73ad0cddef46b46e7ebd6b92a80a362b7d5d3 - de20466501dcb78fc5a6162107e783f8d631a46c726e11222d467794550f1dcc - 8f14022666ecd3b60cd8ddab16aad96e36e5602c93146725d36de24536854c65 - 56303941a3c8c955a07976c147e3f2df84a2829855991dae3b578b6fce5ebbc5 - 6e169ce1d1eb13272cd975247c7f287ced1cfd579838c0f31ed7fa4e0cab310a - a58bf622501b6b9e5d555ca05f1072daaeb65b4d51c59c6d9e1418b09923e4e2 - ef21061edb855fa55dec91b160593fcdba0733659e919b258268f246c470d19d - 33adcfb41d9fc8a19ea0e701736a623739c26e444ae3cd08ab5f581f40e0e242 - 258521699d7b19dac022e1b0defe4a2321e8c6ea277ebc19ae4562225a0526c1 - 60b9343b5545fa4a945e24a36786fbb32fdc59eb4c30ead5e80797b3d73de977 - d77e153f50de3c70dfb0fd1497a8ad23067b508c13fea8e5c02aaf54b6b73730 - bfb2b490475c4d0d49255eb9bf8686b10beba3c03793c4fba7caa71fea82c207 - b9967ad09e94e2356dd00666a3554df9f9e47b26a2a42fd0cbbdadda88c2ed48 - e62a405e498600da9343066242e71ed5c2009b36739abbf1f2b291e25417059e - 059e490f8553f3fb2622094c7e7d9f2f6e8f1e6b3d82ec9aa3f4440fb45559ab - f85d72d646ef012f1cab077850769290507e4a418cff52e861e12503048d22e4 - 60d6b1e0335d3a614c800ab4d3ffe55d121c6de128aacd3b8a3e036319f75242 - dca5484a94569162dbe04d9af94f3e461b32e21fcf2eee000ff151dd3b7797c5 - cb092c2a6900f77c6108688760867e2a016c70ab27c39ed28a140247c1370260 - b1ffab35b5b5e163512148b1ee4e4ecf359664f9196328383ee36391917131d8 - ef8dfd8cc78a2ed55c9082236babfc29f90f0978864aef4ebb71c52c98e73702 - fc1c61833caa0cf8fc25dc314998f7d9a3fb282619cdaf6441caf17fc798dbb2 - 6fe864c9a8bd5b3f75f00ae920fb9959973098df801b290683550d2891686415 - 3ec10b9ed9fb6fa9d1108424f6c18f9209fcb0b3f5d7ae515fa8b7895cacd8f7 - 969bbaec56cf727b1f4113d9d05288d4e60dfafa71ab379b2df08314812ab59c - c762c728c183b8561ca8d78e9f565c3029d90dfc76ce04d266de614bfec7d0af - bc0f1e849910b78a790b76f630dc89e86e807914e57464a916eaab08fd865b9d - 55b07e5d61ef668c7e53b7372eb9649c622efce1851dc11cfd967501a76afcc1 - 47f9f03ee0afa4bf77d1c914057b6b17e04bae12fc05955e26d8b300872bd4ad - 702cf7be703b0cf9e8d6823a579db48ad45dd07e5658237b6dca2ecf31d797a6 - cdcaa5c9bed615d42c30e3cb911548e7850f8566dfb76c83eca6e7e2c29d2ba9 - 09f5abb8d89fd2e12e92a8b4898319ce93708418348ffef336d4b02809fa0cd1 - 40315720e6224e3b97ad4c82b1c9e2705e3e1d511967db8184fc04634402aa77 - b12abcc569961d2199d4e6bdd898d31d343b93ebdd1a5475f2241b07391aad33 - 14cc330337b33d427314179cceb51b11fa81d50314b816264c9029fc09b3efc6 - 38363be90fe01ee02b97d2eac9a04bd3dc732099b78561e4cc73b40c4980a34d - b662514661d2551ace400614c908bd5eb51298306cce801f88ed9e5be2b3c7bb - 9a38652bcec925b3c04694cae5e608831cc78f56ef22eb3c8bb1642d01168d55 - 6fcbc6be1336a78a752e51aaa48b02e64319699abdc6965519887426c496c545 - 7c0afb7fc6c12be340de564bbbc73be771dc10e8798f1fea3b701d5db41c34fa - 1c50849335eb1b1ea9b44047c29250c1bfe55330ca7e9301cc487c5d9844355c - 0144858c69dfaf30ab053409fdd3911d8615bbffd1d684a6372dcbb38a39a2cd - be7b331955d522cdc8f7eee74a6e97b5cda0945fee53604b187b32620fe04f7b - c7d1fbbf614622e0e5cc347cab61259bd86b1e31783d9edf1fd2afa7c753505e - 59243fc2de6ce42e4770057d9c74c3ca85baebf1977e9e5b568e8bc6adffea6f - 1da89fa826e7508b84cf2c535d479335bc890f333ebacf412c6792f26c2641b2 - 7c0c56550cdf663b94a6f7bf5c71dbe8a5f0968564d2240fa59b79baafdaba3f - 305e398a64443dd3bd50250c5025163fb1b7320f3d134493b8fddc19222506aa - f37861203a640b6b6ae00e499a14e71e58fa06483bf223baf1bdbf2a490717cb - 68c2db3b213ca9c586e78548170d5d763d1775999277028acc4de26f94a396d8 - 2c28a6dc1f87fe124b4b1504ec80a06c5f5137891fc599432bcdb4a0d5aa6e41 - fdd4377915ef22021d7610cb5a9d6c91e53ac16eee9d6268a7c4c9c359a45a0a - 999f8c2db0abf974722fc978e7f73457e674a8fca9b4ced04e92e163fd8597da - 5bf73780e1f953f34c2367f0c27ca717baef14aaf645c385529c6c42a3a1c76e - 841454849679338ae40eee0d7dc63c437dabd676aaaacfcf30daf06c9594c73c - 8b3e9f1a73b45290567a92f04898f3013b2be985a33de136040f0bd3d8ca3874 - b80d180daca2d920e86a911566fdaa1dd1fd8fb3870a75e0af4e208a05e97e9c - 63a88b6b2db14037f943b7bc28cfd41c2cb29666d34d4cf6c19266f8323436fd - 04494a9b11b65ce2460485251c0bb9076bafefa0e0961f54a22b2baf9d237d58 - ab910c1330b3b5f82383c3f73c46f1bc2e712fa00cc6ec6e028cedf5cd578bfe - e6d60b1a0ccd16236f1186825eb758703c9611b2ef20a6e88b2d4b7052411bb9 - 7429a4cf68dac3d6027da9422d29822f1a6853bc668f23849ca9e579a8bbc29b - 4157a11e193a93349b92c1d0a69aa1f0c8cff0707287b8e77dcc61ab9038f63e - d56c5832607ba90f2c4a16b1cfa65772e0b3cb9d9c987a2553179b033d4575b6 - 376bedbb1e53276df0daa64746da6022bdccadf0a3efb2ec58a284e3d877b065 - abd364052a3fabe0412492165ecd54e39e85eb00d93b0ae1f451ca28eab5cbb9 - 16f6d9e160fecd9a84fb4f1486e5b9c1c520266a052f49bf6fa1721c6a69b6bd - 39a24d202c440af9d29795f64c82d03d85950efe09628e497a763305e60d806e - 4cebed2c500946f17df5c55cfd707fc49a00767e6a80a725807788c3cf059f0a - 2d7a3d099b7840cafc1fdebbb168b73642cd4bcf231d580bc6bcadcf3fe2af0f - df625be3dfdd15bc654b39a470cd1599b03405f1e25874124845c21dffebb4a7 - bdd2aa7cce4727cfc2c4da1deffca9092d6791dd65410b77aa6040544ea345c0 - ce2478915b5541488a02a041d70383b554cbc6146ddbc8dc5a061275a67f3448 - a43892fdbb349a68132f43ffe8a574ecd7518fbc1115a01d576e1825d0e39ba8 - d0cee55ac73276aa173b6d749f83cba999d61f64e11a9dba648db5e6bfc41b64 - dafe1fa80f65d0acf510e229cf7337b48359fd15f4a4fcfb5d172eb6f32c8def - ff8197abcb285d250b407b65f06fa246eb5a9d8eed19782baeeab8bb41f28d3c - 008830ae0da7ab9c31c16eb671c5242fb50eee96b2f8f8c00d95c0a51bd2596e - 00fadffb1745126d6f073327eab5ef0e8bf82d7929edf0cb1e34b4941aefc90a - b2a1c6523290ebc895c8b263372c86cfe9e95016fcbbdd1b8964fc456ff0e855 - 1054ecc9013cb347b77e9a80d97fa89444e44f667d5d758beb8b7ca5e9da2b12 - c6736dab1165deb33024e6f33fedde79f55c6cbaa4a803ea4e41dec68b33399b - 5aa0239328b4656fbed84dbcb4d8cc24a8232455c98888c064fa62bb927ca75f - aac291540a7da9bed3eeb703ad975614f41b6f76e15ceb3b066000773ca961ab - fcac28b2e02beeeccddc131da2a12ae9344a48669cc3037cb6f0429936af9879 - 693cb3b5196a0276c039497bc5c6e1c99e376959cb1a9802ffc8f08dc9d32c2a - d962e094ec48a8042067d50d2b22b870c94b12ff35afc58c85bf2001fe98da9b" +checksum="6f1323d7e2f83fab85adf6186f1ef956f78c411f886d765be5456511dfd186ea + 1d64d861ca5d2589446fa99891616f13e4ad4bdadda5ac359546a5f9cb99352d + 9a6715814591eb32dee31336ea889245d7de249ee3f1991b8ff4601d052277bc + 43fbbf50040ac575164a5a99f9c4fadbadea533cc8b1c346759941ec786f485d + 41e434b5bc0048e0cb3535785f2047878cc78c784f0bf76f368e4f50f75df2ce + 66a265853e8c4e5e069dd962cb8f5f46af92454750d4fc9970898b0266faacd1 + d243038c30407bb7450af934b57bb47e4635a106992f0beb6d2d766890dbc7a9 + 9119bc2cdc01755c2188b4394008de0a931ef6599ccf3916637010e7ca47c190 + af45fab39b26b7abbd11e4544d4521ea7c661c3515aae59c93e6218c74f7c40f + f6248e19b307b92f96a9d21e6a37d05a3b5558e937413f6884d1faa359df849f + 50035077bbedd8221b4668d08a0541a1efde3b6071cdf5ec054c5e11884c77f6 + 60ad43d1ad326b04d98e2747df83e55dfca770afdf840833d4abfb14a54e2284 + f3e40c87f4c74d33343777460b45f3da0f6333fded727de779ee261946f78bb3 + e3a8b4c53804aa4ea0b6205f16fdf43072d7f259aa684c0780a1b7f1a325b7c8 + f4522bfab3355906fee7883a6fb869c3821100ee050266d000b257903c0ead5e + 674c8a7dc6943ea55d30d11ec61c11eaa2c8008a81a06f63b935566f8cb14903 + 20a0e7c9b9416fbcf67e9e1c2b3ade804d03d8cfc2ff100c83bae7c895770461 + d94aa7d5ffd632404988e6f32c6908c581808788b69935e03c319f7680b158e6 + d3afa3708a336e1965dde959e05518bf21fd6e0faf5a14caa83a937e4c8d3c7a + f8356bead0bfa3cd0421a22dc766d4ed15ef314d6afe1d4a8e64fa4885a056cc + d73fb488a520b26c69f2bbbaf6d24363fb85a6f4c9c1dfd8987d0e579efa9414 + e044f7867855da14093b92e549615cc1f7a032b32777e8c1c089f030348e2ab8 + 2e4612fe4324cbf52ed32678bafa28893fdb6cbe471199e61aed818756a8dae9 + 139f1ae2d124ecc7647d12be88fb6d59bb900915724ab1b69409c222daeed52d + d0f1c3d28ac770e51bcabf037bcd886dd1ee77eafe4ae7e6f6a19a1460856883 + 81b8408718790a592a2392e2db62dff9727ce32b2ac5b88144ad629c3627a39f + 82feec623a6170e8fb4889870a32a9bf693553542eeec7e4137f95e10ec9fe48 + e4eacf8a10af6f9c1d5806b7a5a3158017b26e4e3ea877a846d9a2fd24c77028 + 3bf90e228e27f37b6e0da605d57842027b0f69b117b533c1b91c9fa52a5c239f + f63b88a0aca144957713ad54d4313cabf1909fe936ea13ba949df95548f39660 + b5c890cd947ace32c2b4d399c85c7805b266f07b7ad7c20d7c55b31a34572eb5 + d9fc225a59b2db4c6a38f47a4e455b5fcdc18663a0cdcef87fa99d3cead0b735 + e625248323a95e970c4ef6761c5bfbe8edac3da299ae441a2218dc1cf7fecd34 + eabcb57818417c450935c32329536c007254ba88c9dd7d16e7f774f9b94a9622 + b372ba85961e5f1fcc3c4a7a79e05a69a76d2c186bfc6e9954b0051382477718 + df72fbdd637f33218a630630fc0e8f9119f199a6f62dc2a8a36b262e271d7e28 + 05b735d910681b9c8939f3f3456c2ccc7ce31039da8433383d9375ff0112b2f0 + d8d9d6e43cc8712edfdea7fa10e0f02b3517dec22407c3982638caabae1d0a39 + 56e580610d11db1ff7ad5ab09f92ff6c1e0b8b57d93a92f62a671b79a3a651eb + afc2a520c7e2bcaf7599896bdbd31e72c9fb17d5099ea340f4f9db0773edeeed + 4ff7fd3f58bbaf5b662010f0dad148f282434315f298283051b7c6e2f7ac9588 + aff63fb3402d37b9a18867e57e75b45dd5839c59a06329b56d5800d227d81884 + 01559777feea10eb2ce83730a018915a3f86318e945668bc03336cd6e1772612 + ab4c1ff2e110eec581ff0bb712748534cf5b5d8c6462d9e5dc5101aa30133559 + dc8fb849346ad11a7d72b9685e9dee36713eb7864ed122bdfd1067802746f737 + eb4c20b88190152196d00c527a8ce55148a16cb677c7668a49dd746364a3e9be + a332796f9c3c2ea4187eb6306348ea91577f8604d067ebeb9040d210f912208f + a724d618372f7cd7880c4f86e33c127ef22b8dac6338cb6f1ec25b04c1508182 + d8ed68ca24f7e7d879642aa24d74a63dd3043ce468dc138d6124a534b3b1b968 + dcbf5f1e78777811941cc750641a38dfddb4ee0cade95eed27363c310faf1382 + b15c962a2246eb533f03a0626e65c9e6fcad03c50dc335a0eb3e2090cbf92935 + 256c69078133504dc780f289ecbaa84fd4a2611f4bd427105a799a4bd779af5a + 15a2350e6def7495b77dec4e1c9c34385376a064bd175602807cac05fe32caed + 6439310bc0f1749c91f08c24c50fd2df0be62e50b9c6dd9cd5d19a69fb3d00aa + 60938cc61f49b3f2ba6a3fe8eb150175d6471ff75c4775677f4983d154a2ff21 + 7fa2bed5bee0d237cc2e1e68a4af6856f4e98007c736c260a39755a58a3c2f87 + bd4c6a91b56a42f36d1532a42fe4003ee6de31afcb4c2f05e88fea7455e4f7b1 + c49420700d3caa72b95393024e6cca75c16659234e09bc723faef40bb0e5e0cd + 7dbdbe99761155628d9174401cdfc5ded97e6d0b57b4192402c6320d8d1a5b1f + b89ebbb655b813bf13b24f43765951b99d0a62472f025820123666772470901c + d11f1152d63c9d4fca9565348b811df270272bd4c03a18baecbfe4403fd44ba7 + 8966a94a866dd4d935feee3dcd3396fc9d82223f263b97ed6d0c15b1d122435d + 2b6b059c973d0f105a4e3cf521658178124dc6607d60740695f3edf59998e190 + 244f848ad447d179f94514b3db2df61d16d0672e6aa2281d444df2cc1e847300 + 5540f77ed4b3028eec50e9cf72f45fd5b8fe5a433c66e69e675ca7c2409557eb + b4aed3c16508f273e912f47982249ae7a2606a92121d62991cc17800ad6c5fa6 + f4fbac5311bc23551b11fefe5fe5f4ccce37cc805aaa639a70e3068af7d97ba9 + 228f0afca3e801c1dd429e09ab83bc7caaedd731347221bdca600da1299ea12d + f335792e4d94f49794cfbe66101b991811489fec76376dca98e68a5a9e2d81ba + 12437cab2a81e22ebb05ca53eb4bb8880e5e7596cec5bd5def201c1194a27362 + d5acdb8abfa07a86e35587bd18ac73ea0794d8d4f9bb80435aa7137dd2e5ef77 + 9f20c64081b6578122a57718c6903f13fd2d757ee2abd2a34e347fa485f34b53 + 674fa762aa9f5f51b1a85e61ad6eaa97d4583f83938f5cb0e47d911e9b562cab + e7805307ca7315540e05feb4ceaa586a00c136feea6aa66ccd3d33ea5442ea29 + 4996499e183546d7c3c8aa8b1759c93bbdd6782be0882226fb291b7df18c8ee2 + 01eff6dc976f12984523e755bf7a7d12dc16350ab7adab7bda88256f2601f17f + 7a98122a00ac5e21285fb2d5b76d060c4da2b703dcf4c1a2b0c68fc78285e7af + 395df3db5b5a8ea114babf900df33820e3ef3a0d61ef4b875565000a2349cdbd + d2a95f2be2341ba5cea2ecfa34886d827c7ecc5a55931f37a431ff0c88bd45b0 + 31fa78f45883e5ee64a35257de9ad21b53c7f4a0a576996a4ed69a46b8471159 + 1534847968a25528b58aa45fee74b8e49d3a97498a65057b4fa63627e2a2ce09 + 362981b2728b99066c8553d7e4cf8398bd74901e38f17cdf675c653ba5450e40 + 20907ede7f8114cf8ae451ca3740eb58751871682117a277b6382ef257e57a6c + 3e6ec523a9d4fd1850374c81dee01675eca8d94ac30e43fc240d8482098ad6b9 + 7f27b114561c12ae77d4c4de6181eb6c4efe79563e14eedda647ac5d3ae28644 + 7e724389c5bd642ee48ffa20bc141921e0cb0efd8d51248a55783690dc90bfb5 + 7b046573d6211bed93165f23459dba3a6f7f14fa0024ec4ccf4be9524b2d0a73 + 3cbffa87756a3a832c93b733fb97fe5c8a9e455a43c550d8ba44a3411a1b10c5 + f9e6aa0531443abaf4ad0a23d9333870ee00cb95ee102f7f77dab13f870d350d + 7cb9a4bafe3829b039786ce2fdc23ac23983d6cafcb198442904fa43bef4887a + ee1f7e50f45bf0bc2b188334b7f4a4372869085ebdb8fc4e75cf46a85ab5997e + ed070383adc367992b71e3a5b00e12d74c6164bad6436dddfffcb5ae591c5918 + bead47570626d5976e5f81c231fcc2d64eacee72ee27dd1bbbb276fa6aff7555 + 208ca9cf6762eb021afd79b65c3599f37fb274e9c328778b867879cd840faee1 + a7ab3b04286c0fe5a51d2b7b1bcab54d76743c7a4b5ebb736c165351b6c7a03a + 474de11203a8bc6f876c94bbe33644ebecdc1164eceac915a6771ac0795c17f4 + 40082e21554fe20dc58dba48f894d84298801ac90e13b23ebfb0007f2b604f5d + 10126c047699fc27c484648e6d64a9aeb811341702a16a43a7d399269b867fdd" From 5525b156b695e2c82ce2159ab9c3f840285a234b Mon Sep 17 00:00:00 2001 From: Zapeth Date: Wed, 18 Jan 2023 11:17:24 +0000 Subject: [PATCH 133/138] firefox-esr: update to 102.8.0 Co-authored-by: Duncaen --- srcpkgs/firefox-esr/files/mozconfig | 36 ------ .../firefox-esr/patches/fix-cbindgen.patch | 22 ---- .../patches/fix-iomode-python3.11.patch | 107 ------------------ srcpkgs/firefox-esr/template | 4 +- 4 files changed, 2 insertions(+), 167 deletions(-) delete mode 100644 srcpkgs/firefox-esr/files/mozconfig delete mode 100644 srcpkgs/firefox-esr/patches/fix-cbindgen.patch delete mode 100644 srcpkgs/firefox-esr/patches/fix-iomode-python3.11.patch diff --git a/srcpkgs/firefox-esr/files/mozconfig b/srcpkgs/firefox-esr/files/mozconfig deleted file mode 100644 index fa5a7a42e04b..000000000000 --- a/srcpkgs/firefox-esr/files/mozconfig +++ /dev/null @@ -1,36 +0,0 @@ -ac_add_options --prefix=/usr -ac_add_options --libdir=/usr/lib - -ac_add_options --with-system-nspr -ac_add_options --with-system-nss -ac_add_options --with-system-jpeg -ac_add_options --with-system-zlib -ac_add_options --with-system-libevent -ac_add_options --with-system-libvpx -ac_add_options --with-system-icu -# XXX: the system's libpng doesn't have APNG support -ac_add_options --without-system-png -ac_add_options --enable-system-pixman -ac_add_options --enable-system-ffi - -nspr_config_args=" - --libdir=${XBPS_CROSS_BASE}/usr/lib - --includedir=${XBPS_CROSS_BASE}/usr/include/nspr" - -nss_config_args=" - --libdir=${XBPS_CROSS_BASE}/usr/lib - --includedir=${XBPS_CROSS_BASE}/usr/include/nss" - -ac_add_options --disable-tests -ac_add_options --disable-crashreporter -ac_add_options --disable-updater -ac_add_options --disable-install-strip -ac_add_options --disable-strip -ac_add_options --disable-profiling -ac_add_options --enable-release -ac_add_options --enable-optimize="$CFLAGS" - -ac_add_options --enable-official-branding -ac_add_options --enable-application=browser - -ac_add_options --allow-addon-sideload diff --git a/srcpkgs/firefox-esr/patches/fix-cbindgen.patch b/srcpkgs/firefox-esr/patches/fix-cbindgen.patch deleted file mode 100644 index ba3ce7ae3e97..000000000000 --- a/srcpkgs/firefox-esr/patches/fix-cbindgen.patch +++ /dev/null @@ -1,22 +0,0 @@ -Fix error with new cbindgen: - -/builddir/firefox-102.1.0/obj-x86_64-unknown-linux-gnu/dist/include/mozilla/webrender/webrender_ffi_generated.h:24:33: error: redefinition of 'constexpr const uint64_t mozilla::wr::ROOT_CLIP_CHAIN' - 24 | constexpr static const uint64_t ROOT_CLIP_CHAIN = ~0; - | ^~~~~~~~~~~~~~~ -/builddir/firefox-102.1.0/obj-x86_64-unknown-linux-gnu/dist/include/mozilla/webrender/webrender_ffi.h:76:16: note: 'const uint64_t mozilla::wr::ROOT_CLIP_CHAIN' previously defined here - 76 | const uint64_t ROOT_CLIP_CHAIN = ~0; - | ^~~~~~~~~~~~~~~ - -diff --git a/gfx/webrender_bindings/webrender_ffi.h b/gfx/webrender_bindings/webrender_ffi.h -index b1d67b17a4bde..eb79974bdf434 100644 ---- a/gfx/webrender_bindings/webrender_ffi.h -+++ b/gfx/webrender_bindings/webrender_ffi.h -@@ -73,8 +73,6 @@ struct WrPipelineInfo; - struct WrPipelineIdAndEpoch; - using WrPipelineIdEpochs = nsTArray; - --const uint64_t ROOT_CLIP_CHAIN = ~0; -- - } // namespace wr - } // namespace mozilla - diff --git a/srcpkgs/firefox-esr/patches/fix-iomode-python3.11.patch b/srcpkgs/firefox-esr/patches/fix-iomode-python3.11.patch deleted file mode 100644 index 3c13bc656d54..000000000000 --- a/srcpkgs/firefox-esr/patches/fix-iomode-python3.11.patch +++ /dev/null @@ -1,107 +0,0 @@ -Support for 'U' mode was removed in python 3.11, see https://bugs.python.org/issue37330 - -diff --git a/dom/base/usecounters.py b/dom/base/usecounters.py -index 780e3b3..7e2c714 100644 ---- a/dom/base/usecounters.py -+++ b/dom/base/usecounters.py -@@ -8,7 +8,7 @@ import re - - def read_conf(conf_filename): - # Can't read/write from a single StringIO, so make a new one for reading. -- stream = open(conf_filename, "rU") -+ stream = open(conf_filename, "r") - - def parse_counters(stream): - for line_num, line in enumerate(stream): -diff --git a/python/mozbuild/mozbuild/action/process_define_files.py b/python/mozbuild/mozbuild/action/process_define_files.py -index f1d401a..aca59d0 100644 ---- a/python/mozbuild/mozbuild/action/process_define_files.py -+++ b/python/mozbuild/mozbuild/action/process_define_files.py -@@ -36,7 +36,7 @@ def process_define_file(output, input): - ) and not config.substs.get("JS_STANDALONE"): - config = PartialConfigEnvironment(mozpath.join(topobjdir, "js", "src")) - -- with open(path, "rU") as input: -+ with open(path, "r") as input: - r = re.compile( - "^\s*#\s*(?P[a-z]+)(?:\s+(?P\S+)(?:\s+(?P\S+))?)?", re.U - ) -diff --git a/python/mozbuild/mozbuild/backend/base.py b/python/mozbuild/mozbuild/backend/base.py -index 7bc1986..b64a709 100644 ---- a/python/mozbuild/mozbuild/backend/base.py -+++ b/python/mozbuild/mozbuild/backend/base.py -@@ -272,7 +272,7 @@ class BuildBackend(LoggingMixin): - return status - - @contextmanager -- def _write_file(self, path=None, fh=None, readmode="rU"): -+ def _write_file(self, path=None, fh=None, readmode="r"): - """Context manager to write a file. - - This is a glorified wrapper around FileAvoidWrite with integration to -diff --git a/python/mozbuild/mozbuild/preprocessor.py b/python/mozbuild/mozbuild/preprocessor.py -index f7820b9..857f1a6 100644 ---- a/python/mozbuild/mozbuild/preprocessor.py -+++ b/python/mozbuild/mozbuild/preprocessor.py -@@ -531,7 +531,7 @@ class Preprocessor: - - if args: - for f in args: -- with io.open(f, "rU", encoding="utf-8") as input: -+ with io.open(f, "r", encoding="utf-8") as input: - self.processFile(input=input, output=out) - if depfile: - mk = Makefile() -@@ -860,7 +860,7 @@ class Preprocessor: - args = self.applyFilters(args) - if not os.path.isabs(args): - args = os.path.join(self.curdir, args) -- args = io.open(args, "rU", encoding="utf-8") -+ args = io.open(args, "r", encoding="utf-8") - except Preprocessor.Error: - raise - except Exception: -@@ -914,7 +914,7 @@ class Preprocessor: - def preprocess(includes=[sys.stdin], defines={}, output=sys.stdout, marker="#"): - pp = Preprocessor(defines=defines, marker=marker) - for f in includes: -- with io.open(f, "rU", encoding="utf-8") as input: -+ with io.open(f, "r", encoding="utf-8") as input: - pp.processFile(input=input, output=output) - return pp.includes - -diff --git a/python/mozbuild/mozbuild/util.py b/python/mozbuild/mozbuild/util.py -index b09f164..4f1e0cd 100644 ---- a/python/mozbuild/mozbuild/util.py -+++ b/python/mozbuild/mozbuild/util.py -@@ -236,7 +236,7 @@ class FileAvoidWrite(BytesIO): - still occur, as well as diff capture if requested. - """ - -- def __init__(self, filename, capture_diff=False, dry_run=False, readmode="rU"): -+ def __init__(self, filename, capture_diff=False, dry_run=False, readmode="r"): - BytesIO.__init__(self) - self.name = filename - assert type(capture_diff) == bool -diff --git a/python/mozbuild/mozpack/files.py b/python/mozbuild/mozpack/files.py -index 1d8a1ed..a295a67 100644 ---- a/python/mozbuild/mozpack/files.py -+++ b/python/mozbuild/mozpack/files.py -@@ -554,7 +554,7 @@ class PreprocessedFile(BaseFile): - pp = Preprocessor(defines=self.defines, marker=self.marker) - pp.setSilenceDirectiveWarnings(self.silence_missing_directive_warnings) - -- with _open(self.path, "rU") as input: -+ with _open(self.path, "r") as input: - with _open(os.devnull, "w") as output: - pp.processFile(input=input, output=output) - -@@ -611,7 +611,7 @@ class PreprocessedFile(BaseFile): - pp = Preprocessor(defines=self.defines, marker=self.marker) - pp.setSilenceDirectiveWarnings(self.silence_missing_directive_warnings) - -- with _open(self.path, "rU") as input: -+ with _open(self.path, "r") as input: - pp.processFile(input=input, output=dest, depfile=deps_out) - - dest.close() diff --git a/srcpkgs/firefox-esr/template b/srcpkgs/firefox-esr/template index 99ebf3d75e04..b01b6ffdc9a6 100644 --- a/srcpkgs/firefox-esr/template +++ b/srcpkgs/firefox-esr/template @@ -3,7 +3,7 @@ # THIS PKG MUST BE SYNCHRONIZED WITH "srcpkgs/firefox-esr-i18n". # pkgname=firefox-esr -version=102.3.0 +version=102.8.0 revision=1 build_helper="rust" short_desc="Mozilla Firefox web browser - Extended Support Release" @@ -11,7 +11,7 @@ maintainer="Orphaned " license="MPL-2.0, GPL-2.0-or-later, LGPL-2.1-or-later" homepage="https://www.mozilla.org/firefox/" distfiles="${MOZILLA_SITE}/firefox/releases/${version}esr/source/firefox-${version}esr.source.tar.xz" -checksum=308e23b6dcf964e342cf95fd0c8a386127371b620a489ae26e537d728341b55a +checksum=47f8f6243bce8c2ef51adf8c9626bbf643e1c225dcb9ba5653a055ed5e76ca48 lib32disabled=yes From 77a022311774083e2a94f0454d379351d5ed2105 Mon Sep 17 00:00:00 2001 From: Duncaen Date: Tue, 21 Feb 2023 22:41:19 +0100 Subject: [PATCH 134/138] thunderbird: update to 102.8.0. --- srcpkgs/thunderbird/template | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/srcpkgs/thunderbird/template b/srcpkgs/thunderbird/template index ec3fa3d4c35f..50226396e0ba 100644 --- a/srcpkgs/thunderbird/template +++ b/srcpkgs/thunderbird/template @@ -3,15 +3,15 @@ # THIS PKG MUST BE SYNCHRONIZED WITH "srcpkgs/thunderbird-i18n". # pkgname=thunderbird -version=102.6.1 -revision=3 +version=102.8.0 +revision=1 build_helper="rust" short_desc="Standalone Mail/News reader" maintainer="Érico Nogueira " license="MPL-2.0, GPL-2.0-or-later, LGPL-2.1-or-later" homepage="https://www.thunderbird.net/" distfiles="${MOZILLA_SITE}/${pkgname}/releases/${version}/source/${pkgname}-${version}.source.tar.xz" -checksum=8b8cb5d7532ad8ee65061d2f284ae9f0470e7614dfcfc3c37ca945bcb96d1183 +checksum=12221faeb425490b799df12aa420ff9017eba573812b119b97ae1a1ed2727fc3 lib32disabled=yes From 840cf6551f6706b6f86970f3a12d5e74048ee66d Mon Sep 17 00:00:00 2001 From: Duncaen Date: Tue, 21 Feb 2023 22:41:26 +0100 Subject: [PATCH 135/138] thunderbird-i18n: update to 102.8.0. --- srcpkgs/thunderbird-i18n/template | 134 +++++++++++++++--------------- 1 file changed, 67 insertions(+), 67 deletions(-) diff --git a/srcpkgs/thunderbird-i18n/template b/srcpkgs/thunderbird-i18n/template index 17830bddd777..3cfb4e8c36a7 100644 --- a/srcpkgs/thunderbird-i18n/template +++ b/srcpkgs/thunderbird-i18n/template @@ -1,6 +1,6 @@ # Template file for 'thunderbird-i18n' pkgname=thunderbird-i18n -version=102.6.1 +version=102.8.0 revision=1 build_style=meta short_desc="Thunderbird language packs" @@ -107,69 +107,69 @@ _pkgtmpl() { } } -checksum="5935be82bcbd313b58520d95b04dc32c462e47df88f9724bb31b21686f8b4b77 - 142c0bd4d67b03320db94ae8002c8d67d9bc481a7ad728efa17ba7ae09e9a971 - 5547af80c73146c9892ad2dcd7fb5c6616c9a3a5b49868a23f03914ae2da1537 - e6f34bb2a5412ef9127aacd87823c84ca2881d47b15a45a96751a7557d1e0398 - cb35b936f2db79a897e1372ea34a1fb8237885030446f29269b940c0f221d733 - ada9c925979d25cb0e1549d20466b7e22653931715dd1a7fe85ca835caddf7f7 - 9b92561b20face8de88a77a579afa6d1404f55c69340993508fcc3153e1bd70b - 64db6133cc87197cb793e0e33b72345bc30dabf862a06f7574321ea783c54645 - db622d082616525302f8d32b9f41793804d51495d1a7b1f62125ed9daedd3fb2 - 919ccec7292a6cf9ccce66fc7a91bbae2a3f93d965ecb4237380256cc8c344dd - f160cb1db40b31815096c0c58f9aa75213e294600c12fef2d2deb741e24e22dd - ce4e51c46cb0860c2671606ef94bff741b2e3d5e70e485b9c5c90d0e481cc5b2 - 05a552baec6b12b7e3f9270a628ff6a3fe62ec17c232f905465317e85e40e731 - 6bc18f1db7d0233c9d3bc0cf277234322845d309918681636c30a2c131bd90e9 - a7cc9b51e57b4de49f958cf1ea47d526e6873318fba96b52ee42d541a2e35902 - bf1fac8be9eca95bdbc9f8542445301e146148afe69b40a4ea41bfdf64ab1034 - 85e3c40c5ef6bd2fdbf9951304bec1f17e2f7a212abdf20cf103a5e7b73f2be9 - 6489211d465c053182484faae07c708e076b82a88d0ebecfda071f4bb41b5677 - f0d0d4a58d6bac842c28bee253e6d5906e582b359173fdeedb6d4c40f0b9a4c8 - 4e3da06699c1cc87b735ef9d181f8cc33c989f44840d02c9b9e5dfd893a8c05e - 0dcabb9158d29001082801b1703946b1df9e22653fc7c66c9a725f102f2ada00 - 1e3ee2f9d0291ec2aa0a2d5939ca3074d6b6a7da533186e227da1d3cc2cc7974 - ab7931be527b56dea1939b048030647e4311b0c0eaa23b7843f3baab180801ba - a592cfeb20a346ad8b24facca3f0da2c5fdd65156aafea67b0c3793bb99ab0a1 - 32740a1261d43b6bec2b99e2da64bdf201c60b1d0651a5a5db548e1180cf5fb1 - e9e669a9917eab86af336c1d149910cb8606e21708c2b5707d87452c455905b0 - 777d625c67cbe9e710ac7fffda880e0a1fb523f8cafc6ac2c3b227b2d5de38f5 - 63728cede6b88d8352b9398c675c4537527de00ee8a0e120bcc905be9f47ae89 - 97f387a2b47303ca475eeab466a0d9f4bc64554b82c55a00f2da4cea431aaa03 - c875c6a19505c6a04cbeba85baad5d9432efd930d920eebb72413d6642a33d3f - 4ebd23d9533cf2c5b63ec4dc6b6f83df742c473d7d108dd70b9947d014a4ec45 - de78a9bdb410bd9850b4d1197442e263cfb7f3a112917aa40f76a5c50f5ae64c - b23fb2ac9a531848ef30e960fdd3174ae970f84b42a2adec1bb34329879acd96 - b7024f86fac5844692b7e5c859e91c721a8279ee60880cafe9479476559bd9fa - 7107ffa0816d059147381b63ee31d66b4ad9b6af77ed409c05994fc2eb5c597d - 1e1144a17959632ccce43025f4addc4adea7c0c225bac529f99b501604b96b53 - 3697fe13197519a9838584a17ed612ae08d9c603d56340df13c42fb971ddbca4 - d357fa261223596406a931867f84f1aefaa4ff8556257a005e0d5061c6b5e8cf - a85066ac413255ea51260e8c690b7a4fe8602ceb628e7d2fa6803ccafa02c9c8 - a9850ec702c480ab9ed2bbee16f8ffea2fa1e60da5f68f0f51b051699a3551de - cd784b2b6317748241bc8f5192d5d3e734cc8747b61955485a859faad4be151b - f67ba1abdbf107f5f18db505ea5c5b588bd4fbdd9c589991a643db0da1204f4b - 8de924873919f06468f58d8a1dae8e9d2886d3705aa59b2dc7d30b9659a5327a - 8b2b9ec349e0e562b7e681f8b9c910256c46953c1cd12f131d7e6f04469954f6 - 5ddd93aff16c17626a170fd0a5c95a72e9ab7bcaeaff67f36445ddd21100f42d - 7bbeb6237a36f375cf78820e59dc61e619854bcf031852a5e8201b783176deac - f77a1a325100e9f4bd84eeba002b35b63bad535b723ce854b0ce85e63776de38 - bf1573cca7b0892ca234a5bb2e44646ba997c0be8051017f35ae217aa7f60bdb - 671bb222053b1fa8bb609095e518392dd3cb1ce2dde780ed34441118324cb551 - 6c4c7032d76b31bb76abfae5c5e288bd0a82bbcf7d9bf8aa9197bea687c86a46 - 4195b95b23a643925488e969accb294d1c056247ccfec745748d6ee0b0c94851 - ebaa54f3a992514bbf54bce4ab82743390c715a81343739948efd0ac3ca33599 - 868b30b8b311aed6c74b8d5fc05b7c4a0f32f56602b594229ddcadff2733a1f3 - 75f7542f8d3d49cf4e16023fae32a329fa8e804c90bae236a6415a4a045f6ce0 - ea857d827ee2cc580fae43772648cc410c1bcd4c8612cff9a3a7d11b04e54725 - 25716f39d2d7d25f448dc9a68270f51124f1d234f0b9482743dcc0c1a00fa8b1 - 42d52c4ce57e8cae43667faf7600e98d085b0ab713e7607bc1dae1f34932be67 - 5319b79f719dd27e45ecca54d29482d6558f41947db5c4ec4b70c3e25bb8f55a - 88bcbfa7a2b006b93fd715810661b464e7b150006f046a94e6c03d2e067ae7e3 - 838d84317a7c51c13329c919d4479396b30233136b70fe025faf968b916ba1c1 - 5f686f697c1093c45ef882c3feb1def6064f458d5ae75a74962375b91c6027d5 - 9f9a7a4e6d73698fdc623384a666e677ce2d32990bc69e16aa631a34371cdf78 - 0ba4499c5805a83172e5dcbdc8fd8e464824827f94ed1849d9a1797a9b386e00 - 41f65c5307ec97310b33ace466439e4abf008d461be3835f545e4194e6c54940 - edd966278b660bb280e8e319300e18652ce2ef0fca5baeeb72696b5fd2a03d69 - 13d667aaf3338da21355c042b3a07567553ee48bf0dc071f9a55ef49451de21c" +checksum="85984e442b0caab0e16cecb1f0dd63b2795d7b9c08fb654db4216f172da52a85 + 6079d2bec46c949542c3876af041ca8526b0019052060d0c51efeb7657e8dec3 + 37749e8a9afb94e1281374355f09225fff8c82b9ac1e50547d4a35472f1dde23 + 4e2ad732ad0123775d95e8be825bcc879460369e8049ff446f754c5cdafd658d + 322287dabdbb8675bfebe4fa445b850264e7a92dbe62df2c3299a2c49d212231 + 5debc7deffdf09166b3745c706461f956af34775f6877355cb64135d9f3c649d + bfd419aff55fcc25d09ed2552390512180efe52c62fdc4dec992d0238755c209 + ed2a03944e24e4dcf24922d884dfd4f668ed0715a1dfab4caeae4e0afa708570 + c17b027288e3f3e48a5fbf7ead26cb061bf7cdbec0b4d36024836cd1bdf7de37 + c5f9e6f0a47a6694dc4d3c0de348544412edf71d20c3db0cd64ba8f9890268c7 + a3204fc24919c7a57ed715f4471e7579335f3a7ed8666743a8d5772a88168b19 + 39cba2812b5323b5d01534ca0e35a0b6cc3449dfddc4f7025563604133bd1869 + d8a0f239c3dc4a4ac3ccdacf96e274311cc07a5f128a1c85a96898fec6277601 + f1e74eb0167e12fa9abde37c4601e2f2fd11ef69fc902bbed0e4e034f8dffae0 + de0f4af5a5bbb0059abc9a402ca5daca442d56d8a3ca87bb969d7a3b204e08d6 + 7e899e0c1509269f351e7a28cd47bd6369aa35cb3952fb347a673b70913826dc + 9bb1ec3d36a692846e10653e8d4a9aae581b3ef7f894d51b95d60f35002ef772 + b2d735cc3f0e6e5fe38874d37884edfa73b9187ec92113687790adb4591d3aa8 + 5dbe5085e3f1174cc9a9642d96c914557adee0a87808d2dfcd9d88d3d0108945 + a92a34a6c2d759889f1e5a42f15f5a90f9afa71e9524932f14191bb0ae4d07bc + e8858eafbd997a3c903d4f40b139b0f00cf61c6d8f8ff88f20694ddec2b55712 + 6b8d3c13a9379a988cbdd7395e71307552e99bfacc5f74b74a2b43b3e9d5861f + fba74ca8e0204849798a6034143c7bbaf20e0cc35ee379c10cf4b483031d1fe5 + e4a6ffc065aedfdd6c6c057709bfda3dd18f8cf4672544b117bed67a89e16839 + 5de0f46231c97726fc9fd7690ad557dc06ddec5cbf338326f93217f23139537f + 89a68d529bc27953693e721762c0d8cb6a0d38e4b9d6dffc81c3acad0a3c5551 + 26e457facadc078c4e39a9d90c0114d90e43c681918c60ab17f4a67245fa90c6 + 6d7d123dfc78b76bcc6f4bb5551f28e45b595e3461e4358ece5c4d436edd2275 + 857cc654c7bac6cc4fc23894515afa0e9b61ae15e8e305f60ecc0f4357f6bfa5 + 8d7d073ff7097d91985e1fd85f0b1eec90d08dedf780b8aafbbb3693cb63dc29 + 50c080ffc8a711c2b94b03828c0d2aae7016a149a494d70f60549639ae070b5e + 4acc118c748916192cde62d0bdc0c2cc441fa41d720c9f063c4d5a25a79576e8 + 1d030e98fd22ced18dad6066df38ab9176d8626596aba61b448a2519e7fe099a + c1038a165f6cd2b6ad6eede0ef50e46cbbf02200c84bf7a3e521d215f1de77e6 + e531a18f3e0d6ae1f9f9816f2296c231d2258f69d2f734f107b418bd26071b49 + ce34d433fb253b74ded9116cdeb3e3fd465fcb84962e14021e7a6acda61a3fdf + 9a032405add23bd396a0d5b84c67cf4b0ab7f76c013033a17c9b998de2042952 + e2f75d34cbc5b22f86e84320f98505cf2d5cb103d192f399fe7d0542095abdf5 + 396c5b664ba310ed758f4a302a2522811d98a6bf91be8810672467b1194295c0 + 11619400bab414d816ef2127efcd0936747516b92ddd97aa37104c44fb455024 + 21dfb4414f316d19c3499d8075a904a78822d213de176bc547fbd87ad49d4881 + b30eb16ac42c1b7bd13bb48a5184dbfe490298a572d484be25ac0ece21812e24 + f74d134711d1ad70245687823adc60a8717ac20e5988206164548f6313b62dd4 + e34ec7713706d862553839e93c704e31e76e387f9a7e6cbac5ff8d5b93bc67f8 + ad9cc1e72155fcd95815f8585ed1e129a7a39c4e019ed8a22c85e15f7858a9ac + 211745fe88145976de4aa149c619eeab2e9945a72c33a754bf88c176a6915eb8 + c308868c148bd3adbd982cfd976f387ff6d12076dc2ff04e789e7c329715f8ba + 0022d657a4805430d7676ec6fd53ad2f80874c4870a5e5200372bb5aab799065 + 2d51fc4815d8e029cbd4d0d861ac998498ef4201f4af723fe6890e79840d272f + 2d3a26382ba74c8fa7d1bd5d6ba1365589130e351f67a13974e88545320cc620 + fa7961f2a8cfeece3ab05744e5362b513f57e62f8a09ce43e80dad467467639f + 0a6067a080776bf4c918e79eb503ff6182614a754386ab425c86b6cd64b23516 + 9f3241f256b7b4325066c4da38dc379d4fafe04c036827ebae518df77c7178f7 + 94d0250d74674dd281a39a2e3aa8fc05e824e19dc54b0d3177a34eeeac165fc7 + aff0c44c3f7b0c6d9579b33b8427129db8a4a842b8098b8792c6f83c3fe829a0 + d605a25d0b390779494cac2ae233e1c0c795bdff40294fda0aff30f119831a04 + 168b5d49b5d68a3e56146f31513fc259e5a32eff28e204bb83b961bc6ca5a891 + 86b0b70ccfd23013531edd73a9c8b78f9d700a92e20ad8e8fc191183d82379a8 + fab0015a55e42d1a3a41b25705c2fb79da7116388ea394542a283d8077736533 + 644d06c2539e7c12a930072e14f3bc3d907dd85d6e973e9d29b4a19def94cd3e + cb9b7d968f0b2df4db0ed2052f371a864d199d38c7fab7c616521425d6555982 + e1764f430b936bb137eb0793a7f81546cab8bf27dce11d351ed8e4d1be01adae + 415ef82cfb5c13c3e529bddb4b1de9c12dfa6bd5253a46386ffd4f6d88f8c157 + 034fc20636421a35fe805bf6b4c6dd9179b231d84cbd026b52af23d1d88146fe + eb9305dc2097b0db993c93c8f74407b2f1c60a71b557f8c6903722705adc9dfb + e5db9c67db303b00013f441f9c9ae9850321550f7bc08a55f4b9cc0eed87de60" From eb8500da1337e99dbfa1e35485d800654be70250 Mon Sep 17 00:00:00 2001 From: mhmdanas Date: Fri, 17 Feb 2023 16:59:42 +0000 Subject: [PATCH 136/138] zxing-cpp: update to 2.0.0. --- common/shlibs | 2 +- srcpkgs/zxing-cpp/template | 15 +++++++++++---- 2 files changed, 12 insertions(+), 5 deletions(-) diff --git a/common/shlibs b/common/shlibs index 34b747a6918d..42f680ed115a 100644 --- a/common/shlibs +++ b/common/shlibs @@ -1608,7 +1608,7 @@ libKF5Kirigami2.so.5 kirigami2-5.47.0_1 libtaskmanager.so.6 plasma-workspace-5.8.4_1 libnotificationmanager.so.1 plasma-workspace-5.15.90_1 libKPipeWire.so.5 kpipewire-5.26.0_1 -libZXing.so.1 zxing-cpp-1.2.0_1 +libZXing.so.3 zxing-cpp-2.0.0_1 libfreerdp-client2.so.2 libfreerdp-2.2.0_3 libfreerdp2.so.2 libfreerdp-2.2.0_3 libwinpr2.so.2 libfreerdp-2.2.0_3 diff --git a/srcpkgs/zxing-cpp/template b/srcpkgs/zxing-cpp/template index 8bc0a8a2b89b..8c3f10f294bf 100644 --- a/srcpkgs/zxing-cpp/template +++ b/srcpkgs/zxing-cpp/template @@ -1,15 +1,22 @@ # Template file for 'zxing-cpp' pkgname=zxing-cpp -version=1.2.0 +version=2.0.0 revision=1 build_style=cmake -configure_args="-DBUILD_EXAMPLES=OFF -DBUILD_BLACKBOX_TESTS=OFF" +configure_args="-DBUILD_EXAMPLES=OFF -DBUILD_BLACKBOX_TESTS=OFF -DBUILD_DEPENDENCIES=LOCAL" +checkdepends="gtest-devel" short_desc="Multi-format 1D/2D barcode image processing library" maintainer="John " -license="GPL-3.0-or-later" +license="Apache-2.0" homepage="https://github.com/nu-book/zxing-cpp/" distfiles="https://github.com/nu-book/zxing-cpp/archive/refs/tags/v${version}.tar.gz" -checksum=653d9e44195d86cf64a36af9ff3a1978ec5599df3882439fefa56e7064f55e8a +checksum=12b76b7005c30d34265fc20356d340da179b0b4d43d2c1b35bcca86776069f76 + +if [ "$XBPS_CHECK_PKGS" ]; then + configure_args+=" -DBUILD_UNIT_TESTS=ON" +else + configure_args+=" -DBUILD_UNIT_TESTS=OFF" +fi zxing-cpp-devel_package() { depends="${sourcepkg}>=${version}_${revision}" From 4a60b90727799db8f34ce8f4e3d462765c2bc269 Mon Sep 17 00:00:00 2001 From: mhmdanas Date: Fri, 17 Feb 2023 17:01:55 +0000 Subject: [PATCH 137/138] libreoffice: revbump for zxing-cpp-2.0.0. --- srcpkgs/libreoffice/patches/15e5d86.diff | 51 ++++++++++++++++++++++++ 1 file changed, 51 insertions(+) create mode 100644 srcpkgs/libreoffice/patches/15e5d86.diff diff --git a/srcpkgs/libreoffice/patches/15e5d86.diff b/srcpkgs/libreoffice/patches/15e5d86.diff new file mode 100644 index 000000000000..f01c44c1e58e --- /dev/null +++ b/srcpkgs/libreoffice/patches/15e5d86.diff @@ -0,0 +1,51 @@ +From 15e5d86cc55ad94ac946e04d5e25b84be5810970 Mon Sep 17 00:00:00 2001 +From: Brett T. Warden +Date: Fri, 30 Dec 2022 08:43:25 +0100 +Subject: [PATCH] Remove dependency on BitArray.h from zxing-1.2.0 + +In zxing-1.4.0, numerous headers are no longer public. Rework the +ConvertToSVGFormat method so it uses bitmatrix.get instead of +bitmatrix.getRow, similar to the ToSVG method in zxing itself. + +See https://github.com/zxing-cpp/zxing-cpp/issues/361 + +Change-Id: Ie25eb8f782e8799fbd57c24ef79bba92acf0f9ff +Reviewed-on: https://gerrit.libreoffice.org/c/core/+/144874 +Tested-by: René Engelhard +Reviewed-by: René Engelhard +Tested-by: Jenkins +Reviewed-by: Caolán McNamara +--- + +diff --git a/cui/source/dialogs/QrCodeGenDialog.cxx b/cui/source/dialogs/QrCodeGenDialog.cxx +index f8cbac1..817be7f 100644 +--- a/cui/source/dialogs/QrCodeGenDialog.cxx ++++ b/cui/source/dialogs/QrCodeGenDialog.cxx +@@ -27,7 +27,6 @@ + #endif + + #include +-#include + #include + #include + #include +@@ -79,7 +78,6 @@ + OStringBuffer sb; + const int width = bitmatrix.width(); + const int height = bitmatrix.height(); +- ZXing::BitArray row(width); + sb.append("\n" + " Date: Fri, 17 Feb 2023 17:01:55 +0000 Subject: [PATCH 138/138] prison: revbump for zxing-cpp-2.0.0. --- srcpkgs/prison/template | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/srcpkgs/prison/template b/srcpkgs/prison/template index b5f4fa4f52b9..1294e2923c33 100644 --- a/srcpkgs/prison/template +++ b/srcpkgs/prison/template @@ -1,7 +1,7 @@ # Template file for 'prison' pkgname=prison version=5.103.0 -revision=1 +revision=2 build_style=cmake hostmakedepends="kcoreaddons extra-cmake-modules qt5-tools doxygen qt5-declarative-devel qt5-qmake qt5-host-tools" @@ -14,6 +14,12 @@ homepage="https://community.kde.org/Frameworks" distfiles="${KDE_SITE}/frameworks/${version%.*}/prison-${version}.tar.xz" checksum=44c5f902fac041e6aeb2baa6f26a1b58b3531d500f40e0411e171d3607b0f288 +if [ "$XBPS_CHECK_PKGS" ]; then + configure_args="-DBUILD_TESTING=ON" +else + configure_args="-DBUILD_TESTING=OFF" +fi + post_install() { vlicense LICENSES/BSD-3-Clause.txt vlicense LICENSES/MIT.txt