From 200495b061b008e6d4e5bad82ae6f0a6e920fa2f Mon Sep 17 00:00:00 2001 From: Gerasim Troeglazov <3dEyes@gmail.com> Date: Sat, 5 Oct 2024 19:50:14 +1000 Subject: [PATCH] qt6_base: disable tz backend, fix for ianaId --- .../qt6-base/patches/qt6_base-6.7.2.patchset | 46 +++++++++++++++++++ dev-qt/qt6-base/qt6_base-6.7.2.recipe | 2 +- 2 files changed, 47 insertions(+), 1 deletion(-) diff --git a/dev-qt/qt6-base/patches/qt6_base-6.7.2.patchset b/dev-qt/qt6-base/patches/qt6_base-6.7.2.patchset index 558db7714..e6b80c91d 100644 --- a/dev-qt/qt6-base/patches/qt6_base-6.7.2.patchset +++ b/dev-qt/qt6-base/patches/qt6_base-6.7.2.patchset @@ -961,3 +961,49 @@ index 12c53ce..5805c67 100644 -- 2.45.2 + +From 3df060647cd5f5b31398a2bd964d2df7f9ed3140 Mon Sep 17 00:00:00 2001 +From: Gerasim Troeglazov <3dEyes@gmail.com> +Date: Sat, 5 Oct 2024 19:48:13 +1000 +Subject: Use ICU backend for ianaId + + +diff --git a/src/corelib/time/qtimezone.cpp b/src/corelib/time/qtimezone.cpp +index 5805c67..855ae6a 100644 +--- a/src/corelib/time/qtimezone.cpp ++++ b/src/corelib/time/qtimezone.cpp +@@ -60,6 +60,8 @@ static QTimeZonePrivate *newBackendTimeZone(const QByteArray &ianaId) + #else + #if defined(Q_OS_DARWIN) + return new QMacTimeZonePrivate(ianaId); ++#elif defined(Q_OS_HAIKU) ++ return new QIcuTimeZonePrivate(ianaId); + #elif defined(Q_OS_ANDROID) + return new QAndroidTimeZonePrivate(ianaId); + #elif defined(Q_OS_UNIX) +-- +2.45.2 + + +From c4579c32b3787edb718c6e88b7a5da919cdd258c Mon Sep 17 00:00:00 2001 +From: Gerasim Troeglazov <3dEyes@gmail.com> +Date: Sat, 5 Oct 2024 19:48:35 +1000 +Subject: Disable tz backend for Haiku + + +diff --git a/src/corelib/CMakeLists.txt b/src/corelib/CMakeLists.txt +index 5e37053..f1ec2e8 100644 +--- a/src/corelib/CMakeLists.txt ++++ b/src/corelib/CMakeLists.txt +@@ -893,7 +893,7 @@ qt_internal_extend_target(Core CONDITION QT_FEATURE_timezone AND ANDROID AND NOT + time/qtimezoneprivate_android.cpp + ) + +-qt_internal_extend_target(Core CONDITION QT_FEATURE_timezone AND UNIX AND NOT ANDROID AND NOT APPLE ++qt_internal_extend_target(Core CONDITION QT_FEATURE_timezone AND UNIX AND NOT ANDROID AND NOT APPLE AND NOT HAIKU + SOURCES + time/qtimezoneprivate_tz.cpp + ) +-- +2.45.2 + diff --git a/dev-qt/qt6-base/qt6_base-6.7.2.recipe b/dev-qt/qt6-base/qt6_base-6.7.2.recipe index 87e248c1c..2a2f716bc 100644 --- a/dev-qt/qt6-base/qt6_base-6.7.2.recipe +++ b/dev-qt/qt6-base/qt6_base-6.7.2.recipe @@ -8,7 +8,7 @@ COPYRIGHT="2015-2024 The Qt Company Ltd." LICENSE="GNU LGPL v3 GNU GPL v3 GNU FDL v1" -REVISION="2" +REVISION="3" QT_MIRROR_URI="https://qt-mirror.dannhauer.de/archive" SOURCE_URI="$QT_MIRROR_URI/qt/${portVersion%.*}/$portVersion/submodules/qtbase-everywhere-src-$portVersion.tar.xz" CHECKSUM_SHA256="c5f22a5e10fb162895ded7de0963328e7307611c688487b5d152c9ee64767599"