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: bump version.

Browse Source
This commit is contained in:
Gerasim Troeglazov
2017-11-26 21:52:25 +10:00
parent a2bacaf2ff
commit 58cc27b530
2 changed files with 51 additions and 72 deletions
Download Patch File Download Diff File Expand all files Collapse all files

119
dev-qt/qt5/patches/qt5-5.9.2.patchset → dev-qt/qt5/patches/qt5-5.9.3.patchset
View File

@@ -1,21 +1,9 @@
From 3515207d5ae84131609c34a06953233bc4315ce0 Mon Sep 17 00:00:00 2001
From d841295d609c27409511b15bb429f9e443e51adc 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
diff --git a/qtbase/tests/auto/corelib/io/qfileselector/qfileselector.qrc b/qtbase/tests/auto/corelib/io/qfileselector/qfileselector.qrc
index ea9b827..928e949 100644
--- a/qtbase/tests/auto/corelib/io/qfileselector/qfileselector.qrc
+++ b/qtbase/tests/auto/corelib/io/qfileselector/qfileselector.qrc
@@ -21,6 +21,7 @@
<file>platforms/+unix/+darwin/test</file>
<file>platforms/+unix/+haiku/test</file>
<file>platforms/+unix/+linux/test</file>
+ <file>platforms/+unix/+haiku/test</file>
<file>platforms/+unix/test</file>
<file>platforms/+windows/+wince/test</file>
<file>platforms/+windows/+winnt/test</file>
diff --git a/qtdeclarative/src/3rdparty/masm/wtf/PageBlock.cpp b/qtdeclarative/src/3rdparty/masm/wtf/PageBlock.cpp
index e715ed2..b05e71e 100644
--- a/qtdeclarative/src/3rdparty/masm/wtf/PageBlock.cpp
@@ -59,10 +47,10 @@ index 7f2023a..4b3d202 100644
|| OS(OPENBSD) \
|| OS(QNX) \
--
2.13.1
2.15.0
From 56d29c87119c0b67f6b44f8741cfda7d5fdeb49b Mon Sep 17 00:00:00 2001
From c013af413b3e1cd5ee0bf06508e05db5c01d6aee 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/*
@@ -94,10 +82,10 @@ index 0f62a9d..afd5c0b 100644
deviceDir.setNameFilters(deviceFileNameFilterList);
deviceDir.setFilter(QDir::Files | QDir::System | QDir::NoSymLinks);
--
2.13.1
2.15.0
From 4406a869ef26839ecd5df0ef61d748a3a4336f24 Mon Sep 17 00:00:00 2001
From 1944dc07ba8d5fa1e9331107d3c2094b4a163a1f 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
@@ -119,10 +107,10 @@ index bb5083c..b286bed 100644
CMAKE_DLL_DIR = $$CMAKE_LIB_DIR
CMAKE_DLL_DIR_IS_ABSOLUTE = $$CMAKE_LIB_DIR_IS_ABSOLUTE
--
2.13.1
2.15.0
From c28ebe137e4965c64f089951722d9f87112e568a Mon Sep 17 00:00:00 2001
From d9ab036140ec10e4268dd31cd02e7c0cfe9a691a 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
@@ -141,10 +129,10 @@ index 0b9235a..bfc2a0c 100644
return 0;
}
--
2.13.1
2.15.0
From fa7ffbd94dff7191ad7b6280a13774dd34251a53 Mon Sep 17 00:00:00 2001
From a8208fdf3be60bb94f8a50cc90a3404ea8f241c8 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.
@@ -199,10 +187,10 @@ index 3abda68..0eef251 100644
#elif defined(Q_PROCESSOR_ARM_32) && (QT_POINTER_SIZE == 4)
# if defined(thumb2) || defined(__thumb2__) || ((defined(__thumb) || defined(__thumb__)) && __TARGET_ARCH_THUMB-0 == 4)
--
2.13.1
2.15.0
From c8e7181d6bafdac6c1cfcb7afd6593b0efdf27f0 Mon Sep 17 00:00:00 2001
From 65bcb9f267e38b5318a0912b6308d7dffd1e8d50 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.
@@ -225,10 +213,10 @@ index 81ad7e9..8f3d3e4 100644
if (format == QImage::Format_Mono || format == QImage::Format_Indexed8 || format == QImage::Format_Grayscale8) {
if (format == QImage::Format_Mono) {
--
2.13.1
2.15.0
From 4af5ebdbcb027e0622fc119245e0e3298e4004c8 Mon Sep 17 00:00:00 2001
From e611590e0c80625b01330c595a172d49a9c8fb11 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.
@@ -257,32 +245,10 @@ index 98053cb..57ca638 100644
#if !defined(__x86_64__) && !defined(__arm64__)
//! Constructor for size_t value.
--
2.13.1
2.15.0
From eac8fbf6e07763797a8d08d9160d722b50eb7af1 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 9d11506..16be997 100644
--- a/qtbase/src/network/ssl/qsslsocket.cpp
+++ b/qtbase/src/network/ssl/qsslsocket.cpp
@@ -2670,6 +2670,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.13.1
From 3d43557d7986828feb01f74967aeb0fbd40daaa7 Mon Sep 17 00:00:00 2001
From 19b29cd573eea47eec5fc864ac3459e400b23e41 Mon Sep 17 00:00:00 2001
From: Gerasim Troeglazov <3dEyes@gmail.com>
Date: Sun, 16 Jul 2017 21:55:25 +1000
Subject: Disable built-in haiku QPA plugin
@@ -304,10 +270,10 @@ index 9ccc2b5..9e404e2 100644
qtConfig(integrityfb): SUBDIRS += integrity
--
2.13.1
2.15.0
From 72f5ad38cbfd067145ee063824fb69308c58d5e7 Mon Sep 17 00:00:00 2001
From c7feefd593eb2aa029685ed846d4269e2cedb426 Mon Sep 17 00:00:00 2001
From: Gerasim Troeglazov <3dEyes@gmail.com>
Date: Mon, 9 Oct 2017 22:57:10 +1000
Subject: disable mapbox-gl-native on Haiku.
@@ -327,10 +293,10 @@ index b81ad34..7b642c0 100644
warning("Submodule mapbox-gl-native does not exist. Run 'git submodule update --init' on qtlocation.")
} else {
--
2.13.1
2.15.0
From bdd776d33994af83530b31ef8a735b9f00bfd0f7 Mon Sep 17 00:00:00 2001
From 85c03479cd4278801048ce820f66756214e91b63 Mon Sep 17 00:00:00 2001
From: Gerasim Troeglazov <3dEyes@gmail.com>
Date: Mon, 9 Oct 2017 22:58:38 +1000
Subject: Fix QStandartPaths for Haiku
@@ -390,37 +356,50 @@ index 044d69f..1f255a9 100644
case GenericConfigLocation:
paths += haikuStandardPath(B_SYSTEM_SETTINGS_DIRECTORY);
--
2.13.1
2.15.0
From 35d82fbd54ecedfaea63fc44b42057d7104ffc35 Mon Sep 17 00:00:00 2001
From 104ec97eae6dd9a6f2375078040e0e0970745061 Mon Sep 17 00:00:00 2001
From: Gerasim Troeglazov <3dEyes@gmail.com>
Date: Mon, 9 Oct 2017 22:59:21 +1000
Date: Sun, 26 Nov 2017 19:09:37 +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 8eba5db..2e433d3 100644
--- a/qtbase/src/network/ssl/qsslsocket.cpp
+++ b/qtbase/src/network/ssl/qsslsocket.cpp
@@ -2682,6 +2682,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.15.0
From 758d9e669c5d450e298a64fd70eb932bdf7acdd3 Mon Sep 17 00:00:00 2001
From: Gerasim Troeglazov <3dEyes@gmail.com>
Date: Sun, 26 Nov 2017 19:15:26 +1000
Subject: Fix build for Haiku platform
diff --git a/qtbase/mkspecs/features/toolchain.prf b/qtbase/mkspecs/features/toolchain.prf
index 35175f1..f8cffb5 100644
index ba41598..34b46bc 100644
--- a/qtbase/mkspecs/features/toolchain.prf
+++ b/qtbase/mkspecs/features/toolchain.prf
@@ -120,7 +120,7 @@ isEmpty($${target_prefix}.INCDIRS) {
@@ -116,7 +116,7 @@ isEmpty($${target_prefix}.INCDIRS) {
}
}
}
- !darwin:clang {
+ if(!darwin:clang)|haiku {
- if(!darwin:clang)|intel_icc {
+ if(!darwin:clang)|haiku|intel_icc {
# Clang on a non-Apple system (that is, a system without ld64 -- say, with GNU ld
# 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
@@ -205,7 +205,7 @@ isEmpty($${target_prefix}.COMPILER_MACROS) {
vars = $$qtVariablesFromGCC($$QMAKE_CXX)
}
for (v, vars) {
- isEmpty(v)|contains(v, $${LITERAL_HASH}.*): next()
+ contains(v, $${LITERAL_HASH}.*)|contains(v, " *"): next()
# Set both <varname> for the outer scope ...
eval($$v)
v ~= s/ .*//
--
2.13.1
2.15.0

4
dev-qt/qt5/qt5-5.9.2.recipe → dev-qt/qt5/qt5-5.9.3.recipe
View File

@@ -7,9 +7,9 @@ HOMEPAGE="https://qt.io/"
COPYRIGHT="2015-2017 The Qt Company Ltd."
LICENSE="GNU LGPL v2.1
GNU LGPL v3"
REVISION="4"
REVISION="1"
SOURCE_URI="http://download.qt.io/official_releases/qt/5.9/${portVersion/\~/-}/single/qt-everywhere-opensource-src-${portVersion/\~/-}.tar.xz"
CHECKSUM_SHA256="6c6171a4d1ea3fbd4212d6a04899650218583df3ec583a8a6a4a589fe18620ff"
CHECKSUM_SHA256="57acd8f03f830c2d7dc29fbe28aaa96781b2b9bdddce94196e6761a0f88c6046"
SOURCE_DIR="qt-everywhere-opensource-src-${portVersion/\~/-}"
PATCHES="qt5-$portVersion.patchset"