qt5: update to 5.15.8 - Part3

2023-01-05 01:20:11 +01:00
parent f0c81c16ac
commit ab4c565ae6
9 changed files with 64 additions and 106 deletions
--- a/mingw-w64-qt5-3d/PKGBUILD
+++ b/mingw-w64-qt5-3d/PKGBUILD
@@ -4,42 +4,30 @@ _realname=qt5-3d
 pkgbase="mingw-w64-${_realname}"
 pkgname=("${MINGW_PACKAGE_PREFIX}-${_realname}"
         "${MINGW_PACKAGE_PREFIX}-${_realname}-debug")
-_qtver=5.15.7
-pkgver=${_qtver}+kde+r6
+pkgver=5.15.8
 pkgrel=1
-_commit=0ff905d194e273e04e95b72dbbfd4e58193ecbaa
 arch=('any')
 mingw_arch=('mingw32' 'mingw64' 'ucrt64' 'clang64' 'clang32')
 pkgdesc="C++ and QML APIs for easy inclusion of 3D graphics (mingw-w64)"
 url='https://www.qt.io/'
 license=('GPL3' 'LGPL' 'FDL' 'custom')
-makedepends=("${MINGW_PACKAGE_PREFIX}-qt5-declarative"
+makedepends=("${MINGW_PACKAGE_PREFIX}-cc"
+             "${MINGW_PACKAGE_PREFIX}-qt5-declarative"
             "${MINGW_PACKAGE_PREFIX}-assimp"
             "${MINGW_PACKAGE_PREFIX}-qt5-imageformats"
             "${MINGW_PACKAGE_PREFIX}-qt5-gamepad"
             "${MINGW_PACKAGE_PREFIX}-vulkan-headers"
-             "${MINGW_PACKAGE_PREFIX}-cc"
-             "git"
             "rsync")
-options=('!strip' 'staticlibs' 'ccache')
-_pkgfn="${_realname/5-/}"
-source=(git+https://invent.kde.org/qt/qt/$_pkgfn#commit=$_commit)
-sha256sums=('SKIP')
-
-pkgver() {
-  cd $_pkgfn
-  echo "${_qtver}+kde+r"`git rev-list --count v${_qtver}-lts-lgpl..$_commit`
-}
+options=('!strip')
+_pkgfn="${_realname/5-/}-everywhere-opensource-src-${pkgver}"
+source=("https://download.qt.io/official_releases/qt/${pkgver%.*}/$pkgver/submodules/$_pkgfn.tar.xz")
+sha256sums=('4bbb99b943870544bfbbe0760088d3443f0746484e19c858579f019e28d90ba2')

 build() {
-  cd ${srcdir}
  [[ -d build-${MSYSTEM} ]] && rm -rf build-${MSYSTEM}
  mkdir -p build-${MSYSTEM} && cd build-${MSYSTEM}

-  # https://github.com/msys2/MSYS2-packages/issues/2282
-  export MSYS2_ARG_CONV_EXCL='--foreign-types='
-
-  qmake ../${_pkgfn} -- \
+  qmake ../${_pkgfn/opensource-/} -- \
    -system-assimp \
    -qt3d-simd sse2

@@ -70,7 +58,7 @@ package_qt5-3d() {
  make INSTALL_ROOT="${pkgdir}" install

  install -d "$pkgdir${MINGW_PREFIX}"/share/licenses/${_realname}
-  install -Dm644 $srcdir/${_pkgfn}/LICENSE* -t "$pkgdir${MINGW_PREFIX}"/share/licenses/${_realname}
+  install -Dm644 $srcdir/${_pkgfn/opensource-/}/LICENSE* -t "$pkgdir${MINGW_PREFIX}"/share/licenses/${_realname}

  # Seperate debug-info files
  mv -f "${pkgdir}${MINGW_PREFIX}/lib"/*.debug "${pkgdir}${MINGW_PREFIX}/bin"/ || true
--- a/mingw-w64-qt5-activeqt/PKGBUILD
+++ b/mingw-w64-qt5-activeqt/PKGBUILD
@@ -4,30 +4,25 @@ _realname=qt5-activeqt
 pkgbase="mingw-w64-${_realname}"
 pkgname=("${MINGW_PACKAGE_PREFIX}-${_realname}"
         "${MINGW_PACKAGE_PREFIX}-${_realname}-debug")
-_qtver=5.15.7
-pkgver=${_qtver/-/}
+pkgver=5.15.8
 pkgrel=1
 arch=('any')
 mingw_arch=('mingw32' 'mingw64' 'ucrt64' 'clang64' 'clang32' 'clangarm64')
 pkgdesc="Qt5 ActiveQt Module - ActiveX components (mingw-w64)"
 url='https://www.qt.io/'
 license=('GPL3' 'LGPL' 'FDL' 'custom')
-makedepends=("${MINGW_PACKAGE_PREFIX}-qt5-declarative"
-             "${MINGW_PACKAGE_PREFIX}-cc"
+makedepends=("${MINGW_PACKAGE_PREFIX}-cc"
+             "${MINGW_PACKAGE_PREFIX}-qt5-declarative"
             "rsync")
-options=('!strip' 'staticlibs' 'ccache')
-_pkgfn="${_realname/5-/}-everywhere-opensource-src-${_qtver}"
-source=("https://download.qt.io/official_releases/qt/${pkgver%.*}/$_qtver/submodules/$_pkgfn.tar.xz")
-sha256sums=('92ef6e7b2c8426791434b76b7b685893b6941cbacc8f98c9160f5baf2921b181')
+options=('!strip')
+_pkgfn="${_realname/5-/}-everywhere-opensource-src-${pkgver}"
+source=("https://download.qt.io/official_releases/qt/${pkgver%.*}/$pkgver/submodules/$_pkgfn.tar.xz")
+sha256sums=('fa8321d468bd9d525300c2b056a6f3ff7bc6850990e1d438dd2dbcaf095bc779')

 build() {
-  cd ${srcdir}
  [[ -d build-${MSYSTEM} ]] && rm -rf build-${MSYSTEM}
  mkdir -p build-${MSYSTEM} && cd build-${MSYSTEM}

-  # https://github.com/msys2/MSYS2-packages/issues/2282
-  export MSYS2_ARG_CONV_EXCL='--foreign-types='
-
  qmake ../${_pkgfn/opensource-/}

  make
--- a/mingw-w64-qt5-gamepad/PKGBUILD
+++ b/mingw-w64-qt5-gamepad/PKGBUILD
@@ -4,32 +4,26 @@ _realname=qt5-gamepad
 pkgbase="mingw-w64-${_realname}"
 pkgname=("${MINGW_PACKAGE_PREFIX}-${_realname}"
         "${MINGW_PACKAGE_PREFIX}-${_realname}-debug")
-_qtver=5.15.7
-pkgver=${_qtver/-/}
+pkgver=5.15.8
 pkgrel=1
 arch=('any')
 mingw_arch=('mingw32' 'mingw64' 'ucrt64' 'clang64' 'clang32' 'clangarm64')
 pkgdesc="Adds support for getting events from gamepad devices (mingw-w64)"
 url='https://www.qt.io/'
 license=('GPL3' 'LGPL' 'FDL' 'custom')
-makedepends=("${MINGW_PACKAGE_PREFIX}-qt5-declarative"
+makedepends=("${MINGW_PACKAGE_PREFIX}-cc"
+             "${MINGW_PACKAGE_PREFIX}-qt5-declarative"
             "${MINGW_PACKAGE_PREFIX}-SDL2"
             "${MINGW_PACKAGE_PREFIX}-pkg-config"
-             "${MINGW_PACKAGE_PREFIX}-cc"
             "rsync")
-options=('!strip' 'staticlibs' 'ccache')
-_pkgfn="${_realname/5-/}-everywhere-opensource-src-${_qtver}"
-source=("https://download.qt.io/official_releases/qt/${pkgver%.*}/$_qtver/submodules/$_pkgfn.tar.xz")
-sha256sums=('0d0c80251c8c635b56cbfa19ec481481c9435db2b9151543934e81593d4b3b2e')
+options=('!strip')
+_pkgfn="${_realname/5-/}-everywhere-opensource-src-${pkgver}"
+source=("https://download.qt.io/official_releases/qt/${pkgver%.*}/$pkgver/submodules/$_pkgfn.tar.xz")
+sha256sums=('735f7dedbaa2f2bdbd2bb2f67599fef2f13bdd97543ccd131053d1335fbefd6d')

 build() {
-  cd ${srcdir}
  [[ -d build-${MSYSTEM} ]] && rm -rf build-${MSYSTEM}
-  mkdir -p build-${MSYSTEM}
-  cd build-${MSYSTEM}
-
-  # https://github.com/msys2/MSYS2-packages/issues/2282
-  export MSYS2_ARG_CONV_EXCL='--foreign-types='
+  mkdir -p build-${MSYSTEM} && cd build-${MSYSTEM}

  qmake ../${_pkgfn/opensource-/}

--- a/mingw-w64-qt5-imageformats/PKGBUILD
+++ b/mingw-w64-qt5-imageformats/PKGBUILD
@@ -4,26 +4,25 @@ _realname=qt5-imageformats
 pkgbase="mingw-w64-${_realname}"
 pkgname=("${MINGW_PACKAGE_PREFIX}-${_realname}"
         "${MINGW_PACKAGE_PREFIX}-${_realname}-debug")
-_qtver=5.15.7
-pkgver=${_qtver/-/}
-pkgrel=2
+pkgver=5.15.8
+pkgrel=1
 arch=('any')
 mingw_arch=('mingw32' 'mingw64' 'ucrt64' 'clang64' 'clang32' 'clangarm64')
 pkgdesc="Plugins for additional image formats: TIFF, MNG, TGA, WBMP (mingw-w64)"
 url='https://www.qt.io/'
 license=('GPL3' 'LGPL' 'FDL' 'custom')
-makedepends=("${MINGW_PACKAGE_PREFIX}-qt5-base"
+makedepends=("${MINGW_PACKAGE_PREFIX}-cc"
+             "${MINGW_PACKAGE_PREFIX}-qt5-base"
             "${MINGW_PACKAGE_PREFIX}-jasper"
             "${MINGW_PACKAGE_PREFIX}-libmng"
             "${MINGW_PACKAGE_PREFIX}-libtiff"
             "${MINGW_PACKAGE_PREFIX}-libwebp"
-             "${MINGW_PACKAGE_PREFIX}-cc"
             "rsync")
-options=('!strip' 'staticlibs' 'ccache')
-_pkgfn="${_realname/5-/}-everywhere-opensource-src-${_qtver}"
-source=("https://download.qt.io/official_releases/qt/${pkgver%.*}/$_qtver/submodules/$_pkgfn.tar.xz"
+options=('!strip')
+_pkgfn="${_realname/5-/}-everywhere-opensource-src-${pkgver}"
+source=("https://download.qt.io/official_releases/qt/${pkgver%.*}/$pkgver/submodules/$_pkgfn.tar.xz"
        "0001-qmng-fix-build.patch")
-sha256sums=('6d122a5c0b1a7a5a17fd0307a16c398cfe12f40ef923572b7bd853c69a6269a6'
+sha256sums=('61440ef3b0d06ef8cd6e7e297828097d885097139d9be26d9c0b16ce7ec2ce30'
            '727602791c21070a08c97c9423a4343e2a44d2f7ea48731b3720da50e4797ea5')

 prepare() {
@@ -32,13 +31,9 @@ prepare() {
 }

 build() {
-  cd ${srcdir}
  [[ -d build-${MSYSTEM} ]] && rm -rf build-${MSYSTEM}
  mkdir -p build-${MSYSTEM} && cd build-${MSYSTEM}

-  # https://github.com/msys2/MSYS2-packages/issues/2282
-  export MSYS2_ARG_CONV_EXCL='--foreign-types='
-
  qmake ../${_pkgfn/opensource-/}

  make
--- a/mingw-w64-qt5-multimedia/PKGBUILD
+++ b/mingw-w64-qt5-multimedia/PKGBUILD
@@ -4,24 +4,23 @@ _realname=qt5-multimedia
 pkgbase="mingw-w64-${_realname}"
 pkgname=("${MINGW_PACKAGE_PREFIX}-${_realname}"
         "${MINGW_PACKAGE_PREFIX}-${_realname}-debug")
-_qtver=5.15.7
-pkgver=${_qtver/-/}
+pkgver=5.15.8
 pkgrel=1
 arch=('any')
 mingw_arch=('mingw32' 'mingw64' 'ucrt64' 'clang64' 'clang32' 'clangarm64')
 pkgdesc="Classes for audio, video, radio and camera functionality (mingw-w64)"
 url='https://www.qt.io/'
 license=('GPL3' 'LGPL' 'FDL' 'custom')
-makedepends=("${MINGW_PACKAGE_PREFIX}-qt5-declarative"
+makedepends=("${MINGW_PACKAGE_PREFIX}-cc"
+             "${MINGW_PACKAGE_PREFIX}-qt5-declarative"
             "${MINGW_PACKAGE_PREFIX}-openal"
             "${MINGW_PACKAGE_PREFIX}-pkg-config"
-             "${MINGW_PACKAGE_PREFIX}-cc"
             "rsync")
-options=('!strip' 'staticlibs' 'ccache')
-_pkgfn="${_realname/5-/}-everywhere-opensource-src-${_qtver}"
-source=("https://download.qt.io/official_releases/qt/${pkgver%.*}/$_qtver/submodules/$_pkgfn.tar.xz"
+options=('!strip')
+_pkgfn="${_realname/5-/}-everywhere-opensource-src-${pkgver}"
+source=("https://download.qt.io/official_releases/qt/${pkgver%.*}/$pkgver/submodules/$_pkgfn.tar.xz"
        "0001-fix-wmf-plugin.patch")
-sha256sums=('a1cf936e19f47207119db24fee2092d7e7ffca77bfdfa7316558e0feb3459d94'
+sha256sums=('3347791521b106d1e69ac0b28ea9a295c06dddcf592c051d366fedc9ae73e0bb'
            'd4a325bb319ee746f355a54ea562d974aad4d05dadb0147f30fd023acd631558')

 prepare() {
@@ -30,13 +29,9 @@ prepare() {
 }

 build() {
-  cd ${srcdir}
  [[ -d build-${MSYSTEM} ]] && rm -rf build-${MSYSTEM}
  mkdir -p build-${MSYSTEM} && cd build-${MSYSTEM}

-  # https://github.com/msys2/MSYS2-packages/issues/2282
-  export MSYS2_ARG_CONV_EXCL='--foreign-types='
-
  qmake ../${_pkgfn/opensource-/} -- \
    -no-gstreamer

--- a/mingw-w64-qt5-networkauth/PKGBUILD
+++ b/mingw-w64-qt5-networkauth/PKGBUILD
@@ -4,24 +4,22 @@ _realname=qt5-networkauth
 pkgbase="mingw-w64-${_realname}"
 pkgname=("${MINGW_PACKAGE_PREFIX}-${_realname}"
         "${MINGW_PACKAGE_PREFIX}-${_realname}-debug")
-_qtver=5.15.7
-pkgver=${_qtver/-/}
+pkgver=5.15.8
 pkgrel=1
 arch=('any')
 mingw_arch=('mingw32' 'mingw64' 'ucrt64' 'clang64' 'clang32' 'clangarm64')
 pkgdesc="Network authentication module (mingw-w64)"
 url='https://www.qt.io/'
 license=('GPL3' 'LGPL' 'FDL' 'custom')
-makedepends=("${MINGW_PACKAGE_PREFIX}-qt5-base"
-             "${MINGW_PACKAGE_PREFIX}-cc"
+makedepends=("${MINGW_PACKAGE_PREFIX}-cc"
+             "${MINGW_PACKAGE_PREFIX}-qt5-base"
             "rsync")
-options=('!strip' 'staticlibs' 'ccache')
-_pkgfn="${_realname/5-/}-everywhere-opensource-src-${_qtver}"
-source=("https://download.qt.io/official_releases/qt/${pkgver%.*}/$_qtver/submodules/$_pkgfn.tar.xz")
-sha256sums=('306bc6a53471b2d14cdad40f79fafa69ef11d2688a611561f917e2a65eec83a1')
+options=('!strip')
+_pkgfn="${_realname/5-/}-everywhere-opensource-src-${pkgver}"
+source=("https://download.qt.io/official_releases/qt/${pkgver%.*}/$pkgver/submodules/$_pkgfn.tar.xz")
+sha256sums=('854127960477daddde3051211756d52708f9827ea751a80312c3ff3fb9bc553b')

 build() {
-  cd ${srcdir}
  [[ -d build-${MSYSTEM} ]] && rm -rf build-${MSYSTEM}
  mkdir -p build-${MSYSTEM} && cd build-${MSYSTEM}

--- a/mingw-w64-qt5-svg/PKGBUILD
+++ b/mingw-w64-qt5-svg/PKGBUILD
@@ -4,20 +4,20 @@ _realname=qt5-svg
 pkgbase="mingw-w64-${_realname}"
 pkgname=("${MINGW_PACKAGE_PREFIX}-${_realname}"
         "${MINGW_PACKAGE_PREFIX}-${_realname}-debug")
-_qtver=5.15.7
-pkgver=${_qtver}+kde+r9
+_qtver=5.15.8
+pkgver=${_qtver}+kde+r8
 pkgrel=1
-_commit=83296f10ebdb9a666b11dc69f3a148c38b9c425c
+_commit=a7a0f2491334e8cb4ef5731f5eb741f3f7b9af76
 arch=('any')
 mingw_arch=('mingw32' 'mingw64' 'ucrt64' 'clang64' 'clang32' 'clangarm64')
 pkgdesc="Classes for displaying the contents of SVG files (mingw-w64)"
 url='https://www.qt.io/'
 license=('GPL3' 'LGPL' 'FDL' 'custom')
-makedepends=("${MINGW_PACKAGE_PREFIX}-qt5-base"
-             "${MINGW_PACKAGE_PREFIX}-cc"
+makedepends=("${MINGW_PACKAGE_PREFIX}-cc"
+             "${MINGW_PACKAGE_PREFIX}-qt5-base"
             "git"
             "rsync")
-options=('!strip' 'staticlibs' 'ccache')
+options=('!strip')
 _pkgfn="${_realname/5-/}"
 source=(git+https://invent.kde.org/qt/qt/$_pkgfn#commit=$_commit)
 sha256sums=('SKIP')
@@ -28,7 +28,6 @@ pkgver() {
 }

 build() {
-  cd ${srcdir}
  [[ -d build-${MSYSTEM} ]] && rm -rf build-${MSYSTEM}
  mkdir -p build-${MSYSTEM} && cd build-${MSYSTEM}

--- a/mingw-w64-qt5-tools/PKGBUILD
+++ b/mingw-w64-qt5-tools/PKGBUILD
@@ -4,27 +4,26 @@ _realname=qt5-tools
 pkgbase="mingw-w64-${_realname}"
 pkgname=("${MINGW_PACKAGE_PREFIX}-${_realname}"
         "${MINGW_PACKAGE_PREFIX}-${_realname}-debug")
-_qtver=5.15.7
-pkgver=${_qtver}
+pkgver=5.15.8
 pkgrel=1
 arch=('any')
 mingw_arch=('mingw32' 'mingw64' 'ucrt64' 'clang64' 'clang32' 'clangarm64')
 pkgdesc="A cross-platform application and UI framework (Development Tools, QtHelp) (mingw-w64)"
 url='https://www.qt.io/'
 license=('GPL3' 'LGPL' 'FDL' 'custom')
-makedepends=("${MINGW_PACKAGE_PREFIX}-qt5-declarative"
+makedepends=("${MINGW_PACKAGE_PREFIX}-cc"
+             "${MINGW_PACKAGE_PREFIX}-qt5-declarative"
             "${MINGW_PACKAGE_PREFIX}-qt5-activeqt"
             "${MINGW_PACKAGE_PREFIX}-clang"
             "${MINGW_PACKAGE_PREFIX}-vulkan-headers"
-             "${MINGW_PACKAGE_PREFIX}-cc"
             "rsync")
-options=('!strip' 'staticlibs' 'ccache')
-_pkgfn="${_realname/5-/}-everywhere-opensource-src-${_qtver}"
-source=("https://download.qt.io/official_releases/qt/${pkgver%.*}/$_qtver/submodules/$_pkgfn.tar.xz"
+options=('!strip')
+_pkgfn="${_realname/5-/}-everywhere-opensource-src-${pkgver}"
+source=("https://download.qt.io/official_releases/qt/${pkgver%.*}/$pkgver/submodules/$_pkgfn.tar.xz"
        001-qt-5.11-mingw-fix-link-qdoc-with-clang.patch
        002-qt5-windeployqt-fixes.patch
        003-ugly-hack-disable-qdoc-build.patch)
-sha256sums=('33198502de6cc0c0d661ec2d73404aa301a5a2a08a99e03bdf46c97c00410159'
+sha256sums=('a3bef8de13032dae17450f5df35e8abbb4f41f71e3b628871d3da5633577e9c4'
            'aff15370d18498ee1cc73f027b3fc76cc899b3cd1f79c3ed3bbda50b927dec33'
            '5009ef5c9812f6f6ba6d69d6b2a90b5caa43cf0ef46bf36ac507c672e697e5a1'
            '1927c71175f758914abc485506bb162f3eac5e0816a00be66a78562b168095f0')
@@ -54,9 +53,6 @@ build() {

  export LLVM_INSTALL_DIR=${MINGW_PREFIX}

-  # https://github.com/msys2/MSYS2-packages/issues/2282
-  export MSYS2_ARG_CONV_EXCL='--foreign-types='
-
  qmake ../${_pkgfn/opensource-/}

  make
--- a/mingw-w64-qt5-translations/PKGBUILD
+++ b/mingw-w64-qt5-translations/PKGBUILD
@@ -3,8 +3,7 @@
 _realname=qt5-translations
 pkgbase="mingw-w64-${_realname}"
 pkgname="${MINGW_PACKAGE_PREFIX}-${_realname}"
-_qtver=5.15.7
-pkgver=${_qtver/-/}
+pkgver=5.15.8
 pkgrel=1
 arch=('any')
 mingw_arch=('mingw32' 'mingw64' 'ucrt64' 'clang64' 'clang32' 'clangarm64')
@@ -15,13 +14,12 @@ depends=("${MINGW_PACKAGE_PREFIX}-qt5-base")
 makedepends=("${MINGW_PACKAGE_PREFIX}-cc"
             "${MINGW_PACKAGE_PREFIX}-qt5-tools")
 groups=("${MINGW_PACKAGE_PREFIX}-qt5")
-options=('!strip' 'staticlibs' 'ccache')
-_pkgfn="${_realname/5-/}-everywhere-opensource-src-${_qtver}"
-source=("https://download.qt.io/official_releases/qt/${pkgver%.*}/$_qtver/submodules/$_pkgfn.tar.xz")
-sha256sums=('360d809280d1ff9a86ccdc47c0f3ec66505c47f04d22eeffcf9f0100d6f08cd0')
+options=('!strip')
+_pkgfn="${_realname/5-/}-everywhere-opensource-src-${pkgver}"
+source=("https://download.qt.io/official_releases/qt/${pkgver%.*}/$pkgver/submodules/$_pkgfn.tar.xz")
+sha256sums=('0b28cc71185adbc2e6f99b45ca78f7cfa1be5202b6d2977c3f044f243a943b55')

 build() {
-  cd ${srcdir}
  [[ -d build-${MSYSTEM} ]] && rm -rf build-${MSYSTEM}
  mkdir -p build-${MSYSTEM} && cd build-${MSYSTEM}