Date: Saturday, June 4, 2016 @ 14:28:28 Author: arojas Revision: 268947
archrelease: copy kde-unstable to kde-unstable-i686, kde-unstable-x86_64 Added: qt5-webengine/repos/kde-unstable-i686/ qt5-webengine/repos/kde-unstable-i686/PKGBUILD (from rev 268946, qt5-webengine/kde-unstable/PKGBUILD) qt5-webengine/repos/kde-unstable-i686/qt5-webengine-nss.patch (from rev 268946, qt5-webengine/kde-unstable/qt5-webengine-nss.patch) qt5-webengine/repos/kde-unstable-x86_64/ qt5-webengine/repos/kde-unstable-x86_64/PKGBUILD (from rev 268946, qt5-webengine/kde-unstable/PKGBUILD) qt5-webengine/repos/kde-unstable-x86_64/qt5-webengine-nss.patch (from rev 268946, qt5-webengine/kde-unstable/qt5-webengine-nss.patch) ---------------------------------------------+ kde-unstable-i686/PKGBUILD | 52 ++++++++++++++++++++++++++ kde-unstable-i686/qt5-webengine-nss.patch | 31 +++++++++++++++ kde-unstable-x86_64/PKGBUILD | 52 ++++++++++++++++++++++++++ kde-unstable-x86_64/qt5-webengine-nss.patch | 31 +++++++++++++++ 4 files changed, 166 insertions(+) Copied: qt5-webengine/repos/kde-unstable-i686/PKGBUILD (from rev 268946, qt5-webengine/kde-unstable/PKGBUILD) =================================================================== --- kde-unstable-i686/PKGBUILD (rev 0) +++ kde-unstable-i686/PKGBUILD 2016-06-04 12:28:28 UTC (rev 268947) @@ -0,0 +1,52 @@ +# $Id: PKGBUILD 240297 2015-06-03 10:22:03Z fyan $ +# Maintainer: Felix Yan <felixonm...@archlinux.org> +# Contributor: Andrea Scarpino <and...@archlinux.org> + +pkgname=qt5-webengine +_qtver=5.7.0-rc +pkgver=${_qtver/-/} +pkgrel=1 +arch=('i686' 'x86_64') +url='http://qt-project.org/' +license=('GPL3' 'LGPL' 'FDL' 'custom') +pkgdesc='Provides support for web applications using the Chromium browser project' +depends=('qt5-webchannel' 'qt5-location' 'libxcomposite' 'libxrandr' 'libxtst' 'libxcursor' 'libpulse' 'pciutils' 'libxss' 'libvpx' 'opus' + 'libevent' 'libsrtp' 'jsoncpp' 'libwebp' 'snappy' 'nss' 'libxml2' 'libxslt' 'protobuf' 'libproxy') # minizip +makedepends=('python2' 'git' 'gperf') +groups=('qt' 'qt5') +_pkgfqn="${pkgname/5-/}-opensource-src-${_qtver}" +source=("http://download.qt.io/development_releases/qt/${pkgver%.*}/${_qtver}/submodules/${_pkgfqn}.tar.xz" qt5-webengine-nss.patch) +md5sums=('cb0e6ee6fc580e651f536b5250777d0a' + '2a1610b34204102938a24154a52e5571') + +prepare() { + mkdir -p build + + # Hack to force using python2 + mkdir -p bin + ln -s /usr/bin/python2 bin/python + + # Fix opening some websites with recent NSS https://github.com/QupZilla/qupzilla/issues/1870 (KaOSx patch) + cd ${_pkgfqn} + patch -p1 -i ../qt5-webengine-nss.patch +} + +build() { + cd build + + export PATH="$srcdir/bin:$PATH" + qmake WEBENGINE_CONFIG+=use_proprietary_codecs ../${_pkgfqn} + make +} + +package() { + cd build + make INSTALL_ROOT="$pkgdir" install + + # Drop QMAKE_PRL_BUILD_DIR because reference the build dir + find "$pkgdir/usr/lib" -type f -name '*.prl' \ + -exec sed -i -e '/^QMAKE_PRL_BUILD_DIR/d' {} \; + + install -d "$pkgdir"/usr/share/licenses + ln -s /usr/share/licenses/qt5-base "$pkgdir"/usr/share/licenses/${pkgname} +} Copied: qt5-webengine/repos/kde-unstable-i686/qt5-webengine-nss.patch (from rev 268946, qt5-webengine/kde-unstable/qt5-webengine-nss.patch) =================================================================== --- kde-unstable-i686/qt5-webengine-nss.patch (rev 0) +++ kde-unstable-i686/qt5-webengine-nss.patch 2016-06-04 12:28:28 UTC (rev 268947) @@ -0,0 +1,31 @@ +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); + Copied: qt5-webengine/repos/kde-unstable-x86_64/PKGBUILD (from rev 268946, qt5-webengine/kde-unstable/PKGBUILD) =================================================================== --- kde-unstable-x86_64/PKGBUILD (rev 0) +++ kde-unstable-x86_64/PKGBUILD 2016-06-04 12:28:28 UTC (rev 268947) @@ -0,0 +1,52 @@ +# $Id: PKGBUILD 240297 2015-06-03 10:22:03Z fyan $ +# Maintainer: Felix Yan <felixonm...@archlinux.org> +# Contributor: Andrea Scarpino <and...@archlinux.org> + +pkgname=qt5-webengine +_qtver=5.7.0-rc +pkgver=${_qtver/-/} +pkgrel=1 +arch=('i686' 'x86_64') +url='http://qt-project.org/' +license=('GPL3' 'LGPL' 'FDL' 'custom') +pkgdesc='Provides support for web applications using the Chromium browser project' +depends=('qt5-webchannel' 'qt5-location' 'libxcomposite' 'libxrandr' 'libxtst' 'libxcursor' 'libpulse' 'pciutils' 'libxss' 'libvpx' 'opus' + 'libevent' 'libsrtp' 'jsoncpp' 'libwebp' 'snappy' 'nss' 'libxml2' 'libxslt' 'protobuf' 'libproxy') # minizip +makedepends=('python2' 'git' 'gperf') +groups=('qt' 'qt5') +_pkgfqn="${pkgname/5-/}-opensource-src-${_qtver}" +source=("http://download.qt.io/development_releases/qt/${pkgver%.*}/${_qtver}/submodules/${_pkgfqn}.tar.xz" qt5-webengine-nss.patch) +md5sums=('cb0e6ee6fc580e651f536b5250777d0a' + '2a1610b34204102938a24154a52e5571') + +prepare() { + mkdir -p build + + # Hack to force using python2 + mkdir -p bin + ln -s /usr/bin/python2 bin/python + + # Fix opening some websites with recent NSS https://github.com/QupZilla/qupzilla/issues/1870 (KaOSx patch) + cd ${_pkgfqn} + patch -p1 -i ../qt5-webengine-nss.patch +} + +build() { + cd build + + export PATH="$srcdir/bin:$PATH" + qmake WEBENGINE_CONFIG+=use_proprietary_codecs ../${_pkgfqn} + make +} + +package() { + cd build + make INSTALL_ROOT="$pkgdir" install + + # Drop QMAKE_PRL_BUILD_DIR because reference the build dir + find "$pkgdir/usr/lib" -type f -name '*.prl' \ + -exec sed -i -e '/^QMAKE_PRL_BUILD_DIR/d' {} \; + + install -d "$pkgdir"/usr/share/licenses + ln -s /usr/share/licenses/qt5-base "$pkgdir"/usr/share/licenses/${pkgname} +} Copied: qt5-webengine/repos/kde-unstable-x86_64/qt5-webengine-nss.patch (from rev 268946, qt5-webengine/kde-unstable/qt5-webengine-nss.patch) =================================================================== --- kde-unstable-x86_64/qt5-webengine-nss.patch (rev 0) +++ kde-unstable-x86_64/qt5-webengine-nss.patch 2016-06-04 12:28:28 UTC (rev 268947) @@ -0,0 +1,31 @@ +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); +