view src/qt6-qtbase-1-fixes.patch @ 7186:19a46de50b18 default tip @

* src/jasper.mk: update to v4.2.4
author John Donoghue <john.donoghue@ieee.org>
date Thu, 02 May 2024 09:22:30 -0400
parents cb939ded70d5
children
line wrap: on
line source

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: Mon, 14 Dec 2020 15:09:00 +1100
Subject: [PATCH 1/2] optionally build docs


diff --git a/CMakeLists.txt b/CMakeLists.txt
index 1111111..2222222 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -173,7 +173,9 @@ if(NOT QT_BUILD_STANDALONE_TESTS)
     qt_internal_set_up_config_optimizations_like_in_qmake()
 
     ## Setup documentation
-    add_subdirectory(doc)
+    if(QT_BUILD_DOCS)
+        add_subdirectory(doc)
+    endif()
 
     ## Visit all the directories:
     add_subdirectory(src)

From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
From: Mark Brand <mabrand@mabrand.nl>
Date: Mon, 3 Apr 2023 13:12:47 +0200
Subject: [PATCH 2/2] add missing oleaut32 dependency for networklistmanager

Required for symbols VariantInit and VariantClear.

diff --git a/src/plugins/networkinformation/networklistmanager/CMakeLists.txt b/src/plugins/networkinformation/networklistmanager/CMakeLists.txt
index 1111111..2222222 100644
--- a/src/plugins/networkinformation/networklistmanager/CMakeLists.txt
+++ b/src/plugins/networkinformation/networklistmanager/CMakeLists.txt
@@ -14,6 +14,11 @@ qt_internal_add_plugin(QNLMNIPlugin
         Qt::NetworkPrivate
 )
 
+qt_internal_extend_target(QNLMNIPlugin CONDITION WIN32
+    LIBRARIES
+        oleaut32
+)
+
 qt_internal_extend_target(QNLMNIPlugin CONDITION WIN32 AND MSVC AND NOT CLANG
     LIBRARIES
         runtimeobject
diff -ur qtbase-everywhere-src-6.5.2.orig/src/plugins/platforms/minimal/qminimalintegration.cpp qtbase-everywhere-src-6.5.2/src/plugins/platforms/minimal/qminimalintegration.cpp
--- qtbase-everywhere-src-6.5.2.orig/src/plugins/platforms/minimal/qminimalintegration.cpp	2023-08-24 09:11:53.760448450 -0400
+++ qtbase-everywhere-src-6.5.2/src/plugins/platforms/minimal/qminimalintegration.cpp	2023-08-24 09:34:11.612449868 -0400
@@ -125,7 +125,11 @@
 
         if (!m_fontDatabase) {
 #if QT_CONFIG(fontconfig)
+#  ifdef Q_OS_WIN
+            m_fontDatabase = new QFreeTypeFontDatabase;
+#  else
             m_fontDatabase = new QGenericUnixFontDatabase;
+#  endif
 #else
             m_fontDatabase = QPlatformIntegration::fontDatabase();
 #endif
diff -ur qtbase-everywhere-src-6.5.2.orig/src/plugins/platforms/windows/qwindowsglcontext.cpp qtbase-everywhere-src-6.5.2/src/plugins/platforms/windows/qwindowsglcontext.cpp
--- qtbase-everywhere-src-6.5.2.orig/src/plugins/platforms/windows/qwindowsglcontext.cpp	2023-08-24 09:11:53.769448973 -0400
+++ qtbase-everywhere-src-6.5.2/src/plugins/platforms/windows/qwindowsglcontext.cpp	2023-08-24 09:17:12.428980606 -0400
@@ -142,7 +142,7 @@
     qCDebug(lcQpaGl) << "Qt: Using WGL and OpenGL from" << openglDll;
 
     if (useSystemLib)
-        m_lib = QSystemLibrary::load((wchar_t*)(QString::fromLatin1(openglDll).utf16()));
+        m_lib = QSystemLibrary::load((wchar_t*)(QString::fromLatin1(openglDll).utf16()), false);
     else
         m_lib = LoadLibraryA(openglDll.constData());
     if (!m_lib) {
@@ -154,7 +154,7 @@
         // Load opengl32.dll always. GDI functions like ChoosePixelFormat do
         // GetModuleHandle for opengl32.dll and behave differently (and call back into
         // opengl32) when the module is present. This is fine for dummy contexts and windows.
-        QSystemLibrary::load(L"opengl32");
+        QSystemLibrary::load(L"opengl32", false);
     }
 
     wglCreateContext = reinterpret_cast<HGLRC (WINAPI *)(HDC)>(resolve("wglCreateContext"));
diff -ur qtbase-everywhere-src-6.5.2.orig/src/plugins/platforms/windows/qwindowsopengltester.cpp qtbase-everywhere-src-6.5.2/src/plugins/platforms/windows/qwindowsopengltester.cpp
--- qtbase-everywhere-src-6.5.2.orig/src/plugins/platforms/windows/qwindowsopengltester.cpp	2023-08-24 09:11:53.770449031 -0400
+++ qtbase-everywhere-src-6.5.2/src/plugins/platforms/windows/qwindowsopengltester.cpp	2023-08-24 09:18:13.593537630 -0400
@@ -317,7 +317,7 @@
 
     // Test #1: Load opengl32.dll and try to resolve an OpenGL 2 function.
     // This will typically fail on systems that do not have a real OpenGL driver.
-    lib = QSystemLibrary::load(L"opengl32");
+    lib = QSystemLibrary::load(L"opengl32", false);
     if (lib) {
         CreateContext = reinterpret_cast<CreateContextType>(
             reinterpret_cast<QFunctionPointer>(::GetProcAddress(lib, "wglCreateContext")));