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

qt-creator: Rename bundled libZip to libQZip to avoid conflict with libzip package

Browse Source
This commit is contained in:
Alexey Pavlov 2024-12-11 19:42:43 +03:00
parent 10386fdfa5
commit 1d5da7316f
2 changed files with 44 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

37
mingw-w64-qt-creator/005-rename-creator-libzip.patch Normal file
View File

@ -0,0 +1,37 @@
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

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

@ -8,7 +8,7 @@ pkgname=("${MINGW_PACKAGE_PREFIX}-${_realname}"
"${MINGW_PACKAGE_PREFIX}-${_realname}-devel")
_base_ver=15.0.0
pkgver=${_base_ver/-/}
pkgrel=1
pkgrel=2
pkgdesc='Lightweight, cross-platform integrated development environment (mingw-w64)'
arch=('any')
mingw_arch=('mingw64' 'ucrt64' 'clang64' 'clangarm64')
@ -42,12 +42,14 @@ 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-clang-19.patch::https://invent.kde.org/qt/qt-creator/qt-creator/-/commit/0e9943dd.patch)
004-fix-build-with-clang-19.patch::https://invent.kde.org/qt/qt-creator/qt-creator/-/commit/0e9943dd.patch
005-rename-creator-libzip.patch)
sha256sums=('23b1c6b478ca760997ecddd4c728f0da280b0696008a9bddd9a1068f16d48f72'
'eacd98f69324695595690c5328d62137af609e55c7c94c19e7bd8e1f7e4b4712'
'29d67f88f071abe7a4b589182767b8a697fe4e516d70707bfca88f035883718f'
'5d6c0b626ef29ce39372eb180527d64e11af2bf39a1a3e84e709464a20d2433b'
'bd720dc514eb8d3994a3812c6159f11f46320d20cf2824e51084668e097b5f48')
'bd720dc514eb8d3994a3812c6159f11f46320d20cf2824e51084668e097b5f48'
'417ef118818add39304ec36e4b3651d4fa238ed548cffeab42cbcf651a79294c')
apply_patch_with_msg() {
for _patch in "$@"
@ -64,7 +66,8 @@ 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-clang-19.patch
004-fix-build-with-clang-19.patch \
005-rename-creator-libzip.patch
}
build() {