Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=ab7b228eec49e01a10b73f04baee651f576fe439
commit ab7b228eec49e01a10b73f04baee651f576fe439 Author: Marius Cirsta <[email protected]> Date: Thu Mar 17 18:55:14 2016 +0200 qt5-webengine-5.6.0-1-x86_64 * version bump diff --git a/source/xlib-extra/qt5-webengine/FrugalBuild b/source/xlib-extra/qt5-webengine/FrugalBuild index 1e8a85a..2f241d6 100644 --- a/source/xlib-extra/qt5-webengine/FrugalBuild +++ b/source/xlib-extra/qt5-webengine/FrugalBuild @@ -2,21 +2,26 @@ # Maintainer: Marius Cirsta <[email protected]> pkgname=qt5-webengine -pkgrel=5 -depends=('qt5-declarative' 'qt5-webchannel' 'libxcomposite' 'libxrandr' 'nss' 'libxtst') +pkgrel=1 +depends=('qt5-declarative' 'qt5-webchannel' 'libxcomposite' 'libxrandr' 'nss' 'libxtst' 'libxscrnsaver' \ + 'zlib' 'libwebp' 'libxml2' 'libevent' 'jsoncpp' 'opus' 'libvpx' 'snappy' 'icu4c' 'ffmpeg' 'zlib' \ + 'libsrtp') makedepends=('git' 're2c' 'x11-protos') Finclude qt5 -source=(${source[@]} libjpeg.patch) +source=(${source[@]} libjpeg.patch nss321.patch) replaces=('libqt5webengine') conflicts=("${replaces[@]}") provides=("${replaces[@]}") -sha1sums=('2b87a0eca28150106dfe0a8639ea3520a19bd0c9' \ - 'fc40f2d0b97dfec78b3ca4a125dee8edbbd4da0a') +sha1sums=('8e0a8d8fb988f7935655681f6ed6288923d74dc0' \ + 'fc40f2d0b97dfec78b3ca4a125dee8edbbd4da0a' \ + '21281d067a47467e632a4d1e3bb76e7ca3c79e04') build() { Fpatchall - build_qt5 + qmake-qt5 -d WEBENGINE_CONFIG+=" use_proprietary_codecs use_system_ffmpeg use_system_icu " + make + make INSTALL_ROOT=$Fdestdir install || Fdie } # optimization OK diff --git a/source/xlib-extra/qt5-webengine/nss321.patch b/source/xlib-extra/qt5-webengine/nss321.patch new file mode 100644 index 0000000..616c87a --- /dev/null +++ b/source/xlib-extra/qt5-webengine/nss321.patch @@ -0,0 +1,48 @@ +diff -ur qtwebengine-opensource-src-5.6.0-beta/src/3rdparty/chromium/net/socket/ssl_client_socket_openssl.cc qtwebengine-opensource-src-5.6.0-beta-chimera-nss-init/src/3rdparty/chromium/net/socket/ssl_client_socket_openssl.cc +--- qtwebengine-opensource-src-5.6.0-beta/src/3rdparty/chromium/net/socket/ssl_client_socket_openssl.cc 2015-12-10 18:17:21.000000000 +0100 ++++ qtwebengine-opensource-src-5.6.0-beta-chimera-nss-init/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); + +diff -ur qtwebengine-opensource-src-5.6.0-beta/src/core/config/linux.pri qtwebengine-opensource-src-5.6.0-beta-linux-pri/src/core/config/linux.pri +--- qtwebengine-opensource-src-5.6.0-beta/src/core/config/linux.pri 2015-12-14 16:27:24.000000000 +0100 ++++ qtwebengine-opensource-src-5.6.0-beta-linux-pri/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 + _______________________________________________ Frugalware-git mailing list [email protected] http://frugalware.org/mailman/listinfo/frugalware-git
