qt6: update to 6.4.2 - Part1

msys2 · Jan 5, 2023 · 8c175ab · 8c175ab
1 parent d58cc33
commit 8c175ab
Show file tree

Hide file tree

Showing 10 changed files with 41 additions and 53 deletions.
diff --git a/mingw-w64-qt6-5compat/PKGBUILD b/mingw-w64-qt6-5compat/PKGBUILD
@@ -4,28 +4,27 @@ _realname=qt6-5compat
 pkgbase=mingw-w64-${_realname}
 pkgname=("${MINGW_PACKAGE_PREFIX}-${_realname}"
          "${MINGW_PACKAGE_PREFIX}-${_realname}-debug")
-_qtver=6.4.1
+_qtver=6.4.2
 pkgver=${_qtver/-/}
 pkgrel=1
 arch=(any)
 mingw_arch=('mingw32' 'mingw64' 'ucrt64' 'clang64' 'clang32' 'clangarm64')
 url='https://www.qt.io'
 license=(GPL3 LGPL3 FDL custom)
 pkgdesc='Module that contains unsupported Qt 5 APIs (mingw-w64)'
-makedepends=("${MINGW_PACKAGE_PREFIX}-cmake"
+makedepends=("${MINGW_PACKAGE_PREFIX}-cc"
+             "${MINGW_PACKAGE_PREFIX}-cmake"
              "${MINGW_PACKAGE_PREFIX}-ninja"
              "${MINGW_PACKAGE_PREFIX}-qt6-base"
              "${MINGW_PACKAGE_PREFIX}-qt6-declarative"
              "${MINGW_PACKAGE_PREFIX}-qt6-shadertools"
-             "${MINGW_PACKAGE_PREFIX}-cc"
              "rsync")
 options=('!strip')
 _pkgfn="${_realname/6-/}-everywhere-src-${_qtver}"
 source=("https://download.qt.io/official_releases/qt/${pkgver%.*}/${_qtver}/submodules/${_pkgfn}.tar.xz")
-sha256sums=('d4a533ee45d6341b9eb402e69bc21909eeeeda2b2d29a6c715b31c3ec12fd031')
+sha256sums=('f51f505c8e985b51b7d733e27d782c6fce181beef53364acb0368cc892c4b792')
 
 build() {
-  cd ${srcdir}
   [[ -d build-${MSYSTEM} ]] && rm -rf build-${MSYSTEM}
   mkdir -p build-${MSYSTEM} && cd build-${MSYSTEM}
 

diff --git a/mingw-w64-qt6-activeqt/PKGBUILD b/mingw-w64-qt6-activeqt/PKGBUILD
@@ -4,25 +4,25 @@ _realname=qt6-activeqt
 pkgbase=mingw-w64-${_realname}
 pkgname=("${MINGW_PACKAGE_PREFIX}-${_realname}"
          "${MINGW_PACKAGE_PREFIX}-${_realname}-debug")
-_qtver=6.4.1
+_qtver=6.4.2
 pkgver=${_qtver/-/}
 pkgrel=1
 arch=(any)
 mingw_arch=('mingw32' 'mingw64' 'ucrt64' 'clang64' 'clang32' 'clangarm64')
 url='https://www.qt.io'
 license=(GPL3 LGPL3 FDL custom)
 pkgdesc='Qt5 ActiveQt Module - ActiveX components (mingw-w64)'
-makedepends=("${MINGW_PACKAGE_PREFIX}-cmake"
+makedepends=("${MINGW_PACKAGE_PREFIX}-cc"
+             "${MINGW_PACKAGE_PREFIX}-cmake"
              "${MINGW_PACKAGE_PREFIX}-ninja"
              "${MINGW_PACKAGE_PREFIX}-qt6-declarative"
-             "${MINGW_PACKAGE_PREFIX}-cc"
              "rsync")
 options=('!strip')
 _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
         002-Handle-win64-in-dumpcpp-and-MetaObjectGenerator-read.patch)
-sha256sums=('14cff3961d2d0004e99aaf8bdbabf0f17f172c4902382ca612697603bfdf1185'
+sha256sums=('123d0e6c4e31263a91a8e3acd72ace3f0c7109f1b15a2e18d594e450c47dc5cf'
             '2efb74d2d941f84eddeaa95022aedb3f0e935b9267de910eedff633fa6687e60'
             '93e1c08068e45372fb02e9a33e3366b5067817ea7de4bba4e91b6c165645cb41')
 
@@ -44,7 +44,6 @@ prepare() {
 }
 
 build() {
-  cd ${srcdir}
   [[ -d build-${MSYSTEM} ]] && rm -rf build-${MSYSTEM}
   mkdir -p build-${MSYSTEM} && cd build-${MSYSTEM}
 

diff --git a/mingw-w64-qt6-base/PKGBUILD b/mingw-w64-qt6-base/PKGBUILD
@@ -4,9 +4,9 @@ _realname=qt6-base
 pkgbase=mingw-w64-${_realname}
 pkgname=("${MINGW_PACKAGE_PREFIX}-${_realname}"
          "${MINGW_PACKAGE_PREFIX}-${_realname}-debug")
-_qtver=6.4.1
+_qtver=6.4.2
 pkgver=${_qtver/-/}
-pkgrel=3
+pkgrel=1
 arch=(any)
 mingw_arch=('mingw32' 'mingw64' 'ucrt64' 'clang64' 'clang32' 'clangarm64')
 url='https://www.qt.io'
@@ -49,9 +49,8 @@ source=("https://download.qt.io/official_releases/qt/${pkgver%.*}/${_qtver}/subm
         007-Fix-crashes-in-rasterization-code-using-setjmp.patch
         009-qfileinfo-undefine-mingw-stat.patch
         010-export-some-constexpr-variables.patch
-        011-qt6-windeployqt-fixes.patch
-        012-resolve-theme-fonts-at-96-dpi.patch::https://invent.kde.org/qt/qt/qtbase/-/commit/ca0f0a43.patch)
-sha256sums=('532ad71cc0f9c8f7cb92766c47bc3d23263c60876becd9053802f9727af24fae'
+        011-qt6-windeployqt-fixes.patch)
+sha256sums=('a88bc6cedbb34878a49a622baa79cace78cfbad4f95fdbd3656ddb21c705525d'
             '458abcfe837f5df607b130ee8edcb34d303ab36cfdf30c0a0f989cb7280f1472'
             '3848318bccdfa21a139ccdb70f8226358c4a7ed3943231494aab3df83025d7c7'
             '68156b8b7717a0ce19c4b991942469171bfa048cd5c90765115a546e65669a1d'
@@ -61,8 +60,7 @@ sha256sums=('532ad71cc0f9c8f7cb92766c47bc3d23263c60876becd9053802f9727af24fae'
             '7ca754db6546f0992307e76cf9c5c9e8d4146278b7989fd4df9a8bd45eb62611'
             '97a00b185fe6a952eeb3b8b154996e0527fd78a75150e908cd6acd61676fd453'
             'e9dcf3275163b7dd73f613f2929b10551649c8df80677fafd873b5e31430b43a'
-            'd22d0aa70803bc8bfd98e235dc9c7d381336247def24d4afe77e0044ebc6aafe'
-            '01639dc59a19d1425524527911042e4fb86e99a06efc513ad415ee2e9a96fc07')
+            'd22d0aa70803bc8bfd98e235dc9c7d381336247def24d4afe77e0044ebc6aafe')
 
 # Use the right mkspecs file
 if [[ ${MINGW_PACKAGE_PREFIX} == *-clang-* ]]; then
@@ -92,8 +90,7 @@ prepare() {
     006-qt-6.2.0-dont-add-resource-files-to-qmake-libs.patch \
     007-Fix-crashes-in-rasterization-code-using-setjmp.patch \
     009-qfileinfo-undefine-mingw-stat.patch \
-    011-qt6-windeployqt-fixes.patch \
-    012-resolve-theme-fonts-at-96-dpi.patch
+    011-qt6-windeployqt-fixes.patch
 
   if [[ ${MINGW_PACKAGE_PREFIX} != *-clang-* ]]; then
     apply_patch_with_msg \

diff --git a/mingw-w64-qt6-declarative/PKGBUILD b/mingw-w64-qt6-declarative/PKGBUILD
@@ -4,25 +4,25 @@ _realname=qt6-declarative
 pkgbase=mingw-w64-${_realname}
 pkgname=("${MINGW_PACKAGE_PREFIX}-${_realname}"
          "${MINGW_PACKAGE_PREFIX}-${_realname}-debug")
-_qtver=6.4.1
+_qtver=6.4.2
 pkgver=${_qtver/-/}
 pkgrel=1
 arch=(any)
 mingw_arch=('mingw32' 'mingw64' 'ucrt64' 'clang64' 'clang32' 'clangarm64')
 url='https://www.qt.io'
 license=(GPL3 LGPL3 FDL custom)
 pkgdesc='Classes for QML and JavaScript languages (mingw-w64)'
-makedepends=("${MINGW_PACKAGE_PREFIX}-cmake"
+makedepends=("${MINGW_PACKAGE_PREFIX}-cc"
+             "${MINGW_PACKAGE_PREFIX}-cmake"
              "${MINGW_PACKAGE_PREFIX}-ninja"
              "${MINGW_PACKAGE_PREFIX}-qt6-shadertools"
              "${MINGW_PACKAGE_PREFIX}-qt6-languageserver"
-             "${MINGW_PACKAGE_PREFIX}-cc"
              "rsync")
 options=('!strip')
 _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)
-sha256sums=('af8c485fdb938dda26c4140d246821b7d8c8715024e1441f3f947bd5ac684dfe'
+sha256sums=('a4bdd983de4e9cbca0f85b767dbdd8598711554e370a06da8f509ded4430f5bd'
             'b08b7a9cd263eaa2f09ec1b7718d79c253b4e30f3a1f47df6c89fa2e85d7659d')
 
 # Helper macros to help make tasks easier #
@@ -42,7 +42,6 @@ prepare() {
 }
 
 build() {
-  cd ${srcdir}
   [[ -d build-${MSYSTEM} ]] && rm -rf build-${MSYSTEM}
   mkdir -p build-${MSYSTEM} && cd build-${MSYSTEM}
 

diff --git a/mingw-w64-qt6-languageserver/PKGBUILD b/mingw-w64-qt6-languageserver/PKGBUILD
@@ -4,26 +4,25 @@ _realname=qt6-languageserver
 pkgbase=mingw-w64-${_realname}
 pkgname=("${MINGW_PACKAGE_PREFIX}-${_realname}"
          "${MINGW_PACKAGE_PREFIX}-${_realname}-debug")
-_qtver=6.4.1
+_qtver=6.4.2
 pkgver=${_qtver/-/}
 pkgrel=1
 arch=(any)
 mingw_arch=('mingw32' 'mingw64' 'ucrt64' 'clang64' 'clang32' 'clangarm64')
 url='https://www.qt.io'
 license=(GPL2 GPL3 LGPL3 custom)
 pkgdesc='Qt Language Server (mingw-w64)'
-makedepends=("${MINGW_PACKAGE_PREFIX}-cmake"
+makedepends=("${MINGW_PACKAGE_PREFIX}-cc"
+             "${MINGW_PACKAGE_PREFIX}-cmake"
              "${MINGW_PACKAGE_PREFIX}-ninja"
              "${MINGW_PACKAGE_PREFIX}-qt6-base"
-             "${MINGW_PACKAGE_PREFIX}-cc"
              "rsync")
 options=('!strip')
 _pkgfn="${_realname/6-/}-everywhere-src-${_qtver}"
 source=("https://download.qt.io/official_releases/qt/${pkgver%.*}/${_qtver}/submodules/${_pkgfn}.tar.xz")
-sha256sums=('e355cd879cffd02719d20ca89ea97c761d2653efccaf32b02db13d9b32695dc8')
+sha256sums=('743e66c6ef0a7fbb032ba3eb2b2680915e2951c5f59b8a9dfe573db7241ca811')
 
 build() {
-  cd ${srcdir}
   [[ -d build-${MSYSTEM} ]] && rm -rf build-${MSYSTEM}
   mkdir -p build-${MSYSTEM} && cd build-${MSYSTEM}
 

diff --git a/mingw-w64-qt6-multimedia/PKGBUILD b/mingw-w64-qt6-multimedia/PKGBUILD
@@ -4,15 +4,16 @@ _realname=qt6-multimedia
 pkgbase=mingw-w64-${_realname}
 pkgname=("${MINGW_PACKAGE_PREFIX}-${_realname}"
          "${MINGW_PACKAGE_PREFIX}-${_realname}-debug")
-_qtver=6.4.1
+_qtver=6.4.2
 pkgver=${_qtver/-/}
 pkgrel=1
 arch=(any)
-mingw_arch=('mingw32' 'mingw64' 'ucrt64' 'clang64' 'clang32' 'clangarm64')
+mingw_arch=('mingw64' 'ucrt64' 'clang64' 'clangarm64')
 url='https://www.qt.io'
 license=(GPL3 LGPL3 FDL custom)
 pkgdesc='Classes for audio, video, radio and camera functionality (mingw-w64)'
-makedepends=("${MINGW_PACKAGE_PREFIX}-cmake"
+makedepends=("${MINGW_PACKAGE_PREFIX}-cc"
+             "${MINGW_PACKAGE_PREFIX}-cmake"
              "${MINGW_PACKAGE_PREFIX}-ninja"
              "${MINGW_PACKAGE_PREFIX}-qt6-declarative"
              "${MINGW_PACKAGE_PREFIX}-qt6-shadertools"
@@ -21,13 +22,12 @@ makedepends=("${MINGW_PACKAGE_PREFIX}-cmake"
             #  "${MINGW_PACKAGE_PREFIX}-gst-plugins-base"
             #  "${MINGW_PACKAGE_PREFIX}-mesa"
             #  "${MINGW_PACKAGE_PREFIX}-pulseaudio"
-             "${MINGW_PACKAGE_PREFIX}-cc"
              "rsync")
 options=('!strip')
 _pkgfn="${_realname/6-/}-everywhere-src-${_qtver}"
 source=("https://download.qt.io/official_releases/qt/${pkgver%.*}/${_qtver}/submodules/${_pkgfn}.tar.xz"
         001-export-some-constexpr-variables.patch)
-sha256sums=('c086d43a026e6090971fd7a697ef8370c5c455115240609cd08d5e2f840dbaaf'
+sha256sums=('7f2b70deeada911c8e660e2801286657f297a5d1d543d1f6bfa856f28972c776'
             'e1694338779eb499341618c62d11f832f2b7f1f90c8a20345932530a61203105')
 
 prepare() {
@@ -38,7 +38,6 @@ prepare() {
 }
 
 build() {
-  cd ${srcdir}
   [[ -d build-${MSYSTEM} ]] && rm -rf build-${MSYSTEM}
   mkdir -p build-${MSYSTEM} && cd build-${MSYSTEM}
 

diff --git a/mingw-w64-qt6-shadertools/PKGBUILD b/mingw-w64-qt6-shadertools/PKGBUILD
@@ -4,27 +4,26 @@ _realname=qt6-shadertools
 pkgbase=mingw-w64-${_realname}
 pkgname=("${MINGW_PACKAGE_PREFIX}-${_realname}"
          "${MINGW_PACKAGE_PREFIX}-${_realname}-debug")
-_qtver=6.4.1
+_qtver=6.4.2
 pkgver=${_qtver/-/}
 pkgrel=1
 arch=(any)
 mingw_arch=('mingw32' 'mingw64' 'ucrt64' 'clang64' 'clang32' 'clangarm64')
 url='https://www.qt.io'
 license=(GPL3 LGPL3 FDL custom)
 pkgdesc='Experimental module providing APIs and a host tool to host tool to perform graphics and compute shader conditioning for the upcoming Qt graphics abstraction layer (mingw-w64)'
-makedepends=("${MINGW_PACKAGE_PREFIX}-cmake"
+makedepends=("${MINGW_PACKAGE_PREFIX}-cc"
+             "${MINGW_PACKAGE_PREFIX}-cmake"
              "${MINGW_PACKAGE_PREFIX}-ninja"
              "${MINGW_PACKAGE_PREFIX}-qt6-base"
              "${MINGW_PACKAGE_PREFIX}-vulkan-headers"
-             "${MINGW_PACKAGE_PREFIX}-cc"
              "rsync")
 options=('!strip')
 _pkgfn="${_realname/6-/}-everywhere-src-${_qtver}"
 source=("https://download.qt.io/official_releases/qt/${pkgver%.*}/${_qtver}/submodules/${_pkgfn}.tar.xz")
-sha256sums=('6bc1748326088c87f562fa3a68140e33fde162fd1333fbfecb775aeb66114504')
+sha256sums=('fa65bff84d4e9c2cb4cbf6fb098207e0e23d863dbe675eb277034a29c226a217')
 
 build() {
-  cd ${srcdir}
   [[ -d build-${MSYSTEM} ]] && rm -rf build-${MSYSTEM}
   mkdir -p build-${MSYSTEM} && cd build-${MSYSTEM}
 

diff --git a/mingw-w64-qt6-svg/PKGBUILD b/mingw-w64-qt6-svg/PKGBUILD
@@ -4,26 +4,25 @@ _realname=qt6-svg
 pkgbase=mingw-w64-${_realname}
 pkgname=("${MINGW_PACKAGE_PREFIX}-${_realname}"
          "${MINGW_PACKAGE_PREFIX}-${_realname}-debug")
-_qtver=6.4.1
+_qtver=6.4.2
 pkgver=${_qtver/-/}
 pkgrel=1
 arch=(any)
 mingw_arch=('mingw32' 'mingw64' 'ucrt64' 'clang64' 'clang32' 'clangarm64')
 url='https://www.qt.io'
 license=(GPL3 LGPL3 FDL custom)
 pkgdesc='Classes for displaying the contents of SVG files (mingw-w64)'
-makedepends=("${MINGW_PACKAGE_PREFIX}-cmake"
+makedepends=("${MINGW_PACKAGE_PREFIX}-cc"
+             "${MINGW_PACKAGE_PREFIX}-cmake"
              "${MINGW_PACKAGE_PREFIX}-ninja"
              "${MINGW_PACKAGE_PREFIX}-qt6-base"
-             "${MINGW_PACKAGE_PREFIX}-cc"
              "rsync")
 options=('!strip')
 _pkgfn="${_realname/6-/}-everywhere-src-${_qtver}"
 source=("https://download.qt.io/official_releases/qt/${pkgver%.*}/${_qtver}/submodules/${_pkgfn}.tar.xz")
-sha256sums=('5e5345c5941567db883f9daf8ab25108c6f3a527453b1a13c62290849bce9ce5')
+sha256sums=('b746af3cb1793621d8ed7eae38d9ad5a15541dc2742031069f2ae3fe87590314')
 
 build() {
-  cd ${srcdir}
   [[ -d build-${MSYSTEM} ]] && rm -rf build-${MSYSTEM}
   mkdir -p build-${MSYSTEM} && cd build-${MSYSTEM}
 

diff --git a/mingw-w64-qt6-tools/PKGBUILD b/mingw-w64-qt6-tools/PKGBUILD
@@ -4,27 +4,27 @@ _realname=qt6-tools
 pkgbase=mingw-w64-${_realname}
 pkgname=("${MINGW_PACKAGE_PREFIX}-${_realname}"
          "${MINGW_PACKAGE_PREFIX}-${_realname}-debug")
-_qtver=6.4.1
+_qtver=6.4.2
 pkgver=${_qtver/-/}
 pkgrel=1
 arch=(any)
 mingw_arch=('mingw32' 'mingw64' 'ucrt64' 'clang64' 'clang32' 'clangarm64')
 url='https://www.qt.io'
 license=(GPL3 LGPL3 FDL custom)
 pkgdesc='A cross-platform application and UI framework (Development Tools, QtHelp) (mingw-w64)'
-makedepends=("${MINGW_PACKAGE_PREFIX}-cmake"
+makedepends=("${MINGW_PACKAGE_PREFIX}-cc"
+             "${MINGW_PACKAGE_PREFIX}-cmake"
              "${MINGW_PACKAGE_PREFIX}-ninja"
              "${MINGW_PACKAGE_PREFIX}-qt6-declarative"
              "${MINGW_PACKAGE_PREFIX}-qt6-activeqt"
              "${MINGW_PACKAGE_PREFIX}-clang"
              "${MINGW_PACKAGE_PREFIX}-clang-tools-extra"
-             "${MINGW_PACKAGE_PREFIX}-cc"
              "rsync")
 options=('!strip')
 _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)
-sha256sums=('9e20562c6b04c21fbdb4ed89e59226169ffeaafaab8f45f7d81ea49b0e4b0933'
+sha256sums=('a31387916184e4a5ef522d3ea841e8e931cc0f88be0824a7a354a572d5826c68'
             '858036a20778c3c3fe1030b4ac93da6abcdfc2a04a3a63cc6168f1e6ebb82001')
 
 # Helper macros to help make tasks easier #
@@ -44,7 +44,6 @@ prepare() {
 }
 
 build() {
-  cd ${srcdir}
   [[ -d build-${MSYSTEM} ]] && rm -rf build-${MSYSTEM}
   mkdir -p build-${MSYSTEM} && cd build-${MSYSTEM}
 

diff --git a/mingw-w64-qt6-translations/PKGBUILD b/mingw-w64-qt6-translations/PKGBUILD
@@ -3,7 +3,7 @@
 _realname=qt6-translations
 pkgbase=mingw-w64-${_realname}
 pkgname=${MINGW_PACKAGE_PREFIX}-${_realname}
-_qtver=6.4.1
+_qtver=6.4.2
 pkgver=${_qtver/-/}
 pkgrel=1
 arch=(any)
@@ -20,10 +20,9 @@ options=('!strip')
 groups=("${MINGW_PACKAGE_PREFIX}-qt6")
 _pkgfn="${_realname/6-/}-everywhere-src-${_qtver}"
 source=("https://download.qt.io/official_releases/qt/${pkgver%.*}/${_qtver}/submodules/${_pkgfn}.tar.xz")
-sha256sums=('44dbc6f1d256d2048c96fa665c240e0075c2e67188c93986a39ede3556a16a12')
+sha256sums=('bbe0291502c2604b72fef730e1935bd22f8b921d8c473250f298a723b2a9c496')
 
 build() {
-  cd ${srcdir}
   [[ -d build-${MSYSTEM} ]] && rm -rf build-${MSYSTEM}
   mkdir -p build-${MSYSTEM} && cd build-${MSYSTEM}