[arch-commits] Commit in qt5-webengine/kde-unstable (PKGBUILD qt5-webengine-nss.patch)

[Antonio Rojas]

    Date: Thursday, April 27, 2017 @ 06:05:10
  Author: arojas
Revision: 294883

ICU 59 rebuild

Modified:
  qt5-webengine/kde-unstable/PKGBUILD
Deleted:
  qt5-webengine/kde-unstable/qt5-webengine-nss.patch

-------------------------+
 PKGBUILD                |   15 ++++-----------
 qt5-webengine-nss.patch |   31 -------------------------------
 2 files changed, 4 insertions(+), 42 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2017-04-27 05:50:37 UTC (rev 294882)
+++ PKGBUILD	2017-04-27 06:05:10 UTC (rev 294883)
@@ -5,7 +5,7 @@
 pkgname=qt5-webengine
 _qtver=5.9.0-beta2
 pkgver=${_qtver/-/}
-pkgrel=1
+pkgrel=2
 arch=('i686' 'x86_64')
 url='http://qt-project.org/'
 license=('LGPL3' 'LGPL2.1' 'BSD')
@@ -16,12 +16,9 @@
 makedepends=('python2' 'git' 'gperf' 'jsoncpp' 'ninja')
 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)
+source=("http://download.qt.io/development_releases/qt/${pkgver%.*}/${_qtver}/submodules/${_pkgfqn}.tar.xz")
+sha256sums=('a98709230ed0015e9fa3d82d93cdc757934e5bf577563caf9e5f56217c46ae85')
 
-sha256sums=('a98709230ed0015e9fa3d82d93cdc757934e5bf577563caf9e5f56217c46ae85'
-            '4419e688bfda63b399a9ea2f28d5e4c8c6294096d363b657903329dbba0499cd')
-
 prepare() {
   mkdir -p build
 
@@ -28,10 +25,6 @@
   # 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() {
@@ -38,7 +31,7 @@
   cd build
 
   export PATH="$srcdir/bin:$PATH"
-  qmake CONFIG+="proprietary-codecs" WEBENGINE_CONFIG+="use_proprietary_codecs use_system_ffmpeg use_system_icu" ../${_pkgfqn}
+  qmake CONFIG+="proprietary-codecs" WEBENGINE_CONFIG+="use_proprietary_codecs use_system_ffmpeg" ../${_pkgfqn}
   make
 }
 

Deleted: qt5-webengine-nss.patch
===================================================================
--- qt5-webengine-nss.patch	2017-04-27 05:50:37 UTC (rev 294882)
+++ qt5-webengine-nss.patch	2017-04-27 06:05:10 UTC (rev 294883)
@@ -1,31 +0,0 @@
-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);
-