qt-creator: update to 17.0.0
This commit is contained in:
parent
fd6fc7d2c8
commit
0570a94246
@ -1,37 +0,0 @@
|
||||
diff -Naur qt-creator-opensource-src-15.0.0-orig/src/libs/solutions/zip/CMakeLists.txt qt-creator-opensource-src-15.0.0/src/libs/solutions/zip/CMakeLists.txt
|
||||
--- qt-creator-opensource-src-15.0.0-orig/src/libs/solutions/zip/CMakeLists.txt 2024-11-27 13:00:22.000000000 +0300
|
||||
+++ qt-creator-opensource-src-15.0.0/src/libs/solutions/zip/CMakeLists.txt 2024-12-11 13:23:13.599640700 +0300
|
||||
@@ -1,4 +1,4 @@
|
||||
-add_qtc_library(Zip
|
||||
+add_qtc_library(QZip
|
||||
DEPENDS Qt::Core
|
||||
DEFINES ZIP_LIB
|
||||
SOURCES
|
||||
@@ -10,7 +10,7 @@
|
||||
${CMAKE_CURRENT_LIST_DIR}/../../3rdparty/zlib/src
|
||||
)
|
||||
|
||||
-extend_qtc_library(Zip
|
||||
+extend_qtc_library(QZip
|
||||
SOURCES_PREFIX ${CMAKE_CURRENT_LIST_DIR}/../../3rdparty/zlib/src
|
||||
SKIP_AUTOMOC
|
||||
SOURCES
|
||||
@@ -43,5 +43,5 @@
|
||||
)
|
||||
|
||||
if(MSVC)
|
||||
- target_compile_options(Zip PUBLIC /wd4996)
|
||||
+ target_compile_options(QZip PUBLIC /wd4996)
|
||||
endif()
|
||||
diff -Naur qt-creator-opensource-src-15.0.0-orig/src/plugins/qmldesigner/CMakeLists.txt qt-creator-opensource-src-15.0.0/src/plugins/qmldesigner/CMakeLists.txt
|
||||
--- qt-creator-opensource-src-15.0.0-orig/src/plugins/qmldesigner/CMakeLists.txt 2024-11-27 13:00:24.000000000 +0300
|
||||
+++ qt-creator-opensource-src-15.0.0/src/plugins/qmldesigner/CMakeLists.txt 2024-12-11 13:23:00.532821600 +0300
|
||||
@@ -50,7 +50,7 @@
|
||||
PLUGIN_MANUAL_DEPENDS LicenseChecker ${IDE_VERSION} optional
|
||||
DEPENDS
|
||||
QmlJS LanguageUtils QmlEditorWidgets AdvancedDockingSystem
|
||||
- Qt::QuickWidgets Qt::CorePrivate Qt::Xml Qt::Svg Sqlite Zip Qt::GuiPrivate
|
||||
+ Qt::QuickWidgets Qt::CorePrivate Qt::Xml Qt::Svg Sqlite QZip Qt::GuiPrivate
|
||||
PUBLIC_DEPENDS
|
||||
QmlDesignerUtils QmlPuppetCommunication QmlDesignerCore
|
||||
DEFINES
|
||||
@ -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=16.0.0
|
||||
_base_ver=17.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}-llvm"
|
||||
"${MINGW_PACKAGE_PREFIX}-litehtml"
|
||||
"${MINGW_PACKAGE_PREFIX}-python"
|
||||
"${MINGW_PACKAGE_PREFIX}-qt6-declarative"
|
||||
@ -41,13 +42,11 @@ _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-link-against-clang-cpp.patch
|
||||
005-rename-creator-libzip.patch)
|
||||
sha256sums=('18b4353e68a31c062713008c05ce7f7ee88aaaf56d5ac0c6de579babfb2837da'
|
||||
003-link-against-clang-cpp.patch)
|
||||
sha256sums=('616dfea43a6162bc1a8ccf440e1df6a74b977fcb028d76b7c779a1fb8de39e8c'
|
||||
'eacd98f69324695595690c5328d62137af609e55c7c94c19e7bd8e1f7e4b4712'
|
||||
'29d67f88f071abe7a4b589182767b8a697fe4e516d70707bfca88f035883718f'
|
||||
'5d6c0b626ef29ce39372eb180527d64e11af2bf39a1a3e84e709464a20d2433b'
|
||||
'417ef118818add39304ec36e4b3651d4fa238ed548cffeab42cbcf651a79294c')
|
||||
'5d6c0b626ef29ce39372eb180527d64e11af2bf39a1a3e84e709464a20d2433b')
|
||||
|
||||
apply_patch_with_msg() {
|
||||
for _patch in "$@"
|
||||
@ -63,8 +62,7 @@ prepare() {
|
||||
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-link-against-clang-cpp.patch \
|
||||
005-rename-creator-libzip.patch
|
||||
003-link-against-clang-cpp.patch
|
||||
}
|
||||
|
||||
build() {
|
||||
@ -97,13 +95,16 @@ build() {
|
||||
|
||||
package_qt-creator() {
|
||||
pkgdesc="Lightweight, cross-platform integrated development environment (mingw-w64)"
|
||||
depends=("${MINGW_PACKAGE_PREFIX}-qt6-declarative"
|
||||
depends=("${MINGW_PACKAGE_PREFIX}-cc-libs"
|
||||
"${MINGW_PACKAGE_PREFIX}-qt6-base"
|
||||
"${MINGW_PACKAGE_PREFIX}-qt6-declarative"
|
||||
"${MINGW_PACKAGE_PREFIX}-qt6-tools"
|
||||
"${MINGW_PACKAGE_PREFIX}-qt6-svg"
|
||||
"${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"
|
||||
"${MINGW_PACKAGE_PREFIX}-zstd")
|
||||
@ -114,14 +115,14 @@ package_qt-creator() {
|
||||
"${MINGW_PACKAGE_PREFIX}-clang-libs: ClangCodeModel and ClangFormat plugins"
|
||||
#"${MINGW_PACKAGE_PREFIX}-qt6-charts: Plugin AppStatisticsMonitor"
|
||||
"${MINGW_PACKAGE_PREFIX}-qt6-doc: integrated Qt6 documentation"
|
||||
"${MINGW_PACKAGE_PREFIX}-qt6-quicktimeline")
|
||||
"${MINGW_PACKAGE_PREFIX}-qt6-quicktimeline: qmlpuppet")
|
||||
|
||||
cd "${srcdir}"/build-${MSYSTEM}
|
||||
|
||||
DESTDIR="${pkgdir}" ${MINGW_PREFIX}/bin/cmake --install .
|
||||
|
||||
install -d "${pkgdir}${MINGW_PREFIX}"/share/licenses/${_realname}
|
||||
install -Dm644 "${srcdir}"/${_pkgfqn}/LICENSE* -t "${pkgdir}${MINGW_PREFIX}"/share/licenses/${_realname}
|
||||
install -Dm644 "${srcdir}"/${_pkgfqn}/LICENSES/* -t "${pkgdir}${MINGW_PREFIX}"/share/licenses/${_realname}
|
||||
}
|
||||
|
||||
package_qt-creator-docs() {
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user