llvm-21 rebuilds

2025-09-08 17:34:43 +01:00 · 2025-09-08 17:34:43 +01:00 · 75be7a9f76
commit 75be7a9f76
parent 96f299e240
16 changed files with 178249 additions and 45 deletions
--- a/mingw-w64-arrow/PKGBUILD
+++ b/mingw-w64-arrow/PKGBUILD
@ -4,7 +4,7 @@ _realname=arrow
 pkgbase=mingw-w64-${_realname}
 pkgname="${MINGW_PACKAGE_PREFIX}-${_realname}"
 pkgver=21.0.0
-pkgrel=3
+pkgrel=4
 pkgdesc="Apache Arrow is a cross-language development platform for in-memory data (mingw-w64)"
 arch=(any)
 mingw_arch=('mingw64' 'ucrt64' 'clang64' 'clangarm64')
--- a/mingw-w64-castxml/PKGBUILD
+++ b/mingw-w64-castxml/PKGBUILD
@ -4,7 +4,7 @@ _realname=castxml
 pkgbase=mingw-w64-${_realname}
 pkgname=("${MINGW_PACKAGE_PREFIX}-${_realname}")
 pkgver=0.6.13
-pkgrel=1
+pkgrel=2
 pkgdesc="C-family abstract syntax tree XML output tool. (mingw-w64)"
 arch=('any')
 mingw_arch=('mingw64' 'ucrt64' 'clang64' 'clangarm64')
--- a/mingw-w64-clazy/PKGBUILD
+++ b/mingw-w64-clazy/PKGBUILD
@ -4,31 +4,30 @@ _realname=clazy
 pkgbase=mingw-w64-${_realname}
 pkgname="${MINGW_PACKAGE_PREFIX}-${_realname}"
 pkgver=1.16
-pkgrel=1
+pkgrel=2
 pkgdesc="Qt oriented code checker based on clang framework (mingw-w64)"
 arch=('any')
 mingw_arch=('clang64' 'clangarm64')
 url="https://www.kdab.com/"
 msys2_repository_url="https://invent.kde.org/sdk/clazy"
 license=('spdx:GPL-2.0-or-later')
+depends=("${MINGW_PACKAGE_PREFIX}-cc-libs"
+         "${MINGW_PACKAGE_PREFIX}-clang-libs"
+         "${MINGW_PACKAGE_PREFIX}-llvm-libs")
 makedepends=("${MINGW_PACKAGE_PREFIX}-cc"
             "${MINGW_PACKAGE_PREFIX}-cmake"
-             "${MINGW_PACKAGE_PREFIX}-clang-libs"
-             "${MINGW_PACKAGE_PREFIX}-llvm-libs"
+             "${MINGW_PACKAGE_PREFIX}-clang"
             "${MINGW_PACKAGE_PREFIX}-clang-tools-extra"
             "${MINGW_PACKAGE_PREFIX}-llvm"
             "git" )
-depends=("${MINGW_PACKAGE_PREFIX}-clang"
-         "${MINGW_PACKAGE_PREFIX}-cc-libs"
-         "${MINGW_PACKAGE_PREFIX}-libwinpthread")
-source=("${_realname}-${pkgver}.tar.gz"::"https://github.com/KDE/clazy/archive/refs/tags/v${pkgver}.tar.gz"
+source=("https://invent.kde.org/sdk/clazy/-/archive/v${pkgver}/clazy-v${pkgver}.tar.bz2"
        001-fix-linking.patch)
-sha256sums=('9a80286dab66754706c033db6324507da7b4b337a235a5d65810b849fbeb4903'
+sha256sums=('606084713e0dfa7d7047acc46bffd3fab6987b092fdae22c5055849ea7024a66'
            '5fbde0f37f8d217d1da28d93ef78dd2c297ccc9042e01d0ca8053ac4d8f7b292')
 validpgpkeys=(949014B23D24354DFD548E5457416A0ADCEF0EFE) # Sergio Martins <sergio.martins@kdab.com>

 prepare() {
-  cd "${srcdir}/${_realname}-${pkgver}"
+  cd "${srcdir}/${_realname}-v${pkgver}"
  patch -p1 -i ${srcdir}/001-fix-linking.patch
 }

@ -47,7 +46,7 @@ build() {
    -G"Ninja" \
    -DCMAKE_INSTALL_PREFIX=${MINGW_PREFIX} \
    "${_extra_config[@]}" \
-    "../${_realname}-${pkgver}"
+    "../${_realname}-v${pkgver}"

  ${MINGW_PREFIX}/bin/cmake --build .
 }
@ -57,5 +56,6 @@ package() {
  DESTDIR="${pkgdir}" ${MINGW_PREFIX}/bin/cmake --install .

  mkdir -p "${pkgdir}"${MINGW_PREFIX}/share/licenses/${_realname}
-  install -Dm644 "${srcdir}/${_realname}-${pkgver}"/LICENSES/*.* "${pkgdir}"${MINGW_PREFIX}/share/licenses/${_realname}/
+  install -Dm644 "${srcdir}/${_realname}-v${pkgver}"/LICENSES/*.* \
+    "${pkgdir}"${MINGW_PREFIX}/share/licenses/${_realname}/
 }
--- a/mingw-w64-crystal/PKGBUILD
+++ b/mingw-w64-crystal/PKGBUILD
@ -1,11 +1,11 @@
 # Maintainer: Quinton Miller <nicetas.c@gmail.com>

-_bootstrap=0
+_bootstrap=1
 _realname=crystal
 pkgbase="mingw-w64-${_realname}"
 pkgname="${MINGW_PACKAGE_PREFIX}-${_realname}"
 pkgver=1.17.1
-pkgrel=2
+pkgrel=3
 pkgdesc="Fast and statically typed, compiled language with Ruby-like syntax (mingw-w64)"
 arch=('any')
 mingw_arch=('ucrt64' 'mingw64' 'clang64' 'clangarm64')
--- a/mingw-w64-cvise/PKGBUILD
+++ b/mingw-w64-cvise/PKGBUILD
@ -4,7 +4,7 @@ _realname=cvise
 pkgbase=mingw-w64-${_realname}
 pkgname=("${MINGW_PACKAGE_PREFIX}-${_realname}")
 pkgver=2.11.0
-pkgrel=6
+pkgrel=7
 pkgdesc="Super-parallel Python port of the C-Reduce (mingw-w64)"
 arch=('any')
 mingw_arch=('mingw64' 'ucrt64' 'clang64' 'clangarm64')
--- a/mingw-w64-ghdl/PKGBUILD
+++ b/mingw-w64-ghdl/PKGBUILD
@ -5,7 +5,7 @@ pkgname=(
  "${MINGW_PACKAGE_PREFIX}-${_realname}-mcode"
 )
 pkgver=5.1.1
-pkgrel=2
+pkgrel=3
 pkgdesc='GHDL: the open-source analyzer, compiler, simulator and (experimental) synthesizer for VHDL'
 arch=('any')
 mingw_arch=('mingw64' 'ucrt64')
--- a/mingw-w64-include-what-you-use/.gitignore
+++ b/mingw-w64-include-what-you-use/.gitignore
@ -0,0 +1 @@
+include-what-you-use
--- a/mingw-w64-include-what-you-use/PKGBUILD
+++ b/mingw-w64-include-what-you-use/PKGBUILD
@ -3,7 +3,8 @@
 _realname=include-what-you-use
 pkgbase=mingw-w64-${_realname}
 pkgname=("${MINGW_PACKAGE_PREFIX}-${_realname}")
-pkgver=0.24
+_pkgver=0.24
+pkgver=0.24+r68
 pkgrel=1
 pkgdesc="A tool for use with clang to analyze #includes in C and C++ source files (mingw-w64)"
 arch=('any')
@ -22,9 +23,17 @@ makedepends=("${MINGW_PACKAGE_PREFIX}-cc"
             "${MINGW_PACKAGE_PREFIX}-cmake"
             "${MINGW_PACKAGE_PREFIX}-ninja"
             "${MINGW_PACKAGE_PREFIX}-llvm"
-             "${MINGW_PACKAGE_PREFIX}-clang-tools-extra")
-source=("https://github.com/${_realname}/${_realname}/archive/${pkgver}/${_realname}-${pkgver}.tar.gz")
-sha256sums=('897b4c864a983f493c8efef4a1a9a2d429fd7ead1011f7a41743ed7b6dbe8c2e')
+             "${MINGW_PACKAGE_PREFIX}-clang-tools-extra"
+             git)
+_commit=791e69ea4662cb3e74e8128fd5fd69bd7f4ea6b3
+#source=("https://github.com/${_realname}/${_realname}/archive/${pkgver}/${_realname}-${pkgver}.tar.gz"
+source=("git+https://github.com/${_realname}/${_realname}#commit=${_commit}")
+sha256sums=('edd1ac581a8b9cb3d781ec2d295c8bb1a6922aceefde9564fd7ce2a5d1e13aa0')
+
+pkgver(){
+  cd ${_realname}
+  echo "${_pkgver}+r"`git rev-list --count ${_pkgver}..${_commit}`
+}

 build() {
  declare -a extra_config
@ -41,7 +50,7 @@ build() {
      -DCMAKE_INSTALL_LIBDIR=lib \
      "${extra_config[@]}" \
      -DPython3_EXECUTABLE=${MINGW_PREFIX}/bin/python \
-      -S ${_realname}-${pkgver} \
+      -S ${_realname} \
      -B build-${MSYSTEM}

  cmake --build build-${MSYSTEM}
@ -50,5 +59,6 @@ build() {
 package() {
  DESTDIR="${pkgdir}" cmake --install build-${MSYSTEM}

-  install -Dm644 "${_realname}-${pkgver}/LICENSE.TXT" "${pkgdir}${MINGW_PREFIX}/share/licenses/${_realname}/LICENSE"
+  install -Dm644 "${_realname}"/LICENSE.TXT \
+    "${pkgdir}"${MINGW_PREFIX}/share/licenses/${_realname}/LICENSE
 }
--- a/mingw-w64-ispc/PKGBUILD
+++ b/mingw-w64-ispc/PKGBUILD
@ -4,7 +4,7 @@ _realname=ispc
 pkgbase=mingw-w64-${_realname}
 pkgname="${MINGW_PACKAGE_PREFIX}-${_realname}"
 pkgver=1.28.1
-pkgrel=1
+pkgrel=2
 pkgdesc="Compiler for high-performance SIMD programming on the CPU (mingw-w64)"
 arch=('any')
 mingw_arch=('mingw64' 'ucrt64' 'clang64' 'clangarm64')
--- a/mingw-w64-mesa/PKGBUILD
+++ b/mingw-w64-mesa/PKGBUILD
@ -4,7 +4,7 @@ _realname=mesa
 pkgbase=mingw-w64-${_realname}
 pkgname="${MINGW_PACKAGE_PREFIX}-${_realname}"
 pkgver=25.2.2
-pkgrel=1
+pkgrel=2
 pkgdesc="Open-source implementation of the OpenGL, Vulkan and OpenCL specifications (mingw-w64)"
 arch=('any')
 mingw_arch=('mingw64' 'ucrt64' 'clang64' 'clangarm64')
--- a/mingw-w64-openshadinglanguage/PKGBUILD
+++ b/mingw-w64-openshadinglanguage/PKGBUILD
@ -4,7 +4,7 @@ _realname=openshadinglanguage
 pkgbase=mingw-w64-${_realname}
 pkgname="${MINGW_PACKAGE_PREFIX}-${_realname}"
 pkgver=1.14.7.0
-pkgrel=2
+pkgrel=3
 pkgdesc="Advanced shading language for production GI renderers (mingw-w64)"
 arch=('any')
 mingw_arch=('mingw64' 'ucrt64' 'clang64' 'clangarm64')
@ -14,8 +14,8 @@ msys2_references=(
 )
 license=("spdx:BSD-3-Clause")
 depends=("${MINGW_PACKAGE_PREFIX}-cc-libs"
-         "${MINGW_PACKAGE_PREFIX}-clang-libs"
-         "${MINGW_PACKAGE_PREFIX}-llvm-libs"
+         #"${MINGW_PACKAGE_PREFIX}-clang-libs"
+         #"${MINGW_PACKAGE_PREFIX}-llvm-libs"
         "${MINGW_PACKAGE_PREFIX}-openimageio"
         "${MINGW_PACKAGE_PREFIX}-partio"
         "${MINGW_PACKAGE_PREFIX}-pugixml")
@ -26,8 +26,8 @@ makedepends=("${MINGW_PACKAGE_PREFIX}-cc"
             "${MINGW_PACKAGE_PREFIX}-python"
             "${MINGW_PACKAGE_PREFIX}-pybind11"
             "${MINGW_PACKAGE_PREFIX}-robin-map"
-             "${MINGW_PACKAGE_PREFIX}-clang"
-             "${MINGW_PACKAGE_PREFIX}-llvm"
+             "${MINGW_PACKAGE_PREFIX}-clang-20"
+             "${MINGW_PACKAGE_PREFIX}-llvm-20"
             "${MINGW_PACKAGE_PREFIX}-qt6-base")
 optdepends=("${MINGW_PACKAGE_PREFIX}-python: Python module"
            "${MINGW_PACKAGE_PREFIX}-qt6-base: for osltoy")
@ -74,7 +74,7 @@ build() {
  fi

  export OPENIMAGEIOHOME=${MINGW_PREFIX}
-  export LLVM_DIRECTORY=${MINGW_PREFIX}
+  export LLVM_DIRECTORY=${MINGW_PREFIX}/opt/llvm-20
  CFLAGS+=" -Wno-attributes"
  CXXFLAGS+=" -Wno-attributes -DTINYFORMAT_ALLOW_WCHAR_STRINGS"

@ -91,7 +91,7 @@ build() {
    -DOSL_BUILD_TESTS=OFF \
    -DSTOP_ON_WARNING=OFF \
    -DLLVM_STATIC=OFF \
-    -DLLVM_ROOT=${MINGW_PREFIX} \
+    -DLLVM_ROOT=${MINGW_PREFIX}/opt/llvm-20 \
    -DPython3_EXECUTABLE=${MINGW_PREFIX}/bin/python \
    "${_extra_config[@]}" \
    ../OpenShadingLanguage-${pkgver}
--- a/mingw-w64-qt-creator/PKGBUILD
+++ b/mingw-w64-qt-creator/PKGBUILD
@ -8,7 +8,7 @@ pkgname=("${MINGW_PACKAGE_PREFIX}-${_realname}"
         "${MINGW_PACKAGE_PREFIX}-${_realname}-devel")
 _base_ver=17.0.1
 pkgver=${_base_ver/-/}
-pkgrel=1
+pkgrel=2
 pkgdesc='Lightweight, cross-platform integrated development environment (mingw-w64)'
 arch=('any')
 mingw_arch=('mingw64' 'ucrt64' 'clang64' 'clangarm64')
--- a/mingw-w64-qt6-static/PKGBUILD
+++ b/mingw-w64-qt6-static/PKGBUILD
@ -5,7 +5,7 @@ pkgbase=mingw-w64-${_realname}-static
 pkgname=("${MINGW_PACKAGE_PREFIX}-${_realname}-static")
 _qtver=6.9.2
 pkgver=${_qtver/-/}
-pkgrel=1
+pkgrel=2
 pkgdesc="A cross-platform application and UI framework (mingw-w64)"
 arch=(any)
 mingw_arch=('mingw64' 'ucrt64' 'clang64' 'clangarm64')
@ -60,7 +60,9 @@ source=("https://download.qt.io/official_releases/qt/${pkgver%.*}/${_qtver}/sing
        012-Handle-win64-in-dumpcpp-and-MetaObjectGenerator-read.patch
        013-disable-finding-webp-from-cmake-config-files.patch
        014-imageformats-transitive-dependencies.patch
-        015-qt6-windeployqt-fixes.patch)
+        015-qt6-windeployqt-fixes.patch
+        https://invent.kde.org/qt/qt/qttools/-/commit/d0f1a2e2.patch
+        https://invent.kde.org/qt/qt/qttools/-/commit/d796c813.patch)
 sha256sums=('643f1fe35a739e2bf5e1a092cfe83dbee61ff6683684e957351c599767ca279c'
            '26f3bcc3729520a5ba648a9ce92a9293c8fb1cf16d81af612587ce10d501dcb6'
            '817ce7a15eafb945da5f03706cd7196198c9a903c0372cb7023d1e27634355a4'
@ -76,7 +78,9 @@ sha256sums=('643f1fe35a739e2bf5e1a092cfe83dbee61ff6683684e957351c599767ca279c'
            '39d57493b0edc1317729b88dad6a07b86936072f0fbbd2aae7b01e2211ce29ed'
            'ce0023e8b72fe4b5840ca892bd5ad52120b6b484161bf2ffe0b6da9404625641'
            '1d640ce887bbaaa847b8dd30a1a655f273c9907de06ad9d91580c02215e3e8c8'
-            'ba6d3384ef40e287807e2fe33e3b8ffc815ca2f3b1af5def426fe62c880a5ec9')
+            'ba6d3384ef40e287807e2fe33e3b8ffc815ca2f3b1af5def426fe62c880a5ec9'
+            'ed4a6e3308e0716319d857ae41931dd99f8cf2c3ed0b924f6cfe7aa0aa16919f'
+            '6de557e01daed19796287dead35050ffbb471e6bf7d0c8beb46186d1a814e95d')

 # Use the right mkspecs file
 if [[ ${MINGW_PACKAGE_PREFIX} == *-clang-* ]]; then
@ -120,6 +124,12 @@ prepare() {
    014-imageformats-transitive-dependencies.patch \
    015-qt6-windeployqt-fixes.patch

+  cd qttools
+  apply_patch_with_msg \
+    d0f1a2e2.patch \
+    d796c813.patch
+  cd ..
+
  local _ARCH_TUNE
  if [[ ${CARCH} == x86_64 ]]; then
    _ARCH_TUNE="-march=nocona -msahf -mtune=generic"
@ -211,6 +221,7 @@ build() {
    -DOPENSSL_USE_STATIC_LIBS=ON \
    -DZLIB_USE_STATIC_LIBS=ON \
    -DBUILD_qtwebengine=OFF \
+    -DQT_FEATURE_clangcpp=OFF \
    ../qt${pkgver}

  export PATH=$PWD/bin:$PATH
--- a/mingw-w64-qt6-tools/PKGBUILD
+++ b/mingw-w64-qt6-tools/PKGBUILD
@ -6,7 +6,7 @@ pkgname=("${MINGW_PACKAGE_PREFIX}-${_realname}"
         "${MINGW_PACKAGE_PREFIX}-${_realname}-debug")
 _qtver=6.9.2
 pkgver=${_qtver/-/}
-pkgrel=1
+pkgrel=2
 pkgdesc='A cross-platform application and UI framework (Development Tools, QtHelp) (mingw-w64)'
 arch=(any)
 mingw_arch=('mingw64' 'ucrt64' 'clang64' 'clangarm64')
@ -29,9 +29,13 @@ makedepends=("${MINGW_PACKAGE_PREFIX}-cc"
             "rsync")
 _pkgfn="${_realname/6-/}-everywhere-src-${_qtver}"
 source=("https://download.qt.io/official_releases/qt/${pkgver%.*}/${_qtver}/submodules/${_pkgfn}.tar.xz"
-        001-appending-qt6-to-remove-qt5-conflict.patch)
+        001-appending-qt6-to-remove-qt5-conflict.patch
+        https://invent.kde.org/qt/qt/qttools/-/commit/d0f1a2e2.patch
+        https://invent.kde.org/qt/qt/qttools/-/commit/d796c813.patch)
 sha256sums=('d8b7f7e8e970cc0b975205fd6d5832ea917ef3e751df69b97439c1cddd67a489'
-            '1f6e7a9be264e4679090fb0b6f10e702cee099b270802ca08910baed38030b4c')
+            '1f6e7a9be264e4679090fb0b6f10e702cee099b270802ca08910baed38030b4c'
+            'ed4a6e3308e0716319d857ae41931dd99f8cf2c3ed0b924f6cfe7aa0aa16919f'
+            '6de557e01daed19796287dead35050ffbb471e6bf7d0c8beb46186d1a814e95d')

 # Helper macros to help make tasks easier #
 apply_patch_with_msg() {
@ -46,7 +50,9 @@ prepare() {
  cd $srcdir/${_pkgfn}

  apply_patch_with_msg \
-    001-appending-qt6-to-remove-qt5-conflict.patch
+    001-appending-qt6-to-remove-qt5-conflict.patch \
+    d0f1a2e2.patch \
+    d796c813.patch
 }

 build() {
@ -59,7 +65,7 @@ build() {
    -DCMAKE_BUILD_TYPE=RelWithDebInfo \
    -DCMAKE_INSTALL_PREFIX=${MINGW_PREFIX} \
    -DQT_FEATURE_clang=ON \
-    -DQT_FEATURE_clangcpp=ON \
+    -DQT_FEATURE_clangcpp=OFF \
    ../${_pkgfn}

  ${MINGW_PREFIX}/bin/cmake --build .
@ -71,7 +77,7 @@ package_qt6-tools() {
           "${MINGW_PACKAGE_PREFIX}-zstd")
  optdepends=("${MINGW_PACKAGE_PREFIX}-qt6-declarative: for lupdate-qt6, qdoc-qt6 and qdistancefieldgenerator-qt6"
              "${MINGW_PACKAGE_PREFIX}-qt6-activeqt"
-              "${MINGW_PACKAGE_PREFIX}-clang-libs: for lupdate-qt6 and qdoc-qt6")
+              "${MINGW_PACKAGE_PREFIX}-clang-libs: for qdoc-qt6")
  groups=("${MINGW_PACKAGE_PREFIX}-qt6")

  DESTDIR="${pkgdir}" ${MINGW_PREFIX}/bin/cmake --install build-${MSYSTEM}
--- a/mingw-w64-zig/001-support-llvm-21.patch
+++ b/mingw-w64-zig/001-support-llvm-21.patch
--- a/mingw-w64-zig/PKGBUILD
+++ b/mingw-w64-zig/PKGBUILD
@ -4,7 +4,7 @@ _realname=zig
 pkgbase=mingw-w64-${_realname}
 pkgname="${MINGW_PACKAGE_PREFIX}-${_realname}"
 pkgver=0.15.1
-pkgrel=1
+pkgrel=2
 pkgdesc='A general-purpose programming language and toolchain for maintaining robust, optimal, and reusable software (mingw-w64)'
 arch=('any')
 mingw_arch=('clang64' 'clangarm64')
@ -23,8 +23,16 @@ makedepends=("${MINGW_PACKAGE_PREFIX}-clang"
             "${MINGW_PACKAGE_PREFIX}-ninja"
             "${MINGW_PACKAGE_PREFIX}-llvm"
             "${MINGW_PACKAGE_PREFIX}-lld")
-source=("https://github.com/ziglang/zig/archive/${pkgver}/zig-${pkgver}.tar.gz")
-sha256sums=('f7d587087e551a206ad2e1c1a10e8124f5ecaec1f1efc69b0de6df89af80245c')
+source=("https://github.com/ziglang/zig/archive/${pkgver}/zig-${pkgver}.tar.gz"
+        "001-support-llvm-21.patch")
+sha256sums=('f7d587087e551a206ad2e1c1a10e8124f5ecaec1f1efc69b0de6df89af80245c'
+            '391f97e14d8ecdf039a52e2cef16fc39b8551edeeb76980d2299e0f89bb56cb3')
+
+prepare(){
+  cd ${_realname}-${pkgver}
+  # https://github.com/ziglang/zig/pull/25055
+  patch -p1 -i "${srcdir}"/001-support-llvm-21.patch
+}

 build() {
  declare -a _extra_config