haikuprojects/haikuports
1
0
Fork 0
mirror of https://github.com/yann64/haikuports.git synced 2026-04-22 03:30:05 +02:00
Code Issues Packages Projects Releases Wiki Activity

qt5: add ssl path for Haiku.

Browse Source
This commit is contained in:
Jerome Duval
2017-06-09 19:48:31 +02:00
parent d914b39a30
commit bda0ae976f
2 changed files with 35 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

46
dev-qt/qt5/patches/qt5-5.9.0.patchset
View File

@@ -1,4 +1,4 @@
From feb6dd5c8c20120ab691e60cd81f0fa0e4b530c7 Mon Sep 17 00:00:00 2001
From 5759e15af573b34ef0c2c2cbc41df2619f8c1065 Mon Sep 17 00:00:00 2001
From: Gerasim Troeglazov <3dEyes@gmail.com>
Date: Fri, 16 Oct 2015 23:07:40 +1000
Subject: Fix Haiku build
@@ -106,7 +106,7 @@ index 7f2023a..4b3d202 100644
2.12.2
From 7ff32683491da4eb5a045184d6f4c1733bf741de Mon Sep 17 00:00:00 2001
From 5c0a0a02382d7998792dc413d84bcf02e649564f Mon Sep 17 00:00:00 2001
From: Gerasim Troeglazov <3dEyes@gmail.com>
Date: Fri, 16 Oct 2015 23:07:40 +1000
Subject: Set Experimental Haiku QPA plugin
@@ -5088,7 +5088,7 @@ index 75403fb..d540219 100644
2.12.2
From 2f1ee3642221be0a656169b40b904f8bab0133c5 Mon Sep 17 00:00:00 2001
From 8d6f37452782f73864bae18d62be9b22601f9632 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fran=C3=A7ois=20Revol?= <revol@free.fr>
Date: Mon, 11 Apr 2016 01:04:24 +0200
Subject: Add filteredDeviceFilePaths for Haiku's /dev/ports/*
@@ -5123,7 +5123,7 @@ index 0f62a9d..afd5c0b 100644
2.12.2
From edeaebe279864a8793fd725aa822349fe0ed6e2f Mon Sep 17 00:00:00 2001
From 3ac07d0591009882a348e5367be968a210809780 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fran=C3=A7ois=20Revol?= <revol@free.fr>
Date: Sat, 12 Nov 2016 03:19:40 +0100
Subject: Make sure libs are searched in the develop/ dir by CMake
@@ -5148,7 +5148,7 @@ index bb5083c..b286bed 100644
2.12.2
From 9c5f98d8caadc3ac92909bca772351ebc2cfbb30 Mon Sep 17 00:00:00 2001
From e32a09b8b7b1e08bbba837adf4006ad7e0c0f23a Mon Sep 17 00:00:00 2001
From: Jerome Duval <jerome.duval@gmail.com>
Date: Sat, 4 Mar 2017 10:39:18 +0100
Subject: Haiku PlatformSupport changes.
@@ -5272,7 +5272,7 @@ index dba27ee..0af18a6 100644
2.12.2
From 7865acafd10b1fd7813ea67a8f4c00341644f65e Mon Sep 17 00:00:00 2001
From 14b05cbf7735045b8061acfe951ad006ff9590b6 Mon Sep 17 00:00:00 2001
From: Jerome Duval <jerome.duval@gmail.com>
Date: Sat, 4 Mar 2017 10:41:09 +0100
Subject: Haiku also provides bluetooth/bluetooth.h, so check for Bluez a bit
@@ -5294,7 +5294,7 @@ index 0b9235a..bfc2a0c 100644
2.12.2
From a9efc4f4b705a1d7c489f8fd495522d3bff5dd79 Mon Sep 17 00:00:00 2001
From 80908fce5ebb7b836f8cf9899a7521fce8088f2a Mon Sep 17 00:00:00 2001
From: Jerome Duval <jerome.duval@gmail.com>
Date: Thu, 9 Mar 2017 23:57:24 +0100
Subject: update to QtFontDatabaseSupport.
@@ -5317,7 +5317,7 @@ index 0b5d24c..6c29d98 100644
2.12.2
From e10e621b3535641268aa6eb2b06528b1a946ed9c Mon Sep 17 00:00:00 2001
From 3896b6a07eb4b6488d78593f169653a211d428d0 Mon Sep 17 00:00:00 2001
From: Jerome Duval <jerome.duval@gmail.com>
Date: Thu, 23 Mar 2017 21:08:37 +0100
Subject: enable QV4 JIT.
@@ -5375,7 +5375,7 @@ index 3abda68..0eef251 100644
2.12.2
From 395380b9d5071f4509c6c1baada9b060a9ed28e3 Mon Sep 17 00:00:00 2001
From 4f1f20ac6de2f9331307b196859341a275dcf466 Mon Sep 17 00:00:00 2001
From: Jerome Duval <jerome.duval@gmail.com>
Date: Mon, 10 Apr 2017 19:52:46 +0200
Subject: disable mapbox-gl-native on Haiku.
@@ -5398,7 +5398,7 @@ index 0810d39..9933bf8 100644
2.12.2
From b07e4ee2a7a8d651a6001b3e971d238cecbe1c31 Mon Sep 17 00:00:00 2001
From f62e6106fead6e1febdaa14dd8cf81491772c220 Mon Sep 17 00:00:00 2001
From: Jerome Duval <jerome.duval@gmail.com>
Date: Sat, 22 Apr 2017 13:10:20 +0200
Subject: Rename QBasicFontDatabase to QFreeTypeFontDatabase.
@@ -5448,7 +5448,7 @@ index 2d27d06..f79f087 100644
2.12.2
From 6eb430f6076019d2267763a158c11bd8a3a912e4 Mon Sep 17 00:00:00 2001
From 58a2733191611327b649d7d561651bd5441fc0ee Mon Sep 17 00:00:00 2001
From: Jerome Duval <jerome.duval@gmail.com>
Date: Wed, 31 May 2017 20:58:35 +0200
Subject: fix build in tiff imageformats plugin.
@@ -5474,7 +5474,7 @@ index 81ad7e9..8f3d3e4 100644
2.12.2
From 3edfbdb1e153e610395c9bcca84d96467ae54614 Mon Sep 17 00:00:00 2001
From 95f90b4e462843831e033a4f9624c45c6a9c4448 Mon Sep 17 00:00:00 2001
From: Jerome Duval <jerome.duval@gmail.com>
Date: Wed, 31 May 2017 21:59:22 +0200
Subject: fix qt3d build on x86.
@@ -5505,3 +5505,25 @@ index 98053cb..57ca638 100644
--
2.12.2
From 5f317b306ae240fb49d1dea0779d4821a6932d71 Mon Sep 17 00:00:00 2001
From: Jerome Duval <jerome.duval@gmail.com>
Date: Fri, 9 Jun 2017 19:47:02 +0200
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 84b8f3a..62b63ab 100644
--- a/qtbase/src/network/ssl/qsslsocket.cpp
+++ b/qtbase/src/network/ssl/qsslsocket.cpp
@@ -2658,6 +2658,7 @@ QList<QByteArray> QSslSocketPrivate::unixRootCertDirectories()
<< "/usr/local/ssl/certs/" // Solaris
<< "/etc/openssl/certs/" // BlackBerry
<< "/opt/openssl/certs/" // HP-UX
+ << "/system/data/ssl/" // Haiku
<< "/etc/ssl/"; // OpenBSD
}
--
2.12.2

2
dev-qt/qt5/qt5-5.9.0.recipe
View File

@@ -7,7 +7,7 @@ HOMEPAGE="https://qt.io/"
COPYRIGHT="2015-2017 The Qt Company Ltd."
LICENSE="GNU LGPL v2.1
GNU LGPL v3"
REVISION="2"
REVISION="3"
SOURCE_URI="http://download.qt.io/official_releases/qt/5.9/5.9.0/single/qt-everywhere-opensource-src-${portVersion/\~/-}.tar.xz"
SOURCE_URI_2="http://download.qt.io/community_releases/5.9/5.9.0-final/qtwebkit-opensource-src-${portVersion/\~/-}.tar.xz"
CHECKSUM_SHA256="f70b5c66161191489fc13c7b7eb69bf9df3881596b183e7f6d94305a39837517"