From cd33a0fa4e5c4a823bb086f5de536f7c7c7cbc31 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=D9=85=D9=87=D8=AF=D9=8A=20=D8=B4=D9=8A=D9=86=D9=88=D9=86?= =?UTF-8?q?=20=28Mehdi=20Chinoune=29?= Date: Thu, 29 Sep 2022 08:59:59 +0100 Subject: [PATCH] qt6: update to 6.4.0 - Part1 --- mingw-w64-qt6-5compat/PKGBUILD | 11 ++++++---- mingw-w64-qt6-activeqt/PKGBUILD | 7 ++++--- .../008-enable-avx-support.patch | 12 ----------- mingw-w64-qt6-base/PKGBUILD | 10 ++++----- mingw-w64-qt6-declarative/PKGBUILD | 7 ++++--- mingw-w64-qt6-languageserver/PKGBUILD | 7 ++++--- mingw-w64-qt6-shadertools/PKGBUILD | 7 ++++--- mingw-w64-qt6-svg/PKGBUILD | 7 ++++--- mingw-w64-qt6-tools/PKGBUILD | 21 +++++++++++-------- mingw-w64-qt6-translations/PKGBUILD | 7 ++++--- 10 files changed, 47 insertions(+), 49 deletions(-) delete mode 100644 mingw-w64-qt6-base/008-enable-avx-support.patch diff --git a/mingw-w64-qt6-5compat/PKGBUILD b/mingw-w64-qt6-5compat/PKGBUILD index 22599c568f..b17d3b3034 100644 --- a/mingw-w64-qt6-5compat/PKGBUILD +++ b/mingw-w64-qt6-5compat/PKGBUILD @@ -4,7 +4,7 @@ _realname=qt6-5compat pkgbase=mingw-w64-${_realname} pkgname=("${MINGW_PACKAGE_PREFIX}-${_realname}" "${MINGW_PACKAGE_PREFIX}-${_realname}-debug") -_qtver=6.3.2 +_qtver=6.4.0 pkgver=${_qtver/-/} pkgrel=1 arch=(any) @@ -16,12 +16,13 @@ makedepends=("${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=('91a3ac0f3f87e4103afa5834ccbecff9374daf716fab362d0c5e2d6ab98560cc') +sha256sums=('73475d0837f78246d509199f211a35c71fc36cccf64b3de258ebc6387194a4c0') build() { cd ${srcdir} @@ -30,6 +31,7 @@ build() { MSYS2_ARG_CONV_EXCL="-DCMAKE_INSTALL_PREFIX=" \ ${MINGW_PREFIX}/bin/cmake \ + --log-level=STATUS \ -GNinja \ -DCMAKE_BUILD_TYPE=RelWithDebInfo \ -DCMAKE_INSTALL_PREFIX=${MINGW_PREFIX} \ @@ -40,7 +42,8 @@ build() { package_qt6-5compat() { depends=("${MINGW_PACKAGE_PREFIX}-qt6-base") - optdepends=("${MINGW_PACKAGE_PREFIX}-qt6-declarative") + optdepends=("${MINGW_PACKAGE_PREFIX}-qt6-declarative" + "${MINGW_PACKAGE_PREFIX}-qt6-shadertools") groups=("${MINGW_PACKAGE_PREFIX}-qt6") DESTDIR=${pkgdir} ${MINGW_PREFIX}/bin/cmake --install build-${MSYSTEM} @@ -49,7 +52,7 @@ package_qt6-5compat() { rsync -armR --remove-source-files --include="*/" --include="*.debug" --exclude="*" --prune-empty-dirs ${pkgdir}/.${MINGW_PREFIX} ${srcdir}/${MSYSTEM}-debug/ install -d "$pkgdir${MINGW_PREFIX}"/share/licenses/${_realname} - install -Dm644 $_pkgfn/LICENSE* -t "$pkgdir${MINGW_PREFIX}"/share/licenses/${_realname} + install -Dm644 $_pkgfn/LICENSES/* -t "$pkgdir${MINGW_PREFIX}"/share/licenses/${_realname} } package_qt6-5compat-debug() { diff --git a/mingw-w64-qt6-activeqt/PKGBUILD b/mingw-w64-qt6-activeqt/PKGBUILD index 7e3ca46632..21516bc8d6 100644 --- a/mingw-w64-qt6-activeqt/PKGBUILD +++ b/mingw-w64-qt6-activeqt/PKGBUILD @@ -4,7 +4,7 @@ _realname=qt6-activeqt pkgbase=mingw-w64-${_realname} pkgname=("${MINGW_PACKAGE_PREFIX}-${_realname}" "${MINGW_PACKAGE_PREFIX}-${_realname}-debug") -_qtver=6.3.2 +_qtver=6.4.0 pkgver=${_qtver/-/} pkgrel=1 arch=(any) @@ -22,7 +22,7 @@ _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=('fc70894425fa064bb486b6323c3ae9f405e462ed32b7494ab830a16429675514' +sha256sums=('591532f49d7796da1776332d532469fea7a2bcb82aa37f41eed9aafe5ea8aadd' '2efb74d2d941f84eddeaa95022aedb3f0e935b9267de910eedff633fa6687e60' '93e1c08068e45372fb02e9a33e3366b5067817ea7de4bba4e91b6c165645cb41') @@ -50,6 +50,7 @@ build() { MSYS2_ARG_CONV_EXCL="-DCMAKE_INSTALL_PREFIX=" \ ${MINGW_PREFIX}/bin/cmake \ + --log-level=STATUS \ -GNinja \ -DCMAKE_BUILD_TYPE=RelWithDebInfo \ -DCMAKE_INSTALL_PREFIX=${MINGW_PREFIX} \ @@ -69,7 +70,7 @@ package_qt6-activeqt() { rsync -armR --remove-source-files --include="*/" --include="*.debug" --exclude="*" --prune-empty-dirs ${pkgdir}/.${MINGW_PREFIX} ${srcdir}/${MSYSTEM}-debug/ install -d "$pkgdir${MINGW_PREFIX}"/share/licenses/${_realname} - install -Dm644 $_pkgfn/LICENSE* -t "$pkgdir${MINGW_PREFIX}"/share/licenses/${_realname} + install -Dm644 $_pkgfn/LICENSES/* -t "$pkgdir${MINGW_PREFIX}"/share/licenses/${_realname} } package_qt6-activeqt-debug() { diff --git a/mingw-w64-qt6-base/008-enable-avx-support.patch b/mingw-w64-qt6-base/008-enable-avx-support.patch deleted file mode 100644 index 597f48bb87..0000000000 --- a/mingw-w64-qt6-base/008-enable-avx-support.patch +++ /dev/null @@ -1,12 +0,0 @@ ---- a/config.tests/x86_simd/main.cpp -+++ b/config.tests/x86_simd/main.cpp -@@ -161,9 +161,6 @@ - #endif - - #if T(AVX) --# if defined(__WIN64__) && defined(__GNUC__) && !defined(__clang__) --# error "AVX support is broken in 64-bit MinGW - https://gcc.gnu.org/bugzilla/show_bug.cgi?id=49001" --# endif - attribute_target("avx") void test_avx() - { - __m256d a = _mm256_setzero_pd(); diff --git a/mingw-w64-qt6-base/PKGBUILD b/mingw-w64-qt6-base/PKGBUILD index a53ae692f5..2bbcca488e 100644 --- a/mingw-w64-qt6-base/PKGBUILD +++ b/mingw-w64-qt6-base/PKGBUILD @@ -4,7 +4,7 @@ _realname=qt6-base pkgbase=mingw-w64-${_realname} pkgname=("${MINGW_PACKAGE_PREFIX}-${_realname}" "${MINGW_PACKAGE_PREFIX}-${_realname}-debug") -_qtver=6.3.2 +_qtver=6.4.0 pkgver=${_qtver/-/} pkgrel=2 arch=(any) @@ -47,11 +47,10 @@ source=("https://download.qt.io/official_releases/qt/${pkgver%.*}/${_qtver}/subm 005-Allow-overriding-CMAKE_FIND_LIBRARY_SUFFIXES-to-pref.patch 006-qt-6.2.0-dont-add-resource-files-to-qmake-libs.patch 007-Fix-crashes-in-rasterization-code-using-setjmp.patch - 008-enable-avx-support.patch 009-qfileinfo-undefine-mingw-stat.patch 010-export-some-constexpr-variables.patch 011-qt6-windeployqt-fixes.patch) -sha256sums=('7929ba4df870b6b30870bc0aed2525cfc606ed7091107b23cf7ed7e434caa9a6' +sha256sums=('cb6475a0bd8567c49f7ffbb072a05516ee6671171bed55db75b22b94ead9b37d' '458abcfe837f5df607b130ee8edcb34d303ab36cfdf30c0a0f989cb7280f1472' '3848318bccdfa21a139ccdb70f8226358c4a7ed3943231494aab3df83025d7c7' '68156b8b7717a0ce19c4b991942469171bfa048cd5c90765115a546e65669a1d' @@ -59,7 +58,6 @@ sha256sums=('7929ba4df870b6b30870bc0aed2525cfc606ed7091107b23cf7ed7e434caa9a6' 'b644586be741dabf66b79bcc2eed71727739f4b301e0ae7da35506b30605aeb5' '4085a10b290b8e3d930de535cbad2ba3e643432cba433aa2b28fe664f86d38a3' '7ca754db6546f0992307e76cf9c5c9e8d4146278b7989fd4df9a8bd45eb62611' - 'e5d22486bf809d9422103471766f4a11d3090acaf9104cfaf333bad1aa1dcc6c' '97a00b185fe6a952eeb3b8b154996e0527fd78a75150e908cd6acd61676fd453' '4c883c4ff91d789b0c1484935c14647776c59360c259ce6bd5671c1a0ba7d38a' 'd22d0aa70803bc8bfd98e235dc9c7d381336247def24d4afe77e0044ebc6aafe') @@ -91,7 +89,6 @@ prepare() { 005-Allow-overriding-CMAKE_FIND_LIBRARY_SUFFIXES-to-pref.patch \ 006-qt-6.2.0-dont-add-resource-files-to-qmake-libs.patch \ 007-Fix-crashes-in-rasterization-code-using-setjmp.patch \ - 008-enable-avx-support.patch \ 009-qfileinfo-undefine-mingw-stat.patch \ 011-qt6-windeployqt-fixes.patch @@ -132,6 +129,7 @@ build() { MSYS2_ARG_CONV_EXCL="-DCMAKE_INSTALL_PREFIX=" \ ${MINGW_PREFIX}/bin/cmake \ + --log-level=STATUS \ -GNinja \ -DCMAKE_BUILD_TYPE=RelWithDebInfo \ -DQT_QMAKE_TARGET_MKSPEC=${_platform} \ @@ -197,7 +195,7 @@ package_qt6-base() { DESTDIR=${pkgdir} ${MINGW_PREFIX}/bin/cmake --install build-${MSYSTEM} install -d "$pkgdir${MINGW_PREFIX}"/share/licenses/${_realname} - install -Dm644 $_pkgfn/LICENSE* -t "$pkgdir${MINGW_PREFIX}"/share/licenses/${_realname} + install -Dm644 $_pkgfn/LICENSES/* -t "$pkgdir${MINGW_PREFIX}"/share/licenses/${_realname} # Seperate debug-info files rsync -armR --remove-source-files --include="*/" --include="*.debug" --exclude="*" --prune-empty-dirs ${pkgdir}/.${MINGW_PREFIX} ${srcdir}/${MSYSTEM}-debug/ diff --git a/mingw-w64-qt6-declarative/PKGBUILD b/mingw-w64-qt6-declarative/PKGBUILD index cc9a36aa4d..68d5e6762b 100644 --- a/mingw-w64-qt6-declarative/PKGBUILD +++ b/mingw-w64-qt6-declarative/PKGBUILD @@ -4,7 +4,7 @@ _realname=qt6-declarative pkgbase=mingw-w64-${_realname} pkgname=("${MINGW_PACKAGE_PREFIX}-${_realname}" "${MINGW_PACKAGE_PREFIX}-${_realname}-debug") -_qtver=6.3.2 +_qtver=6.4.0 pkgver=${_qtver/-/} pkgrel=1 arch=(any) @@ -22,7 +22,7 @@ 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=('b813111dc0d45dc133bf15d26513ae245fb6d8bc221ab252dde85e24d0307cc1' +sha256sums=('3434e72fccfa0c929c326790723d05c155f5067746b1ab05cfd7a9ba632c4383' 'b08b7a9cd263eaa2f09ec1b7718d79c253b4e30f3a1f47df6c89fa2e85d7659d') # Helper macros to help make tasks easier # @@ -48,6 +48,7 @@ build() { MSYS2_ARG_CONV_EXCL="-DCMAKE_INSTALL_PREFIX=" \ ${MINGW_PREFIX}/bin/cmake \ + --log-level=STATUS \ -GNinja \ -DCMAKE_BUILD_TYPE=RelWithDebInfo \ -DCMAKE_INSTALL_PREFIX=${MINGW_PREFIX} \ @@ -71,7 +72,7 @@ package_qt6-declarative() { rsync -armR --remove-source-files --include="*/" --include="*.debug" --exclude="*" --prune-empty-dirs ${pkgdir}/.${MINGW_PREFIX} ${srcdir}/${MSYSTEM}-debug/ install -d "$pkgdir${MINGW_PREFIX}"/share/licenses/${_realname} - install -Dm644 $_pkgfn/LICENSE* -t "$pkgdir${MINGW_PREFIX}"/share/licenses/${_realname} + install -Dm644 $_pkgfn/LICENSES/* -t "$pkgdir${MINGW_PREFIX}"/share/licenses/${_realname} } package_qt6-declarative-debug() { diff --git a/mingw-w64-qt6-languageserver/PKGBUILD b/mingw-w64-qt6-languageserver/PKGBUILD index 588ce4e280..75d69da443 100644 --- a/mingw-w64-qt6-languageserver/PKGBUILD +++ b/mingw-w64-qt6-languageserver/PKGBUILD @@ -4,7 +4,7 @@ _realname=qt6-languageserver pkgbase=mingw-w64-${_realname} pkgname=("${MINGW_PACKAGE_PREFIX}-${_realname}" "${MINGW_PACKAGE_PREFIX}-${_realname}-debug") -_qtver=6.3.2 +_qtver=6.4.0 pkgver=${_qtver/-/} pkgrel=1 arch=(any) @@ -20,7 +20,7 @@ makedepends=("${MINGW_PACKAGE_PREFIX}-cmake" options=('!strip') _pkgfn="${_realname/6-/}-everywhere-src-${_qtver}" source=("https://download.qt.io/official_releases/qt/${pkgver%.*}/${_qtver}/submodules/${_pkgfn}.tar.xz") -sha256sums=('52656e5e12d5a3865d7954535fd59b7697aba3536a1466d013b889cd3135ca03') +sha256sums=('1878a6713574da9121fccbfe81c230c871fc0198f9e800638da81d51d9787025') build() { cd ${srcdir} @@ -29,6 +29,7 @@ build() { MSYS2_ARG_CONV_EXCL="-DCMAKE_INSTALL_PREFIX=" \ ${MINGW_PREFIX}/bin/cmake \ + --log-level=STATUS \ -GNinja \ -DCMAKE_BUILD_TYPE=RelWithDebInfo \ -DCMAKE_INSTALL_PREFIX=${MINGW_PREFIX} \ @@ -47,7 +48,7 @@ package_qt6-languageserver() { rsync -armR --remove-source-files --include="*/" --include="*.debug" --exclude="*" --prune-empty-dirs ${pkgdir}/.${MINGW_PREFIX} ${srcdir}/${MSYSTEM}-debug/ install -d "$pkgdir${MINGW_PREFIX}"/share/licenses/${_realname} - install -Dm644 $_pkgfn/LICENSE* -t "$pkgdir${MINGW_PREFIX}"/share/licenses/${_realname} + install -Dm644 $_pkgfn/LICENSES/* -t "$pkgdir${MINGW_PREFIX}"/share/licenses/${_realname} } package_qt6-languageserver-debug() { diff --git a/mingw-w64-qt6-shadertools/PKGBUILD b/mingw-w64-qt6-shadertools/PKGBUILD index fae1ce31ed..ca99ccb931 100644 --- a/mingw-w64-qt6-shadertools/PKGBUILD +++ b/mingw-w64-qt6-shadertools/PKGBUILD @@ -4,7 +4,7 @@ _realname=qt6-shadertools pkgbase=mingw-w64-${_realname} pkgname=("${MINGW_PACKAGE_PREFIX}-${_realname}" "${MINGW_PACKAGE_PREFIX}-${_realname}-debug") -_qtver=6.3.2 +_qtver=6.4.0 pkgver=${_qtver/-/} pkgrel=1 arch=(any) @@ -21,7 +21,7 @@ makedepends=("${MINGW_PACKAGE_PREFIX}-cmake" options=('!strip') _pkgfn="${_realname/6-/}-everywhere-src-${_qtver}" source=("https://download.qt.io/official_releases/qt/${pkgver%.*}/${_qtver}/submodules/${_pkgfn}.tar.xz") -sha256sums=('f6be2766f528f26cfec7ac655e1b6dba3aab29a6ba656f2fea949140e6cdb3ae') +sha256sums=('dbd6a5f00e8178cd2fea7e84c4eef3818de5287d34e20a68383929c754ae3b90') build() { cd ${srcdir} @@ -30,6 +30,7 @@ build() { MSYS2_ARG_CONV_EXCL="-DCMAKE_INSTALL_PREFIX=" \ ${MINGW_PREFIX}/bin/cmake \ + --log-level=STATUS \ -GNinja \ -DCMAKE_BUILD_TYPE=RelWithDebInfo \ -DCMAKE_INSTALL_PREFIX=${MINGW_PREFIX} \ @@ -48,7 +49,7 @@ package_qt6-shadertools() { rsync -armR --remove-source-files --include="*/" --include="*.debug" --exclude="*" --prune-empty-dirs ${pkgdir}/.${MINGW_PREFIX} ${srcdir}/${MSYSTEM}-debug/ install -d "$pkgdir${MINGW_PREFIX}"/share/licenses/${_realname} - install -Dm644 $_pkgfn/LICENSE* -t "$pkgdir${MINGW_PREFIX}"/share/licenses/${_realname} + install -Dm644 $_pkgfn/LICENSES/* -t "$pkgdir${MINGW_PREFIX}"/share/licenses/${_realname} } package_qt6-shadertools-debug() { diff --git a/mingw-w64-qt6-svg/PKGBUILD b/mingw-w64-qt6-svg/PKGBUILD index cfa63abc1b..a992b44450 100644 --- a/mingw-w64-qt6-svg/PKGBUILD +++ b/mingw-w64-qt6-svg/PKGBUILD @@ -4,7 +4,7 @@ _realname=qt6-svg pkgbase=mingw-w64-${_realname} pkgname=("${MINGW_PACKAGE_PREFIX}-${_realname}" "${MINGW_PACKAGE_PREFIX}-${_realname}-debug") -_qtver=6.3.2 +_qtver=6.4.0 pkgver=${_qtver/-/} pkgrel=1 arch=(any) @@ -20,7 +20,7 @@ makedepends=("${MINGW_PACKAGE_PREFIX}-cmake" options=('!strip') _pkgfn="${_realname/6-/}-everywhere-src-${_qtver}" source=("https://download.qt.io/official_releases/qt/${pkgver%.*}/${_qtver}/submodules/${_pkgfn}.tar.xz") -sha256sums=('4c1542a0528e4052e3cef1e44245056cd4c2e1ff46f13b551807cc3487702392') +sha256sums=('03fdae9437d074dcfa387dc1f2c6e7e14fea0f989bf7e1aa265fd35ffc2c5b25') build() { cd ${srcdir} @@ -29,6 +29,7 @@ build() { MSYS2_ARG_CONV_EXCL="-DCMAKE_INSTALL_PREFIX=" \ ${MINGW_PREFIX}/bin/cmake \ + --log-level=STATUS \ -GNinja \ -DCMAKE_BUILD_TYPE=RelWithDebInfo \ -DCMAKE_INSTALL_PREFIX=${MINGW_PREFIX} \ @@ -47,7 +48,7 @@ package_qt6-svg() { rsync -armR --remove-source-files --include="*/" --include="*.debug" --exclude="*" --prune-empty-dirs ${pkgdir}/.${MINGW_PREFIX} ${srcdir}/${MSYSTEM}-debug/ install -d "$pkgdir${MINGW_PREFIX}"/share/licenses/${_realname} - install -Dm644 $_pkgfn/LICENSE* -t "$pkgdir${MINGW_PREFIX}"/share/licenses/${_realname} + install -Dm644 $_pkgfn/LICENSES/* -t "$pkgdir${MINGW_PREFIX}"/share/licenses/${_realname} } package_qt6-svg-debug() { diff --git a/mingw-w64-qt6-tools/PKGBUILD b/mingw-w64-qt6-tools/PKGBUILD index f51d2d92de..b2d56fa7f9 100644 --- a/mingw-w64-qt6-tools/PKGBUILD +++ b/mingw-w64-qt6-tools/PKGBUILD @@ -4,7 +4,7 @@ _realname=qt6-tools pkgbase=mingw-w64-${_realname} pkgname=("${MINGW_PACKAGE_PREFIX}-${_realname}" "${MINGW_PACKAGE_PREFIX}-${_realname}-debug") -_qtver=6.3.2 +_qtver=6.4.0 pkgver=${_qtver/-/} pkgrel=1 arch=(any) @@ -24,7 +24,7 @@ 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=('e5b07d2ffab68cebe935972506c88ffe1e4b7d24bdc28c67578dbc075799aed2' +sha256sums=('97f3d5f88c458be7a8f7b7b08efc06c4ebad39ca51669476b18bf9e4c11afba2' '858036a20778c3c3fe1030b4ac93da6abcdfc2a04a3a63cc6168f1e6ebb82001') # Helper macros to help make tasks easier # @@ -48,15 +48,18 @@ build() { [[ -d build-${MSYSTEM} ]] && rm -rf build-${MSYSTEM} mkdir -p build-${MSYSTEM} && cd build-${MSYSTEM} - local -a _clangcpp - if [[ "${MINGW_PACKAGE_PREFIX}" == *-clang-* ]]; then - _clangcpp="ON" - else - _clangcpp="OFF" - fi + # see https://bugreports.qt.io/browse/QTBUG-106669 + # local -a _clangcpp + # if [[ "${MINGW_PACKAGE_PREFIX}" == *-clang-* ]]; then + # _clangcpp="ON" + # else + # _clangcpp="OFF" + # fi + _clangcpp=OFF MSYS2_ARG_CONV_EXCL="-DCMAKE_INSTALL_PREFIX=" \ ${MINGW_PREFIX}/bin/cmake \ + --log-level=STATUS \ -GNinja \ -DCMAKE_BUILD_TYPE=RelWithDebInfo \ -DCMAKE_INSTALL_PREFIX=${MINGW_PREFIX} \ @@ -84,7 +87,7 @@ package_qt6-tools() { rsync -armR --remove-source-files --include="*/" --include="*.debug" --exclude="*" --prune-empty-dirs ${pkgdir}/.${MINGW_PREFIX} ${srcdir}/${MSYSTEM}-debug/ install -d "$pkgdir${MINGW_PREFIX}"/share/licenses/${_realname} - install -Dm644 $_pkgfn/LICENSE* -t "$pkgdir${MINGW_PREFIX}"/share/licenses/${_realname} + install -Dm644 $_pkgfn/LICENSES/* -t "$pkgdir${MINGW_PREFIX}"/share/licenses/${_realname} } package_qt6-tools-debug() { diff --git a/mingw-w64-qt6-translations/PKGBUILD b/mingw-w64-qt6-translations/PKGBUILD index bfc48c283e..879ada7da0 100644 --- 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.3.2 +_qtver=6.4.0 pkgver=${_qtver/-/} pkgrel=1 arch=(any) @@ -20,7 +20,7 @@ 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=('ef76cc957b762fb7761c96651ba07f87e4515f8262dc977962c53cd259b2c6c0') +sha256sums=('7ab93a930b693eeb53ab97b038b4e6e057d06374e6f49a3814d99145a276925f') build() { cd ${srcdir} @@ -29,6 +29,7 @@ build() { MSYS2_ARG_CONV_EXCL="-DCMAKE_INSTALL_PREFIX=" \ ${MINGW_PREFIX}/bin/cmake \ + --log-level=STATUS \ -GNinja \ -DCMAKE_BUILD_TYPE=RelWithDebInfo \ -DCMAKE_INSTALL_PREFIX=${MINGW_PREFIX} \ @@ -41,5 +42,5 @@ package() { DESTDIR=${pkgdir} ${MINGW_PREFIX}/bin/cmake --install build-${MSYSTEM} install -d "$pkgdir${MINGW_PREFIX}"/share/licenses/${_realname} - install -Dm644 $_pkgfn/LICENSE* -t "$pkgdir${MINGW_PREFIX}"/share/licenses/${_realname} + install -Dm644 $_pkgfn/LICENSES/* -t "$pkgdir${MINGW_PREFIX}"/share/licenses/${_realname} }