mirror of
https://github.com/yann64/haikuports.git
synced 2026-04-23 12:10:06 +02:00
Qt5: QDnsLookup fix
This commit is contained in:
Gerasim Troeglazov
@@ -1,4 +1,4 @@
|
||||
From 3de1c0dac0dac1d29b4a171f57187f1f89e5325b Mon Sep 17 00:00:00 2001
|
||||
From 4be92758a26f0503939c35f984b7fe8acde15ea5 Mon Sep 17 00:00:00 2001
|
||||
From: Gerasim Troeglazov <3dEyes@gmail.com>
|
||||
Date: Sun, 22 Apr 2018 10:49:00 +1000
|
||||
Subject: Fix Haiku build
|
||||
@@ -25,10 +25,10 @@ index e715ed2..1362a13 100644
|
||||
inline size_t systemPageSize()
|
||||
{
|
||||
diff --git a/qtdeclarative/src/3rdparty/masm/wtf/Platform.h b/qtdeclarative/src/3rdparty/masm/wtf/Platform.h
|
||||
index 4f37245..e9c0c95 100644
|
||||
index 5905f42..834bb3d 100644
|
||||
--- a/qtdeclarative/src/3rdparty/masm/wtf/Platform.h
|
||||
+++ b/qtdeclarative/src/3rdparty/masm/wtf/Platform.h
|
||||
@@ -412,6 +412,11 @@
|
||||
@@ -417,6 +417,11 @@
|
||||
#define WTF_OS_QNX 1
|
||||
#endif
|
||||
|
||||
@@ -40,7 +40,7 @@ index 4f37245..e9c0c95 100644
|
||||
/* OS(SOLARIS) - Solaris */
|
||||
#if defined(sun) || defined(__sun)
|
||||
#define WTF_OS_SOLARIS 1
|
||||
@@ -442,6 +447,7 @@
|
||||
@@ -447,6 +452,7 @@
|
||||
|| OS(HURD) \
|
||||
|| OS(INTEGRITY) \
|
||||
|| OS(LINUX) \
|
||||
@@ -49,10 +49,10 @@ index 4f37245..e9c0c95 100644
|
||||
|| OS(OPENBSD) \
|
||||
|| OS(QNX) \
|
||||
--
|
||||
2.16.2
|
||||
2.16.4
|
||||
|
||||
|
||||
From a8f3b2b3fee674dd15b94db8c12dc023a9ea3eba Mon Sep 17 00:00:00 2001
|
||||
From ab99219c20db2b159e7378aa82047919a506e259 Mon Sep 17 00:00:00 2001
|
||||
From: =?UTF-8?q?Fran=C3=A7ois=20Revol?= <revol@free.fr>
|
||||
Date: Sun, 22 Apr 2018 10:50:57 +1000
|
||||
Subject: Add filteredDeviceFilePaths for Haiku's /dev/ports/*
|
||||
@@ -84,10 +84,10 @@ index 0f62a9d..afd5c0b 100644
|
||||
deviceDir.setNameFilters(deviceFileNameFilterList);
|
||||
deviceDir.setFilter(QDir::Files | QDir::System | QDir::NoSymLinks);
|
||||
--
|
||||
2.16.2
|
||||
2.16.4
|
||||
|
||||
|
||||
From d288d26e046c22cd9789f13f98a8038fc99f5338 Mon Sep 17 00:00:00 2001
|
||||
From 8f2ef25348627539cc9095a969489a29f3c236fa Mon Sep 17 00:00:00 2001
|
||||
From: =?UTF-8?q?Fran=C3=A7ois=20Revol?= <revol@free.fr>
|
||||
Date: Sun, 22 Apr 2018 10:52:35 +1000
|
||||
Subject: Make sure libs are searched in the develop/ dir by CMake
|
||||
@@ -95,7 +95,7 @@ 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 66acede..9468bde 100644
|
||||
index 2ed708e..28e0d93 100644
|
||||
--- a/qtbase/mkspecs/features/create_cmake.prf
|
||||
+++ b/qtbase/mkspecs/features/create_cmake.prf
|
||||
@@ -86,6 +86,9 @@ win32:!static:!staticlib {
|
||||
@@ -109,10 +109,10 @@ index 66acede..9468bde 100644
|
||||
CMAKE_DLL_DIR = $$CMAKE_LIB_DIR
|
||||
CMAKE_DLL_DIR_IS_ABSOLUTE = $$CMAKE_LIB_DIR_IS_ABSOLUTE
|
||||
--
|
||||
2.16.2
|
||||
2.16.4
|
||||
|
||||
|
||||
From a854665fedc45156468c69d1176a15830d26966f Mon Sep 17 00:00:00 2001
|
||||
From 7cdf1b388a447f015f6d23e5e998686e8d07355f Mon Sep 17 00:00:00 2001
|
||||
From: Gerasim Troeglazov <3dEyes@gmail.com>
|
||||
Date: Sun, 22 Apr 2018 10:55:55 +1000
|
||||
Subject: Disable built-in haiku QPA plugin
|
||||
@@ -134,10 +134,10 @@ index e618876..42c830c 100644
|
||||
|
||||
qtConfig(integrityfb): SUBDIRS += integrity
|
||||
--
|
||||
2.16.2
|
||||
2.16.4
|
||||
|
||||
|
||||
From 3d9cd2a1a5cffecdb04176482da587b8d6abed2f Mon Sep 17 00:00:00 2001
|
||||
From 2dd7d3595b057261b6088c35cf3c212c47ab8285 Mon Sep 17 00:00:00 2001
|
||||
From: Gerasim Troeglazov <3dEyes@gmail.com>
|
||||
Date: Sun, 22 Apr 2018 10:56:50 +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.16.2
|
||||
2.16.4
|
||||
|
||||
|
||||
From ca73dd2c016d9451a4f8812e6a0eab7b2dc4a457 Mon Sep 17 00:00:00 2001
|
||||
From b62aa747e22f723e927aae2346309104e69ae41d Mon Sep 17 00:00:00 2001
|
||||
From: Gerasim Troeglazov <3dEyes@gmail.com>
|
||||
Date: Sun, 22 Apr 2018 10:57:22 +1000
|
||||
Subject: Fix QStandartPaths for Haiku
|
||||
@@ -220,10 +220,10 @@ index 044d69f..1f255a9 100644
|
||||
case GenericConfigLocation:
|
||||
paths += haikuStandardPath(B_SYSTEM_SETTINGS_DIRECTORY);
|
||||
--
|
||||
2.16.2
|
||||
2.16.4
|
||||
|
||||
|
||||
From 83a0095958ef58e95163f1aedb15dbc64c8a78a0 Mon Sep 17 00:00:00 2001
|
||||
From 9877ca5a770ad124af1c645954d17831b97d551a Mon Sep 17 00:00:00 2001
|
||||
From: Gerasim Troeglazov <3dEyes@gmail.com>
|
||||
Date: Sun, 22 Apr 2018 10:57:46 +1000
|
||||
Subject: QSslSocketPrivate::unixRootCertDirectories(): add ssl path for Haiku.
|
||||
@@ -242,10 +242,10 @@ index 4273904..57fa06d 100644
|
||||
}
|
||||
|
||||
--
|
||||
2.16.2
|
||||
2.16.4
|
||||
|
||||
|
||||
From 84830b0cdf502e9f606819f4fcff93f03057b201 Mon Sep 17 00:00:00 2001
|
||||
From cb6b05aa30a7fa3ceed7751d0e46ec34cbebd97d Mon Sep 17 00:00:00 2001
|
||||
From: Gerasim Troeglazov <3dEyes@gmail.com>
|
||||
Date: Sun, 22 Apr 2018 10:58:17 +1000
|
||||
Subject: Fix build for Haiku platform
|
||||
@@ -265,10 +265,10 @@ index fdf3d1c..6424b71 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.16.2
|
||||
2.16.4
|
||||
|
||||
|
||||
From e0dfd2001e522927dc0b9a42fe3d76d53d2b85a1 Mon Sep 17 00:00:00 2001
|
||||
From 6966988f7284d582969cc2b65764def6cc994616 Mon Sep 17 00:00:00 2001
|
||||
From: Gerasim Troeglazov <3dEyes@gmail.com>
|
||||
Date: Sat, 26 May 2018 15:46:27 +1000
|
||||
Subject: Fix clang-config detection on Haiku
|
||||
@@ -290,10 +290,10 @@ index 583cf0e..58e1bf4 100644
|
||||
llvm_config = $$clangInstallDir/bin/llvm-config
|
||||
exists($$llvm_config) {
|
||||
--
|
||||
2.16.2
|
||||
2.16.4
|
||||
|
||||
|
||||
From de8c4776e3595358663b1ab3ee51071729fb9f25 Mon Sep 17 00:00:00 2001
|
||||
From 4c79833b96864dd0c6f82a015ca44ede6045c45d Mon Sep 17 00:00:00 2001
|
||||
From: Gerasim Troeglazov <3dEyes@gmail.com>
|
||||
Date: Sat, 26 May 2018 20:05:01 +1000
|
||||
Subject: Fix build qt3d zip module
|
||||
@@ -313,5 +313,30 @@ index 916fb1f..8834128 100644
|
||||
#include <utime.h>
|
||||
#endif
|
||||
--
|
||||
2.16.2
|
||||
2.16.4
|
||||
|
||||
|
||||
From 5753a9be9554412571222403751b9d125ba293d3 Mon Sep 17 00:00:00 2001
|
||||
From: Gerasim Troeglazov <3dEyes@gmail.com>
|
||||
Date: Wed, 8 Aug 2018 23:16:08 +1000
|
||||
Subject: Use libnetwork as resolve library
|
||||
|
||||
|
||||
diff --git a/qtbase/src/network/kernel/kernel.pri b/qtbase/src/network/kernel/kernel.pri
|
||||
index 11b80d5..32983e7 100644
|
||||
--- a/qtbase/src/network/kernel/kernel.pri
|
||||
+++ b/qtbase/src/network/kernel/kernel.pri
|
||||
@@ -50,6 +50,10 @@ android:qtConfig(dnslookup) {
|
||||
SOURCES += kernel/qdnslookup_android.cpp
|
||||
}
|
||||
|
||||
+haiku {
|
||||
+ DEFINES += "LIBRESOLV_SO=\\\"network\\\""
|
||||
+}
|
||||
+
|
||||
win32: {
|
||||
SOURCES += kernel/qhostinfo_win.cpp
|
||||
|
||||
--
|
||||
2.16.4
|
||||
|
||||
|
||||
@@ -7,7 +7,7 @@ HOMEPAGE="https://qt.io/"
|
||||
COPYRIGHT="2015-2018 The Qt Company Ltd."
|
||||
LICENSE="GNU LGPL v2.1
|
||||
GNU LGPL v3"
|
||||
REVISION="1"
|
||||
REVISION="2"
|
||||
SOURCE_URI="https://download.qt.io/official_releases/qt/5.11/${portVersion/\~/-}/single/qt-everywhere-src-${portVersion/\~/-}.tar.xz"
|
||||
CHECKSUM_SHA256="39602cb08f9c96867910c375d783eed00fc4a244bffaa93b801225d17950fb2b"
|
||||
SOURCE_DIR="qt-everywhere-src-${portVersion/\~/-}"
|
||||
|
||||
Reference in New Issue
Block a user