From 40900bd876e41014100d801bfa14b147c02ebcd3 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: Wed, 24 Jul 2024 06:48:31 +0100 Subject: [PATCH] qt5-base: update to 5.15.14+kde+r143 Set opengl to dynamic only on 64-bit environments. There is no angle for 32-bit environments --- mingw-w64-qt5-base/.gitignore | 1 + mingw-w64-qt5-base/PKGBUILD | 16 +++++++++++----- 2 files changed, 12 insertions(+), 5 deletions(-) create mode 100644 mingw-w64-qt5-base/.gitignore diff --git a/mingw-w64-qt5-base/.gitignore b/mingw-w64-qt5-base/.gitignore new file mode 100644 index 0000000000..2f19754328 --- /dev/null +++ b/mingw-w64-qt5-base/.gitignore @@ -0,0 +1 @@ +qtbase diff --git a/mingw-w64-qt5-base/PKGBUILD b/mingw-w64-qt5-base/PKGBUILD index 0069c3bb7a..b92b4508be 100644 --- a/mingw-w64-qt5-base/PKGBUILD +++ b/mingw-w64-qt5-base/PKGBUILD @@ -12,8 +12,8 @@ pkgbase="mingw-w64-${_realname}" pkgname=("${MINGW_PACKAGE_PREFIX}-${_realname}" $([[ ${CARCH} == i686 ]] || echo "${MINGW_PACKAGE_PREFIX}-${_realname}-debug")) _qtver=5.15.14 -pkgver=${_qtver}+kde+r141 -pkgrel=2 +pkgver=${_qtver}+kde+r143 +pkgrel=1 pkgdesc="A cross-platform application and UI framework (mingw-w64)" arch=('any') mingw_arch=('mingw32' 'mingw64' 'ucrt64' 'clang64' 'clang32' 'clangarm64') @@ -50,7 +50,7 @@ makedepends=("${MINGW_PACKAGE_PREFIX}-cc" "git" "rsync") _pkgfn="${_realname/5-/}" -_commit=0e1ff2f06ddac7c32c5a5e0b65e402c9332e56f8 +_commit=9f9a56d750caff8b4459e7e9bf82f1f4d725f72f source=(git+https://invent.kde.org/qt/qt/$_pkgfn#commit=$_commit 0001-adjust-qmake-conf-mingw.patch 0002-qt-5.8.0-fix-sql-libraries-mingw.patch @@ -79,7 +79,7 @@ source=(git+https://invent.kde.org/qt/qt/$_pkgfn#commit=$_commit 0026-fix-mingw-win32-winnt-detection.patch 0027-qt-5.7.0-qdbus-manager-quit.patch 0028-work-around-pyside2-brokenness.patch) -sha256sums=('d1d4f36a90fd1ddf61a0e7d00a6dbca8c64a39b7e9113d16c38c753c2dfe2a99' +sha256sums=('bb2f9696a97908f96c0b06c185ea6a76e718f7c483bc9f5293fac3cd820e8eb7' 'a74eec5be1aee1bd3a37af0955b7c5f3d36d54bc64c07e4c2edd5526cdc3cad5' 'e0a535278057f42e43952405e567c23cc493ef6badeeb3bbce0154953cd545a5' 'e7252bdc92fa75f067e4beafbf3c844fca3a4bd16d14ac5344256f022a9214d5' @@ -217,6 +217,12 @@ build() { _extra_config+=("-plugin-sql-psql" "-plugin-sql-mysql") fi + if [[ ${CARCH} != i686 ]]; then + _opengl=dynamic + else + _opengl=desktop + fi + ../${_pkgfn}/configure.bat \ -prefix ${MINGW_PREFIX} \ -datadir ${MINGW_PREFIX}/share/qt5 \ @@ -226,10 +232,10 @@ build() { -opensource \ -confirm-license \ -platform ${_platform} \ + -opengl ${_opengl} \ -shared \ -make-tool make \ -I${MINGW_PREFIX}/include/mariadb \ - -opengl dynamic \ -dbus \ -fontconfig \ -icu \