qt5: bump version.

* enable x86_64.
* had to remove a patch for libdl test, wouldn't fit anymore.
This commit is contained in:
Jerome Duval
2017-01-23 22:52:06 +01:00
parent 850dd70bf0
commit a910365ad9
3 changed files with 17 additions and 36 deletions

View File

@@ -1,4 +1,4 @@
From 55cb3e812e93f1d744181df05247bb8b1d8cd29c Mon Sep 17 00:00:00 2001
From 6a384c530792c443356501a64c85f119fe2edf6c 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
@@ -103,10 +103,10 @@ index f0612fe..bec9f72 100644
|| OS(OPENBSD) \
|| OS(QNX) \
--
2.2.2
2.10.2
From 6f655ce97181e9f66f6e2b79c0b5ef0c9ecc3f88 Mon Sep 17 00:00:00 2001
From d230a2b9612041021e655508c7505fe239f3c301 Mon Sep 17 00:00:00 2001
From: Gerasim Troeglazov <3dEyes@gmail.com>
Date: Fri, 16 Oct 2015 23:07:40 +1000
Subject: Set Experimanetal Haiku QPA plugin
@@ -5948,10 +5948,10 @@ index a8035e7..87f220e 100644
QT_END_NAMESPACE
--
2.2.2
2.10.2
From 7eed82391a2dccc95a26f9c55eb36fedb557069a Mon Sep 17 00:00:00 2001
From 17ecd4ee293c03f79ed66b001560b0dc4e12381e Mon Sep 17 00:00:00 2001
From: Oswald Buddenhagen <oswald.buddenhagen@theqtcompany.com>
Date: Fri, 12 Feb 2016 16:03:42 +0100
Subject: consistently put {qt,qml}_{module,plugin} at the end of project files
@@ -5987,10 +5987,10 @@ index 8a52f48..19fcc05 100644
+!equals(TARGET, $$QT_DEFAULT_QPA_PLUGIN): PLUGIN_EXTENDS = -
+load(qt_plugin)
--
2.2.2
2.10.2
From d3703fe6bb7d172170ddd343f466ac8c46a3f5b2 Mon Sep 17 00:00:00 2001
From 06b73035b541b27aeff07954ab80bde77062fe77 Mon Sep 17 00:00:00 2001
From: Jerome Duval <jerome.duval@gmail.com>
Date: Thu, 11 Aug 2016 18:17:45 +0000
Subject: haiku: fix 64-bit build.
@@ -6010,10 +6010,10 @@ index 300badb..37ecf38 100644
if(dataLen && stat==B_OK) {
QString mime(name);
--
2.2.2
2.10.2
From 8442c5f74f28e8c78144c6fcbf6815244ffb4bc0 Mon Sep 17 00:00:00 2001
From b98e7fa93b94155a65be74eaaad77cd910855a98 Mon Sep 17 00:00:00 2001
From: Tobias Koenig <tobias.koenig@kdab.com>
Date: Tue, 8 Dec 2015 15:49:44 +0000
Subject: Haiku: Fix compilation of network library
@@ -6042,10 +6042,10 @@ index eb73a2f..637fe49 100644
ifindex = if_nametoindex(req.ifr_name);
# endif
--
2.2.2
2.10.2
From 65f19ad377143544d7110e691b99187f447e1e52 Mon Sep 17 00:00:00 2001
From 29b038a665a378d3c4cb701d78378d3680f87463 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/*
@@ -6077,29 +6077,10 @@ index 8f39045..5a7c0e5 100644
deviceDir.setNameFilters(deviceFileNameFilterList);
deviceDir.setFilter(QDir::Files | QDir::System | QDir::NoSymLinks);
--
2.7.0
2.10.2
From 29fa3d74a1e1c45492ce51c0b7292274b3e5f4ee Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fran=C3=A7ois=20Revol?= <revol@free.fr>
Date: Sun, 6 Nov 2016 16:46:49 +0100
Subject: Haiku: fix libdl test (no need for -ldl)
diff --git a/qtbase/config.tests/unix/libdl/libdl.pro b/qtbase/config.tests/unix/libdl/libdl.pro
index 8ed5231..903d274 100644
--- a/qtbase/config.tests/unix/libdl/libdl.pro
+++ b/qtbase/config.tests/unix/libdl/libdl.pro
@@ -1,3 +1,3 @@
SOURCES = libdl.cpp
CONFIG -= qt dylib
-!qnx: LIBS += -ldl
+!haiku:!qnx: LIBS += -ldl
--
2.7.0
From 1b440d369ce2ea247d40efe90f4e90d9f66e63c2 Mon Sep 17 00:00:00 2001
From 1a1b7bf774bf7205a29ec1aa19a9a8ba3d7ff009 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
@@ -6121,5 +6102,5 @@ index 11fb52a..bd08522 100644
CMAKE_DLL_DIR = $$CMAKE_LIB_DIR
CMAKE_DLL_DIR_IS_ABSOLUTE = $$CMAKE_LIB_DIR_IS_ABSOLUTE
--
2.7.0
2.10.2

View File

@@ -9,8 +9,8 @@ LICENSE="GNU LGPL v2"
REVISION="1"
SOURCE_URI="https://download.qt.io/official_releases/qt/5.6/$portVersion/single/qt-everywhere-opensource-src-$portVersion.tar.xz"
SOURCE_URI_2="https://download.qt.io/community_releases/5.6/$portVersion/qtwebkit-opensource-src-$portVersion.tar.xz"
CHECKSUM_SHA256="0d3cc75d2368ad988c9ec6bcbed6362dbaa8e03fdfd04e679284f4b9af91e565"
CHECKSUM_SHA256_2="f5cfbfa5fad2b65a9be907d426f99694b86a04c3bb5a8814b21bd0ade4c672aa"
CHECKSUM_SHA256="83e61bfc78bba230770704e828fa4d23fe3bbfdcfa4a8f5db37ce149731d89b3"
CHECKSUM_SHA256_2="528a6b8b1c5095367b26e8ce4f3a46bb739e2e9913ff4dfc6ef58a04fcd73966"
SOURCE_DIR="qt-everywhere-opensource-src-$portVersion"
SOURCE_DIR_2="qtwebkit-opensource-src-$portVersion"
PATCHES="qt5-$portVersion.patchset"
@@ -24,7 +24,7 @@ ADDITIONAL_FILES="
qmlviewer.rdef.in
"
ARCHITECTURES="!x86_gcc2 ?x86 ?x86_64"
ARCHITECTURES="!x86_gcc2 ?x86 x86_64"
SECONDARY_ARCHITECTURES="?x86"
PROVIDES="