[vlc-devel] [PATCH 3.0 37/41] contrib: qt: Update Qt to 5.12.7

Steve Lhomme robux4 at ycbcr.xyz
Tue Jul 7 15:11:36 CEST 2020


Co-authored-by: Pierre Lamot <pierre at videolabs.io>

(cherry picked from commit 452c75c8f1c7fa31478931f1d8074cb242546b90) (edited)

edited:
- this branch doesn't have qtdeclarative, qtgraphicaleffects and qtquickcontrols2
- this branch doesn't need to add QtANGLE to pkg-config

Signed-off-by: Steve Lhomme <robux4 at ycbcr.xyz>
---
 ...nt-pkg-config-files-for-debug-and-re.patch | 34 --------------
 ...UX_INCLUDES-in-the-generated-.pc-fil.patch | 30 ------------
 ...it-QMAKE_DEFAULT_LIBDIRS-using-with-.patch | 46 -------------------
 ...ash.c-mingw-clang-64-bit-compilation.patch | 25 ----------
 contrib/src/qt/SHA512SUMS                     |  2 +-
 contrib/src/qt/rules.mak                      |  6 +--
 contrib/src/qtsvg/SHA512SUMS                  |  2 +-
 contrib/src/qtsvg/rules.mak                   |  2 +-
 8 files changed, 4 insertions(+), 143 deletions(-)
 delete mode 100644 contrib/src/qt/0001-generate-different-pkg-config-files-for-debug-and-re.patch
 delete mode 100644 contrib/src/qt/0001-include-MODULE_AUX_INCLUDES-in-the-generated-.pc-fil.patch
 delete mode 100644 contrib/src/qt/0001-qmake-Always-split-QMAKE_DEFAULT_LIBDIRS-using-with-.patch
 delete mode 100644 contrib/src/qt/0004-Fix-PMurHash.c-mingw-clang-64-bit-compilation.patch

diff --git a/contrib/src/qt/0001-generate-different-pkg-config-files-for-debug-and-re.patch b/contrib/src/qt/0001-generate-different-pkg-config-files-for-debug-and-re.patch
deleted file mode 100644
index feaa0fa972..0000000000
--- a/contrib/src/qt/0001-generate-different-pkg-config-files-for-debug-and-re.patch
+++ /dev/null
@@ -1,34 +0,0 @@
-From 533641dced8e5a630940490a30812ee299ef880f Mon Sep 17 00:00:00 2001
-From: Steve Lhomme <robux4 at ycbcr.xyz>
-Date: Mon, 29 Apr 2019 08:16:39 +0200
-Subject: [PATCH] generate different pkg-config files for debug and release
- targets
-
-When generating a release-only build the release and debug makefiles are
-generated, in that order. So the debug .pc file overwrites the release one,
-making pkg-config using debug targets that are not even built.
-
-This is only needed on Windows targets where debug and release builds have
-different suffixes.
-
-Fixes QTBUG-75468
----
- qmake/generators/makefile.cpp | 2 ++
- 1 file changed, 2 insertions(+)
-
-diff --git a/qmake/generators/makefile.cpp b/qmake/generators/makefile.cpp
-index b634ec622b..761212ebec 100644
---- a/qmake/generators/makefile.cpp
-+++ b/qmake/generators/makefile.cpp
-@@ -3244,6 +3244,8 @@ MakefileGenerator::pkgConfigFileName(bool fixify)
-         if (dot != -1)
-             ret = ret.left(dot);
-     }
-+    if (project->isActiveConfig("debug") && project->isActiveConfig("win32"))
-+        ret += "d";
-     ret += Option::pkgcfg_ext;
-     QString subdir = project->first("QMAKE_PKGCONFIG_DESTDIR").toQString();
-     if(!subdir.isEmpty()) {
--- 
-2.19.1.windows.1
-
diff --git a/contrib/src/qt/0001-include-MODULE_AUX_INCLUDES-in-the-generated-.pc-fil.patch b/contrib/src/qt/0001-include-MODULE_AUX_INCLUDES-in-the-generated-.pc-fil.patch
deleted file mode 100644
index 5f00050167..0000000000
--- a/contrib/src/qt/0001-include-MODULE_AUX_INCLUDES-in-the-generated-.pc-fil.patch
+++ /dev/null
@@ -1,30 +0,0 @@
-From 41833ff2e8918cf776b7849fd4ab1eab03dd6592 Mon Sep 17 00:00:00 2001
-From: Steve Lhomme <robux4 at ycbcr.xyz>
-Date: Mon, 29 Apr 2019 10:49:01 +0200
-Subject: [PATCH] include MODULE_AUX_INCLUDES in the generated .pc files
-
-QtANGLE is set on MODULE_AUX_INCLUDES so the headers can be found when building
-with angle (gui.pro) but the pkg-config file is missing this header and the Qt
-headers cannot be compiled with the path from this config.
-
-Fixes QTBUG-75495
----
- mkspecs/features/qt_module.prf | 2 ++
- 1 file changed, 2 insertions(+)
-
-diff --git a/mkspecs/features/qt_module.prf b/mkspecs/features/qt_module.prf
-index 8bd2d92421..7963356c82 100644
---- a/mkspecs/features/qt_module.prf
-+++ b/mkspecs/features/qt_module.prf
-@@ -278,6 +278,8 @@ load(qt_targets)
-         QMAKE_PKGCONFIG_INCDIR = $$[QT_INSTALL_HEADERS/raw]
-         QMAKE_PKGCONFIG_CFLAGS = -D$$MODULE_DEFINE -I${includedir}/$$MODULE_INCNAME
-     }
-+    !isEmpty(MODULE_AUX_INCLUDES): \
-+        QMAKE_PKGCONFIG_CFLAGS += -I${includedir}/$$section(MODULE_AUX_INCLUDES, /, 1, 1)
-     QMAKE_PKGCONFIG_NAME = $$replace(TARGET, ^Qt, "Qt$$QT_MAJOR_VERSION ")
-     QMAKE_PKGCONFIG_FILE = $$replace(TARGET, ^Qt, Qt$$QT_MAJOR_VERSION)
-     for(i, MODULE_DEPENDS): \
--- 
-2.19.1.windows.1
-
diff --git a/contrib/src/qt/0001-qmake-Always-split-QMAKE_DEFAULT_LIBDIRS-using-with-.patch b/contrib/src/qt/0001-qmake-Always-split-QMAKE_DEFAULT_LIBDIRS-using-with-.patch
deleted file mode 100644
index a624f7d7cd..0000000000
--- a/contrib/src/qt/0001-qmake-Always-split-QMAKE_DEFAULT_LIBDIRS-using-with-.patch
+++ /dev/null
@@ -1,46 +0,0 @@
-From d6854fe5fc456cedfa40f91e9a8b62ae18ad19c8 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Martin=20Storsj=C3=B6?= <martin at martin.st>
-Date: Thu, 25 Apr 2019 12:13:13 +0300
-Subject: [PATCH] qmake: Always split QMAKE_DEFAULT_LIBDIRS using ; with clang
- on windows
-
-When building in a unix style build system (i.e. msys), QMAKE_DIRLIST_SEP
-is a colon, not a semicolon. Thus, always split the incoming string
-(after the fixup regex) using semicolons on windows.
-
-This matches the code for gcc, further up, which does:
-
-    equals(QMAKE_HOST.os, Windows): \
-        paths = $$split(line, ;)
-    else: \
-        paths = $$split(line, $$QMAKE_DIRLIST_SEP)
-
-Change-Id: I6a0175f9d14ae9ca188553483b7868f0549c784a
----
- mkspecs/features/toolchain.prf | 10 +++++++---
- 1 file changed, 7 insertions(+), 3 deletions(-)
-
-diff --git a/mkspecs/features/toolchain.prf b/mkspecs/features/toolchain.prf
-index 9c3a64aa8b..03612e5689 100644
---- a/mkspecs/features/toolchain.prf
-+++ b/mkspecs/features/toolchain.prf
-@@ -267,9 +267,13 @@ isEmpty($${target_prefix}.INCDIRS) {
-             for (line, output) {
-                 contains(line, "^libraries: .*") {
-                     line ~= s,^libraries: ,,
--                    # clang (7.x) on Windows uses the wrong path list separator ...
--                    equals(QMAKE_HOST.os, Windows): line ~= s,:(?![/\\\\]),;,
--                    paths = $$split(line, $$QMAKE_DIRLIST_SEP)
-+                    equals(QMAKE_HOST.os, Windows) {
-+                        # clang (7.x) on Windows uses the wrong path list separator ...
-+                        line ~= s,:(?![/\\\\]),;,
-+                        paths = $$split(line, ;)
-+                    } else {
-+                        paths = $$split(line, $$QMAKE_DIRLIST_SEP)
-+                    }
-                     for (path, paths): \
-                         QMAKE_DEFAULT_LIBDIRS += $$clean_path($$replace(path, ^=, $$[SYSROOT]))
-                 }
--- 
-2.20.1 (Apple Git-117)
-
diff --git a/contrib/src/qt/0004-Fix-PMurHash.c-mingw-clang-64-bit-compilation.patch b/contrib/src/qt/0004-Fix-PMurHash.c-mingw-clang-64-bit-compilation.patch
deleted file mode 100644
index 47f98a5014..0000000000
--- a/contrib/src/qt/0004-Fix-PMurHash.c-mingw-clang-64-bit-compilation.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-From 7e0e146443663db23ea0164e0b72694b8f9a1b69 Mon Sep 17 00:00:00 2001
-From: LLVM MinGW <root at localhost>
-Date: Fri, 21 Dec 2018 14:41:36 +0000
-Subject: [PATCH] Fix PMurHash.c mingw clang 64-bit compilation.
-
----
- .../angle/src/common/third_party/smhasher/src/PMurHash.cpp      | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/src/3rdparty/angle/src/common/third_party/smhasher/src/PMurHash.cpp b/src/3rdparty/angle/src/common/third_party/smhasher/src/PMurHash.cpp
-index 071bc31..ff75759 100644
---- a/src/3rdparty/angle/src/common/third_party/smhasher/src/PMurHash.cpp
-+++ b/src/3rdparty/angle/src/common/third_party/smhasher/src/PMurHash.cpp
-@@ -208,7 +208,7 @@ void PMurHash32_Process(uint32_t *ph1, uint32_t *pcarry, const void *key, int le
-   /* This CPU does not handle unaligned word access */
- 
-   /* Consume enough so that the next data byte is word aligned */
--  int i = -(long)ptr & 3;
-+  int i = -(intptr_t)ptr & 3;
-   if(i && i <= len) {
-       DOBYTES(i, h1, c, n, ptr, len);
-   }
--- 
-2.20.0.rc1
-
diff --git a/contrib/src/qt/SHA512SUMS b/contrib/src/qt/SHA512SUMS
index 5b722f03c8..72ee6cc797 100644
--- a/contrib/src/qt/SHA512SUMS
+++ b/contrib/src/qt/SHA512SUMS
@@ -1 +1 @@
-6752ecc096f8baf8e14e56f0d1f139e8a0d75967ab61bf1734ad5f4f4609a7cc707ab080f5f85f2230bbbb1454a0669be60a14d57d9a93aef553ce6f85f71613  qtbase-everywhere-src-5.12.2.tar.xz
+c8b90e50ec1824236541273b81024f1332c604748a038a48bc377b4c8e0886bfc27132990758abfd8ab9ea2aa5f1e42181ff369a0df4bc879dad0ef95868fde3  qtbase-everywhere-src-5.12.7.tar.xz
\ No newline at end of file
diff --git a/contrib/src/qt/rules.mak b/contrib/src/qt/rules.mak
index 82a07f36d2..53c90738c6 100644
--- a/contrib/src/qt/rules.mak
+++ b/contrib/src/qt/rules.mak
@@ -1,7 +1,7 @@
 # Qt
 
 QT_VERSION_MAJOR := 5.12
-QT_VERSION := $(QT_VERSION_MAJOR).2
+QT_VERSION := $(QT_VERSION_MAJOR).7
 # Insert potential -betaX suffix here:
 QT_VERSION_FULL := $(QT_VERSION)
 QT_URL := https://download.qt.io/official_releases/qt/$(QT_VERSION_MAJOR)/$(QT_VERSION_FULL)/submodules/qtbase-everywhere-src-$(QT_VERSION_FULL).tar.xz
@@ -27,7 +27,6 @@ qt: qtbase-everywhere-src-$(QT_VERSION_FULL).tar.xz .sum-qt
 ifdef HAVE_WIN32
 	$(APPLY) $(SRC)/qt/0001-Windows-QPA-prefer-lower-value-when-rounding-fractio.patch
 	$(APPLY) $(SRC)/qt/0002-Windows-QPA-Disable-systray-notification-sounds.patch
-	$(APPLY) $(SRC)/qt/0004-Fix-PMurHash.c-mingw-clang-64-bit-compilation.patch
 ifndef HAVE_WIN64
 	$(APPLY) $(SRC)/qt/0001-disable-qt_random_cpu.patch
 endif
@@ -38,9 +37,6 @@ ifndef HAVE_CROSS_COMPILE
 endif
 
 endif
-	$(APPLY) $(SRC)/qt/0001-qmake-Always-split-QMAKE_DEFAULT_LIBDIRS-using-with-.patch
-	$(APPLY) $(SRC)/qt/0001-generate-different-pkg-config-files-for-debug-and-re.patch
-	$(APPLY) $(SRC)/qt/0001-include-MODULE_AUX_INCLUDES-in-the-generated-.pc-fil.patch
 	$(MOVE)
 
 QT_OPENGL := -no-opengl
diff --git a/contrib/src/qtsvg/SHA512SUMS b/contrib/src/qtsvg/SHA512SUMS
index 81138cd69d..40a1300d02 100644
--- a/contrib/src/qtsvg/SHA512SUMS
+++ b/contrib/src/qtsvg/SHA512SUMS
@@ -1 +1 @@
-6dd7bce8d24aaeb9ec4ff4006381b03c86cbb818b38264be0a947e862b122f0ba82cd14888efedf26f2c67219058842af071851f19d4767371e14bc009439249  qtsvg-everywhere-src-5.12.2.tar.xz
+13e6053c99cc0f5b31bc48df0a8b93cfa26e49f3aa2732850747c7a8b3e78ff0a1c620e2a8729d291b5a6cf935d9a481f361ec9f6a78ae090ca997b344786f47  qtsvg-everywhere-src-5.12.7.tar.xz
\ No newline at end of file
diff --git a/contrib/src/qtsvg/rules.mak b/contrib/src/qtsvg/rules.mak
index 1c94ed6e70..d3eeade887 100644
--- a/contrib/src/qtsvg/rules.mak
+++ b/contrib/src/qtsvg/rules.mak
@@ -1,7 +1,7 @@
 # Qt
 
 QTSVG_VERSION_MAJOR := 5.12
-QTSVG_VERSION := $(QTSVG_VERSION_MAJOR).2
+QTSVG_VERSION := $(QTSVG_VERSION_MAJOR).7
 QTSVG_URL := https://download.qt.io/official_releases/qt/$(QTSVG_VERSION_MAJOR)/$(QTSVG_VERSION)/submodules/qtsvg-everywhere-src-$(QTSVG_VERSION).tar.xz
 
 DEPS_qtsvg += qt $(DEPS_qt)
-- 
2.26.2



More information about the vlc-devel mailing list