Skip to content

Commit

Permalink
(conan-io#15102) qt 5.15.8
Browse files Browse the repository at this point in the history
* qt 5.15.8

* remove patch merged upstream

* remove more merged patches

* fix building qtbase for iOS with Xcode 14.x
  • Loading branch information
ericLemanissier authored and AbrilRBS committed Jan 16, 2023
1 parent 61cc61f commit 8652433
Show file tree
Hide file tree
Showing 4 changed files with 391 additions and 0 deletions.
24 changes: 24 additions & 0 deletions recipes/qt/5.x.x/conandata.yml
Original file line number Diff line number Diff line change
@@ -1,4 +1,11 @@
sources:
"5.15.8":
url:
- "https://download.qt.io/archive/qt/5.15/5.15.8/single/qt-everywhere-opensource-src-5.15.8.tar.xz"
- "https://qt-mirror.dannhauer.de/archive/qt/5.15/5.15.8/single/qt-everywhere-opensource-src-5.15.8.tar.xz"
- "https://www.funet.fi/pub/mirrors/download.qt-project.org/archive/qt/5.15/5.15.8/single/qt-everywhere-opensource-src-5.15.8.tar.xz"
- "https://ftp.fau.de/qtproject/archive/qt/5.15/5.15.8/single/qt-everywhere-opensource-src-5.15.8.tar.xz"
sha256: "776a9302c336671f9406a53bd30b8e36f825742b2ec44a57c08217bff0fa86b9"
"5.15.7":
url:
- "https://download.qt.io/archive/qt/5.15/5.15.7/single/qt-everywhere-opensource-src-5.15.7.tar.xz"
Expand All @@ -21,6 +28,23 @@ sources:
- "https://ftp.fau.de/qtproject/archive/qt/5.15/5.15.5/single/qt-everywhere-opensource-src-5.15.5.tar.xz"
sha256: "5a97827bdf9fd515f43bc7651defaf64fecb7a55e051c79b8f80510d0e990f06"
patches:
"5.15.8":
- patch_file: "patches/aa2a39dea5.diff"
base_path: "qt5/qtbase"
- patch_file: "patches/c72097e.diff"
base_path: "qt5/qtwebengine"
- patch_file: "patches/fix-macdeployqt.diff"
base_path: "qt5/qttools"
- patch_file: "patches/chromium-v8-missing-constexpr.patch"
base_path: "qt5/qtwebengine/src/3rdparty/chromium/v8"
- patch_file: "patches/chromium-skia-missing-iterator-include.patch"
base_path: "qt5/qtwebengine/src/3rdparty"
- patch_file: "patches/skia-cd397f3.diff"
base_path: "qt5/qtwebengine/src/3rdparty/chromium/third_party/skia"
- patch_file: "patches/0001-Find-fontconfig-using-pkg-config.patch"
base_path: "qt5/qtwebengine/src/3rdparty"
- patch_file: "patches/337f28c9ab-5.15.8.patch"
base_path: "qt5/qtbase"
"5.15.7":
- patch_file: "patches/337f28c9ab.patch"
base_path: "qt5/qtbase"
Expand Down
39 changes: 39 additions & 0 deletions recipes/qt/5.x.x/patches/337f28c9ab-5.15.8.patch
Original file line number Diff line number Diff line change
@@ -0,0 +1,39 @@
From 337f28c9abb12f28538cfe2f49e5afc460578b32 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Tor=20Arne=20Vestb=C3=B8?= <tor.arne.vestbo@qt.io>
Date: Tue, 5 Jul 2022 15:38:33 +0200
Subject: Darwin: Replace deprecated symbol kIOMasterPortDefault with
equivalent

We can't use the replacement kIOMainPortDefault yet, as it's not
available in operating system versions we still support, but the
kIOMasterPortDefault documentation explicitly says that passing
NULL as a port argument indicates "use the default".

As the underlying type of a mach_port_t is potentially either
a pointer or an unsigned int, we initialize the default to 0.

Pick-to: 6.2 6.3 6.4 5.15
Change-Id: I288aa94b8f2fbda47fd1cbaf329799db7ab988a0
Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
---
src/corelib/global/qglobal.cpp | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)

(limited to 'src/corelib/global/qglobal.cpp')

diff --git a/src/corelib/global/qglobal.cpp b/src/corelib/global/qglobal.cpp
index 738e39658f..c894471ad6 100644
--- a/src/corelib/global/qglobal.cpp
+++ b/src/corelib/global/qglobal.cpp
@@ -3077,7 +3077,8 @@ QByteArray QSysInfo::machineUniqueId()
{
#if defined(Q_OS_DARWIN) && __has_include(<IOKit/IOKitLib.h>)
char uuid[UuidStringLen + 1];
- io_service_t service = IOServiceGetMatchingService(kIOMasterPortDefault, IOServiceMatching("IOPlatformExpertDevice"));
+ static const mach_port_t defaultPort = 0; // Effectively kIOMasterPortDefault/kIOMainPortDefault
+ io_service_t service = IOServiceGetMatchingService(defaultPort, IOServiceMatching("IOPlatformExpertDevice"));
QCFString stringRef = (CFStringRef)IORegistryEntryCreateCFProperty(service, CFSTR(kIOPlatformUUIDKey), kCFAllocatorDefault, 0);
CFStringGetCString(stringRef, uuid, sizeof(uuid), kCFStringEncodingMacRoman);
return QByteArray(uuid);
--
cgit v1.2.1
Loading

0 comments on commit 8652433

Please sign in to comment.