haikuprojects/haikuports
1
0
Fork 0
mirror of https://github.com/yann64/haikuports.git synced 2026-04-23 12:10:06 +02:00
Code Issues Packages Projects Releases Wiki Activity

Qt5: disable libresolve

Browse Source
This commit is contained in:
Gerasim Troeglazov
2019-06-24 21:36:22 +10:00
parent 663e33909e
commit 2578563bbf
2 changed files with 44 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

59
dev-qt/qt5/patches/qt5-5.13.0.patchset
View File

@@ -1,4 +1,4 @@
From bcd54d38d6d0af906a10fe11141a7689c643b80e Mon Sep 17 00:00:00 2001
From a38c0129246ca0550c1012134d3cb149ab8e14c8 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
@@ -52,7 +52,7 @@ index d5f6992..c2a1e4f 100644
2.21.0
From 36a2750838cd3f54f1201dd74cf005e3d6aebeb4 Mon Sep 17 00:00:00 2001
From 261adaae6a066dd6499f732d011ae94ccf23e3d5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fran=C3=A7ois=20Revol?= <revol@free.fr>
Date: Mon, 11 Feb 2019 15:53:20 +1000
Subject: Add filteredDeviceFilePaths for Haiku's /dev/ports/*
@@ -87,7 +87,7 @@ index 0f62a9d..afd5c0b 100644
2.21.0
From bb82905e378d76be6b8326aeb9035bf2ca191815 Mon Sep 17 00:00:00 2001
From d703592fa42ade3e542bfdec590403a3333772c6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fran=C3=A7ois=20Revol?= <revol@free.fr>
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 6bf1380..1eed4c8 100644
index 2ab7775..71234bc 100644
--- a/qtbase/mkspecs/features/create_cmake.prf
+++ b/qtbase/mkspecs/features/create_cmake.prf
@@ -86,6 +86,9 @@ win32:!static:!staticlib {
@@ -95,6 +95,9 @@ win32:!static:!staticlib {
CMAKE_DLL_DIR = $$[QT_INSTALL_BINS]/
CMAKE_DLL_DIR_IS_ABSOLUTE = True
}
@@ -112,7 +112,7 @@ index 6bf1380..1eed4c8 100644
2.21.0
From a2a1d6761a3b460ba03e12db8f3deddf9d4d5c80 Mon Sep 17 00:00:00 2001
From eeeafa2363f6fc590ab18cdcf4c14d6ae2c18ca5 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
@@ -137,7 +137,7 @@ index acc55ad..a36c18e 100644
2.21.0
From dce88511c1a8e0d35fbdbc840284b84145ec2a36 Mon Sep 17 00:00:00 2001
From 41c01ff49239217ce2fef4b1cd281fe3a8922487 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.
@@ -160,7 +160,7 @@ index b81ad34..7b642c0 100644
2.21.0
From c047db6bf915a73233366fe1c0bc1e0ea0495569 Mon Sep 17 00:00:00 2001
From 26c8b16a8cb2c33146e02a63f6e7a2bcc1920cc9 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
@@ -223,17 +223,17 @@ index 044d69f..1f255a9 100644
2.21.0
From d85dd8d43156c4c72da85467e8bad315c91d611d Mon Sep 17 00:00:00 2001
From 3f714853e45d9450fd59beddd54ffe26d6f3e93d 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.
diff --git a/qtbase/src/network/ssl/qsslsocket.cpp b/qtbase/src/network/ssl/qsslsocket.cpp
index 4f49a71..92909a4 100644
index e164217..ad0317a 100644
--- a/qtbase/src/network/ssl/qsslsocket.cpp
+++ b/qtbase/src/network/ssl/qsslsocket.cpp
@@ -2800,6 +2800,7 @@ QList<QByteArray> QSslSocketPrivate::unixRootCertDirectories()
@@ -2866,6 +2866,7 @@ QList<QByteArray> QSslSocketPrivate::unixRootCertDirectories()
<< "/usr/local/ssl/certs/" // Solaris
<< "/etc/openssl/certs/" // BlackBerry
<< "/opt/openssl/certs/" // HP-UX
@@ -245,14 +245,14 @@ index 4f49a71..92909a4 100644
2.21.0
From ecbf32d622114448705c30e4eec70885592377bb Mon Sep 17 00:00:00 2001
From d04fcdda9282d1c0a58f3c1dcd102a84760da2e1 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
diff --git a/qtbase/mkspecs/features/toolchain.prf b/qtbase/mkspecs/features/toolchain.prf
index 9c3a64a..da7734e 100644
index 03612e5..866ad17 100644
--- a/qtbase/mkspecs/features/toolchain.prf
+++ b/qtbase/mkspecs/features/toolchain.prf
@@ -254,7 +254,7 @@ isEmpty($${target_prefix}.INCDIRS) {
@@ -268,7 +268,7 @@ index 9c3a64a..da7734e 100644
2.21.0
From d714be6cde52a674fb5cd2030a9de0a80f39c743 Mon Sep 17 00:00:00 2001
From c5d6f2d41eeb7b7dd687da52bda64af98a68cf09 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
@@ -291,7 +291,7 @@ index 2e4e223..6436df5 100644
2.21.0
From 2079bbd8c7d581b54691ff72f5cd126d631bafd3 Mon Sep 17 00:00:00 2001
From 3ae2a4d6666d66b600f8904f7b00792563fb7cbd 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
@@ -318,17 +318,17 @@ index 09d2a8b..49d74ae 100644
2.21.0
From 081f0bdfac4bcd712e54c1c64e7d10be99bbb93e Mon Sep 17 00:00:00 2001
From 3ac55f2241c894d50f4152a92219941a03060454 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
diff --git a/qtbase/src/network/kernel/kernel.pri b/qtbase/src/network/kernel/kernel.pri
index 11b80d5..57406e2 100644
index 7074fcd..2ff1ab7 100644
--- a/qtbase/src/network/kernel/kernel.pri
+++ b/qtbase/src/network/kernel/kernel.pri
@@ -50,6 +50,11 @@ android:qtConfig(dnslookup) {
@@ -53,6 +53,11 @@ android:qtConfig(dnslookup) {
SOURCES += kernel/qdnslookup_android.cpp
}
@@ -405,3 +405,26 @@ index 0000000..0b387df
--
2.21.0
From 3b54da4e33efb3dfdbf53088df3d9085ed25ebc1 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
diff --git a/qtbase/src/network/kernel/qhostinfo_unix.cpp b/qtbase/src/network/kernel/qhostinfo_unix.cpp
index e4810d6..04f5fa7 100644
--- a/qtbase/src/network/kernel/qhostinfo_unix.cpp
+++ b/qtbase/src/network/kernel/qhostinfo_unix.cpp
@@ -98,7 +98,7 @@ typedef void (*res_nclose_proto)(res_state_ptr);
static res_nclose_proto local_res_nclose = 0;
static res_state_ptr local_res = 0;
-#if QT_CONFIG(library) && !defined(Q_OS_QNX)
+#if QT_CONFIG(library) && !defined(Q_OS_QNX) && !defined(Q_OS_HAIKU)
namespace {
struct LibResolv
{
--
2.21.0

5
dev-qt/qt5/qt5-5.13.0.recipe
View File

@@ -7,7 +7,7 @@ HOMEPAGE="https://qt.io/"
COPYRIGHT="2015-2019 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/${portVersion%.*}/$portVersion/single/qt-everywhere-src-$portVersion.tar.xz"
CHECKSUM_SHA256="2cba31e410e169bd5cdae159f839640e672532a4687ea0f265f686421e0e86d6"
SOURCE_DIR="qt-everywhere-src-$portVersion"
@@ -438,7 +438,8 @@ BUILD()
-qmldir $dataDir/Qt5/qml \
-plugindir $addOnsDir/Qt5 \
-platform haiku-g++ -no-pch \
-nomake examples -release -opensource \
-nomake examples -nomake tests \
-release -opensource \
-confirm-license -no-iconv \
-no-rpath -system-sqlite \
-gstreamer 1.0 \