diff --git a/mingw-w64-qt-creator/003-find-qdoc-qt6.patch b/mingw-w64-qt-creator/003-find-qdoc-qt6.patch deleted file mode 100644 index 9f43faf3d2..0000000000 --- a/mingw-w64-qt-creator/003-find-qdoc-qt6.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- a/cmake/QtCreatorDocumentation.cmake -+++ b/cmake/QtCreatorDocumentation.cmake -@@ -181,7 +181,7 @@ - function(qdoc_build_qdocconf_file _qdocconf_file) - _setup_doc_targets() - -- _doc_find_program(_qdoc NAMES qdoc qdoc-qt5) -+ _doc_find_program(_qdoc NAMES qdoc 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-qt-creator/PKGBUILD b/mingw-w64-qt-creator/PKGBUILD index f727172bda..d34c678dd0 100644 --- a/mingw-w64-qt-creator/PKGBUILD +++ b/mingw-w64-qt-creator/PKGBUILD @@ -6,7 +6,7 @@ pkgbase=mingw-w64-${_realname} pkgname=("${MINGW_PACKAGE_PREFIX}-${_realname}" "${MINGW_PACKAGE_PREFIX}-${_realname}-docs" "${MINGW_PACKAGE_PREFIX}-${_realname}-devel") -_base_ver=9.0.1 +_base_ver=10.0.0 pkgver=${_base_ver/-/} pkgrel=1 pkgdesc='Lightweight, cross-platform integrated development environment (mingw-w64)' @@ -14,7 +14,7 @@ url='https://www.qt.io/' install=qt-creator-${MSYSTEM}.install arch=('any') mingw_arch=('mingw64' 'ucrt64' 'clang64' 'clangarm64') -license=('GPL3') +license=('spdx:Qt-GPL-exception-1.0') makedepends=("${MINGW_PACKAGE_PREFIX}-cc" "${MINGW_PACKAGE_PREFIX}-cmake" "${MINGW_PACKAGE_PREFIX}-ninja" @@ -35,13 +35,11 @@ makedepends=("${MINGW_PACKAGE_PREFIX}-cc" _pkgfqn="${_realname}-opensource-src-${_base_ver}" source=(https://download.qt.io/official_releases/qtcreator/${_base_ver%.*}/${_base_ver}/${_pkgfqn}.tar.xz qt-creator-3.2.0-Allow-iOS-plugin-on-any-platform.patch - qt-creator-5.0.1-fix-library-archive-path.patch - 003-find-qdoc-qt6.patch) -noextract=(${_pkgfqn}.tar.xz) -sha256sums=('4e4e881b2635bac07e785c9e889ab9a253ad47a00074e260cbccdb3c0aef189f' + qt-creator-5.0.1-fix-library-archive-path.patch) +# noextract=(${_pkgfqn}.tar.xz) +sha256sums=('9489829de05893a4628b7b6581af096c48afbd31c932cd8a4db30a90c52197bf' '6166817edb9055b98e53f644a41f28a1dbbfc3743931776852753212eee639c3' - '29d67f88f071abe7a4b589182767b8a697fe4e516d70707bfca88f035883718f' - '5870c81167909d549c14c2b60acabfae2b0b85e84bae7aa7e383333ff9411a4a') + '29d67f88f071abe7a4b589182767b8a697fe4e516d70707bfca88f035883718f') apply_patch_with_msg() { for _patch in "$@" @@ -52,19 +50,17 @@ apply_patch_with_msg() { } prepare() { - [[ -d ${srcdir}/${_pkgfqn} ]] && rm -rf ${srcdir}/${_pkgfqn} - tar -xf ${srcdir}/${_pkgfqn}.tar.xz -C "${srcdir}" || true + # [[ -d ${srcdir}/${_pkgfqn} ]] && rm -rf ${srcdir}/${_pkgfqn} + # tar -xJf ${srcdir}/${_pkgfqn}.tar.xz -C "${srcdir}" || true cd ${srcdir}/${_pkgfqn} apply_patch_with_msg \ qt-creator-3.2.0-Allow-iOS-plugin-on-any-platform.patch \ - qt-creator-5.0.1-fix-library-archive-path.patch \ - 003-find-qdoc-qt6.patch + qt-creator-5.0.1-fix-library-archive-path.patch } build() { - [[ -d ${srcdir}/build-${MSYSTEM} ]] && rm -rf ${srcdir}/build-${MSYSTEM} mkdir -p ${srcdir}/build-${MSYSTEM} && cd ${srcdir}/build-${MSYSTEM} if check_option "debug" "y"; then @@ -81,7 +77,8 @@ build() { -DWITH_DOCS=ON \ -DBUILD_DEVELOPER_DOCS=ON \ -DBUILD_QBS=OFF \ - -DPython3_ROOT_DIR=${MINGW_PREFIX} \ + -DPython3_EXECUTABLE=${MINGW_PREFIX}/bin/python \ + -DWITH_TESTS=OFF \ ../${_pkgfqn} ${MINGW_PREFIX}/bin/cmake --build .