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

qt-installer-framework: Update to 4.10.0 (#24623)

Browse Source
This commit is contained in:
Christoph Reiter 2025-06-22 10:36:58 +02:00 committed by GitHub
parent 3958626a7b
commit 180a2014af
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
5 changed files with 41 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
mingw-w64-qt-installer-framework/0002-add-installation-stuff-to-pro-files.patch
View File

@ -24,15 +24,6 @@ index 76bd4c5..4f9e480 100644
-target.path = $$[QT_INSTALL_BINS]
+target.path = $$PREFIX/bin
INSTALLS += target
--- a/src/libs/3rdparty/7zip/7zip.pro
+++ b/src/libs/3rdparty/7zip/7zip.pro
@@ -10,5 +10,5 @@
win32:include($$7ZIP_BASE/win.pri) #7zip
unix:include($$7ZIP_BASE/unix.pri) #p7zip
-target.path = $$[QT_INSTALL_LIBS]
+target.path = $$PREFIX/lib
INSTALLS += target
diff --git a/src/libs/installer/installer.pro b/src/libs/installer/installer.pro
index 76bd4c5..4f9e480 100644
--- a/src/libs/installer/installer.pro

10
mingw-w64-qt-installer-framework/0005-fix-build-with-qt6.patch
View File

@ -71,3 +71,13 @@
macx:include(../../no_app_bundle.pri)
target.path = $$PREFIX/bin
--- a/tools/checksumgenerator/checksumgenerator.pro.orig 2025-06-22 10:18:55.310151400 +0200
+++ b/tools/checksumgenerator/checksumgenerator.pro 2025-06-22 10:19:00.129716100 +0200
@@ -9,3 +9,7 @@
CONFIG -= import_plugins
SOURCES += main.cpp
+
+win32 {
+ QMAKE_LIBS += -loleaut32 -lrpcrt4 -lgraphite2 -llcms2
+}

12
mingw-w64-qt-installer-framework/0010-fix-version-pass-to-windres.patch
View File

@ -1,19 +1,21 @@
--- a/installerfw.pri
+++ b/installerfw.pri
@@ -161,12 +161,12 @@
--- installer-framework-everywhere-src-4.10/installerfw.pri.orig 2025-06-22 08:48:41.047103400 +0200
+++ installer-framework-everywhere-src-4.10/installerfw.pri 2025-06-22 08:50:56.972022700 +0200
@@ -154,13 +154,13 @@
DEFINES += NOMINMAX QT_NO_CAST_FROM_ASCII QT_STRICT_ITERATORS QT_USE_QSTRINGBUILDER \
"_GIT_SHA1_=$$GIT_SHA1" \
- IFW_VERSION_STR=$$IFW_VERSION_STR \
- IFW_VERSION=$$IFW_VERSION \
- IFW_VERSION_STR_WIN32=$$IFW_VERSION_STR_WIN32 \
- IFW_VERSION_WIN32=$$IFW_VERSION_WIN32
- IFW_VERSION_WIN32=$$IFW_VERSION_WIN32 \
- IFW_LIB_PATH=$$IFW_LIB_PATH
-DEFINES += IFW_REPOSITORY_FORMAT_VERSION=$$IFW_REPOSITORY_FORMAT_VERSION \
- IFW_CACHE_FORMAT_VERSION=$$IFW_CACHE_FORMAT_VERSION
+ IFW_VERSION_STR=\"$$IFW_VERSION_STR\" \
+ IFW_VERSION=\"$$IFW_VERSION\" \
+ IFW_VERSION_STR_WIN32=\"$$IFW_VERSION_STR_WIN32\" \
+ IFW_VERSION_WIN32=\"$$IFW_VERSION_WIN32\"
+ IFW_VERSION_WIN32=\"$$IFW_VERSION_WIN32\" \
+ IFW_LIB_PATH=\"$$IFW_LIB_PATH\"
+DEFINES += IFW_REPOSITORY_FORMAT_VERSION=\"$$IFW_REPOSITORY_FORMAT_VERSION\" \
+ IFW_CACHE_FORMAT_VERSION=\"$$IFW_CACHE_FORMAT_VERSION\"

12
mingw-w64-qt-installer-framework/0013-fix-libarchive-linking.patch Normal file
View File

@ -0,0 +1,12 @@
--- installer-framework-everywhere-src-4.10/installerfw.pri.orig 2025-05-19 11:02:56.000000000 +0200
+++ installer-framework-everywhere-src-4.10/installerfw.pri 2025-06-22 09:59:52.942863500 +0200
@@ -171,7 +171,8 @@
}
CONFIG(libarchive):equals(TEMPLATE, app) {
- LIBS += -llibarchive
+ LIBS += $$IFW_LIB_PATH/liblibarchive.a
+ win32:LIBS += -lbcrypt
!isEmpty(IFW_ZLIB_LIBRARY) {
LIBS += $$IFW_ZLIB_LIBRARY
} else:!contains(QT_MODULES, zlib) {

24
mingw-w64-qt-installer-framework/PKGBUILD
View File

@ -4,7 +4,7 @@ _realname=installer-framework
pkgbase=mingw-w64-qt-${_realname}
pkgname="${MINGW_PACKAGE_PREFIX}-qt-${_realname}"
pkgdesc="The Qt Installer Framework used for the Qt SDK installer (mingw-w64)"
pkgver=4.9.0
pkgver=4.10.0
pkgrel=1
arch=('any')
mingw_arch=('mingw64' 'ucrt64' 'clang64' 'clangarm64')
@ -39,17 +39,19 @@ source=(https://download.qt.io/official_releases/qt-${_realname}/${pkgver}/${_re
"0010-fix-version-pass-to-windres.patch"
"0011-fix-redefined-mode_t.patch"
"0012-get_timezone-not-available-on-msvcrt.patch"
"qt6_8_2.patch"::"https://github.com/qtproject/installer-framework/commit/252c1e8554130f4f097752913481eceed171a510.patch")
sha256sums=('4e6d937e5b64d9817df5f7308f9972f09b4d693588f556a71cbcf3fcdcf154d2'
'4100a93ac7e117a32430d22187a4ebe94e7830d94d2c23b85651bc1d95821409'
"0013-fix-libarchive-linking.patch"
"https://github.com/qtproject/installer-framework/commit/c3e9ef46a705d5561ae80f64e632036a2a4189ff.patch")
sha256sums=('c800433f230bbf01a5653644c103a0d4906a0eaa3f8d797f76f7b32025c8ac9b'
'5f9f2a2ff87698dd72f9b9a42765e6b02034e3bfec8e8e348d55285048097a9b'
'3de4920ee4f04cce6bc791b01e2ee9894958b26c47dcac7a4e2843eb429154b5'
'2aaf51f346edb6db2367262d0d8e1bb77d0afee51fabd5b2766038a97ebf0ca6'
'd4d52149e6cbc595222589c92b3a2f1ba48a36d19a27952dfb5dc063d7b417b3'
'88ca7c3c31ce1dc32036658e1307e93ce933e1088205056def6b178eb52953b6'
'00857e9a654ecaed93ec79898389329799fdc01968b7562ae1889498b12c943d'
'2129715e22dac176a669b7c3776b4d7f0bc66a3c01ad262b89dd23ca3825a324'
'b1c741190c172bc0f49ec17292132c7257e382ea29438c7177ec46e0eeaac5ca'
'a2eaac4c11e0b6a41f3289657d9e95894a5ed6d625ea98cc41fd4356d2d22a8e'
'51d50531fa3cc4f68473d51812f5feea128690dc8bc7de379bf9888dae9b9d46'
'7550bff6736344f29b9e447c19b2416dbcfb4125e580b5582ca7013c37c43943')
'f064ed89be41deea9aa25c7d145ca566f9dfe03fadcba3850ac61c8542b09255'
'fc10c9af91bb475bfd58e141feef0d0cfd516c8adc240248ee9ad4bc47bdf579')
# Helper macros to help make tasks easier #
apply_patch_with_msg() {
@ -61,12 +63,8 @@ apply_patch_with_msg() {
}
prepare() {
mv "${srcdir}"/${_realname}-everywhere-src-master "${srcdir}"/${_realname}-everywhere-src-${pkgver%.*}
cd "${srcdir}"/${_realname}-everywhere-src-${pkgver%.*}
apply_patch_with_msg \
qt6_8_2.patch
apply_patch_with_msg \
0002-add-installation-stuff-to-pro-files.patch \
0003-add-recursive-option-to-rmdir-operation.patch \
@ -74,7 +72,9 @@ prepare() {
0005-fix-build-with-qt6.patch \
0010-fix-version-pass-to-windres.patch \
0011-fix-redefined-mode_t.patch \
0012-get_timezone-not-available-on-msvcrt.patch
0012-get_timezone-not-available-on-msvcrt.patch \
0013-fix-libarchive-linking.patch \
c3e9ef46a705d5561ae80f64e632036a2a4189ff.patch
# This requires ../mingw-w64-qt5-static/0044-qt-5.4.1-Revert-Revert-fix-NTFS-mount-points.patch
# to fix the problem for junction points. Together they fix: