qbs: fix building qt6 programs

This commit is contained in:
مهدي شينون (Mehdi Chinoune)
2023-04-27 12:22:28 +01:00
parent cd3860ed28
commit 31cf40975b
2 changed files with 19 additions and 3 deletions

View File

@@ -0,0 +1,12 @@
--- a/share/qbs/module-providers/Qt/setup-qt.js
+++ b/share/qbs/module-providers/Qt/setup-qt.js
@@ -179,7 +179,7 @@
if (!targetsDesktopWindows(qtProps))
return "";
if (qtProps.qtMajorVersion >= 6)
- return "10.0";
+ return "6.2";
if (qtProps.architecture === "x86_64" || qtProps.architecture === "ia64")
return "5.2"
var match = qtProps.mkspecName.match(/^win32-msvc(\d+)$/);

View File

@@ -23,7 +23,7 @@ _realname=qbs
pkgbase=mingw-w64-${_realname}
pkgname="${MINGW_PACKAGE_PREFIX}-${_realname}"
pkgver=2.0.0
pkgrel=1
pkgrel=2
pkgdesc="Qt Build Suite (mingw-w64)"
url='https://www.qt.io/'
arch=('any')
@@ -46,18 +46,22 @@ source=("https://download.qt.io/official_releases/qbs/${pkgver}/${_pkgfqn}.tar.g
"manifest"
"0002-remove-lib-prefix-from-plugin-names.patch"
"0004-Use-.dll.a-instead-of-.a-for-mingw-import-librar.1.4.patch"
"0001-Fix-build-with-Qt-6.5.patch::https://invent.kde.org/qt/qbs/qbs/-/commit/4de3f91a.patch")
"0001-Fix-build-with-Qt-6.5.patch::https://invent.kde.org/qt/qbs/qbs/-/commit/4de3f91a.patch"
"0003-Fix-building-Qt6-programs-with-qbs.patch")
sha256sums=('d78555691ea732949346860e56f68c7c44e9384011359722b032a49b52dfccfd'
'838098b25a8044176b3139b4003594570c62a8d64f5470fbbd769f3bf44e0855'
'f1c8edc641a8738a4e14925970b64912c412cad83213647f18719e852440be7c'
'b6d51c58e96ac4fd957ccedcff7812de6f84ccfc9f996e30cf2e75fb5b4e5f02'
'b3b8de2a1bfc613da766b12217920badb29cc6a4ade3c6459dbe4366069e6c86')
'b3b8de2a1bfc613da766b12217920badb29cc6a4ade3c6459dbe4366069e6c86'
'90823d01d2e0466c7d7b58a57ac3e5e3dd713e7c25f402187c12b760028b82b1')
prepare() {
cd ${_pkgfqn}
patch -p1 -i "${srcdir}"/0001-Fix-build-with-Qt-6.5.patch
patch -p1 -i "${srcdir}"/0002-remove-lib-prefix-from-plugin-names.patch
# https://sourceforge.net/p/mingw-w64/bugs/968/
patch -p1 -i "${srcdir}"/0003-Fix-building-Qt6-programs-with-qbs.patch
patch -p1 -i "${srcdir}"/0004-Use-.dll.a-instead-of-.a-for-mingw-import-librar.1.4.patch
}