rebuild packages against icu-75

2024-05-11 04:42:10 +01:00
parent 56fa3c2281
commit dca603ec14
36 changed files with 131 additions and 100 deletions
--- a/mingw-w64-boost/PKGBUILD
+++ b/mingw-w64-boost/PKGBUILD
@@ -8,7 +8,7 @@ pkgbase=mingw-w64-${_realname}
 pkgname="${MINGW_PACKAGE_PREFIX}-${_realname}"
 pkgver=1.85.0
 _boostver=${pkgver//./_}
-pkgrel=1
+pkgrel=2
 pkgdesc="Free peer-reviewed portable C++ source libraries (mingw-w64)"
 arch=('any')
 mingw_arch=('mingw32' 'mingw64' 'ucrt64' 'clang64' 'clang32' 'clangarm64')
--- a/mingw-w64-darktable/PKGBUILD
+++ b/mingw-w64-darktable/PKGBUILD
@@ -4,7 +4,7 @@ _realname=darktable
 pkgbase=mingw-w64-${_realname}
 pkgname=("${MINGW_PACKAGE_PREFIX}-${_realname}")
 pkgver=4.6.1
-pkgrel=2
+pkgrel=3
 pkgdesc="darktable is an open source photography workflow application and raw developer (mingw-w64)"
 arch=('any')
 mingw_arch=('mingw64' 'ucrt64' 'clang64' 'clangarm64')
--- a/mingw-w64-dcmtk/PKGBUILD
+++ b/mingw-w64-dcmtk/PKGBUILD
@@ -4,7 +4,7 @@ _realname=dcmtk
 pkgbase=mingw-w64-${_realname}
 pkgname=("${MINGW_PACKAGE_PREFIX}-${_realname}")
 pkgver=3.6.8
-pkgrel=1
+pkgrel=2
 pkgdesc="A collection of libraries and applications implementing large parts of the DICOM standard (mingw-w64)"
 arch=('any')
 mingw_arch=('mingw64' 'ucrt64' 'clang64' 'clangarm64')
@@ -14,9 +14,7 @@ msys2_references=(
  "cpe: cpe:/a:offis:dcmtk"
 )
 license=('spdx:BSD-3-Clause')
-depends=("${MINGW_PACKAGE_PREFIX}-icu"
-         "${MINGW_PACKAGE_PREFIX}-libiconv"
-         "${MINGW_PACKAGE_PREFIX}-libpng"
+depends=("${MINGW_PACKAGE_PREFIX}-libpng"
         "${MINGW_PACKAGE_PREFIX}-libsndfile"
         "${MINGW_PACKAGE_PREFIX}-libtiff"
         "${MINGW_PACKAGE_PREFIX}-libxml2"
@@ -26,7 +24,11 @@ depends=("${MINGW_PACKAGE_PREFIX}-icu"
 makedepends=("${MINGW_PACKAGE_PREFIX}-cc"
             "${MINGW_PACKAGE_PREFIX}-cmake"
             "${MINGW_PACKAGE_PREFIX}-ninja"
+             "${MINGW_PACKAGE_PREFIX}-icu"
+             "${MINGW_PACKAGE_PREFIX}-libiconv"
             "${MINGW_PACKAGE_PREFIX}-autotools")
+optdepends=("${MINGW_PACKAGE_PREFIX}-icu"
+            "${MINGW_PACKAGE_PREFIX}-libiconv")
 source=("https://dicom.offis.de/download/dcmtk/dcmtk${pkgver//./}/${_realname}-${pkgver}.tar.gz"
        "001-fix-cmake-config-install-destination.patch"
        "002-properly-detect-canonical-host.patch")
--- a/mingw-w64-enchant/PKGBUILD
+++ b/mingw-w64-enchant/PKGBUILD
@@ -5,7 +5,7 @@ _realname=enchant
 pkgbase=mingw-w64-${_realname}
 pkgname="${MINGW_PACKAGE_PREFIX}-${_realname}"
 pkgver=2.6.7
-pkgrel=1
+pkgrel=2
 pkgdesc="Enchanting Spell Checking Library (mingw-w64)"
 arch=('any')
 mingw_arch=('mingw64' 'ucrt64' 'clang64' 'clangarm64')
@@ -42,9 +42,6 @@ build() {
  mkdir -p "${srcdir}/build-${MSYSTEM}" && cd "${srcdir}/build-${MSYSTEM}"

  ../${_realname}-${pkgver}/configure \
-    --build=${MINGW_CHOST} \
-    --host=${MINGW_CHOST} \
-    --target=${MINGW_CHOST} \
    --prefix=${MINGW_PREFIX} \
    --enable-relocatable \
    --with-aspell \
--- a/mingw-w64-firebird/PKGBUILD
+++ b/mingw-w64-firebird/PKGBUILD
@@ -5,7 +5,7 @@ _realname=firebird
 pkgbase=mingw-w64-${_realname}
 pkgname="${MINGW_PACKAGE_PREFIX}-${_realname}"
 pkgver=5.0.0.1306
-pkgrel=1
+pkgrel=2
 pkgdesc="Cross-platform relational database offering many ANSI SQL standard features (mingw-w64)"
 url="https://www.firebirdsql.org/"
 license=('spdx:Interbase-1.0 AND MPL-1.0')
@@ -19,14 +19,14 @@ msys2_repository_url='https://github.com/FirebirdSQL/firebird/'
 msys2_documentation_url='https://www.firebirdsql.org/en/documentation/'
 conflicts=("${MINGW_PACKAGE_PREFIX}-firebird2-git")
 replaces=("${MINGW_PACKAGE_PREFIX}-firebird2-git")
-depends=("${MINGW_PACKAGE_PREFIX}-icu"
-         "${MINGW_PACKAGE_PREFIX}-libiconv"
+depends=("${MINGW_PACKAGE_PREFIX}-libiconv"
         "${MINGW_PACKAGE_PREFIX}-libtomcrypt"
         "${MINGW_PACKAGE_PREFIX}-libtommath"
         "${MINGW_PACKAGE_PREFIX}-re2")
 makedepends=("${MINGW_PACKAGE_PREFIX}-cc"
             "${MINGW_PACKAGE_PREFIX}-cmake"
             "${MINGW_PACKAGE_PREFIX}-autotools"
+             "${MINGW_PACKAGE_PREFIX}-icu"
             "unzip")
 source=("https://github.com/FirebirdSQL/firebird/archive/refs/tags/v${pkgver%.*}.tar.gz"
        001-configure-fixes.patch
--- a/mingw-w64-gnome-text-editor/PKGBUILD
+++ b/mingw-w64-gnome-text-editor/PKGBUILD
@@ -4,7 +4,7 @@ _realname=gnome-text-editor
 pkgbase=mingw-w64-${_realname}
 pkgname="${MINGW_PACKAGE_PREFIX}-${_realname}"
 pkgver=45.3
-pkgrel=1
+pkgrel=2
 pkgdesc="A simple text editor for the GNOME desktop (mingw-w64)"
 arch=('any')
 mingw_arch=('mingw64' 'ucrt64' 'clang64' 'clangarm64')
--- a/mingw-w64-gnustep-base/PKGBUILD
+++ b/mingw-w64-gnustep-base/PKGBUILD
@@ -4,7 +4,7 @@ _realname=gnustep-base
 pkgbase=mingw-w64-${_realname}
 pkgname=("${MINGW_PACKAGE_PREFIX}-${_realname}")
 pkgver=1.29.0
-pkgrel=5
+pkgrel=6
 pkgdesc="GNUstep Base library (mingw-w64)"
 arch=('any')
 mingw_arch=('mingw64' 'ucrt64')
@@ -14,14 +14,17 @@ makedepends=("${MINGW_PACKAGE_PREFIX}-autotools"
             "${MINGW_PACKAGE_PREFIX}-clang"
             "${MINGW_PACKAGE_PREFIX}-lld"
             "${MINGW_PACKAGE_PREFIX}-gnustep-make"
+             "${MINGW_PACKAGE_PREFIX}-curl"
             rsync)
-depends=("${MINGW_PACKAGE_PREFIX}-libobjc2"
-         "${MINGW_PACKAGE_PREFIX}-libffi"
-         "${MINGW_PACKAGE_PREFIX}-icu"
-         "${MINGW_PACKAGE_PREFIX}-libxml2"
-         "${MINGW_PACKAGE_PREFIX}-curl"
-         "${MINGW_PACKAGE_PREFIX}-libxslt"
+depends=("${MINGW_PACKAGE_PREFIX}-gcc-libs"
         "${MINGW_PACKAGE_PREFIX}-gnutls"
+         "${MINGW_PACKAGE_PREFIX}-icu"
+         "${MINGW_PACKAGE_PREFIX}-libffi"
+         "${MINGW_PACKAGE_PREFIX}-libiconv"
+         "${MINGW_PACKAGE_PREFIX}-libobjc2"
+         "${MINGW_PACKAGE_PREFIX}-libxml2"
+         "${MINGW_PACKAGE_PREFIX}-libxslt"
+         "${MINGW_PACKAGE_PREFIX}-zlib"
 )
 source=("https://github.com/gnustep/libs-base/releases/download/base-${pkgver//./_}/${_realname}-${pkgver}.tar.gz"
        # Fix GSXML compatibility with libxml2 v2.11.0
@@ -71,10 +74,7 @@ build() {
  CC="$MINGW_PREFIX/bin/clang" \
  CXX="$MINGW_PREFIX/bin/clang++" \
  ./configure \
-    --prefix="${MINGW_PREFIX}" \
-    --build="${MINGW_CHOST}" \
-    --host="${MINGW_CHOST}" \
-    --target="${MINGW_CHOST}"
+    --prefix="${MINGW_PREFIX}"
  
  CC="$MINGW_PREFIX/bin/clang" \
  CXX="$MINGW_PREFIX/bin/clang++" \
--- a/mingw-w64-gnustep-gui/PKGBUILD
+++ b/mingw-w64-gnustep-gui/PKGBUILD
@@ -15,8 +15,13 @@ makedepends=("${MINGW_PACKAGE_PREFIX}-autotools"
             "${MINGW_PACKAGE_PREFIX}-lld"
             "${MINGW_PACKAGE_PREFIX}-gnustep-make"
             rsync)
-depends=("${MINGW_PACKAGE_PREFIX}-gnustep-base"
-         "${MINGW_PACKAGE_PREFIX}-openjpeg2")
+depends=("${MINGW_PACKAGE_PREFIX}-gcc-libs"
+         "${MINGW_PACKAGE_PREFIX}-gnustep-base"
+         "${MINGW_PACKAGE_PREFIX}-giflib"
+         "${MINGW_PACKAGE_PREFIX}-icu"
+         "${MINGW_PACKAGE_PREFIX}-libjpeg-turbo"
+         "${MINGW_PACKAGE_PREFIX}-libpng"
+         "${MINGW_PACKAGE_PREFIX}-libtiff")
 source=("https://github.com/gnustep/libs-gui/releases/download/gui-${pkgver//./_}/${_realname}-${pkgver}.tar.gz"
        # GifQuantizeBuffer is considered private API in libgif 5.2 and later
        # https://github.com/gnustep/libs-gui/pull/207, merged
@@ -51,10 +56,7 @@ build() {
  CC="$MINGW_PREFIX/bin/clang" \
  CXX="$MINGW_PREFIX/bin/clang++" \
  ./configure \
-    --prefix="${MINGW_PREFIX}" \
-    --build="${MINGW_CHOST}" \
-    --host="${MINGW_CHOST}" \
-    --target="${MINGW_CHOST}"
+    --prefix="${MINGW_PREFIX}"
  
  CC="$MINGW_PREFIX/bin/clang" \
  CXX="$MINGW_PREFIX/bin/clang++" \
--- a/mingw-w64-gspell/PKGBUILD
+++ b/mingw-w64-gspell/PKGBUILD
@@ -4,10 +4,10 @@ _realname=gspell
 pkgbase=mingw-w64-${_realname}
 pkgname="${MINGW_PACKAGE_PREFIX}-${_realname}"
 pkgver=1.12.2
-pkgrel=2
+pkgrel=3
+pkgdesc="Spell-checking library for GTK applications (mingw-w64)"
 arch=('any')
 mingw_arch=('mingw64' 'ucrt64' 'clang64' 'clangarm64')
-pkgdesc="Spell-checking library for GTK applications (mingw-w64)"
 url="https://gitlab.gnome.org/GNOME/gspell"
 license=('spdx:LGPL-2.1-or-later')
 depends=("${MINGW_PACKAGE_PREFIX}-gtk3"
@@ -37,9 +37,6 @@ build() {
  export lt_cv_deplibs_check_method='pass_all'

  ../${_realname}-${pkgver}/configure \
-    --host=${MINGW_CHOST} \
-    --target=${MINGW_CHOST} \
-    --build=${MINGW_CHOST} \
    --prefix=${MINGW_PREFIX} \
    --libexecdir=${MINGW_PREFIX}/lib \
    --enable-introspection \
--- a/mingw-w64-harfbuzz/PKGBUILD
+++ b/mingw-w64-harfbuzz/PKGBUILD
@@ -6,7 +6,7 @@ pkgbase=mingw-w64-${_realname}
 pkgname=("${MINGW_PACKAGE_PREFIX}-${_realname}"
         "${MINGW_PACKAGE_PREFIX}-${_realname}-docs")
 pkgver=8.4.0
-pkgrel=1
+pkgrel=2
 pkgdesc="OpenType text shaping engine (mingw-w64)"
 arch=('any')
 mingw_arch=('mingw32' 'mingw64' 'ucrt64' 'clang64' 'clang32' 'clangarm64')
@@ -78,6 +78,7 @@ build() {
    -Dintrospection=enabled \
    -Dgobject=enabled \
    -Dicu=enabled \
+    -Dcpp_std=c++17 \
    -Dgdi=enabled \
    -Dgraphite=enabled \
    -Dchafa=disabled \
--- a/mingw-w64-konsole/PKGBUILD
+++ b/mingw-w64-konsole/PKGBUILD
@@ -6,7 +6,7 @@ _realname=konsole
 pkgbase=mingw-w64-${_realname}
 pkgname="${MINGW_PACKAGE_PREFIX}-${_realname}"
 pkgver=23.08.5
-pkgrel=1
+pkgrel=2
 arch=('any')
 mingw_arch=('mingw64' 'ucrt64' 'clang64' 'clangarm64')
 msys2_references=(
--- a/mingw-w64-libcdr/PKGBUILD
+++ b/mingw-w64-libcdr/PKGBUILD
@@ -4,7 +4,7 @@ _realname=libcdr
 pkgbase=mingw-w64-${_realname}
 pkgname="${MINGW_PACKAGE_PREFIX}-${_realname}"
 pkgver=0.1.7
-pkgrel=7
+pkgrel=8
 pkgdesc="libcdr is a library and a set of tools for reading and converting binary files produced by Corel DRAW (mingw-w64)"
 arch=('any')
 mingw_arch=('mingw64' 'ucrt64' 'clang64' 'clangarm64')
@@ -33,8 +33,6 @@ build() {

  ../${_realname}-${pkgver}/configure \
    --prefix=${MINGW_PREFIX} \
-    --build=${MINGW_CHOST} \
-    --host=${MINGW_CHOST} \
    --enable-shared \
    --enable-static \
    --disable-silent-rules
--- a/mingw-w64-libe-book/PKGBUILD
+++ b/mingw-w64-libe-book/PKGBUILD
@@ -4,7 +4,7 @@ _realname=libe-book
 pkgbase=mingw-w64-${_realname}
 pkgname=("${MINGW_PACKAGE_PREFIX}-${_realname}")
 pkgver=0.1.3
-pkgrel=1
+pkgrel=2
 pkgdesc="Library for import of reflowable e-book formats. (mingw-w64)"
 arch=('any')
 mingw_arch=('ucrt64' 'clang64')
--- a/mingw-w64-libgedit-tepl/PKGBUILD
+++ b/mingw-w64-libgedit-tepl/PKGBUILD
@@ -5,7 +5,7 @@ pkgbase=mingw-w64-${_realname}
 pkgname=("${MINGW_PACKAGE_PREFIX}-${_realname}"
         "${MINGW_PACKAGE_PREFIX}-${_realname}-docs")
 pkgver=6.10.0
-pkgrel=1
+pkgrel=2
 pkgdesc='Library that eases the development of GtkSourceView-based text editors and IDEs (mingw-w64)'
 arch=('any')
 mingw_arch=('mingw64' 'ucrt64' 'clang64' 'clangarm64')
--- a/mingw-w64-libical/PKGBUILD
+++ b/mingw-w64-libical/PKGBUILD
@@ -7,7 +7,7 @@ provides=(${MINGW_PACKAGE_PREFIX}-${_realname}-lib)
 conflicts=(${MINGW_PACKAGE_PREFIX}-${_realname}-glib)
 replaces=(${MINGW_PACKAGE_PREFIX}-${_realname}-glib)
 pkgver=3.0.18
-pkgrel=1
+pkgrel=2
 pkgdesc="An Open Source implementation of the iCalendar protocols and protocol data units (mingw-w64)"
 arch=('any')
 mingw_arch=('mingw64' 'ucrt64' 'clang64')
@@ -53,7 +53,7 @@ build() {
  ${MINGW_PREFIX}/bin/cmake.exe \
    -G "Ninja" \
    -DCMAKE_INSTALL_PREFIX=${MINGW_PREFIX} \
-    ${extra_config} \
+    "${extra_config[@]}" \
    -DCMAKE_SKIP_RPATH=ON \
    -DGOBJECT_INTROSPECTION=OFF \
    -DENABLE_GTK_DOC=OFF \
--- a/mingw-w64-liblcf/PKGBUILD
+++ b/mingw-w64-liblcf/PKGBUILD
@@ -4,7 +4,7 @@ _realname=liblcf
 pkgbase="mingw-w64-${_realname}"
 pkgname="${MINGW_PACKAGE_PREFIX}-${_realname}"
 pkgver=0.8
-pkgrel=3
+pkgrel=4
 pkgdesc="Library to handle RPG Maker 2000/2003 and EasyRPG game data (mingw-w64)"
 arch=("any")
 mingw_arch=("mingw64" "ucrt64" "clang64")
@@ -18,13 +18,16 @@ makedepends=("${MINGW_PACKAGE_PREFIX}-cc"
             "${MINGW_PACKAGE_PREFIX}-ninja"
             "${MINGW_PACKAGE_PREFIX}-pkgconf")
 source=("https://github.com/EasyRPG/liblcf/archive/${pkgver}/${_realname}-${pkgver}.tar.gz"
-        0001-include-stdint.patch)
+        0001-include-stdint.patch
+        0002-require-c++17.patch::https://github.com/EasyRPG/liblcf/commit/8c782e54.patch)
 sha256sums=('aa5664145842a39442e9bbf178273e91816d6d6bf6db7347196bde518dfb431e'
-            '474777d5eb40ed787a0f8f9a0570cb0f8076df38a588b550059ecbcf901f2308')
+            '474777d5eb40ed787a0f8f9a0570cb0f8076df38a588b550059ecbcf901f2308'
+            '25ca0f3b1440a1db832fe7d3418ebc099a23649c99920572ff44fec2273de588')

 prepare() {
  cd "${_realname}-${pkgver}"
  patch -p1 -i "${srcdir}/0001-include-stdint.patch"
+  patch -p1 -i "${srcdir}/0002-require-c++17.patch"
 }

 build() {
--- a/mingw-w64-libmspub/PKGBUILD
+++ b/mingw-w64-libmspub/PKGBUILD
@@ -4,7 +4,7 @@ _realname=libmspub
 pkgbase=mingw-w64-${_realname}
 pkgname=("${MINGW_PACKAGE_PREFIX}-${_realname}")
 pkgver=0.1.4
-pkgrel=1
+pkgrel=2
 pkgdesc="Library for import of Microsoft Publisher documents. (mingw-w64)"
 arch=('any')
 mingw_arch=('ucrt64' 'clang64' 'clangarm64')
--- a/mingw-w64-libqalculate/PKGBUILD
+++ b/mingw-w64-libqalculate/PKGBUILD
@@ -4,7 +4,7 @@ _realname=libqalculate
 pkgbase=mingw-w64-${_realname}
 pkgname=("${MINGW_PACKAGE_PREFIX}-${_realname}")
 pkgver=5.1.1
-pkgrel=1
+pkgrel=2
 pkgdesc="Multi-purpose desktop calculator (mingw-w64)"
 arch=('any')
 mingw_arch=('ucrt64' 'clang64' 'clangarm64')
@@ -22,8 +22,8 @@ depends=(
  "${MINGW_PACKAGE_PREFIX}-mpfr"
 )
 makedepends=(
-  "${MINGW_PACKAGE_PREFIX}-autotools"
  "${MINGW_PACKAGE_PREFIX}-cc"
+  "${MINGW_PACKAGE_PREFIX}-autotools"
  "${MINGW_PACKAGE_PREFIX}-gettext-tools"
  "intltool"
 )
@@ -42,9 +42,6 @@ build() {

  ../"${_realname}-${pkgver}"/configure \
    --prefix="${MINGW_PREFIX}" \
-    --build="${MINGW_CHOST}" \
-    --host="${MINGW_CHOST}" \
-    --target="${MINGW_CHOST}" \
    --enable-static \
    --enable-shared

--- a/mingw-w64-libqxp/PKGBUILD
+++ b/mingw-w64-libqxp/PKGBUILD
@@ -4,7 +4,7 @@ _realname=libqxp
 pkgbase=mingw-w64-${_realname}
 pkgname=("${MINGW_PACKAGE_PREFIX}-${_realname}")
 pkgver=0.0.2
-pkgrel=1
+pkgrel=2
 pkgdesc="Library for import of QuarkXPress documents. (mingw-w64)"
 arch=('any')
 mingw_arch=('ucrt64' 'clang64' 'clangarm64')
--- a/mingw-w64-libvisio/PKGBUILD
+++ b/mingw-w64-libvisio/PKGBUILD
@@ -4,7 +4,7 @@ _realname=libvisio
 pkgbase=mingw-w64-${_realname}
 pkgname="${MINGW_PACKAGE_PREFIX}-${_realname}"
 pkgver=0.1.7
-pkgrel=12
+pkgrel=13
 pkgdesc="libvisio is a library and a set of tools for reading and converting MS Visio diagram (mingw-w64)"
 arch=('any')
 mingw_arch=('mingw64' 'ucrt64' 'clang64' 'clangarm64')
@@ -34,8 +34,6 @@ build() {

  ../${_realname}-${pkgver}/configure \
    --prefix=${MINGW_PREFIX} \
-    --build=${MINGW_CHOST} \
-    --host=${MINGW_CHOST} \
    --enable-shared \
    --enable-static \
    --disable-silent-rules
--- a/mingw-w64-libvmime-git/PKGBUILD
+++ b/mingw-w64-libvmime-git/PKGBUILD
@@ -7,7 +7,7 @@ provides=("${MINGW_PACKAGE_PREFIX}-${_realname}")
 conflicts=("${MINGW_PACKAGE_PREFIX}-${_realname}")
 pkgver=r1270.d03ad5f0
 _commit=d03ad5f0f6d3b2d54009ccdc7d1f7670218b263c
-pkgrel=1
+pkgrel=2
 pkgdesc="An open source solution for working with MIME messages and Internet messaging services like IMAP, POP or SMTP (mingw-w64)"
 arch=('any')
 mingw_arch=('mingw64' 'ucrt64' 'clang64')
--- a/mingw-w64-libzmf/PKGBUILD
+++ b/mingw-w64-libzmf/PKGBUILD
@@ -4,7 +4,7 @@ _realname=libzmf
 pkgbase=mingw-w64-${_realname}
 pkgname=("${MINGW_PACKAGE_PREFIX}-${_realname}")
 pkgver=0.0.2
-pkgrel=1
+pkgrel=2
 pkgdesc="Library for importing and converting Zoner Draw drawings. (mingw-w64)"
 arch=('any')
 mingw_arch=('ucrt64' 'clang64' 'clangarm64')
--- a/mingw-w64-nodejs/PKGBUILD
+++ b/mingw-w64-nodejs/PKGBUILD
@@ -9,7 +9,7 @@ _realname=nodejs
 pkgbase=mingw-w64-${_realname}
 pkgname="${MINGW_PACKAGE_PREFIX}-${_realname}"
 pkgver=21.7.2
-pkgrel=1
+pkgrel=2
 pkgdesc="An open-source, cross-platform JavaScript runtime environment (mingw-w64)"
 arch=('any')
 mingw_arch=('mingw64' 'ucrt64' 'clang64' 'clangarm64')
--- a/mingw-w64-nuspell/PKGBUILD
+++ b/mingw-w64-nuspell/PKGBUILD
@@ -4,7 +4,7 @@ _realname=nuspell
 pkgbase=mingw-w64-${_realname}
 pkgname="${MINGW_PACKAGE_PREFIX}-${_realname}"
 pkgver=5.1.4
-pkgrel=1
+pkgrel=2
 pkgdesc="Fast and safe spellchecking C++ library (mingw-w64)"
 arch=('any')
 mingw_arch=('mingw64' 'ucrt64' 'clang64' 'clangarm64')
@@ -19,7 +19,7 @@ makedepends=("${MINGW_PACKAGE_PREFIX}-cc"
             "${MINGW_PACKAGE_PREFIX}-ninja"
             "${MINGW_PACKAGE_PREFIX}-catch")
 depends=("${MINGW_PACKAGE_PREFIX}-icu")
-source=("${_realname}-${pkgver}.tar.gz"::"https://github.com/nuspell/nuspell/archive/v${pkgver}.tar.gz")
+source=("https://github.com/nuspell/nuspell/archive/v${pkgver}/${_realname}-${pkgver}.tar.gz")
 sha256sums=('bdf344c5adbcc6797940f8f8cb75cb59f5a3794eb21b9547751a11782a792ef7')

 build() {
--- a/mingw-w64-postgresql/PKGBUILD
+++ b/mingw-w64-postgresql/PKGBUILD
@@ -4,7 +4,7 @@ _realname=postgresql
 pkgbase=mingw-w64-${_realname}
 pkgname="${MINGW_PACKAGE_PREFIX}-${_realname}"
 pkgver=16.2
-pkgrel=1
+pkgrel=2
 pkgdesc="Libraries for use with PostgreSQL (mingw-w64)"
 arch=('any')
 mingw_arch=('mingw64' 'ucrt64' 'clang64' 'clangarm64')
@@ -83,9 +83,6 @@ build() {
  export PYTHON=${MINGW_PREFIX}/bin/python

  ../postgresql-${pkgver}/configure \
-    --build=${MINGW_CHOST} \
-    --host=${MINGW_CHOST} \
-    --target=${MINGW_CHOST} \
    --prefix=${MINGW_PREFIX} \
    --enable-thread-safety \
    --enable-integer-datetimes \
--- a/mingw-w64-python-icu/PKGBUILD
+++ b/mingw-w64-python-icu/PKGBUILD
@@ -7,7 +7,7 @@ provides=("${MINGW_PACKAGE_PREFIX}-python3-icu")
 conflicts=("${MINGW_PACKAGE_PREFIX}-python3-icu")
 replaces=("${MINGW_PACKAGE_PREFIX}-python3-icu")
 pkgver=2.13.1
-pkgrel=1
+pkgrel=2
 pkgdesc="Python extension wrapping the ICU C++ API (mingw-w64)"
 arch=('any')
 mingw_arch=('mingw64' 'ucrt64' 'clang64' 'clangarm64')
--- a/mingw-w64-qt5-base/PKGBUILD
+++ b/mingw-w64-qt5-base/PKGBUILD
@@ -12,7 +12,7 @@ pkgbase="mingw-w64-${_realname}"
 pkgname=("${MINGW_PACKAGE_PREFIX}-${_realname}"
         $([[ ${CARCH} == i686 ]] || echo "${MINGW_PACKAGE_PREFIX}-${_realname}-debug"))
 _qtver=5.15.13
-pkgver=${_qtver}+kde+r138
+pkgver=${_qtver}+kde+r145
 pkgrel=1
 pkgdesc="A cross-platform application and UI framework (mingw-w64)"
 arch=('any')
@@ -47,7 +47,7 @@ makedepends=("${MINGW_PACKAGE_PREFIX}-cc"
             "git"
             "rsync")
 _pkgfn="${_realname/5-/}"
-_commit=b9906b5233a80cab372c95ac4dd68b25bdca0646
+_commit=8d30c21cfb529edbdcfd32a928f97b4f861d20e2
 source=(git+https://invent.kde.org/qt/qt/$_pkgfn#commit=$_commit
        0001-adjust-qmake-conf-mingw.patch
        0002-qt-5.8.0-fix-sql-libraries-mingw.patch
--- a/mingw-w64-qt6-5compat/PKGBUILD
+++ b/mingw-w64-qt6-5compat/PKGBUILD
@@ -6,7 +6,7 @@ pkgname=("${MINGW_PACKAGE_PREFIX}-${_realname}"
         "${MINGW_PACKAGE_PREFIX}-${_realname}-debug")
 _qtver=6.7.0
 pkgver=${_qtver/-/}
-pkgrel=1
+pkgrel=2
 pkgdesc='Module that contains unsupported Qt 5 APIs (mingw-w64)'
 arch=(any)
 mingw_arch=('mingw64' 'ucrt64' 'clang64' 'clangarm64')
--- a/mingw-w64-qt6-base/PKGBUILD
+++ b/mingw-w64-qt6-base/PKGBUILD
@@ -6,7 +6,7 @@ pkgname=("${MINGW_PACKAGE_PREFIX}-${_realname}"
         "${MINGW_PACKAGE_PREFIX}-${_realname}-debug")
 _qtver=6.7.0
 pkgver=${_qtver/-/}
-pkgrel=2
+pkgrel=3
 pkgdesc="A cross-platform application and UI framework (mingw-w64)"
 arch=(any)
 mingw_arch=('mingw64' 'ucrt64' 'clang64' 'clangarm64')
@@ -55,7 +55,8 @@ source=("https://download.qt.io/official_releases/qt/${pkgver%.*}/${_qtver}/subm
        009-qfileinfo-undefine-mingw-stat.patch
        010-export-some-constexpr-variables.patch
        011-qt6-windeployqt-fixes.patch
-        012-fix-unicode-definitions-in-cmake-interface.patch)
+        012-fix-unicode-definitions-in-cmake-interface.patch
+        https://download.qt.io/official_releases/qt/6.7/CVE-2024-33861-qtbase-6.7.diff)
 sha256sums=('11b2e29e2e52fb0e3b453ea13bbe51a10fdff36e1c192d8868c5a40233b8b254'
            '31465d25af40e2722764d86b85b43ebc7d29844836172259b16780ec8c4ed3bd'
            '3848318bccdfa21a139ccdb70f8226358c4a7ed3943231494aab3df83025d7c7'
@@ -67,7 +68,8 @@ sha256sums=('11b2e29e2e52fb0e3b453ea13bbe51a10fdff36e1c192d8868c5a40233b8b254'
            'f4261d43a142a24e5fa3b23e25813754839db84078cc8c6dc611139bf531e64a'
            '23656a7839d7dcb763d022722d723493c847914b0639bab861ddb05d823af5b7'
            '7f1a0a14f423741956253690d16d635055a8e887fe39f7f0160d40c5c63ae1b1'
-            'b217dad1b9ebf212f4d0d5c88140c26c491373e66d3ae88cb98deb5d688e59b0')
+            'b217dad1b9ebf212f4d0d5c88140c26c491373e66d3ae88cb98deb5d688e59b0'
+            '5a59c188a8d852879fdaa237b28eab451f06ad0bb25760c8e8d4e5598aafc0d0')

 # Use the right mkspecs file
 if [[ ${MINGW_PACKAGE_PREFIX} == *-clang-* ]]; then
@@ -109,6 +111,10 @@ prepare() {
      010-export-some-constexpr-variables.patch
  fi

+  # https://www.qt.io/blog/security-advisory-qstringconverter
+  apply_patch_with_msg \
+    CVE-2024-33861-qtbase-6.7.diff
+
  local _ARCH_TUNE=
  if [[ ${CARCH} == x86_64 ]]; then
    _ARCH_TUNE="-march=nocona -msahf -mtune=generic"
--- a/mingw-w64-raptor/PKGBUILD
+++ b/mingw-w64-raptor/PKGBUILD
@@ -4,7 +4,7 @@ _realname=raptor
 pkgbase=mingw-w64-${_realname}
 pkgname=("${MINGW_PACKAGE_PREFIX}-${_realname}")
 pkgver=2.0.16
-pkgrel=1
+pkgrel=2
 pkgdesc="RDF Syntax Library. (mingw-w64)"
 arch=('any')
 mingw_arch=('ucrt64' 'clang64' 'clangarm64')
--- a/mingw-w64-supertux/PKGBUILD
+++ b/mingw-w64-supertux/PKGBUILD
@@ -1,10 +1,12 @@
 # Maintainer: Biswapriyo Nath <nathbappai@gmail.com>

+_rj_ver=1.1.0
+
 _realname=supertux
 pkgbase=mingw-w64-${_realname}
 pkgname=("${MINGW_PACKAGE_PREFIX}-${_realname}")
 pkgver=0.6.3
-pkgrel=3
+pkgrel=4
 pkgdesc="A classic 2D jump'n'run sidescroller game (mingw-w64)"
 arch=('any')
 mingw_arch=('mingw64' 'ucrt64' 'clang64' 'clangarm64')
@@ -30,19 +32,24 @@ makedepends=("${MINGW_PACKAGE_PREFIX}-cc"
             "${MINGW_PACKAGE_PREFIX}-boost"
             "${MINGW_PACKAGE_PREFIX}-glm")
 source=("https://github.com/SuperTux/supertux/releases/download/v${pkgver}/SuperTux-v${pkgver}-Source.tar.gz"
+        "https://github.com/miloyip/rapidjson/archive/v${_rj_ver}/rapidjson-${_rj_ver}.tar.gz"
        0001-cmake-disable-dependencies-paths.patch
        0002-cmake-fix-linking-order.patch
        0003-include-missing-header.patch
-        0004-cmake-fix-iconv-check.patch)
+        0004-cmake-fix-iconv-check.patch
+        0101-rj-remove-non-compiling-assignment-operator.patch::https://patch-diff.githubusercontent.com/raw/Tencent/rapidjson/pull/719.patch)
 noextract=("SuperTux-v${pkgver}-Source.tar.gz")
 sha256sums=('f7940e6009c40226eb34ebab8ffb0e3a894892d891a07b35d0e5762dd41c79f6'
+            'bf7ced29704a1e696fbccf2a2b4ea068e7774fa37f6d7dd4039d0787f8bed98e'
            '9577cbee1c9affa6147ebb20345cef542bd340ea278074099b197f123f4e1ab9'
            'f869efc73f9d6bf5694257845e1f4b5c74831a798ec638126e7aca7c01838832'
            '9259b303a62dbe74b1a6b5224d8860496c5a501fa5aa7658aa44dc92da30695f'
-            '7d74c3623f87e969352b23faf7f14f5c3082254496ef7986ab96080f7e3517ec')
+            '7d74c3623f87e969352b23faf7f14f5c3082254496ef7986ab96080f7e3517ec'
+            '8abc5c5ef033801ea99a9f289126e473ccf4ebdb9ab33fa8157f957fdeb03a2f')

 prepare() {
-  tar -xf "SuperTux-v${pkgver}-Source.tar.gz" || true
+  echo "Extracting SuperTux-v${pkgver}-Source.tar.gz..."
+  tar -xzf "SuperTux-v${pkgver}-Source.tar.gz" || true
  cd "${srcdir}"/SuperTux-v${pkgver}-Source

  if [[ ${MINGW_PACKAGE_PREFIX} == *-clang-* ]]; then
@@ -53,6 +60,12 @@ prepare() {
  patch -p1 -i "${srcdir}"/0002-cmake-fix-linking-order.patch
  patch -p1 -i "${srcdir}"/0003-include-missing-header.patch
  patch -p1 -i "${srcdir}"/0004-cmake-fix-iconv-check.patch
+
+  cd "${srcdir}"/rapidjson-${_rj_ver}
+  patch -p1 -i "${srcdir}"/0101-rj-remove-non-compiling-assignment-operator.patch
+
+  cd ..
+  cp -r "${srcdir}"/rapidjson-${_rj_ver} "${srcdir}"/SuperTux-v${pkgver}-Source/external/discord-sdk/thirdparty/
 }

 build() {
--- a/mingw-w64-tesseract-ocr/PKGBUILD
+++ b/mingw-w64-tesseract-ocr/PKGBUILD
@@ -5,15 +5,15 @@ _realname=tesseract-ocr
 pkgbase=mingw-w64-${_realname}
 pkgname="${MINGW_PACKAGE_PREFIX}-${_realname}"
 pkgver=5.3.4
-pkgrel=1
+pkgrel=2
 pkgdesc="Tesseract OCR (mingw-w64)"
 arch=('any')
 mingw_arch=('mingw64' 'ucrt64' 'clang64' 'clangarm64')
+url="https://github.com/tesseract-ocr/tesseract"
 msys2_references=(
  'archlinux: tesseract'
  "cpe: cpe:/a:tesseract_project:tesseract"
 )
-url="https://github.com/tesseract-ocr/tesseract"
 license=("spdx:Apache-2.0")
 makedepends=("${MINGW_PACKAGE_PREFIX}-cc" "${MINGW_PACKAGE_PREFIX}-autotools")
 depends=(${MINGW_PACKAGE_PREFIX}-asciidoc
@@ -54,9 +54,6 @@ build() {
  fi

  ./configure \
-    --build=${MINGW_CHOST} \
-    --host=${MINGW_CHOST} \
-    --target=${MINGW_CHOST} \
    --prefix=${MINGW_PREFIX} \
    "${extra_config[@]}"

--- a/mingw-w64-v8/PKGBUILD
+++ b/mingw-w64-v8/PKGBUILD
@@ -5,7 +5,7 @@ _realname=v8
 pkgbase=mingw-w64-${_realname}
 pkgname="${MINGW_PACKAGE_PREFIX}-${_realname}"
 pkgver=11.9.169.6
-pkgrel=2
+pkgrel=3
 pkgdesc="Fast and modern Javascript engine (mingw-w64)"
 arch=('any')
 mingw_arch=('mingw64' 'ucrt64' 'clang64' 'clangarm64')
@@ -159,9 +159,7 @@ build() {

  local _arch=x64
  local _cfg=true
-  if [[ ${CARCH} == i686 ]]; then
-    _arch=x86
-  elif [[ ${CARCH} == aarch64 ]]; then
+  if [[ ${CARCH} == aarch64 ]]; then
    _arch=arm64
    _cfg=false
  fi
--- a/mingw-w64-xalan-c/05-set-cxx-std-17.patch
+++ b/mingw-w64-xalan-c/05-set-cxx-std-17.patch
@@ -0,0 +1,13 @@
+--- a/CMakeLists.txt
+++ b/CMakeLists.txt
+@@ -32,9 +32,7 @@
+   cmake_policy(SET CMP0067 NEW)
+ endif(POLICY CMP0067)
+ 
+-# Try C++14, then fall back to C++11 and C++98.  Used for feature tests
+-# for optional features.
+-set(CMAKE_CXX_STANDARD 14)
+set(CMAKE_CXX_STANDARD 17)
+ 
+ # Use folders (for IDE project grouping)
+ set_property(GLOBAL PROPERTY USE_FOLDERS ON)
--- a/mingw-w64-xalan-c/PKGBUILD
+++ b/mingw-w64-xalan-c/PKGBUILD
@@ -4,7 +4,7 @@ _realname=xalan-c
 pkgbase=mingw-w64-${_realname}
 pkgname="${MINGW_PACKAGE_PREFIX}-${_realname}"
 pkgver=1.12
-pkgrel=10
+pkgrel=11
 pkgdesc="An XSLT processing library (mingw-w64)"
 arch=('any')
 mingw_arch=('mingw64' 'ucrt64' 'clang64' 'clangarm64')
@@ -22,19 +22,31 @@ source=(https://archive.apache.org/dist/xalan/xalan-c/sources/xalan_c-${pkgver}.
        01-mingw-icu.patch
        02-mingw-as-msvc.patch
        03-install-layout.patch
-        04-no-std-file.patch)
+        04-no-std-file.patch
+        05-set-cxx-std-17.patch)
 sha256sums=('ee7d4b0b08c5676f5e586c7154d94a5b32b299ac3cbb946e24c4375a25552da7'
            '64ca2fb25114fd9c35c0a0815c7308ab3222eb421965892a402c4f30d23f180b'
            '8ccef1339fcfb6472861545295a9cb72a6b8da3a81407d082a5df51ac5f5c8e0'
            '35f2cf6b4aefb29c1c88f94b808c07a2b2845c025f236b38f4e31b5e378ba874'
-            '0b2bcce90c90261e309a7d3914631f91deaca00930acda487c9b828c581ea968')
+            '0b2bcce90c90261e309a7d3914631f91deaca00930acda487c9b828c581ea968'
+            '1af451cf368fc50e48ffc6f17f987f4e51e9facd1e811ca477026d88eedee9bb')
+
+apply_patch_with_msg() {
+  for _patch in "$@"
+  do
+    msg2 "Applying $_patch"
+    patch -Np1 -i "${srcdir}/$_patch"
+  done
+}

 prepare(){
  cd "${srcdir}"/${_realname//-/_}-${pkgver}
-  patch -p1 -i ${srcdir}/01-mingw-icu.patch
-  patch -p1 -i ${srcdir}/02-mingw-as-msvc.patch
-  patch -p1 -i ${srcdir}/03-install-layout.patch
-  patch -p1 -i ${srcdir}/04-no-std-file.patch
+  apply_patch_with_msg \
+    01-mingw-icu.patch \
+    02-mingw-as-msvc.patch \
+    03-install-layout.patch \
+    04-no-std-file.patch \
+    05-set-cxx-std-17.patch
 }

 build() {
@@ -51,7 +63,8 @@ build() {
    ${MINGW_PREFIX}/bin/cmake.exe \
      -G"Ninja" \
      -DCMAKE_INSTALL_PREFIX=${MINGW_PREFIX} \
-      ${extra_config} \
+      -DCMAKE_CXX_STANDARD=17 \
+      "${extra_config}" \
      -DBUILD_SHARED_LIBS=ON \
      ../${_realname//-/_}-${pkgver}

--- a/mingw-w64-xerces-c/PKGBUILD
+++ b/mingw-w64-xerces-c/PKGBUILD
@@ -4,7 +4,7 @@ _realname=xerces-c
 pkgbase=mingw-w64-${_realname}
 pkgname="${MINGW_PACKAGE_PREFIX}-${_realname}"
 pkgver=3.2.5
-pkgrel=1
+pkgrel=2
 pkgdesc="A validating XML parser written in a portable subset of C++ (mingw-w64)"
 arch=('any')
 mingw_arch=('mingw64' 'ucrt64' 'clang64' 'clangarm64')
@@ -42,9 +42,7 @@ build() {
  mkdir -p "${srcdir}/build-${MSYSTEM}" && cd "${srcdir}/build-${MSYSTEM}"

  "${srcdir}"/${_realname}-${pkgver}/configure \
-    --prefix=${MINGW_PREFIX} \
-    --build=${MINGW_CHOST} \
-    --host=${MINGW_CHOST}
+    --prefix=${MINGW_PREFIX}

  make
 }
@@ -53,5 +51,6 @@ package() {
  cd "${srcdir}/build-${MSYSTEM}"

  make DESTDIR="${pkgdir}" install
+
  install -Dm644 "${srcdir}/${_realname}-${pkgver}/LICENSE" "${pkgdir}${MINGW_PREFIX}/share/licenses/${_realname}/LICENSE"
 }