qt5: update to 5.6.1

This commit is contained in:
Jürgen Buchmüller 2016-06-15 00:16:48 +02:00
parent 40cafe84fc
commit 7976c6f2b0
5 changed files with 4 additions and 69 deletions

View file

@ -1866,6 +1866,7 @@ libQt5LabsTemplates.so.5 qt5-quickcontrols2-5.6.0_1
libQt5Script.so.5 qt5-script-5.6.0_1 libQt5Script.so.5 qt5-script-5.6.0_1
libQt5ScriptTools.so.5 qt5-script-5.6.0_1 libQt5ScriptTools.so.5 qt5-script-5.6.0_1
libQt5Sensors.so.5 qt5-sensors-5.6.0_1 libQt5Sensors.so.5 qt5-sensors-5.6.0_1
libQt5SerialBus.so.5 qt5-serialbus-5.6.0_1
libQt5SerialPort.so.5 qt5-serialport-5.6.0_1 libQt5SerialPort.so.5 qt5-serialport-5.6.0_1
libQt5Svg.so.5 qt5-svg-5.6.0_1 libQt5Svg.so.5 qt5-svg-5.6.0_1
libQt5CLucene.so.5 qt5-tools-5.6.0_1 libQt5CLucene.so.5 qt5-tools-5.6.0_1

View file

@ -1,11 +0,0 @@
--- qtbase/config.tests/unix/alsa/alsatest.cpp 2016-03-03 12:35:22.000000000 +0100
+++ qtbase/config.tests/unix/alsa/alsatest.cpp 2016-04-24 11:21:33.168021766 +0200
@@ -32,7 +32,7 @@
****************************************************************************/
#include <alsa/asoundlib.h>
-#if(!(SND_LIB_MAJOR == 1 && SND_LIB_MINOR == 0 && SND_LIB_SUBMINOR >= 10))
+#if(!(SND_LIB_MAJOR == 1 && (SND_LIB_MINOR > 0) || (SND_LIB_MINOR == 0 && SND_LIB_SUBMINOR >= 10)))
#error "Alsa version found too old, require >= 1.0.10"
#endif

View file

@ -1,46 +0,0 @@
--- qtwebengine/src/3rdparty/chromium/net/socket/ssl_client_socket_openssl.cc 2015-12-10 18:17:21.000000000 +0100
+++ qtwebengine/src/3rdparty/chromium/net/socket/ssl_client_socket_openssl.cc 2016-01-14 17:11:38.432633534 +0100
@@ -57,6 +57,10 @@
#include "net/ssl/ssl_platform_key.h"
#endif
+#if defined(USE_NSS_CERTS) || defined(OS_IOS)
+#include "net/cert_net/nss_ocsp.h"
+#endif
+
namespace net {
namespace {
@@ -795,6 +799,14 @@
DCHECK(!ssl_);
DCHECK(!transport_bio_);
+#if defined(USE_NSS_CERTS) || defined(OS_IOS)
+ if (ssl_config_.cert_io_enabled) {
+ // TODO(davidben): Move this out of SSLClientSocket. See
+ // https://crbug.com/539520.
+ EnsureNSSHttpIOInit();
+ }
+#endif
+
SSLContext* context = SSLContext::GetInstance();
crypto::OpenSSLErrStackTracer err_tracer(FROM_HERE);
--- qtwebengine/src/core/config/linux.pri 2015-12-14 16:27:24.000000000 +0100
+++ qtwebengine/src/core/config/linux.pri 2016-01-14 17:31:05.765975551 +0100
@@ -18,7 +18,13 @@
use_kerberos=0 \
use_pango=0
-!use?(nss) {
+use?(nss) {
+# do a "chimera build" (BoringSSL code, NSS certs): This is the default in
+# Chromium 47+, and it is the only variant that works with NSS 3.21.
+ GYP_CONFIG += use_nss_certs=1 \
+ use_openssl=1 \
+ use_openssl_certs=0
+} else {
GYP_CONFIG += use_nss_certs=0 \
use_openssl=1 \
use_openssl_certs=1

View file

@ -15,12 +15,3 @@ just as it is for Android. See: https://bugreports.qt.io/browse/QTBUG-44268
QT_BEGIN_NAMESPACE QT_BEGIN_NAMESPACE
using namespace QV4; using namespace QV4;
@@ -147,7 +152,7 @@
pthread_attr_getstack(&attr, &stackBottom, &stackSize);
pthread_attr_destroy(&attr);
-# if defined(Q_OS_ANDROID)
+# if defined(Q_OS_ANDROID) || !defined(__GLIBC__)
// Bionic pretends that the main thread has a tiny stack; work around it
if (gettid() == getpid()) {
rlimit limit;

View file

@ -1,14 +1,14 @@
# Template file for 'qt5' # Template file for 'qt5'
pkgname=qt5 pkgname=qt5
version=5.6.0 version=5.6.1
revision=10 revision=1
wrksrc="qt-everywhere-opensource-src-${version}" wrksrc="qt-everywhere-opensource-src-${version}"
homepage="http://qt.io/" homepage="http://qt.io/"
short_desc="A cross-platform application and UI framework (QT5)" short_desc="A cross-platform application and UI framework (QT5)"
maintainer="Juan RP <xtraeme@voidlinux.eu>" maintainer="Juan RP <xtraeme@voidlinux.eu>"
license="GPL-3, LGPL-2.1" license="GPL-3, LGPL-2.1"
distfiles="http://download.qt.io/official_releases/qt/${version%.*}/${version}/single/qt-everywhere-opensource-src-${version}.tar.xz" distfiles="http://download.qt.io/official_releases/qt/${version%.*}/${version}/single/qt-everywhere-opensource-src-${version}.tar.xz"
checksum=76a95cf6c1503290f75a641aa25079cd0c5a8fcd7cff07ddebff80a955b07de7 checksum=0d3cc75d2368ad988c9ec6bcbed6362dbaa8e03fdfd04e679284f4b9af91e565
nocross=yes nocross=yes
if [ "${XBPS_MACHINE%%-musl}" = i686 ]; then if [ "${XBPS_MACHINE%%-musl}" = i686 ]; then