diff --git a/mingw-w64-qt5-3d/PKGBUILD b/mingw-w64-qt5-3d/PKGBUILD index f8e5ad6aa3..05b548176b 100644 --- a/mingw-w64-qt5-3d/PKGBUILD +++ b/mingw-w64-qt5-3d/PKGBUILD @@ -3,14 +3,14 @@ _realname=qt5-3d pkgbase="mingw-w64-${_realname}" pkgname=("${MINGW_PACKAGE_PREFIX}-${_realname}" - "${MINGW_PACKAGE_PREFIX}-${_realname}-debug") -pkgver=5.15.11 + $([[ ${CARCH} == i686 ]] || echo "${MINGW_PACKAGE_PREFIX}-${_realname}-debug")) +pkgver=5.15.12 pkgrel=1 arch=('any') mingw_arch=('mingw32' 'mingw64' 'ucrt64' 'clang64' 'clang32' 'clangarm64') pkgdesc="C++ and QML APIs for easy inclusion of 3D graphics (mingw-w64)" url='https://www.qt.io/' -license=('spdx:LGPL-3.0-only' 'spdx:Qt-GPL-exception-1.0' 'spdx:GPL-3.0-or-later' 'spdx:GPL-2.0-or-later' 'spdx:GPL-2.0-only') +license=('spdx:LGPL-3.0-only WITH Qt-GPL-exception-1.0 AND GPL-3.0-or-later AND GPL-2.0-or-later AND GPL-2.0-only') makedepends=("${MINGW_PACKAGE_PREFIX}-cc" "${MINGW_PACKAGE_PREFIX}-qt5-declarative" "${MINGW_PACKAGE_PREFIX}-assimp" @@ -20,7 +20,7 @@ makedepends=("${MINGW_PACKAGE_PREFIX}-cc" "rsync") _pkgfn="${_realname/5-/}-everywhere-opensource-src-${pkgver}" source=("https://download.qt.io/official_releases/qt/${pkgver%.*}/$pkgver/submodules/$_pkgfn.tar.xz") -sha256sums=('76e1c779b6744029b39035c28980153fd43d1d9c9b25112f7f6c2a6c7554eb4c') +sha256sums=('d058c53e72dd7caa92e6c1a4a2ed301aee55a9bd92828136752f0a1299fe694b') build() { mkdir -p build-${MSYSTEM} && cd build-${MSYSTEM} @@ -44,10 +44,10 @@ check() { package_qt5-3d() { depends=("${MINGW_PACKAGE_PREFIX}-qt5-declarative" + "${MINGW_PACKAGE_PREFIX}-qt5-gamepad" "${MINGW_PACKAGE_PREFIX}-assimp") - optdepends=("${MINGW_PACKAGE_PREFIX}-qt5-imageformats" - "${MINGW_PACKAGE_PREFIX}-qt5-gamepad") - groups=("${MINGW_PACKAGE_PREFIX}-qt5") + optdepends=("${MINGW_PACKAGE_PREFIX}-qt5-imageformats") + groups=($([[ ${CARCH} == i686 ]] || echo "${MINGW_PACKAGE_PREFIX}-qt5")) cd build-${MSYSTEM} @@ -63,9 +63,11 @@ package_qt5-3d() { install -d "$pkgdir${MINGW_PREFIX}"/share/licenses/${_realname} install -Dm644 $srcdir/${_pkgfn/opensource-/}/LICENSE* -t "$pkgdir${MINGW_PREFIX}"/share/licenses/${_realname} + if [[ ${CARCH} != i686 ]]; then # Seperate debug-info files mv -f "${pkgdir}${MINGW_PREFIX}/lib"/*.debug "${pkgdir}${MINGW_PREFIX}/bin"/ || true rsync -armR --remove-source-files --include="*/" --include="*.debug" --exclude="*" --prune-empty-dirs ${pkgdir}/.${MINGW_PREFIX} ${srcdir}/${MSYSTEM}-debug/ + fi # Fix paths in *.pri, *prl and *.pc files: # $(cygpath -m ${MINGW_PREFIX}) -> $(cygpath -m ${pkgdir}${MINGW_PREFIX}) diff --git a/mingw-w64-qt5-activeqt/PKGBUILD b/mingw-w64-qt5-activeqt/PKGBUILD index f234237e26..f4e96bea2c 100644 --- a/mingw-w64-qt5-activeqt/PKGBUILD +++ b/mingw-w64-qt5-activeqt/PKGBUILD @@ -3,20 +3,20 @@ _realname=qt5-activeqt pkgbase="mingw-w64-${_realname}" pkgname=("${MINGW_PACKAGE_PREFIX}-${_realname}" - "${MINGW_PACKAGE_PREFIX}-${_realname}-debug") -pkgver=5.15.11 + $([[ ${CARCH} == i686 ]] || echo "${MINGW_PACKAGE_PREFIX}-${_realname}-debug")) +pkgver=5.15.12 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=('spdx:GPL-3.0-only' 'spdx:Qt-GPL-exception-1.0' 'spdx:GFDL-1.3-no-invariants-only') +license=('spdx:GPL-3.0-only WITH Qt-GPL-exception-1.0 AND GFDL-1.3-no-invariants-only') makedepends=("${MINGW_PACKAGE_PREFIX}-cc" "${MINGW_PACKAGE_PREFIX}-qt5-declarative" "rsync") _pkgfn="${_realname/5-/}-everywhere-opensource-src-${pkgver}" source=("https://download.qt.io/official_releases/qt/${pkgver%.*}/$pkgver/submodules/$_pkgfn.tar.xz") -sha256sums=('4ad3af4b0c9e3f72f9078a754f6287e477560450171be9eb448738f0de1b935e') +sha256sums=('2c73c4cd80f22ec709ebd6f5ef231be2a028d188a2844fb0f3eb198100d9bf41') build() { mkdir -p build-${MSYSTEM} && cd build-${MSYSTEM} @@ -34,7 +34,7 @@ check() { package_qt5-activeqt() { depends=("${MINGW_PACKAGE_PREFIX}-qt5-base") optdepends=("${MINGW_PACKAGE_PREFIX}-qt5-declarative") - groups=("${MINGW_PACKAGE_PREFIX}-qt5") + groups=($([[ ${CARCH} == i686 ]] || echo "${MINGW_PACKAGE_PREFIX}-qt5")) cd build-${MSYSTEM} @@ -50,9 +50,11 @@ package_qt5-activeqt() { install -d "$pkgdir${MINGW_PREFIX}"/share/licenses/${_realname} install -Dm644 $srcdir/${_pkgfn/opensource-/}/LICENSE* -t "$pkgdir${MINGW_PREFIX}"/share/licenses/${_realname} + if [[ ${CARCH} != i686 ]]; then # Seperate debug-info files mv -f "${pkgdir}${MINGW_PREFIX}/lib"/*.debug "${pkgdir}${MINGW_PREFIX}/bin"/ || true rsync -armR --remove-source-files --include="*/" --include="*.debug" --exclude="*" --prune-empty-dirs ${pkgdir}/.${MINGW_PREFIX} ${srcdir}/${MSYSTEM}-debug/ + fi # Fix paths in *.pri, *prl and *.pc files: # $(cygpath -m ${MINGW_PREFIX}) -> $(cygpath -m ${pkgdir}${MINGW_PREFIX}) diff --git a/mingw-w64-qt5-base/PKGBUILD b/mingw-w64-qt5-base/PKGBUILD index 1e1e6ac918..1ea989e394 100644 --- a/mingw-w64-qt5-base/PKGBUILD +++ b/mingw-w64-qt5-base/PKGBUILD @@ -10,11 +10,11 @@ fi _realname=qt5-base pkgbase="mingw-w64-${_realname}" pkgname=("${MINGW_PACKAGE_PREFIX}-${_realname}" - "${MINGW_PACKAGE_PREFIX}-${_realname}-debug") -_qtver=5.15.11 -pkgver=${_qtver}+kde+r138 + $([[ ${CARCH} == i686 ]] || echo "${MINGW_PACKAGE_PREFIX}-${_realname}-debug")) +_qtver=5.15.12 +pkgver=${_qtver}+kde+r144 pkgrel=1 -_commit=ea7a183732c17005f08ca14fd70cdd305c90396d +_commit=9e450254296be0a8fd4e6da10d116862a0fce82e arch=('any') mingw_arch=('mingw32' 'mingw64' 'ucrt64' 'clang64' 'clang32' 'clangarm64') pkgdesc="A cross-platform application and UI framework (mingw-w64)" @@ -38,7 +38,6 @@ makedepends=("${MINGW_PACKAGE_PREFIX}-cc" "${MINGW_PACKAGE_PREFIX}-zlib" "${MINGW_PACKAGE_PREFIX}-zstd" "${MINGW_PACKAGE_PREFIX}-libmariadbclient" - $([[ ${MINGW_PACKAGE_PREFIX} == *-clang-* ]] || echo "${MINGW_PACKAGE_PREFIX}-firebird2") "${MINGW_PACKAGE_PREFIX}-postgresql" "git" "rsync") @@ -179,14 +178,6 @@ prepare() { build() { mkdir -p build-${MSYSTEM} && cd build-${MSYSTEM} - local -a _sql_config - if [[ ${MINGW_PACKAGE_PREFIX} != *-clang-* ]]; then - _sql_config+=("-plugin-sql-ibase") - fi - _sql_config+=("-plugin-sql-psql") - _sql_config+=("-plugin-sql-mysql") - _sql_config+=("-plugin-sql-odbc") - # Qt manages the compiler flags for release / debug configs separately, so having our own values (-O2) is harmful here .. unset CFLAGS unset CXXFLAGS @@ -199,6 +190,16 @@ build() { export PATH="${srcdir}/build-${MSYSTEM}/bin:${srcdir}/build-${MSYSTEM}/lib:${PATH}" export VULKAN_SDK=${MINGW_PREFIX} + declare -a _extra_config + if check_option "debug" "n"; then + _extra_config+=("-release") + if [[ ${CARCH} != i686 ]]; then + _extra_config+=("-force-debug-info" "-separate-debug-info") + fi + else + _extra_config+=("-debug") + fi + ../${_pkgfn}/configure.bat \ -prefix ${MINGW_PREFIX} \ -datadir ${MINGW_PREFIX}/share/qt5 \ @@ -225,8 +226,10 @@ build() { -system-sqlite \ -system-zlib \ -no-iconv \ - -release -force-debug-info -separate-debug-info \ - "${_sql_config[@]}" + -plugin-sql-psql \ + -plugin-sql-mysql \ + -plugin-sql-odbc \ + "${_extra_config[@]}" make } @@ -253,9 +256,8 @@ package_qt5-base() { "${MINGW_PACKAGE_PREFIX}-zlib" "${MINGW_PACKAGE_PREFIX}-zstd") optdepends=("${MINGW_PACKAGE_PREFIX}-libmariadbclient" - "${MINGW_PACKAGE_PREFIX}-firebird2" "${MINGW_PACKAGE_PREFIX}-postgresql") - groups=("${MINGW_PACKAGE_PREFIX}-qt5") + groups=($([[ ${CARCH} == i686 ]] || echo "${MINGW_PACKAGE_PREFIX}-qt5")) cd build-${MSYSTEM} @@ -271,9 +273,11 @@ package_qt5-base() { install -d "$pkgdir${MINGW_PREFIX}"/share/licenses/${_realname} install -Dm644 $srcdir/${_pkgfn}/LICENSE* -t "$pkgdir${MINGW_PREFIX}"/share/licenses/${_realname} + if [[ ${CARCH} != i686 ]]; then # Seperate debug-info files mv -f "${pkgdir}${MINGW_PREFIX}/lib"/*.debug "${pkgdir}${MINGW_PREFIX}/bin"/ || true rsync -armR --remove-source-files --include="*/" --include="*.debug" --exclude="*" --prune-empty-dirs ${pkgdir}/.${MINGW_PREFIX} ${srcdir}/${MSYSTEM}-debug/ + fi # Fix paths in *.pri, *prl and *.pc files: # $(cygpath -m ${MINGW_PREFIX}) -> $(cygpath -m ${pkgdir}${MINGW_PREFIX}) diff --git a/mingw-w64-qt5-charts/PKGBUILD b/mingw-w64-qt5-charts/PKGBUILD index daabbe3f55..36d74f5ea9 100644 --- a/mingw-w64-qt5-charts/PKGBUILD +++ b/mingw-w64-qt5-charts/PKGBUILD @@ -3,20 +3,20 @@ _realname=qt5-charts pkgbase="mingw-w64-${_realname}" pkgname=("${MINGW_PACKAGE_PREFIX}-${_realname}" - "${MINGW_PACKAGE_PREFIX}-${_realname}-debug") -pkgver=5.15.11 + $([[ ${CARCH} == i686 ]] || echo "${MINGW_PACKAGE_PREFIX}-${_realname}-debug")) +pkgver=5.15.12 pkgrel=1 arch=('any') mingw_arch=('mingw32' 'mingw64' 'ucrt64' 'clang64' 'clang32' 'clangarm64') pkgdesc="Provides a set of easy to use chart components (mingw-w64)" -license=('spdx:GPL-3.0-or-later' 'spdx:Qt-GPL-exception-1.0') +license=('spdx:GPL-3.0-or-later WITH Qt-GPL-exception-1.0') makedepends=("${MINGW_PACKAGE_PREFIX}-cc" "${MINGW_PACKAGE_PREFIX}-qt5-base" "${MINGW_PACKAGE_PREFIX}-qt5-declarative" "rsync") _pkgfn="${_realname/5-/}-everywhere-opensource-src-${pkgver}" source=("https://download.qt.io/official_releases/qt/${pkgver%.*}/$pkgver/submodules/$_pkgfn.tar.xz") -sha256sums=('48bc3ba505c9e7400edb92a33788e8dc6215400a28695e5ddf82caffdfe1ea2d') +sha256sums=('97ad0afca7eab9440d3a6908f5499b29a78401a04503c4f9fc4fa87287dda8e2') build() { mkdir -p build-${MSYSTEM} && cd build-${MSYSTEM} @@ -34,7 +34,7 @@ check() { package_qt5-charts() { depends=("${MINGW_PACKAGE_PREFIX}-qt5-base") optdepends=("${MINGW_PACKAGE_PREFIX}-qt5-declarative") - groups=("${MINGW_PACKAGE_PREFIX}-qt5") + groups=($([[ ${CARCH} == i686 ]] || echo "${MINGW_PACKAGE_PREFIX}-qt5")) cd build-${MSYSTEM} @@ -50,9 +50,11 @@ package_qt5-charts() { install -d "$pkgdir${MINGW_PREFIX}"/share/licenses/${_realname} install -Dm644 $srcdir/${_pkgfn/opensource-/}/LICENSE* -t "$pkgdir${MINGW_PREFIX}"/share/licenses/${_realname} + if [[ ${CARCH} != i686 ]]; then # Seperate debug-info files mv -f "${pkgdir}${MINGW_PREFIX}/lib"/*.debug "${pkgdir}${MINGW_PREFIX}/bin"/ || true rsync -armR --remove-source-files --include="*/" --include="*.debug" --exclude="*" --prune-empty-dirs ${pkgdir}/.${MINGW_PREFIX} ${srcdir}/${MSYSTEM}-debug/ + fi # Fix paths in *.pri, *prl and *.pc files: # $(cygpath -m ${MINGW_PREFIX}) -> $(cygpath -m ${pkgdir}${MINGW_PREFIX}) diff --git a/mingw-w64-qt5-connectivity/PKGBUILD b/mingw-w64-qt5-connectivity/PKGBUILD index 38d50c8e2b..339c9e6ab0 100644 --- a/mingw-w64-qt5-connectivity/PKGBUILD +++ b/mingw-w64-qt5-connectivity/PKGBUILD @@ -3,16 +3,16 @@ _realname=qt5-connectivity pkgbase="mingw-w64-${_realname}" pkgname=("${MINGW_PACKAGE_PREFIX}-${_realname}" - "${MINGW_PACKAGE_PREFIX}-${_realname}-debug") -_qtver=5.15.11 + $([[ ${CARCH} == i686 ]] || echo "${MINGW_PACKAGE_PREFIX}-${_realname}-debug")) +_qtver=5.15.12 pkgver=${_qtver}+kde+r6 pkgrel=1 -_commit=e33b82889625b6a72e0be91c5023a30d53136a80 +_commit=70020cb64f71dcf2fd65a8a167cb785d2127e159 arch=('any') mingw_arch=('mingw32' 'mingw64' 'ucrt64' 'clang64' 'clang32' 'clangarm64') pkgdesc="Provides access to Bluetooth hardware (mingw-w64)" url='https://www.qt.io/' -license=('spdx:LGPL-3.0-only' 'spdx:Qt-GPL-exception-1.0' 'spdx:GPL-3.0-or-later' 'spdx:GPL-2.0-or-later' 'spdx:GFDL-1.3-no-invariants-only') +license=('spdx:LGPL-3.0-only WITH Qt-GPL-exception-1.0 AND GPL-3.0-or-later AND GPL-2.0-or-later AND GFDL-1.3-no-invariants-only') makedepends=("${MINGW_PACKAGE_PREFIX}-cc" "${MINGW_PACKAGE_PREFIX}-qt5-declarative" "git" @@ -49,7 +49,7 @@ check() { package_qt5-connectivity() { depends=("${MINGW_PACKAGE_PREFIX}-qt5-base") optdepends=("${MINGW_PACKAGE_PREFIX}-qt5-declarative") - groups=("${MINGW_PACKAGE_PREFIX}-qt5") + groups=($([[ ${CARCH} == i686 ]] || echo "${MINGW_PACKAGE_PREFIX}-qt5")) cd build-${MSYSTEM} @@ -65,9 +65,11 @@ package_qt5-connectivity() { install -d "$pkgdir${MINGW_PREFIX}"/share/licenses/${_realname} install -Dm644 $srcdir/${_pkgfn}/LICENSE* -t "$pkgdir${MINGW_PREFIX}"/share/licenses/${_realname} + if [[ ${CARCH} != i686 ]]; then # Seperate debug-info files mv -f "${pkgdir}${MINGW_PREFIX}/lib"/*.debug "${pkgdir}${MINGW_PREFIX}/bin"/ || true rsync -armR --remove-source-files --include="*/" --include="*.debug" --exclude="*" --prune-empty-dirs ${pkgdir}/.${MINGW_PREFIX} ${srcdir}/${MSYSTEM}-debug/ + fi # Fix paths in *.pri, *prl and *.pc files: # $(cygpath -m ${MINGW_PREFIX}) -> $(cygpath -m ${pkgdir}${MINGW_PREFIX}) diff --git a/mingw-w64-qt5-datavis3d/PKGBUILD b/mingw-w64-qt5-datavis3d/PKGBUILD index a6d2ddf002..a3e8da3910 100644 --- a/mingw-w64-qt5-datavis3d/PKGBUILD +++ b/mingw-w64-qt5-datavis3d/PKGBUILD @@ -3,21 +3,21 @@ _realname=qt5-datavis3d pkgbase="mingw-w64-${_realname}" pkgname=("${MINGW_PACKAGE_PREFIX}-${_realname}" - "${MINGW_PACKAGE_PREFIX}-${_realname}-debug") -pkgver=5.15.11 + $([[ ${CARCH} == i686 ]] || echo "${MINGW_PACKAGE_PREFIX}-${_realname}-debug")) +pkgver=5.15.12 pkgrel=1 arch=('any') mingw_arch=('mingw32' 'mingw64' 'ucrt64' 'clang64' 'clangarm64' 'clang32') pkgdesc="Qt Data Visualization module (mingw-w64)" url='https://www.qt.io/' -license=('spdx:GPL-3.0-or-later' 'spdx:Qt-GPL-exception-1.0') +license=('spdx:GPL-3.0-or-later WITH Qt-GPL-exception-1.0') makedepends=("${MINGW_PACKAGE_PREFIX}-cc" "${MINGW_PACKAGE_PREFIX}-qt5-declarative" "${MINGW_PACKAGE_PREFIX}-qt5-multimedia" "rsync") _pkgfn="${_realname/5-/}-everywhere-opensource-src-${pkgver}" source=("https://download.qt.io/official_releases/qt/${pkgver%.*}/$pkgver/submodules/$_pkgfn.tar.xz") -sha256sums=('6e46688bcecc2920a73e575279e782ebf233e4e5fcd9d469a8c63a6f9df47fe2') +sha256sums=('0d8bfd1bd973c50adf62dd96a070dc7089b9466ddb2c7385c3bfbbf88a71efcb') build() { mkdir -p build-${MSYSTEM} && cd build-${MSYSTEM} @@ -36,7 +36,7 @@ package_qt5-datavis3d() { depends=("${MINGW_PACKAGE_PREFIX}-qt5-base") optdepends=("${MINGW_PACKAGE_PREFIX}-qt5-declarative" "${MINGW_PACKAGE_PREFIX}-qt5-multimedia") - groups=("${MINGW_PACKAGE_PREFIX}-qt5") + groups=($([[ ${CARCH} == i686 ]] || echo "${MINGW_PACKAGE_PREFIX}-qt5")) cd build-${MSYSTEM} @@ -52,9 +52,11 @@ package_qt5-datavis3d() { install -d "$pkgdir${MINGW_PREFIX}"/share/licenses/${_realname} install -Dm644 $srcdir/${_pkgfn/opensource-/}/LICENSE* -t "$pkgdir${MINGW_PREFIX}"/share/licenses/${_realname} + if [[ ${CARCH} != i686 ]]; then # Seperate debug-info files mv -f "${pkgdir}${MINGW_PREFIX}/lib"/*.debug "${pkgdir}${MINGW_PREFIX}/bin"/ || true rsync -armR --remove-source-files --include="*/" --include="*.debug" --exclude="*" --prune-empty-dirs ${pkgdir}/.${MINGW_PREFIX} ${srcdir}/${MSYSTEM}-debug/ + fi # Fix paths in *.pri, *prl and *.pc files: # $(cygpath -m ${MINGW_PREFIX}) -> $(cygpath -m ${pkgdir}${MINGW_PREFIX}) diff --git a/mingw-w64-qt5-declarative/PKGBUILD b/mingw-w64-qt5-declarative/PKGBUILD index d489b8dd8e..f022d3a7a6 100644 --- a/mingw-w64-qt5-declarative/PKGBUILD +++ b/mingw-w64-qt5-declarative/PKGBUILD @@ -3,16 +3,16 @@ _realname=qt5-declarative pkgbase="mingw-w64-${_realname}" pkgname=("${MINGW_PACKAGE_PREFIX}-${_realname}" - "${MINGW_PACKAGE_PREFIX}-${_realname}-debug") -_qtver=5.15.11 -pkgver=${_qtver}+kde+r30 + $([[ ${CARCH} == i686 ]] || echo "${MINGW_PACKAGE_PREFIX}-${_realname}-debug")) +_qtver=5.15.12 +pkgver=${_qtver}+kde+r31 pkgrel=1 -_commit=1b0e366092bcfae0392592c3b7891f0e47af1018 +_commit=792a55bb701d233116c3731c7a53ffdb8c67e407 arch=('any') mingw_arch=('mingw32' 'mingw64' 'ucrt64' 'clang64' 'clang32' 'clangarm64') pkgdesc="Classes for QML and JavaScript languages (mingw-w64)" url='https://www.qt.io/' -license=('spdx:LGPL-3.0-only' 'spdx:Qt-GPL-exception-1.0' 'spdx:GPL-3.0-or-later' 'spdx:GPL-2.0-or-later' 'spdx:GFDL-1.3-no-invariants-only') +license=('spdx:LGPL-3.0-only WITH Qt-GPL-exception-1.0 AND GPL-3.0-or-later AND GPL-2.0-or-later AND GFDL-1.3-no-invariants-only') makedepends=("${MINGW_PACKAGE_PREFIX}-cc" "${MINGW_PACKAGE_PREFIX}-qt5-base" "${MINGW_PACKAGE_PREFIX}-python" @@ -64,7 +64,7 @@ check() { package_qt5-declarative() { depends=("${MINGW_PACKAGE_PREFIX}-qt5-base") - groups=("${MINGW_PACKAGE_PREFIX}-qt5") + groups=($([[ ${CARCH} == i686 ]] || echo "${MINGW_PACKAGE_PREFIX}-qt5")) cd build-${MSYSTEM} @@ -80,9 +80,11 @@ package_qt5-declarative() { install -d "$pkgdir${MINGW_PREFIX}"/share/licenses/${_realname} install -Dm644 $srcdir/${_pkgfn}/LICENSE* -t "$pkgdir${MINGW_PREFIX}"/share/licenses/${_realname} + if [[ ${CARCH} != i686 ]]; then # Seperate debug-info files mv -f "${pkgdir}${MINGW_PREFIX}/lib"/*.debug "${pkgdir}${MINGW_PREFIX}/bin"/ || true rsync -armR --remove-source-files --include="*/" --include="*.debug" --exclude="*" --prune-empty-dirs ${pkgdir}/.${MINGW_PREFIX} ${srcdir}/${MSYSTEM}-debug/ + fi # Fix paths in *.pri, *prl and *.pc files: # $(cygpath -m ${MINGW_PREFIX}) -> $(cygpath -m ${pkgdir}${MINGW_PREFIX}) diff --git a/mingw-w64-qt5-gamepad/PKGBUILD b/mingw-w64-qt5-gamepad/PKGBUILD index 2c2a23b7dd..c477eb52ce 100644 --- a/mingw-w64-qt5-gamepad/PKGBUILD +++ b/mingw-w64-qt5-gamepad/PKGBUILD @@ -3,14 +3,14 @@ _realname=qt5-gamepad pkgbase="mingw-w64-${_realname}" pkgname=("${MINGW_PACKAGE_PREFIX}-${_realname}" - "${MINGW_PACKAGE_PREFIX}-${_realname}-debug") -pkgver=5.15.11 + $([[ ${CARCH} == i686 ]] || echo "${MINGW_PACKAGE_PREFIX}-${_realname}-debug")) +pkgver=5.15.12 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=('spdx:LGPL-3.0-only' 'spdx:Qt-GPL-exception-1.0' 'spdx:GPL-3.0-or-later') +license=('spdx:LGPL-3.0-only WITH Qt-GPL-exception-1.0 AND GPL-3.0-or-later') makedepends=("${MINGW_PACKAGE_PREFIX}-cc" "${MINGW_PACKAGE_PREFIX}-qt5-declarative" "${MINGW_PACKAGE_PREFIX}-SDL2" @@ -18,7 +18,7 @@ makedepends=("${MINGW_PACKAGE_PREFIX}-cc" "rsync") _pkgfn="${_realname/5-/}-everywhere-opensource-src-${pkgver}" source=("https://download.qt.io/official_releases/qt/${pkgver%.*}/$pkgver/submodules/$_pkgfn.tar.xz") -sha256sums=('968bffc57d5ea7872d7850e3a319a94fb249603d81414b210e2df87e20346d22') +sha256sums=('58653d5fb2e989ebac25be73bb0eec8d646625ecab1cb419b2ec00a5d1fe4f2e') build() { mkdir -p build-${MSYSTEM} && cd build-${MSYSTEM} @@ -37,7 +37,7 @@ package_qt5-gamepad() { depends=("${MINGW_PACKAGE_PREFIX}-qt5-base") optdepends=("${MINGW_PACKAGE_PREFIX}-qt5-declarative" "${MINGW_PACKAGE_PREFIX}-SDL2") - groups=("${MINGW_PACKAGE_PREFIX}-qt5") + groups=($([[ ${CARCH} == i686 ]] || echo "${MINGW_PACKAGE_PREFIX}-qt5")) cd build-${MSYSTEM} @@ -53,9 +53,11 @@ package_qt5-gamepad() { install -d "$pkgdir${MINGW_PREFIX}"/share/licenses/${_realname} install -Dm644 $srcdir/${_pkgfn/opensource-/}/LICENSE* -t "$pkgdir${MINGW_PREFIX}"/share/licenses/${_realname} + if [[ ${CARCH} != i686 ]]; then # Seperate debug-info files mv -f "${pkgdir}${MINGW_PREFIX}/lib"/*.debug "${pkgdir}${MINGW_PREFIX}/bin"/ || true rsync -armR --remove-source-files --include="*/" --include="*.debug" --exclude="*" --prune-empty-dirs ${pkgdir}/.${MINGW_PREFIX} ${srcdir}/${MSYSTEM}-debug/ + fi # Fix paths in *.pri, *prl and *.pc files: # $(cygpath -m ${MINGW_PREFIX}) -> $(cygpath -m ${pkgdir}${MINGW_PREFIX}) diff --git a/mingw-w64-qt5-graphicaleffects/PKGBUILD b/mingw-w64-qt5-graphicaleffects/PKGBUILD index 867afa5bc3..6549967054 100644 --- a/mingw-w64-qt5-graphicaleffects/PKGBUILD +++ b/mingw-w64-qt5-graphicaleffects/PKGBUILD @@ -3,20 +3,20 @@ _realname=qt5-graphicaleffects pkgbase="mingw-w64-${_realname}" pkgname=("${MINGW_PACKAGE_PREFIX}-${_realname}" - "${MINGW_PACKAGE_PREFIX}-${_realname}-debug") -pkgver=5.15.11 + $([[ ${CARCH} == i686 ]] || echo "${MINGW_PACKAGE_PREFIX}-${_realname}-debug")) +pkgver=5.15.12 pkgrel=1 arch=('any') mingw_arch=('mingw32' 'mingw64' 'ucrt64' 'clang64' 'clang32' 'clangarm64') pkgdesc="Graphical effects for use with Qt Quick 2 (mingw-w64)" url='https://www.qt.io/' -license=('spdx:LGPL-3.0-only' 'spdx:Qt-GPL-exception-1.0' 'spdx:GPL-3.0-or-later' 'spdx:GPL-2.0-or-later' 'spdx:GFDL-1.3-no-invariants-only') +license=('spdx:LGPL-3.0-only WITH Qt-GPL-exception-1.0 AND GPL-3.0-or-later AND GPL-2.0-or-later AND GFDL-1.3-no-invariants-only') makedepends=("${MINGW_PACKAGE_PREFIX}-cc" "${MINGW_PACKAGE_PREFIX}-qt5-declarative" "rsync") _pkgfn="${_realname/5-/}-everywhere-opensource-src-${pkgver}" source=("https://download.qt.io/official_releases/qt/${pkgver%.*}/$pkgver/submodules/$_pkgfn.tar.xz") -sha256sums=('f52223a3e8b0c371eb1a47211ca740f0cbf8e6a93793da6c649002288ac479de') +sha256sums=('4664b1096c848d3679b91df3062508a1992ce75eaa0eb292947dfae2b61ad4e9') build() { mkdir -p build-${MSYSTEM} && cd build-${MSYSTEM} @@ -33,7 +33,7 @@ check() { package_qt5-graphicaleffects() { depends=("${MINGW_PACKAGE_PREFIX}-qt5-declarative") - groups=("${MINGW_PACKAGE_PREFIX}-qt5") + groups=($([[ ${CARCH} == i686 ]] || echo "${MINGW_PACKAGE_PREFIX}-qt5")) cd build-${MSYSTEM} @@ -49,9 +49,11 @@ package_qt5-graphicaleffects() { install -d "$pkgdir${MINGW_PREFIX}"/share/licenses/${_realname} install -Dm644 $srcdir/${_pkgfn/opensource-/}/LICENSE* -t "$pkgdir${MINGW_PREFIX}"/share/licenses/${_realname} + if [[ ${CARCH} != i686 ]]; then # Seperate debug-info files mv -f "${pkgdir}${MINGW_PREFIX}/lib"/*.debug "${pkgdir}${MINGW_PREFIX}/bin"/ || true rsync -armR --remove-source-files --include="*/" --include="*.debug" --exclude="*" --prune-empty-dirs ${pkgdir}/.${MINGW_PREFIX} ${srcdir}/${MSYSTEM}-debug/ + fi } package_qt5-graphicaleffects-debug() { diff --git a/mingw-w64-qt5-imageformats/PKGBUILD b/mingw-w64-qt5-imageformats/PKGBUILD index fd2b0a2580..84962a0e5f 100644 --- a/mingw-w64-qt5-imageformats/PKGBUILD +++ b/mingw-w64-qt5-imageformats/PKGBUILD @@ -3,14 +3,14 @@ _realname=qt5-imageformats pkgbase="mingw-w64-${_realname}" pkgname=("${MINGW_PACKAGE_PREFIX}-${_realname}" - "${MINGW_PACKAGE_PREFIX}-${_realname}-debug") -pkgver=5.15.11 + $([[ ${CARCH} == i686 ]] || echo "${MINGW_PACKAGE_PREFIX}-${_realname}-debug")) +pkgver=5.15.12 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=('spdx:LGPL-3.0-only' 'spdx:Qt-GPL-exception-1.0' 'spdx:LGPL-2.1-or-later' 'spdx:GPL-3.0-or-later' 'spdx:GPL-2.0-or-later' 'spdx:GPL-2.0-only' 'spdx:GFDL-1.3-no-invariants-only') +license=('spdx:LGPL-3.0-only WITH Qt-GPL-exception-1.0 AND LGPL-2.1-or-later AND GPL-3.0-or-later AND GPL-2.0-or-later AND GPL-2.0-only AND GFDL-1.3-no-invariants-only') makedepends=("${MINGW_PACKAGE_PREFIX}-cc" "${MINGW_PACKAGE_PREFIX}-qt5-base" "${MINGW_PACKAGE_PREFIX}-jasper" @@ -21,7 +21,7 @@ makedepends=("${MINGW_PACKAGE_PREFIX}-cc" _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=('12fb3a15f927b46178e73891efed3e63313997b025129cdf053fd211fdc9b47f' +sha256sums=('f5125e32ff40fe8688872cbd92b56127d17edda4471d41605da0a5bbf7adb489' '727602791c21070a08c97c9423a4343e2a44d2f7ea48731b3720da50e4797ea5') prepare() { @@ -48,7 +48,7 @@ package_qt5-imageformats() { "${MINGW_PACKAGE_PREFIX}-libmng" "${MINGW_PACKAGE_PREFIX}-libtiff" "${MINGW_PACKAGE_PREFIX}-libwebp") - groups=("${MINGW_PACKAGE_PREFIX}-qt5") + groups=($([[ ${CARCH} == i686 ]] || echo "${MINGW_PACKAGE_PREFIX}-qt5")) cd build-${MSYSTEM} @@ -64,9 +64,11 @@ package_qt5-imageformats() { install -d "$pkgdir${MINGW_PREFIX}"/share/licenses/${_realname} install -Dm644 $srcdir/${_pkgfn/opensource-/}/LICENSE* -t "$pkgdir${MINGW_PREFIX}"/share/licenses/${_realname} + if [[ ${CARCH} != i686 ]]; then # Seperate debug-info files mv -f "${pkgdir}${MINGW_PREFIX}/lib"/*.debug "${pkgdir}${MINGW_PREFIX}/bin"/ || true rsync -armR --remove-source-files --include="*/" --include="*.debug" --exclude="*" --prune-empty-dirs ${pkgdir}/.${MINGW_PREFIX} ${srcdir}/${MSYSTEM}-debug/ + fi # Fix paths in *.cmake files: # $(cygpath -m ${MINGW_PREFIX}) -> $(cygpath -m ${pkgdir}${MINGW_PREFIX}) diff --git a/mingw-w64-qt5-location/PKGBUILD b/mingw-w64-qt5-location/PKGBUILD index d9e3a7695f..c05802e2a0 100644 --- a/mingw-w64-qt5-location/PKGBUILD +++ b/mingw-w64-qt5-location/PKGBUILD @@ -3,16 +3,16 @@ _realname=qt5-location pkgbase="mingw-w64-${_realname}" pkgname=("${MINGW_PACKAGE_PREFIX}-${_realname}" - "${MINGW_PACKAGE_PREFIX}-${_realname}-debug") -_qtver=5.15.11 -pkgver=${_qtver}+kde+r4 + $([[ ${CARCH} == i686 ]] || echo "${MINGW_PACKAGE_PREFIX}-${_realname}-debug")) +_qtver=5.15.12 +pkgver=${_qtver}+kde+r6 pkgrel=1 -_commit=b4c42e255ee0f04eec4cf5cde35398f3c303ddb9 +_commit=5b27b8921f1f2de93573df903c47aee634209f80 arch=('any') mingw_arch=('mingw32' 'mingw64' 'ucrt64' 'clang64' 'clang32' 'clangarm64') pkgdesc="Provides access to position, satellite and area monitoring classes (mingw-w64)" url='https://www.qt.io/' -license=('spdx:LGPL-3.0-only' 'spdx:Qt-GPL-exception-1.0' 'spdx:GPL-3.0-or-later' 'spdx:GPL-2.0-or-later' 'spdx:GFDL-1.3-no-invariants-only') +license=('spdx:LGPL-3.0-only WITH Qt-GPL-exception-1.0 AND GPL-3.0-or-later AND GPL-2.0-or-later AND GFDL-1.3-no-invariants-only') makedepends=("${MINGW_PACKAGE_PREFIX}-cc" "${MINGW_PACKAGE_PREFIX}-qt5-base" "${MINGW_PACKAGE_PREFIX}-qt5-declarative" @@ -58,7 +58,7 @@ check() { package_qt5-location() { depends=("${MINGW_PACKAGE_PREFIX}-qt5-declarative") - groups=("${MINGW_PACKAGE_PREFIX}-qt5") + groups=($([[ ${CARCH} == i686 ]] || echo "${MINGW_PACKAGE_PREFIX}-qt5")) cd build-${MSYSTEM} @@ -74,9 +74,11 @@ package_qt5-location() { install -d "$pkgdir${MINGW_PREFIX}"/share/licenses/${_realname} install -Dm644 $srcdir/${_pkgfn}/LICENSE* -t "$pkgdir${MINGW_PREFIX}"/share/licenses/${_realname} + if [[ ${CARCH} != i686 ]]; then # Seperate debug-info files mv -f "${pkgdir}${MINGW_PREFIX}/lib"/*.debug "${pkgdir}${MINGW_PREFIX}/bin"/ || true rsync -armR --remove-source-files --include="*/" --include="*.debug" --exclude="*" --prune-empty-dirs ${pkgdir}/.${MINGW_PREFIX} ${srcdir}/${MSYSTEM}-debug/ + fi # Fix paths in *.pri, *prl and *.pc files: # $(cygpath -m ${MINGW_PREFIX}) -> $(cygpath -m ${pkgdir}${MINGW_PREFIX}) diff --git a/mingw-w64-qt5-lottie/PKGBUILD b/mingw-w64-qt5-lottie/PKGBUILD index 497bfd180e..7cd113da9a 100644 --- a/mingw-w64-qt5-lottie/PKGBUILD +++ b/mingw-w64-qt5-lottie/PKGBUILD @@ -3,20 +3,20 @@ _realname=qt5-lottie pkgbase="mingw-w64-${_realname}" pkgname=("${MINGW_PACKAGE_PREFIX}-${_realname}" - "${MINGW_PACKAGE_PREFIX}-${_realname}-debug") -pkgver=5.15.11 + $([[ ${CARCH} == i686 ]] || echo "${MINGW_PACKAGE_PREFIX}-${_realname}-debug")) +pkgver=5.15.12 pkgrel=1 arch=('any') mingw_arch=('mingw32' 'mingw64' 'ucrt64' 'clang64' 'clang32' 'clangarm64') pkgdesc="A family of player software for a certain json-based file format for describing 2d vector graphics animations (mingw-w64)" url='https://www.qt.io/' -license=('spdx:GPL-3.0-or-later' 'spdx:Qt-GPL-exception-1.0') +license=('spdx:GPL-3.0-or-later WITH Qt-GPL-exception-1.0') makedepends=("${MINGW_PACKAGE_PREFIX}-cc" "${MINGW_PACKAGE_PREFIX}-qt5-declarative" "rsync") _pkgfn="${_realname/5-/}-everywhere-opensource-src-${pkgver}" source=("https://download.qt.io/official_releases/qt/${pkgver%.*}/$pkgver/submodules/$_pkgfn.tar.xz") -sha256sums=('fe4ef65c47d7f109dbe43d0e30b7d2b9ea6c58c3fe2a5031b66284d0ef5299e5') +sha256sums=('8e44fe071ccaa2bf039e1e9af2b7c6c0221182fb2395ac1682e49d8077c320d8') build() { mkdir -p build-${MSYSTEM} && cd build-${MSYSTEM} @@ -33,7 +33,7 @@ check() { package_qt5-lottie() { depends=("${MINGW_PACKAGE_PREFIX}-qt5-declarative") - groups=("${MINGW_PACKAGE_PREFIX}-qt5") + groups=($([[ ${CARCH} == i686 ]] || echo "${MINGW_PACKAGE_PREFIX}-qt5")) cd build-${MSYSTEM} @@ -49,9 +49,11 @@ package_qt5-lottie() { install -d "$pkgdir${MINGW_PREFIX}"/share/licenses/${_realname} install -Dm644 $srcdir/${_pkgfn/opensource-/}/LICENSE* -t "$pkgdir${MINGW_PREFIX}"/share/licenses/${_realname} + if [[ ${CARCH} != i686 ]]; then # Seperate debug-info files mv -f "${pkgdir}${MINGW_PREFIX}/lib"/*.debug "${pkgdir}${MINGW_PREFIX}/bin"/ || true rsync -armR --remove-source-files --include="*/" --include="*.debug" --exclude="*" --prune-empty-dirs ${pkgdir}/.${MINGW_PREFIX} ${srcdir}/${MSYSTEM}-debug/ + fi # Fix paths in *.pri, *prl and *.pc files: # $(cygpath -m ${MINGW_PREFIX}) -> $(cygpath -m ${pkgdir}${MINGW_PREFIX}) diff --git a/mingw-w64-qt5-multimedia/PKGBUILD b/mingw-w64-qt5-multimedia/PKGBUILD index 3fd45f98ae..cc5a6a17c1 100644 --- a/mingw-w64-qt5-multimedia/PKGBUILD +++ b/mingw-w64-qt5-multimedia/PKGBUILD @@ -3,14 +3,14 @@ _realname=qt5-multimedia pkgbase="mingw-w64-${_realname}" pkgname=("${MINGW_PACKAGE_PREFIX}-${_realname}" - "${MINGW_PACKAGE_PREFIX}-${_realname}-debug") -pkgver=5.15.11 + $([[ ${CARCH} == i686 ]] || echo "${MINGW_PACKAGE_PREFIX}-${_realname}-debug")) +pkgver=5.15.12 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=('spdx:LGPL-3.0-only' 'spdx:Qt-GPL-exception-1.0' 'spdx:GPL-3.0-or-later' 'spdx:GPL-2.0-or-later' 'spdx:GFDL-1.3-no-invariants-only') +license=('spdx:LGPL-3.0-only WITH Qt-GPL-exception-1.0 AND GPL-3.0-or-later AND GPL-2.0-or-later AND GFDL-1.3-no-invariants-only') makedepends=("${MINGW_PACKAGE_PREFIX}-cc" "${MINGW_PACKAGE_PREFIX}-qt5-declarative" "${MINGW_PACKAGE_PREFIX}-openal" @@ -19,7 +19,7 @@ makedepends=("${MINGW_PACKAGE_PREFIX}-cc" _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=('28ba35efe904c05f2d28c275ec9bd90a00b3f5857457bbd21c6d3c55c2aa521c' +sha256sums=('1040585c91f9da6768973d9c81d31d571c152464a9f5021b5270a5ab1e874429' 'd4a325bb319ee746f355a54ea562d974aad4d05dadb0147f30fd023acd631558') prepare() { @@ -45,7 +45,7 @@ package_qt5-multimedia() { depends=("${MINGW_PACKAGE_PREFIX}-qt5-base" "${MINGW_PACKAGE_PREFIX}-openal") optdepends=("${MINGW_PACKAGE_PREFIX}-qt5-declarative") - groups=("${MINGW_PACKAGE_PREFIX}-qt5") + groups=($([[ ${CARCH} == i686 ]] || echo "${MINGW_PACKAGE_PREFIX}-qt5")) cd build-${MSYSTEM} @@ -61,9 +61,11 @@ package_qt5-multimedia() { install -d "$pkgdir${MINGW_PREFIX}"/share/licenses/${_realname} install -Dm644 $srcdir/${_pkgfn/opensource-/}/LICENSE* -t "$pkgdir${MINGW_PREFIX}"/share/licenses/${_realname} + if [[ ${CARCH} != i686 ]]; then # Seperate debug-info files mv -f "${pkgdir}${MINGW_PREFIX}/lib"/*.debug "${pkgdir}${MINGW_PREFIX}/bin"/ || true rsync -armR --remove-source-files --include="*/" --include="*.debug" --exclude="*" --prune-empty-dirs ${pkgdir}/.${MINGW_PREFIX} ${srcdir}/${MSYSTEM}-debug/ + fi # Fix paths in *.pri, *prl and *.pc files: # $(cygpath -m ${MINGW_PREFIX}) -> $(cygpath -m ${pkgdir}${MINGW_PREFIX}) diff --git a/mingw-w64-qt5-networkauth/PKGBUILD b/mingw-w64-qt5-networkauth/PKGBUILD index bdf03c948a..46164822d7 100644 --- a/mingw-w64-qt5-networkauth/PKGBUILD +++ b/mingw-w64-qt5-networkauth/PKGBUILD @@ -3,20 +3,20 @@ _realname=qt5-networkauth pkgbase="mingw-w64-${_realname}" pkgname=("${MINGW_PACKAGE_PREFIX}-${_realname}" - "${MINGW_PACKAGE_PREFIX}-${_realname}-debug") -pkgver=5.15.11 + $([[ ${CARCH} == i686 ]] || echo "${MINGW_PACKAGE_PREFIX}-${_realname}-debug")) +pkgver=5.15.12 pkgrel=1 arch=('any') mingw_arch=('mingw32' 'mingw64' 'ucrt64' 'clang64' 'clang32' 'clangarm64') pkgdesc="Network authentication module (mingw-w64)" url='https://www.qt.io/' -license=('spdx:GPL-3.0-or-later' 'spdx:Qt-GPL-exception-1.0' 'spdx:GFDL-1.3-no-invariants-only') +license=('spdx:GPL-3.0-or-later WITH Qt-GPL-exception-1.0 AND GFDL-1.3-no-invariants-only') makedepends=("${MINGW_PACKAGE_PREFIX}-cc" "${MINGW_PACKAGE_PREFIX}-qt5-base" "rsync") _pkgfn="${_realname/5-/}-everywhere-opensource-src-${pkgver}" source=("https://download.qt.io/official_releases/qt/${pkgver%.*}/$pkgver/submodules/$_pkgfn.tar.xz") -sha256sums=('af17a868bbb2a6ffc9425b9d8ef46c4e9089a5b4d4f16ee877252490ca893f75') +sha256sums=('797626e86d3ecfe6c319ed3f2e26017c8dbdf7fdcb6b22317b00371ee67988d3') build() { mkdir -p build-${MSYSTEM} && cd build-${MSYSTEM} @@ -33,7 +33,7 @@ check() { package_qt5-networkauth() { depends=("${MINGW_PACKAGE_PREFIX}-qt5-base") - groups=("${MINGW_PACKAGE_PREFIX}-qt5") + groups=($([[ ${CARCH} == i686 ]] || echo "${MINGW_PACKAGE_PREFIX}-qt5")) cd build-${MSYSTEM} @@ -49,9 +49,11 @@ package_qt5-networkauth() { install -d "$pkgdir${MINGW_PREFIX}"/share/licenses/${_realname} install -Dm644 $srcdir/${_pkgfn/opensource-/}/LICENSE* -t "$pkgdir${MINGW_PREFIX}"/share/licenses/${_realname} + if [[ ${CARCH} != i686 ]]; then # Seperate debug-info files mv -f "${pkgdir}${MINGW_PREFIX}/lib"/*.debug "${pkgdir}${MINGW_PREFIX}/bin"/ || true rsync -armR --remove-source-files --include="*/" --include="*.debug" --exclude="*" --prune-empty-dirs ${pkgdir}/.${MINGW_PREFIX} ${srcdir}/${MSYSTEM}-debug/ + fi # Fix paths in *.pri, *prl and *.pc files: # $(cygpath -m ${MINGW_PREFIX}) -> $(cygpath -m ${pkgdir}${MINGW_PREFIX}) diff --git a/mingw-w64-qt5-purchasing/PKGBUILD b/mingw-w64-qt5-purchasing/PKGBUILD index 9cd27c520b..f9e759ce46 100644 --- a/mingw-w64-qt5-purchasing/PKGBUILD +++ b/mingw-w64-qt5-purchasing/PKGBUILD @@ -3,20 +3,20 @@ _realname=qt5-purchasing pkgbase="mingw-w64-${_realname}" pkgname=("${MINGW_PACKAGE_PREFIX}-${_realname}" - "${MINGW_PACKAGE_PREFIX}-${_realname}-debug") -pkgver=5.15.11 + $([[ ${CARCH} == i686 ]] || echo "${MINGW_PACKAGE_PREFIX}-${_realname}-debug")) +pkgver=5.15.12 pkgrel=1 arch=('any') mingw_arch=('mingw32' 'mingw64' 'ucrt64' 'clang64' 'clang32' 'clangarm64') pkgdesc="Qt In-App Purchasing API (mingw-w64)" url='https://www.qt.io/' -license=('spdx:LGPL-3.0-only' 'spdx:Qt-GPL-exception-1.0' 'spdx:GPL-3.0-or-later') +license=('spdx:LGPL-3.0-only WITH Qt-GPL-exception-1.0 AND GPL-3.0-or-later') makedepends=("${MINGW_PACKAGE_PREFIX}-cc" "${MINGW_PACKAGE_PREFIX}-qt5-declarative" "rsync") _pkgfn="${_realname/5-/}-everywhere-opensource-src-${pkgver}" source=("https://download.qt.io/official_releases/qt/${pkgver%.*}/$pkgver/submodules/$_pkgfn.tar.xz") -sha256sums=('ffc8e4616e84567c9a507d4464e68b6a81b0aeec856690d1ccd219650c6e7e1e') +sha256sums=('c97e5efc015d31d6a3ef38038438735e44b9d34e524ab6632d48a11f776fe24e') build() { mkdir -p build-${MSYSTEM} && cd build-${MSYSTEM} @@ -34,7 +34,7 @@ check() { package_qt5-purchasing() { depends=("${MINGW_PACKAGE_PREFIX}-qt5-base") optdepends=("${MINGW_PACKAGE_PREFIX}-qt5-declarative") - groups=("${MINGW_PACKAGE_PREFIX}-qt5") + groups=($([[ ${CARCH} == i686 ]] || echo "${MINGW_PACKAGE_PREFIX}-qt5")) cd build-${MSYSTEM} @@ -50,9 +50,11 @@ package_qt5-purchasing() { install -d "$pkgdir${MINGW_PREFIX}"/share/licenses/${_realname} install -Dm644 $srcdir/${_pkgfn/opensource-/}/LICENSE* -t "$pkgdir${MINGW_PREFIX}"/share/licenses/${_realname} + if [[ ${CARCH} != i686 ]]; then # Seperate debug-info files mv -f "${pkgdir}${MINGW_PREFIX}/lib"/*.debug "${pkgdir}${MINGW_PREFIX}/bin"/ || true rsync -armR --remove-source-files --include="*/" --include="*.debug" --exclude="*" --prune-empty-dirs ${pkgdir}/.${MINGW_PREFIX} ${srcdir}/${MSYSTEM}-debug/ + fi # Fix paths in *.pri, *prl and *.pc files: # $(cygpath -m ${MINGW_PREFIX}) -> $(cygpath -m ${pkgdir}${MINGW_PREFIX}) diff --git a/mingw-w64-qt5-svg/PKGBUILD b/mingw-w64-qt5-svg/PKGBUILD index 45280e12b8..4a88b8319b 100644 --- a/mingw-w64-qt5-svg/PKGBUILD +++ b/mingw-w64-qt5-svg/PKGBUILD @@ -3,16 +3,16 @@ _realname=qt5-svg pkgbase="mingw-w64-${_realname}" pkgname=("${MINGW_PACKAGE_PREFIX}-${_realname}" - "${MINGW_PACKAGE_PREFIX}-${_realname}-debug") -_qtver=5.15.11 + $([[ ${CARCH} == i686 ]] || echo "${MINGW_PACKAGE_PREFIX}-${_realname}-debug")) +_qtver=5.15.12 pkgver=${_qtver}+kde+r6 pkgrel=1 -_commit=7d6e373c7db9c05ef586db0eb50c87cd894229ad +_commit=5b1b4a99d6bc98c42a11b7a3f6c9f0b0f9e56f34 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=('spdx:LGPL-3.0-only' 'spdx:Qt-GPL-exception-1.0' 'spdx:LGPL-2.1-or-later' 'spdx:GPL-3.0-or-later' 'spdx:GPL-2.0-or-later' 'spdx:GFDL-1.3-no-invariants-only') +license=('spdx:LGPL-3.0-only WITH Qt-GPL-exception-1.0' 'spdx:LGPL-2.1-or-later AND GPL-3.0-or-later AND GPL-2.0-or-later AND GFDL-1.3-no-invariants-only') makedepends=("${MINGW_PACKAGE_PREFIX}-cc" "${MINGW_PACKAGE_PREFIX}-qt5-base" "git" @@ -41,7 +41,7 @@ check() { package_qt5-svg() { depends=("${MINGW_PACKAGE_PREFIX}-qt5-base") - groups=("${MINGW_PACKAGE_PREFIX}-qt5") + groups=($([[ ${CARCH} == i686 ]] || echo "${MINGW_PACKAGE_PREFIX}-qt5")) cd build-${MSYSTEM} @@ -57,9 +57,11 @@ package_qt5-svg() { install -d "$pkgdir${MINGW_PREFIX}"/share/licenses/${_realname} install -Dm644 $srcdir/${_pkgfn}/LICENSE* -t "$pkgdir${MINGW_PREFIX}"/share/licenses/${_realname} + if [[ ${CARCH} != i686 ]]; then # Seperate debug-info files mv -f "${pkgdir}${MINGW_PREFIX}/lib"/*.debug "${pkgdir}${MINGW_PREFIX}/bin"/ || true rsync -armR --remove-source-files --include="*/" --include="*.debug" --exclude="*" --prune-empty-dirs ${pkgdir}/.${MINGW_PREFIX} ${srcdir}/${MSYSTEM}-debug/ + fi # Fix paths in *.pri, *prl and *.pc files: # $(cygpath -m ${MINGW_PREFIX}) -> $(cygpath -m ${pkgdir}${MINGW_PREFIX}) diff --git a/mingw-w64-qt5-tools/PKGBUILD b/mingw-w64-qt5-tools/PKGBUILD index 74b790d4a6..b28f1ee95c 100644 --- a/mingw-w64-qt5-tools/PKGBUILD +++ b/mingw-w64-qt5-tools/PKGBUILD @@ -3,9 +3,9 @@ _realname=qt5-tools pkgbase="mingw-w64-${_realname}" pkgname=("${MINGW_PACKAGE_PREFIX}-${_realname}" - "${MINGW_PACKAGE_PREFIX}-${_realname}-debug") -pkgver=5.15.11 -pkgrel=2 + $([[ ${CARCH} == i686 ]] || echo "${MINGW_PACKAGE_PREFIX}-${_realname}-debug")) +pkgver=5.15.12 +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)" @@ -22,7 +22,7 @@ source=("https://download.qt.io/official_releases/qt/${pkgver%.*}/$pkgver/submod 001-qt-5.11-mingw-fix-link-qdoc-with-clang.patch 002-qt5-windeployqt-fixes.patch 003-ugly-hack-disable-qdoc-build.patch) -sha256sums=('7cd847ae6ff09416df617136eadcaf0eb98e3bc9b89979219a3ea8111fb8d339' +sha256sums=('9a4084fee80a2acebb6415efa5a28dd666960129895a0bb7d97468a9f0c66506' 'aff15370d18498ee1cc73f027b3fc76cc899b3cd1f79c3ed3bbda50b927dec33' '5009ef5c9812f6f6ba6d69d6b2a90b5caa43cf0ef46bf36ac507c672e697e5a1' '1927c71175f758914abc485506bb162f3eac5e0816a00be66a78562b168095f0') @@ -64,7 +64,7 @@ package_qt5-tools() { depends=("${MINGW_PACKAGE_PREFIX}-qt5-base") optdepends=("${MINGW_PACKAGE_PREFIX}-clang-libs" "${MINGW_PACKAGE_PREFIX}-qt5-activeqt") - groups=("${MINGW_PACKAGE_PREFIX}-qt5") + groups=($([[ ${CARCH} == i686 ]] || echo "${MINGW_PACKAGE_PREFIX}-qt5")) cd build-${MSYSTEM} @@ -80,9 +80,11 @@ package_qt5-tools() { install -d "$pkgdir${MINGW_PREFIX}"/share/licenses/${_realname} install -Dm644 $srcdir/${_pkgfn/opensource-/}/LICENSE* -t "$pkgdir${MINGW_PREFIX}"/share/licenses/${_realname} + if [[ ${CARCH} != i686 ]]; then # Seperate debug-info files mv -f "${pkgdir}${MINGW_PREFIX}/lib"/*.debug "${pkgdir}${MINGW_PREFIX}/bin"/ || true rsync -armR --remove-source-files --include="*/" --include="*.debug" --exclude="*" --prune-empty-dirs ${pkgdir}/.${MINGW_PREFIX} ${srcdir}/${MSYSTEM}-debug/ + fi # Fix paths in *.pri, *prl and *.pc files: # $(cygpath -m ${MINGW_PREFIX}) -> $(cygpath -m ${pkgdir}${MINGW_PREFIX}) diff --git a/mingw-w64-qt5-translations/PKGBUILD b/mingw-w64-qt5-translations/PKGBUILD index 0b153d9f2b..2f8ad0d622 100644 --- a/mingw-w64-qt5-translations/PKGBUILD +++ b/mingw-w64-qt5-translations/PKGBUILD @@ -3,20 +3,20 @@ _realname=qt5-translations pkgbase="mingw-w64-${_realname}" pkgname="${MINGW_PACKAGE_PREFIX}-${_realname}" -pkgver=5.15.11 +pkgver=5.15.12 pkgrel=1 arch=('any') mingw_arch=('mingw32' 'mingw64' 'ucrt64' 'clang64' 'clang32' 'clangarm64') pkgdesc="A cross-platform application and UI framework (Translations) (mingw-w64)" url='https://www.qt.io/' -license=('spdx:LGPL-3.0-only' 'spdx:Qt-GPL-exception-1.0') +license=('spdx:LGPL-3.0-only WITH Qt-GPL-exception-1.0') depends=("${MINGW_PACKAGE_PREFIX}-qt5-base") makedepends=("${MINGW_PACKAGE_PREFIX}-cc" "${MINGW_PACKAGE_PREFIX}-qt5-tools") -groups=("${MINGW_PACKAGE_PREFIX}-qt5") +groups=($([[ ${CARCH} == i686 ]] || echo "${MINGW_PACKAGE_PREFIX}-qt5")) _pkgfn="${_realname/5-/}-everywhere-opensource-src-${pkgver}" source=("https://download.qt.io/official_releases/qt/${pkgver%.*}/$pkgver/submodules/$_pkgfn.tar.xz") -sha256sums=('a31785948c640b7c66d9fe2db4993728ca07f64e41c560b3625ad191b276ff20') +sha256sums=('a830ba6158ccb36fdae97ebfa33ac7c2c92f4b609786717830d65aa2e0e77612') build() { mkdir -p build-${MSYSTEM} && cd build-${MSYSTEM} diff --git a/mingw-w64-qt5-winextras/PKGBUILD b/mingw-w64-qt5-winextras/PKGBUILD index 409e2154d5..dcb7cc8a90 100644 --- a/mingw-w64-qt5-winextras/PKGBUILD +++ b/mingw-w64-qt5-winextras/PKGBUILD @@ -3,21 +3,21 @@ _realname=qt5-winextras pkgbase="mingw-w64-${_realname}" pkgname=("${MINGW_PACKAGE_PREFIX}-${_realname}" - "${MINGW_PACKAGE_PREFIX}-${_realname}-debug") -pkgver=5.15.11 + $([[ ${CARCH} == i686 ]] || echo "${MINGW_PACKAGE_PREFIX}-${_realname}-debug")) +pkgver=5.15.12 pkgrel=1 arch=('any') mingw_arch=('mingw32' 'mingw64' 'ucrt64' 'clang64' 'clang32' 'clangarm64') pkgdesc="Provides platform-specific APIs for Windows (mingw-w64)" url='https://www.qt.io/' -license=('spdx:LGPL-3.0-only' 'spdx:Qt-GPL-exception-1.0' 'spdx:GPL-3.0-or-later' 'spdx:GPL-2.0-or-later' 'spdx:GFDL-1.3-no-invariants-only') +license=('spdx:LGPL-3.0-only WITH Qt-GPL-exception-1.0 AND GPL-3.0-or-later AND GPL-2.0-or-later AND GFDL-1.3-no-invariants-only') makedepends=("${MINGW_PACKAGE_PREFIX}-cc" "${MINGW_PACKAGE_PREFIX}-qt5-declarative" "${MINGW_PACKAGE_PREFIX}-qt5-multimedia" "rsync") _pkgfn="${_realname/5-/}-everywhere-opensource-src-${pkgver}" source=("https://download.qt.io/official_releases/qt/${pkgver%.*}/$pkgver/submodules/$_pkgfn.tar.xz") -sha256sums=('9038daca82bc36b63402a9fe9128c3c82b15504632710be48f8a27dc35fa187a') +sha256sums=('d3c6ffb2c8e44457a4b5a2e29d2da17783a5d765bf15c653b372161b2c031160') build() { mkdir -p build-${MSYSTEM} && cd build-${MSYSTEM} @@ -36,7 +36,7 @@ package_qt5-winextras() { depends=("${MINGW_PACKAGE_PREFIX}-qt5-base") optdepends=("${MINGW_PACKAGE_PREFIX}-qt5-declarative" "${MINGW_PACKAGE_PREFIX}-qt5-multimedia") - groups=("${MINGW_PACKAGE_PREFIX}-qt5") + groups=($([[ ${CARCH} == i686 ]] || echo "${MINGW_PACKAGE_PREFIX}-qt5")) cd build-${MSYSTEM} @@ -52,9 +52,11 @@ package_qt5-winextras() { install -d "$pkgdir${MINGW_PREFIX}"/share/licenses/${_realname} install -Dm644 $srcdir/${_pkgfn/opensource-/}/LICENSE* -t "$pkgdir${MINGW_PREFIX}"/share/licenses/${_realname} + if [[ ${CARCH} != i686 ]]; then # Seperate debug-info files mv -f "${pkgdir}${MINGW_PREFIX}/lib"/*.debug "${pkgdir}${MINGW_PREFIX}/bin"/ || true rsync -armR --remove-source-files --include="*/" --include="*.debug" --exclude="*" --prune-empty-dirs ${pkgdir}/.${MINGW_PREFIX} ${srcdir}/${MSYSTEM}-debug/ + fi # Fix paths in *.pri, *prl and *.pc files: # $(cygpath -m ${MINGW_PREFIX}) -> $(cygpath -m ${pkgdir}${MINGW_PREFIX})