diff --git a/dev-qt/qt5/patches/qt5-5.13.0.patchset b/dev-qt/qt5/patches/qt5-5.13.1.patchset similarity index 78% rename from dev-qt/qt5/patches/qt5-5.13.0.patchset rename to dev-qt/qt5/patches/qt5-5.13.1.patchset index 72a0e89d7..1910c71d7 100644 --- a/dev-qt/qt5/patches/qt5-5.13.0.patchset +++ b/dev-qt/qt5/patches/qt5-5.13.1.patchset @@ -1,4 +1,4 @@ -From a38c0129246ca0550c1012134d3cb149ab8e14c8 Mon Sep 17 00:00:00 2001 +From 45ffbaaa25c68ba5301c6709d301fe9b126ad205 Mon Sep 17 00:00:00 2001 From: Gerasim Troeglazov <3dEyes@gmail.com> Date: Mon, 11 Feb 2019 15:51:31 +1000 Subject: Fix Haiku build @@ -49,17 +49,17 @@ index d5f6992..c2a1e4f 100644 || OS(OPENBSD) \ || OS(QNX) \ -- -2.21.0 +2.23.0 -From 261adaae6a066dd6499f732d011ae94ccf23e3d5 Mon Sep 17 00:00:00 2001 +From f4752625faaf74622f89062da0a02eb9519a8800 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Fran=C3=A7ois=20Revol?= Date: Mon, 11 Feb 2019 15:53:20 +1000 Subject: Add filteredDeviceFilePaths for Haiku's /dev/ports/* diff --git a/qtserialport/src/serialport/qserialportinfo_unix.cpp b/qtserialport/src/serialport/qserialportinfo_unix.cpp -index 0f62a9d..afd5c0b 100644 +index 105d10a..80932e9 100644 --- a/qtserialport/src/serialport/qserialportinfo_unix.cpp +++ b/qtserialport/src/serialport/qserialportinfo_unix.cpp @@ -79,13 +79,20 @@ static QStringList filteredDeviceFilePaths() @@ -84,10 +84,10 @@ index 0f62a9d..afd5c0b 100644 deviceDir.setNameFilters(deviceFileNameFilterList); deviceDir.setFilter(QDir::Files | QDir::System | QDir::NoSymLinks); -- -2.21.0 +2.23.0 -From d703592fa42ade3e542bfdec590403a3333772c6 Mon Sep 17 00:00:00 2001 +From 3b00bdebb7c14547038b323a2babb779fa487b03 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Fran=C3=A7ois=20Revol?= Date: Mon, 11 Feb 2019 15:53:49 +1000 Subject: Make sure libs are searched in the develop/ dir by CMake @@ -95,10 +95,10 @@ Subject: Make sure libs are searched in the develop/ dir by CMake Static libs at least are not in the lib[/x86] dirs... diff --git a/qtbase/mkspecs/features/create_cmake.prf b/qtbase/mkspecs/features/create_cmake.prf -index 2ab7775..71234bc 100644 +index 376a7de..e153a55 100644 --- a/qtbase/mkspecs/features/create_cmake.prf +++ b/qtbase/mkspecs/features/create_cmake.prf -@@ -95,6 +95,9 @@ win32:!static:!staticlib { +@@ -109,6 +109,9 @@ win32:!static:!staticlib { CMAKE_DLL_DIR = $$[QT_INSTALL_BINS]/ CMAKE_DLL_DIR_IS_ABSOLUTE = True } @@ -109,10 +109,10 @@ index 2ab7775..71234bc 100644 CMAKE_DLL_DIR = $$CMAKE_LIB_DIR CMAKE_DLL_DIR_IS_ABSOLUTE = $$CMAKE_LIB_DIR_IS_ABSOLUTE -- -2.21.0 +2.23.0 -From eeeafa2363f6fc590ab18cdcf4c14d6ae2c18ca5 Mon Sep 17 00:00:00 2001 +From c0d5cec605b50cd7891ad5254cc0dcdfd6ddd0d0 Mon Sep 17 00:00:00 2001 From: Gerasim Troeglazov <3dEyes@gmail.com> Date: Mon, 11 Feb 2019 15:55:08 +1000 Subject: Disable built-in haiku QPA plugin @@ -134,10 +134,10 @@ index acc55ad..a36c18e 100644 qtConfig(mirclient): SUBDIRS += mirclient -- -2.21.0 +2.23.0 -From 41c01ff49239217ce2fef4b1cd281fe3a8922487 Mon Sep 17 00:00:00 2001 +From 626d40ce70a4adf92ca742d9d5c40706a1f4c601 Mon Sep 17 00:00:00 2001 From: Gerasim Troeglazov <3dEyes@gmail.com> Date: Mon, 11 Feb 2019 15:55:38 +1000 Subject: disable mapbox-gl-native on Haiku. @@ -157,10 +157,10 @@ index b81ad34..7b642c0 100644 warning("Submodule mapbox-gl-native does not exist. Run 'git submodule update --init' on qtlocation.") } else { -- -2.21.0 +2.23.0 -From 26c8b16a8cb2c33146e02a63f6e7a2bcc1920cc9 Mon Sep 17 00:00:00 2001 +From bc250710ce2440a53edd85f97c7c4d63ce1dc83d Mon Sep 17 00:00:00 2001 From: Gerasim Troeglazov <3dEyes@gmail.com> Date: Mon, 11 Feb 2019 15:56:12 +1000 Subject: Fix QStandartPaths for Haiku @@ -220,10 +220,10 @@ index 044d69f..1f255a9 100644 case GenericConfigLocation: paths += haikuStandardPath(B_SYSTEM_SETTINGS_DIRECTORY); -- -2.21.0 +2.23.0 -From 3f714853e45d9450fd59beddd54ffe26d6f3e93d Mon Sep 17 00:00:00 2001 +From 77b8f96ef7c5fc2a9dc878d75856c51a054cb5fa Mon Sep 17 00:00:00 2001 From: Gerasim Troeglazov <3dEyes@gmail.com> Date: Mon, 11 Feb 2019 15:56:39 +1000 Subject: QSslSocketPrivate::unixRootCertDirectories(): add ssl path for Haiku. @@ -242,10 +242,10 @@ index e164217..ad0317a 100644 } -- -2.21.0 +2.23.0 -From d04fcdda9282d1c0a58f3c1dcd102a84760da2e1 Mon Sep 17 00:00:00 2001 +From 8dc3120d2c66a4618ca67e4850c55bf92868afd3 Mon Sep 17 00:00:00 2001 From: Gerasim Troeglazov <3dEyes@gmail.com> Date: Mon, 11 Feb 2019 15:56:59 +1000 Subject: Fix build for Haiku platform @@ -265,10 +265,10 @@ index 03612e5..866ad17 100644 # or gold under Linux) will not print any library search path. Need to use another # invocation with different options (which in turn doesn't print include search -- -2.21.0 +2.23.0 -From c5d6f2d41eeb7b7dd687da52bda64af98a68cf09 Mon Sep 17 00:00:00 2001 +From 6ef4365e955bf55647a6743d7de6ad9a1a31cb58 Mon Sep 17 00:00:00 2001 From: Gerasim Troeglazov <3dEyes@gmail.com> Date: Mon, 11 Feb 2019 15:57:25 +1000 Subject: Fix build qt3d zip module @@ -288,10 +288,10 @@ index 2e4e223..6436df5 100644 #include #endif -- -2.21.0 +2.23.0 -From 3ae2a4d6666d66b600f8904f7b00792563fb7cbd Mon Sep 17 00:00:00 2001 +From b026abbfbad05a429e2d3470aff91af3ac515b13 Mon Sep 17 00:00:00 2001 From: Gerasim Troeglazov <3dEyes@gmail.com> Date: Mon, 11 Feb 2019 15:57:54 +1000 Subject: Fix endian detection @@ -315,10 +315,10 @@ index 09d2a8b..49d74ae 100644 # endif # endif -- -2.21.0 +2.23.0 -From 3ac55f2241c894d50f4152a92219941a03060454 Mon Sep 17 00:00:00 2001 +From 4ab4274b80b5323bb98b61f64741be3f3212556d Mon Sep 17 00:00:00 2001 From: Gerasim Troeglazov <3dEyes@gmail.com> Date: Sat, 27 Apr 2019 17:47:23 +1000 Subject: Add dnslookup query function for Haiku @@ -403,10 +403,10 @@ index 0000000..0b387df + +QT_END_NAMESPACE -- -2.21.0 +2.23.0 -From 3b54da4e33efb3dfdbf53088df3d9085ed25ebc1 Mon Sep 17 00:00:00 2001 +From b00f4824e6daca1335414e014a8a2696717ef298 Mon Sep 17 00:00:00 2001 From: Gerasim Troeglazov <3dEyes@gmail.com> Date: Mon, 24 Jun 2019 21:20:17 +1000 Subject: Disable LibResolv for Haiku @@ -426,5 +426,94 @@ index e4810d6..04f5fa7 100644 struct LibResolv { -- -2.21.0 +2.23.0 + + +From f38ba1fc85dde4d5941fbf27813088e2839b3769 Mon Sep 17 00:00:00 2001 +From: Gerasim Troeglazov <3dEyes@gmail.com> +Date: Sun, 8 Sep 2019 00:17:19 +1000 +Subject: Don't use ifaddrs for Haiku + + +diff --git a/qtbase/src/network/kernel/qnetworkinterface_unix.cpp b/qtbase/src/network/kernel/qnetworkinterface_unix.cpp +index c28c5ea..ea07283 100644 +--- a/qtbase/src/network/kernel/qnetworkinterface_unix.cpp ++++ b/qtbase/src/network/kernel/qnetworkinterface_unix.cpp +@@ -51,7 +51,7 @@ + # include "qdatetime.h" + #endif + +-#if defined(QT_LINUXBASE) ++#if defined(QT_LINUXBASE) || defined(Q_OS_HAIKU) + # define QT_NO_GETIFADDRS + #endif + +-- +2.23.0 + + +From a5b02fd5debeda09e032307e58d6a6f29351858d Mon Sep 17 00:00:00 2001 +From: Gerasim Troeglazov <3dEyes@gmail.com> +Date: Sun, 8 Sep 2019 18:32:05 +1000 +Subject: Add platform plugins installer + + +diff --git a/qtbase/src/gui/gui.pro b/qtbase/src/gui/gui.pro +index edf8124..ad11511 100644 +--- a/qtbase/src/gui/gui.pro ++++ b/qtbase/src/gui/gui.pro +@@ -34,6 +34,7 @@ testcocoon { + + osx: LIBS_PRIVATE += -framework AppKit + darwin: LIBS_PRIVATE += -framework CoreGraphics ++haiku: LIBS_PRIVATE += -lbe + + CONFIG += simd optimize_full + +diff --git a/qtbase/src/gui/kernel/qguiapplication.cpp b/qtbase/src/gui/kernel/qguiapplication.cpp +index f6e67e0..79651ad 100644 +--- a/qtbase/src/gui/kernel/qguiapplication.cpp ++++ b/qtbase/src/gui/kernel/qguiapplication.cpp +@@ -115,6 +115,11 @@ + # include + #endif // Q_OS_WIN + ++#if defined(Q_OS_HAIKU) ++#include ++#include ++#endif ++ + #ifdef Q_OS_WASM + #include + #endif +@@ -1214,6 +1219,27 @@ static void init_platform(const QString &pluginNamesWithArguments, const QString + if (!availablePlugins.isEmpty()) + fatalMessage += QStringLiteral("\nAvailable platform plugins are: %1.\n").arg(availablePlugins.join(QLatin1String(", "))); + ++#if defined(Q_OS_HAIKU) ++ BApplication bApp("application/x-vnd.qt5-qtbase"); ++ QString errorMessage = QStringLiteral("Qt platform plugins package is required but not installed.\n\n" ++ "Do you want to install it now?"); ++ int32 index = (new BAlert("Error", errorMessage.toUtf8().constData(), ++ "Install", "Cancel", NULL, B_WIDTH_AS_USUAL, B_STOP_ALERT))->Go(); ++ if (index == 0) { ++#if defined(__INTEL__) && defined(__i386__) && !defined(__x86_64__) ++ int ret = system ("pkgman install qthaikuplugins_x86 -y"); ++#else ++ int ret = system ("pkgman install qthaikuplugins -y"); ++#endif ++ if (ret == 0) ++ (new BAlert("Information", "Platform plugins has been succesfully installed.\nTry running this application again.", ++ "Ok", NULL, NULL, B_WIDTH_AS_USUAL, B_INFO_ALERT))->Go(); ++ else ++ (new BAlert("Error", "Platform plugins is not installed.", "Close", NULL, NULL, B_WIDTH_AS_USUAL, B_STOP_ALERT))->Go(); ++ } ++ exit(-1); ++#endif // Q_OS_HAIKU ++ + #if defined(Q_OS_WIN) && !defined(Q_OS_WINRT) + // Windows: Display message box unless it is a console application + // or debug build showing an assert box. +-- +2.23.0 diff --git a/dev-qt/qt5/qt5-5.13.0.recipe b/dev-qt/qt5/qt5-5.13.1.recipe similarity index 99% rename from dev-qt/qt5/qt5-5.13.0.recipe rename to dev-qt/qt5/qt5-5.13.1.recipe index 068867b23..4efae74be 100644 --- a/dev-qt/qt5/qt5-5.13.0.recipe +++ b/dev-qt/qt5/qt5-5.13.1.recipe @@ -7,9 +7,9 @@ HOMEPAGE="https://qt.io/" COPYRIGHT="2015-2019 The Qt Company Ltd." LICENSE="GNU LGPL v2.1 GNU LGPL v3" -REVISION="3" +REVISION="1" SOURCE_URI="https://download.qt.io/official_releases/qt/${portVersion%.*}/$portVersion/single/qt-everywhere-src-$portVersion.tar.xz" -CHECKSUM_SHA256="2cba31e410e169bd5cdae159f839640e672532a4687ea0f265f686421e0e86d6" +CHECKSUM_SHA256="adf00266dc38352a166a9739f1a24a1e36f1be9c04bf72e16e142a256436974e" SOURCE_DIR="qt-everywhere-src-$portVersion" PATCHES="qt5-$portVersion.patchset" ADDITIONAL_FILES=" @@ -120,7 +120,6 @@ PROVIDES=" REQUIRES=" haiku$secondaryArchSuffix cmd:qsystray - qthaikuplugins$secondaryArchSuffix lib:libcrypto$secondaryArchSuffix lib:libdouble_conversion$secondaryArchSuffix lib:libegl$secondaryArchSuffix