qtifw: update 3.1.1 --> 3.2.0 and fix for Qt 5.14

also use BUILD_DIR etc
2020-01-19 16:22:37 +11:00 · 2020-01-19 16:22:37 +11:00 · b97b15372f
parent fb86013d62
commit b97b15372f
2 changed files with 79 additions and 32 deletions
--- a/src/qtifw-1-fixes.patch
+++ b/src/qtifw-1-fixes.patch
@ -1,7 +1,15 @@
 This file is part of MXE. See LICENSE.md for licensing information.

+Contains ad hoc patches for cross building.
+
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
+From: Tony Theodore <tonyt@logyst.com>
+Date: Sun, 19 Jan 2020 13:27:42 +1100
+Subject: [PATCH 1/2] fixes
+
+
 diff --git a/installerfw.pro b/installerfw.pro
-index 10414ad5..1cec9c6a 100644
+index 1111111..2222222 100644
 --- a/installerfw.pro
 +++ b/installerfw.pro
@@ -2,8 +2,6 @@ TEMPLATE = subdirs
@ -14,10 +22,10 @@ index 10414ad5..1cec9c6a 100644
 include (doc/doc.pri)
 
 diff --git a/src/libs/7zip/win/CPP/Windows/SecurityUtils.h b/src/libs/7zip/win/CPP/Windows/SecurityUtils.h
-index 715de250..bfb65a34 100644
+index 1111111..2222222 100644
 --- a/src/libs/7zip/win/CPP/Windows/SecurityUtils.h
 +++ b/src/libs/7zip/win/CPP/Windows/SecurityUtils.h
-@@ -2,7 +2,7 @@
+@@ -3,7 +3,7 @@
 #ifndef __WINDOWS_SECURITY_UTILS_H
 #define __WINDOWS_SECURITY_UTILS_H
 
@ -26,21 +34,8 @@ index 715de250..bfb65a34 100644
 
 #include "Defs.h"
 
-diff --git a/src/libs/installer/createshortcutoperation.cpp b/src/libs/installer/createshortcutoperation.cpp
-index 2c2e96ef..36f97b0c 100644
--- a/src/libs/installer/createshortcutoperation.cpp
-+++ b/src/libs/installer/createshortcutoperation.cpp
-@@ -41,7 +41,7 @@ using namespace QInstaller;
- #ifdef Q_OS_WIN
- #include <qt_windows.h>
- #include <shlobj.h>
-#include <Intshcut.h>
-+#include <intshcut.h>
- 
- #ifndef PIDLIST_ABSOLUTE
- typedef ITEMIDLIST *PIDLIST_ABSOLUTE;
 diff --git a/src/libs/installer/binaryformat.h b/src/libs/installer/binaryformat.h
-index 3bd8a6aa..87d5e323 100644
+index 1111111..2222222 100644
 --- a/src/libs/installer/binaryformat.h
 +++ b/src/libs/installer/binaryformat.h
@@ -33,7 +33,7 @@
@ -61,8 +56,21 @@ index 3bd8a6aa..87d5e323 100644
     QByteArray m_name;
     Range<qint64> m_segment;
 };
+diff --git a/src/libs/installer/createshortcutoperation.cpp b/src/libs/installer/createshortcutoperation.cpp
+index 1111111..2222222 100644
+--- a/src/libs/installer/createshortcutoperation.cpp
+++ b/src/libs/installer/createshortcutoperation.cpp
+@@ -41,7 +41,7 @@ using namespace QInstaller;
+ #ifdef Q_OS_WIN
+ #include <qt_windows.h>
+ #include <shlobj.h>
+-#include <Intshcut.h>
+#include <intshcut.h>
+ 
+ #ifndef PIDLIST_ABSOLUTE
+ typedef ITEMIDLIST *PIDLIST_ABSOLUTE;
 diff --git a/src/libs/installer/extractarchiveoperation_p.h b/src/libs/installer/extractarchiveoperation_p.h
-index f333da36..9f528b6a 100644
+index 1111111..2222222 100644
 --- a/src/libs/installer/extractarchiveoperation_p.h
 +++ b/src/libs/installer/extractarchiveoperation_p.h
@@ -37,6 +37,8 @@
@ -74,3 +82,34 @@ index f333da36..9f528b6a 100644
 
 namespace QInstaller {
 
+
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
+From: Tony Theodore <tonyt@logyst.com>
+Date: Sun, 19 Jan 2020 13:28:53 +1100
+Subject: [PATCH 2/2] fixes for Qt 5.14 update
+
+
+diff --git a/src/libs/installer/component.cpp b/src/libs/installer/component.cpp
+index 1111111..2222222 100644
+--- a/src/libs/installer/component.cpp
+++ b/src/libs/installer/component.cpp
+@@ -50,7 +50,6 @@
+ 
+ #include <QtUiTools/QUiLoader>
+ 
+-#include <private/qv8engine_p.h>
+ #include <private/qv4scopedvalue_p.h>
+ #include <private/qv4object_p.h>
+ 
+diff --git a/src/libs/installer/extractarchiveoperation.cpp b/src/libs/installer/extractarchiveoperation.cpp
+index 1111111..2222222 100644
+--- a/src/libs/installer/extractarchiveoperation.cpp
+++ b/src/libs/installer/extractarchiveoperation.cpp
+@@ -30,6 +30,7 @@
+ 
+ #include "constants.h"
+ 
+#include <QDataStream>
+ #include <QEventLoop>
+ #include <QThreadPool>
+ #include <QFileInfo>
--- a/src/qtifw.mk
+++ b/src/qtifw.mk
@ -4,34 +4,42 @@ PKG             := qtifw
 $(PKG)_WEBSITE  := https://doc.qt.io/qtinstallerframework/index.html
 $(PKG)_DESCR    := Qt Installer Framework
 $(PKG)_IGNORE   :=
-$(PKG)_VERSION  := 3.1.1
-$(PKG)_CHECKSUM := 59b5370aaf521bb1a34a025ac451bb3bbbfa519ee271156aba9d42ee1132d1b1
-# the archive is in fact only a tar file, not a tar.gz
-$(PKG)_FILE     := qtifw-$($(PKG)_VERSION).tar
+$(PKG)_VERSION  := 3.2.0
+$(PKG)_CHECKSUM := 7cd0d7b86fbe63b101f263b6532485df3a2d336cc0026b47eb866dae134e319f
+$(PKG)_FILE     := qtifw-$($(PKG)_VERSION).tar.gz
 $(PKG)_URL      := https://download.qt.io/official_releases/qt-installer-framework/$($(PKG)_VERSION)/qt-installer-framework-opensource-src-$($(PKG)_VERSION).tar.gz
 $(PKG)_TARGETS  := $(BUILD) $(MXE_TARGETS)

 $(PKG)_DEPS_$(BUILD) := cc qtbase qttools
 $(PKG)_DEPS_STATIC   := $($(PKG)_DEPS_$(BUILD)) qtwinextras $(BUILD)~$(PKG)

+define $(PKG)_UPDATE
+    $(WGET) -q -O- 'https://download.qt.io/official_releases/qt-installer-framework/' | \
+    $(SED) -n 's,.*<a href="*\([0-9][^"]*\)/.*,\1,p' | \
+    $(SORT) -V | \
+    tail -1
+endef
+
 define $(PKG)_BUILD_$(BUILD)
-    cd '$(1)' && $(TARGET)-qmake-qt5
-    $(MAKE) -C '$(1)' -j '$(JOBS)'
-    $(INSTALL) -m755 '$(1)/bin/binarycreator' '$(PREFIX)/bin/$(TARGET)-binarycreator'
-    $(INSTALL) -m755 '$(1)/bin/repogen' '$(PREFIX)/bin/$(TARGET)-repogen'
-    $(INSTALL) -m755 '$(1)/bin/archivegen' '$(PREFIX)/bin/$(TARGET)-archivegen'
-    $(INSTALL) -m755 '$(1)/bin/devtool' '$(PREFIX)/bin/$(TARGET)-devtool'
+    cd '$(BUILD_DIR)' && $(TARGET)-qmake-qt5 '$(SOURCE_DIR)'
+    $(MAKE) -C '$(BUILD_DIR)' -j '$(JOBS)'
+    $(INSTALL) -m755 '$(BUILD_DIR)/bin/binarycreator' '$(PREFIX)/bin/$(TARGET)-binarycreator'
+    $(INSTALL) -m755 '$(BUILD_DIR)/bin/repogen' '$(PREFIX)/bin/$(TARGET)-repogen'
+    $(INSTALL) -m755 '$(BUILD_DIR)/bin/archivegen' '$(PREFIX)/bin/$(TARGET)-archivegen'
+    $(INSTALL) -m755 '$(BUILD_DIR)/bin/devtool' '$(PREFIX)/bin/$(TARGET)-devtool'
 endef

 # only makes sense for static builds
 define $(PKG)_BUILD_STATIC
-    cd '$(1)' && '$(PREFIX)/$(TARGET)/qt5/bin/qmake'
-    $(MAKE) -C '$(1)' -j '$(JOBS)' || $(MAKE) -C '$(1)' -j  1
-    $(MAKE) -C '$(1)' -j 1 install
+    # *.rc file has strange encoding issues with macro
+    $(SED) -i 's,IFW_VERSION_STR_WIN32,"$($(PKG)_VERSION)",g' '$(SOURCE_DIR)/src/sdk/installerbase.rc'
+    cd '$(BUILD_DIR)' && $(TARGET)-qmake-qt5 '$(SOURCE_DIR)'
+    $(MAKE) -C '$(BUILD_DIR)' -j '$(JOBS)' || $(MAKE) -C '$(BUILD_DIR)' -j  1
+    $(MAKE) -C '$(BUILD_DIR)' -j 1 install

    # build the tutorial installer in /tmp, because the binarycreator internal
    # rename will fail if /tmp is not in the same filesystem as mxe
-    cd '$(1)examples/tutorial' && \
+    cd '$(SOURCE_DIR)examples/tutorial' && \
    '$(PREFIX)/bin/$(BUILD)-binarycreator' \
        -c config/config.xml \
        -p packages \