From faf7487addb686414530a8709bce2bd7e2d3be3c 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?= <mehdi.chinoune@hotmail.com>
Date: Mon, 17 Apr 2023 07:00:32 +0100
Subject: [PATCH] qbs: update to 2.0.0

---
 mingw-w64-qbs/0001-find-qdoc.patch | 12 ------------
 mingw-w64-qbs/PKGBUILD             | 31 ++++++++++++++----------------
 2 files changed, 14 insertions(+), 29 deletions(-)
 delete mode 100644 mingw-w64-qbs/0001-find-qdoc.patch

diff --git a/mingw-w64-qbs/0001-find-qdoc.patch b/mingw-w64-qbs/0001-find-qdoc.patch
deleted file mode 100644
index 4732e7f172..0000000000
--- a/mingw-w64-qbs/0001-find-qdoc.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-
---- a/cmake/QbsDocumentation.cmake
-+++ b/cmake/QbsDocumentation.cmake
-@@ -246,7 +246,7 @@
- function(_qbs_qdoc_build_qdocconf_file _qdocconf_file)
-     _qbs_setup_doc_targets()
- 
--    _qbs_doc_find_program(_qdoc NAMES qdoc qdoc-qt5)
-+    _qbs_doc_find_program(_qdoc NAMES qdoc qdoc-qt5 qdoc-qt6)
-     if (_qdoc STREQUAL "_prg__qdoc-NOTFOUND")
-         message(WARNING "No qdoc binary found: No documentation targets were generated")
-         return()
diff --git a/mingw-w64-qbs/PKGBUILD b/mingw-w64-qbs/PKGBUILD
index 4d61231438..92562f5c60 100644
--- a/mingw-w64-qbs/PKGBUILD
+++ b/mingw-w64-qbs/PKGBUILD
@@ -22,43 +22,41 @@
 _realname=qbs
 pkgbase=mingw-w64-${_realname}
 pkgname="${MINGW_PACKAGE_PREFIX}-${_realname}"
-pkgver=1.24.1
+pkgver=2.0.0
 pkgrel=1
 pkgdesc="Qt Build Suite (mingw-w64)"
 url='https://www.qt.io/'
 arch=('any')
-mingw_arch=('mingw32' 'mingw64' 'ucrt64')
+mingw_arch=('mingw64' 'ucrt64' 'clang64' 'clangarm64')
 license=('LGPL')
-depends=($([[ ${CARCH} != i686 ]] && echo \
-           "${MINGW_PACKAGE_PREFIX}-qt6-base" \
-           "${MINGW_PACKAGE_PREFIX}-qt6-5compat" || echo \
-           "${MINGW_PACKAGE_PREFIX}-qt5-script"))
+depends=("${MINGW_PACKAGE_PREFIX}-gcc-libs"
+         "${MINGW_PACKAGE_PREFIX}-libwinpthread-git"
+         "${MINGW_PACKAGE_PREFIX}-qt6-base"
+         "${MINGW_PACKAGE_PREFIX}-qt6-5compat")
 makedepends=("${MINGW_PACKAGE_PREFIX}-cc"
              "${MINGW_PACKAGE_PREFIX}-cmake"
              "${MINGW_PACKAGE_PREFIX}-ninja"
              "${MINGW_PACKAGE_PREFIX}-clang"
              "${MINGW_PACKAGE_PREFIX}-python-beautifulsoup4"
              "${MINGW_PACKAGE_PREFIX}-python-lxml"
-             $([[ ${CARCH} != i686 ]] && echo \
-               "${MINGW_PACKAGE_PREFIX}-qt6-declarative" \
-               "${MINGW_PACKAGE_PREFIX}-qt6-tools" || echo \
-               "${MINGW_PACKAGE_PREFIX}-qt5-tools"))  # clang for qdoc
+              "${MINGW_PACKAGE_PREFIX}-qt6-declarative"
+              "${MINGW_PACKAGE_PREFIX}-qt6-tools")  # clang for qdoc
 _pkgfqn="${_realname}-src-${pkgver}"
 source=("https://download.qt.io/official_releases/qbs/${pkgver}/${_pkgfqn}.tar.gz"
         "manifest"
-        "0001-find-qdoc.patch"
         "0002-remove-lib-prefix-from-plugin-names.patch"
-        "0004-Use-.dll.a-instead-of-.a-for-mingw-import-librar.1.4.patch")
-sha256sums=('1f1a92c840e708bbbc30705e3b0bb1d0cd47ffcf679d566dd071a1768ee65992'
+        "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")
+sha256sums=('d78555691ea732949346860e56f68c7c44e9384011359722b032a49b52dfccfd'
             '838098b25a8044176b3139b4003594570c62a8d64f5470fbbd769f3bf44e0855'
-            'e0ccca7131e0b58ad37a6287a5e6d82a2bea0b3973adc2a2617342b75040bc02'
             'f1c8edc641a8738a4e14925970b64912c412cad83213647f18719e852440be7c'
-            'b6d51c58e96ac4fd957ccedcff7812de6f84ccfc9f996e30cf2e75fb5b4e5f02')
+            'b6d51c58e96ac4fd957ccedcff7812de6f84ccfc9f996e30cf2e75fb5b4e5f02'
+            'b3b8de2a1bfc613da766b12217920badb29cc6a4ade3c6459dbe4366069e6c86')
 
 prepare() {
   cd ${_pkgfqn}
 
-  patch -p1 -i "${srcdir}"/0001-find-qdoc.patch
+  patch -p1 -i "${srcdir}"/0001-Fix-build-with-Qt-6.5.patch
   patch -p1 -i "${srcdir}"/0002-remove-lib-prefix-from-plugin-names.patch
   patch -p1 -i "${srcdir}"/0004-Use-.dll.a-instead-of-.a-for-mingw-import-librar.1.4.patch
 }
@@ -88,7 +86,6 @@ build() {
     -DQBS_INSTALL_MAN_PAGE=ON \
     ../${_pkgfqn}
 
-  cp ${srcdir}/manifest ${srcdir}/build-${MSYSTEM}/bin/qbs.exe.manifest
   ${MINGW_PREFIX}/bin/cmake --build .
 }