Befator-Inc-Firmen-Netzwerk/MINGW-packages
3
0
Fork 0
Code Issues Pull Requests Packages Projects Releases 1 Wiki Activity

qt-creator: update to 18.0.0 (#26176)

Browse Source
This commit is contained in:
Konstantin Podsvirov
2025-11-01 23:20:34 +03:00
committed by GitHub
parent 9b689f1ca4
commit ea328548a1
2 changed files with 20 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
mingw-w64-qt-creator/PKGBUILD
View File

@@ -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=17.0.2
_base_ver=18.0.0
pkgver=${_base_ver/-/}
pkgrel=1
pkgdesc='Lightweight, cross-platform integrated development environment (mingw-w64)'
@@ -23,6 +23,7 @@ makedepends=("${MINGW_PACKAGE_PREFIX}-cc"
"${MINGW_PACKAGE_PREFIX}-ninja"
"${MINGW_PACKAGE_PREFIX}-clang"
"${MINGW_PACKAGE_PREFIX}-clang-tools-extra"
"${MINGW_PACKAGE_PREFIX}-go"
"${MINGW_PACKAGE_PREFIX}-llvm"
"${MINGW_PACKAGE_PREFIX}-litehtml"
"${MINGW_PACKAGE_PREFIX}-python"
@@ -32,8 +33,7 @@ makedepends=("${MINGW_PACKAGE_PREFIX}-cc"
"${MINGW_PACKAGE_PREFIX}-qt6-quick3d"
"${MINGW_PACKAGE_PREFIX}-qt6-serialport"
"${MINGW_PACKAGE_PREFIX}-qt6-translations"
"${MINGW_PACKAGE_PREFIX}-qt6-5compat"
#"${MINGW_PACKAGE_PREFIX}-qt6-charts"
"${MINGW_PACKAGE_PREFIX}-qt6-charts"
"${MINGW_PACKAGE_PREFIX}-qt6-doc"
"${MINGW_PACKAGE_PREFIX}-qt6-quicktimeline"
"${MINGW_PACKAGE_PREFIX}-yaml-cpp")
@@ -43,12 +43,12 @@ source=(https://download.qt.io/official_releases/qtcreator/${_base_ver%.*}/${_ba
qt-creator-3.2.0-Allow-iOS-plugin-on-any-platform.patch
qt-creator-5.0.1-fix-library-archive-path.patch
003-link-against-clang-cpp.patch
004-fix-build-with-qt-6-10.patch::https://invent.kde.org/qt/qt-creator/qt-creator/-/commit/5a4c700c.patch)
sha256sums=('b0e118f9fb89be717628b3f9251c295fa6df41fa8b7d81216e2ead8355e55a13'
qt-creator-18.0.0-plugin-appstatisticsmonitor-define-callback.patch)
sha256sums=('c773b74114d1fbca66c81b8fb799892827e7e1542491ed459aaad279e0253973'
'eacd98f69324695595690c5328d62137af609e55c7c94c19e7bd8e1f7e4b4712'
'29d67f88f071abe7a4b589182767b8a697fe4e516d70707bfca88f035883718f'
'5d6c0b626ef29ce39372eb180527d64e11af2bf39a1a3e84e709464a20d2433b'
'd40bdb0505b99cb1ad89aa976f1dc0dba0edf3d1f238dab6905b08394fe5ed38')
'90993b47414cdb31bce7c12ed8e3f9a9932c74832c4b51c0a22272081dc4f4c0')
apply_patch_with_msg() {
for _patch in "$@"
@@ -65,7 +65,7 @@ prepare() {
qt-creator-3.2.0-Allow-iOS-plugin-on-any-platform.patch \
qt-creator-5.0.1-fix-library-archive-path.patch \
003-link-against-clang-cpp.patch \
004-fix-build-with-qt-6-10.patch
qt-creator-18.0.0-plugin-appstatisticsmonitor-define-callback.patch
}
build() {
@@ -106,7 +106,6 @@ package_qt-creator() {
"${MINGW_PACKAGE_PREFIX}-qt6-quick3d"
"${MINGW_PACKAGE_PREFIX}-qt6-serialport"
"${MINGW_PACKAGE_PREFIX}-qt6-translations"
"${MINGW_PACKAGE_PREFIX}-qt6-5compat"
"${MINGW_PACKAGE_PREFIX}-libarchive"
"${MINGW_PACKAGE_PREFIX}-litehtml"
"${MINGW_PACKAGE_PREFIX}-yaml-cpp"
@@ -116,7 +115,7 @@ package_qt-creator() {
"${MINGW_PACKAGE_PREFIX}-ninja: Ninja Generator"
"${MINGW_PACKAGE_PREFIX}-qbs: QBS project support"
"${MINGW_PACKAGE_PREFIX}-clang-libs: ClangCodeModel and ClangFormat plugins"
#"${MINGW_PACKAGE_PREFIX}-qt6-charts: Plugin AppStatisticsMonitor"
"${MINGW_PACKAGE_PREFIX}-qt6-charts: Plugin AppStatisticsMonitor"
"${MINGW_PACKAGE_PREFIX}-qt6-doc: integrated Qt6 documentation"
"${MINGW_PACKAGE_PREFIX}-qt6-quicktimeline: qmlpuppet")

12
mingw-w64-qt-creator/qt-creator-18.0.0-plugin-appstatisticsmonitor-define-callback.patch Normal file
View File

@@ -0,0 +1,12 @@
--- qt-creator-opensource-src-18.0.0.orig/src/plugins/appstatisticsmonitor/idataprovider.cpp 2025-10-30 23:22:29.115442300 +0300
+++ qt-creator-opensource-src-18.0.0/src/plugins/appstatisticsmonitor/idataprovider.cpp 2025-10-30 22:52:57.760170000 +0300
@@ -17,6 +17,9 @@
#ifdef Q_OS_WIN
#include <windows.h>
+#ifndef CALLBACK
+#define CALLBACK __stdcall
+#endif
#include <psapi.h>
#endif