Date: Thursday, April 27, 2017 @ 06:05:33
Author: arojas
Revision: 294884
archrelease: copy kde-unstable to kde-unstable-x86_64
Added:
qt5-webengine/repos/kde-unstable-x86_64/PKGBUILD
(from rev 294883, qt5-webengine/kde-unstable/PKGBUILD)
Deleted:
qt5-webengine/repos/kde-unstable-x86_64/PKGBUILD
qt5-webengine/repos/kde-unstable-x86_64/qt5-webengine-nss.patch
-------------------------+
PKGBUILD | 101 +++++++++++++++++++++-------------------------
qt5-webengine-nss.patch | 31 --------------
2 files changed, 47 insertions(+), 85 deletions(-)
Deleted: PKGBUILD
===================================================================
--- PKGBUILD 2017-04-27 06:05:10 UTC (rev 294883)
+++ PKGBUILD 2017-04-27 06:05:33 UTC (rev 294884)
@@ -1,54 +0,0 @@
-# $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.9.0-beta2
-pkgver=${_qtver/-/}
-pkgrel=1
-arch=('i686' 'x86_64')
-url='http://qt-project.org/'
-license=('LGPL3' 'LGPL2.1' 'BSD')
-pkgdesc='Provides support for web applications using the Chromium browser
project'
-depends=('qt5-webchannel' 'qt5-location' 'libxcomposite' 'libxrandr'
'pciutils' 'libxss' 'libvpx'
- 'libevent' 'libsrtp' 'snappy' 'nss' 'protobuf' 'libxslt' 'libxdamage'
'minizip' 'ffmpeg')
- # namcap note: libxdamage is needed for nvidia users
-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)
-
-sha256sums=('a98709230ed0015e9fa3d82d93cdc757934e5bf577563caf9e5f56217c46ae85'
- '4419e688bfda63b399a9ea2f28d5e4c8c6294096d363b657903329dbba0499cd')
-
-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 CONFIG+="proprietary-codecs" WEBENGINE_CONFIG+="use_proprietary_codecs
use_system_ffmpeg use_system_icu" ../${_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 -Dm644 "$srcdir"/${_pkgfqn}/src/3rdparty/chromium/LICENSE
"$pkgdir"/usr/share/licenses/${pkgname}/LICENSE.chromium
-}
Copied: qt5-webengine/repos/kde-unstable-x86_64/PKGBUILD (from rev 294883,
qt5-webengine/kde-unstable/PKGBUILD)
===================================================================
--- PKGBUILD (rev 0)
+++ PKGBUILD 2017-04-27 06:05:33 UTC (rev 294884)
@@ -0,0 +1,47 @@
+# $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.9.0-beta2
+pkgver=${_qtver/-/}
+pkgrel=2
+arch=('i686' 'x86_64')
+url='http://qt-project.org/'
+license=('LGPL3' 'LGPL2.1' 'BSD')
+pkgdesc='Provides support for web applications using the Chromium browser
project'
+depends=('qt5-webchannel' 'qt5-location' 'libxcomposite' 'libxrandr'
'pciutils' 'libxss' 'libvpx'
+ 'libevent' 'libsrtp' 'snappy' 'nss' 'protobuf' 'libxslt' 'libxdamage'
'minizip' 'ffmpeg')
+ # namcap note: libxdamage is needed for nvidia users
+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";)
+sha256sums=('a98709230ed0015e9fa3d82d93cdc757934e5bf577563caf9e5f56217c46ae85')
+
+prepare() {
+ mkdir -p build
+
+ # Hack to force using python2
+ mkdir -p bin
+ ln -s /usr/bin/python2 bin/python
+}
+
+build() {
+ cd build
+
+ export PATH="$srcdir/bin:$PATH"
+ qmake CONFIG+="proprietary-codecs" WEBENGINE_CONFIG+="use_proprietary_codecs
use_system_ffmpeg" ../${_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 -Dm644 "$srcdir"/${_pkgfqn}/src/3rdparty/chromium/LICENSE
"$pkgdir"/usr/share/licenses/${pkgname}/LICENSE.chromium
+}
Deleted: qt5-webengine-nss.patch
===================================================================
--- qt5-webengine-nss.patch 2017-04-27 06:05:10 UTC (rev 294883)
+++ qt5-webengine-nss.patch 2017-04-27 06:05:33 UTC (rev 294884)
@@ -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);
-
