[arch-commits] Commit in qt5-webengine/repos (6 files)

2017-10-15 Thread Antonio Rojas
Date: Sunday, October 15, 2017 @ 16:40:34
  Author: arojas
Revision: 307952

archrelease: copy trunk to staging-i686, staging-x86_64

Added:
  qt5-webengine/repos/staging-i686/
  qt5-webengine/repos/staging-i686/PKGBUILD
(from rev 307951, qt5-webengine/trunk/PKGBUILD)
  qt5-webengine/repos/staging-i686/harmony-fix.diff
(from rev 307951, qt5-webengine/trunk/harmony-fix.diff)
  qt5-webengine/repos/staging-x86_64/
  qt5-webengine/repos/staging-x86_64/PKGBUILD
(from rev 307951, qt5-webengine/trunk/PKGBUILD)
  qt5-webengine/repos/staging-x86_64/harmony-fix.diff
(from rev 307951, qt5-webengine/trunk/harmony-fix.diff)

-+
 staging-i686/PKGBUILD   |   54 +
 staging-i686/harmony-fix.diff   |   69 ++
 staging-x86_64/PKGBUILD |   54 +
 staging-x86_64/harmony-fix.diff |   69 ++
 4 files changed, 246 insertions(+)

Copied: qt5-webengine/repos/staging-i686/PKGBUILD (from rev 307951, 
qt5-webengine/trunk/PKGBUILD)
===
--- staging-i686/PKGBUILD   (rev 0)
+++ staging-i686/PKGBUILD   2017-10-15 16:40:34 UTC (rev 307952)
@@ -0,0 +1,54 @@
+# $Id$
+# Maintainer: Felix Yan 
+# Contributor: Andrea Scarpino 
+
+pkgname=qt5-webengine
+_qtver=5.9.2
+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/official_releases/qt/${pkgver%.*}/${_qtver}/submodules/${_pkgfqn}.tar.xz;
+ harmony-fix.diff)
+sha256sums=('cab069e4589f806640bebe4077c70e5cd5ffeb146c6e8caca6c4454fc0c4a108'
+'2c309c0f6978e6a399422319b5034b01881d5526cf48b2ee5fcc7f418029a344')
+
+prepare() {
+  mkdir -p build
+
+  # Hack to force using python2
+  mkdir -p bin
+  ln -s /usr/bin/python2 bin/python
+
+  cd ${_pkgfqn}
+
+  # FreeType 2.8.1
+  patch -Np1 -i ../harmony-fix.diff
+}
+
+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/staging-i686/harmony-fix.diff (from rev 307951, 
qt5-webengine/trunk/harmony-fix.diff)
===
--- staging-i686/harmony-fix.diff   (rev 0)
+++ staging-i686/harmony-fix.diff   2017-10-15 16:40:34 UTC (rev 307952)
@@ -0,0 +1,69 @@
+diff -u -r 
qtwebengine-opensource-src-5.9.1/src/3rdparty/chromium/third_party/skia/src/ports/SkFontHost_FreeType.cpp
 
qtwebengine-opensource-src-5.9.1-ftfixes/src/3rdparty/chromium/third_party/skia/src/ports/SkFontHost_FreeType.cpp
+--- 
qtwebengine-opensource-src-5.9.1/src/3rdparty/chromium/third_party/skia/src/ports/SkFontHost_FreeType.cpp
  2017-09-19 17:38:43.659642835 +0200
 
qtwebengine-opensource-src-5.9.1-ftfixes/src/3rdparty/chromium/third_party/skia/src/ports/SkFontHost_FreeType.cpp
  2017-09-19 17:38:50.492991631 +0200
+@@ -80,7 +80,7 @@
+ 
+ class FreeTypeLibrary : SkNoncopyable {
+ public:
+-FreeTypeLibrary() : fLibrary(nullptr), fIsLCDSupported(false), 
fLCDExtra(0) {
++FreeTypeLibrary() : fLibrary(nullptr) {
+ if (FT_New_Library(, )) {
+ return;
+ }
+@@ -90,8 +90,6 @@
+ // Default { 0x10, 0x40, 0x70, 0x40, 0x10 } adds up to 0x110, 
simulating ink spread.
+ // SetLcdFilter must be called before SetLcdFilterWeights.
+ if (FT_Library_SetLcdFilter(fLibrary, FT_LCD_FILTER_DEFAULT) == 0) {
+-fIsLCDSupported = true;
+-fLCDExtra = 2; //Using a filter adds one full pixel to each side.
+ 
+ #ifdef SK_FONTHOST_FREETYPE_USE_NORMAL_LCD_FILTER
+ // Adds to 0x110 simulating ink spread, but provides better 
results than default.
+@@ -124,13 +122,9 @@
+ }
+ 
+ FT_Library library() { return fLibrary; }
+-bool isLCDSupported() { return fIsLCDSupported; }
+-int 

[arch-commits] Commit in qt5-webengine/repos (6 files)

2017-10-07 Thread Antonio Rojas
Date: Saturday, October 7, 2017 @ 06:42:20
  Author: arojas
Revision: 307080

archrelease: copy trunk to staging-i686, staging-x86_64

Added:
  qt5-webengine/repos/staging-i686/
  qt5-webengine/repos/staging-i686/PKGBUILD
(from rev 307079, qt5-webengine/trunk/PKGBUILD)
  qt5-webengine/repos/staging-i686/harmony-fix.diff
(from rev 307079, qt5-webengine/trunk/harmony-fix.diff)
  qt5-webengine/repos/staging-x86_64/
  qt5-webengine/repos/staging-x86_64/PKGBUILD
(from rev 307079, qt5-webengine/trunk/PKGBUILD)
  qt5-webengine/repos/staging-x86_64/harmony-fix.diff
(from rev 307079, qt5-webengine/trunk/harmony-fix.diff)

-+
 staging-i686/PKGBUILD   |   54 +
 staging-i686/harmony-fix.diff   |   69 ++
 staging-x86_64/PKGBUILD |   54 +
 staging-x86_64/harmony-fix.diff |   69 ++
 4 files changed, 246 insertions(+)

Copied: qt5-webengine/repos/staging-i686/PKGBUILD (from rev 307079, 
qt5-webengine/trunk/PKGBUILD)
===
--- staging-i686/PKGBUILD   (rev 0)
+++ staging-i686/PKGBUILD   2017-10-07 06:42:20 UTC (rev 307080)
@@ -0,0 +1,54 @@
+# $Id$
+# Maintainer: Felix Yan 
+# Contributor: Andrea Scarpino 
+
+pkgname=qt5-webengine
+_qtver=5.9.2
+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/official_releases/qt/${pkgver%.*}/${_qtver}/submodules/${_pkgfqn}.tar.xz;
+ harmony-fix.diff)
+sha256sums=('cab069e4589f806640bebe4077c70e5cd5ffeb146c6e8caca6c4454fc0c4a108'
+'2c309c0f6978e6a399422319b5034b01881d5526cf48b2ee5fcc7f418029a344')
+
+prepare() {
+  mkdir -p build
+
+  # Hack to force using python2
+  mkdir -p bin
+  ln -s /usr/bin/python2 bin/python
+
+  cd ${_pkgfqn}
+
+  # FreeType 2.8.1
+  patch -Np1 -i ../harmony-fix.diff
+}
+
+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/staging-i686/harmony-fix.diff (from rev 307079, 
qt5-webengine/trunk/harmony-fix.diff)
===
--- staging-i686/harmony-fix.diff   (rev 0)
+++ staging-i686/harmony-fix.diff   2017-10-07 06:42:20 UTC (rev 307080)
@@ -0,0 +1,69 @@
+diff -u -r 
qtwebengine-opensource-src-5.9.1/src/3rdparty/chromium/third_party/skia/src/ports/SkFontHost_FreeType.cpp
 
qtwebengine-opensource-src-5.9.1-ftfixes/src/3rdparty/chromium/third_party/skia/src/ports/SkFontHost_FreeType.cpp
+--- 
qtwebengine-opensource-src-5.9.1/src/3rdparty/chromium/third_party/skia/src/ports/SkFontHost_FreeType.cpp
  2017-09-19 17:38:43.659642835 +0200
 
qtwebengine-opensource-src-5.9.1-ftfixes/src/3rdparty/chromium/third_party/skia/src/ports/SkFontHost_FreeType.cpp
  2017-09-19 17:38:50.492991631 +0200
+@@ -80,7 +80,7 @@
+ 
+ class FreeTypeLibrary : SkNoncopyable {
+ public:
+-FreeTypeLibrary() : fLibrary(nullptr), fIsLCDSupported(false), 
fLCDExtra(0) {
++FreeTypeLibrary() : fLibrary(nullptr) {
+ if (FT_New_Library(, )) {
+ return;
+ }
+@@ -90,8 +90,6 @@
+ // Default { 0x10, 0x40, 0x70, 0x40, 0x10 } adds up to 0x110, 
simulating ink spread.
+ // SetLcdFilter must be called before SetLcdFilterWeights.
+ if (FT_Library_SetLcdFilter(fLibrary, FT_LCD_FILTER_DEFAULT) == 0) {
+-fIsLCDSupported = true;
+-fLCDExtra = 2; //Using a filter adds one full pixel to each side.
+ 
+ #ifdef SK_FONTHOST_FREETYPE_USE_NORMAL_LCD_FILTER
+ // Adds to 0x110 simulating ink spread, but provides better 
results than default.
+@@ -124,13 +122,9 @@
+ }
+ 
+ FT_Library library() { return fLibrary; }
+-bool isLCDSupported() { return fIsLCDSupported; }
+-int 

[arch-commits] Commit in qt5-webengine/repos (6 files)

2016-06-09 Thread Antonio Rojas
Date: Friday, June 10, 2016 @ 01:04:16
  Author: arojas
Revision: 269250

archrelease: copy trunk to testing-i686, testing-x86_64

Added:
  qt5-webengine/repos/testing-i686/PKGBUILD
(from rev 269249, qt5-webengine/trunk/PKGBUILD)
  
qt5-webengine/repos/testing-i686/qt5-webengine-fno-delete-null-pointer-checks.patch
(from rev 269249, 
qt5-webengine/trunk/qt5-webengine-fno-delete-null-pointer-checks.patch)
  qt5-webengine/repos/testing-x86_64/PKGBUILD
(from rev 269249, qt5-webengine/trunk/PKGBUILD)
  
qt5-webengine/repos/testing-x86_64/qt5-webengine-fno-delete-null-pointer-checks.patch
(from rev 269249, 
qt5-webengine/trunk/qt5-webengine-fno-delete-null-pointer-checks.patch)
Deleted:
  qt5-webengine/repos/testing-i686/PKGBUILD
  qt5-webengine/repos/testing-x86_64/PKGBUILD

---+
 /PKGBUILD |  108 
++
 testing-i686/PKGBUILD |   48 
 testing-i686/qt5-webengine-fno-delete-null-pointer-checks.patch   |   49 
 testing-x86_64/PKGBUILD   |   48 
 testing-x86_64/qt5-webengine-fno-delete-null-pointer-checks.patch |   49 
 5 files changed, 206 insertions(+), 96 deletions(-)

Deleted: testing-i686/PKGBUILD
===
--- testing-i686/PKGBUILD   2016-06-09 23:03:31 UTC (rev 269249)
+++ testing-i686/PKGBUILD   2016-06-09 23:04:16 UTC (rev 269250)
@@ -1,48 +0,0 @@
-# $Id: PKGBUILD 240297 2015-06-03 10:22:03Z fyan $
-# Maintainer: Felix Yan 
-# Contributor: Andrea Scarpino 
-
-pkgname=qt5-webengine
-_qtver=5.6.1
-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') # minizip
-makedepends=('python2' 'git' 'gperf')
-conflicts=('qt')
-groups=('qt' 'qt5')
-_pkgfqn="${pkgname/5-/}-opensource-src-${_qtver}"
-source=("http://download.qt.io/official_releases/qt/${pkgver%.*}/${_qtver}/submodules/${_pkgfqn}.tar.xz;)
-md5sums=('35f168743638b07157e20af0586f39a2')
-
-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 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/testing-i686/PKGBUILD (from rev 269249, 
qt5-webengine/trunk/PKGBUILD)
===
--- testing-i686/PKGBUILD   (rev 0)
+++ testing-i686/PKGBUILD   2016-06-09 23:04:16 UTC (rev 269250)
@@ -0,0 +1,54 @@
+# $Id: PKGBUILD 240297 2015-06-03 10:22:03Z fyan $
+# Maintainer: Felix Yan 
+# Contributor: Andrea Scarpino 
+
+pkgname=qt5-webengine
+_qtver=5.6.1
+pkgver=${_qtver/-/}
+pkgrel=2
+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') # minizip
+makedepends=('python2' 'git' 'gperf')
+conflicts=('qt')
+groups=('qt' 'qt5')
+_pkgfqn="${pkgname/5-/}-opensource-src-${_qtver}"
+source=("http://download.qt.io/official_releases/qt/${pkgver%.*}/${_qtver}/submodules/${_pkgfqn}.tar.xz;
+qt5-webengine-fno-delete-null-pointer-checks.patch)
+md5sums=('35f168743638b07157e20af0586f39a2'
+ '5c4e4eb61165985330e018d79906d012')
+
+prepare() {
+  mkdir -p build
+
+  # Hack to force using python2
+  mkdir -p bin
+  ln -s /usr/bin/python2 bin/python
+
+  cd ${_pkgfqn}/src/3rdparty
+  # Workaround for v8 segfaults with GCC 6
+  patch -p1 -i "$srcdir"/qt5-webengine-fno-delete-null-pointer-checks.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 

[arch-commits] Commit in qt5-webengine/repos (6 files)

2016-06-04 Thread Antonio Rojas
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 
+# Contributor: Andrea Scarpino 
+
+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.0 +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)
===

[arch-commits] Commit in qt5-webengine/repos (6 files)

2016-03-05 Thread Antonio Rojas
Date: Saturday, March 5, 2016 @ 18:17:07
  Author: arojas
Revision: 260956

archrelease: copy trunk to kde-unstable-i686, kde-unstable-x86_64

Added:
  qt5-webengine/repos/kde-unstable-i686/PKGBUILD
(from rev 260955, qt5-webengine/trunk/PKGBUILD)
  qt5-webengine/repos/kde-unstable-i686/qt5-webengine-nss.patch
(from rev 260955, qt5-webengine/trunk/qt5-webengine-nss.patch)
  qt5-webengine/repos/kde-unstable-x86_64/PKGBUILD
(from rev 260955, qt5-webengine/trunk/PKGBUILD)
  qt5-webengine/repos/kde-unstable-x86_64/qt5-webengine-nss.patch
(from rev 260955, qt5-webengine/trunk/qt5-webengine-nss.patch)
Deleted:
  qt5-webengine/repos/kde-unstable-i686/PKGBUILD
  qt5-webengine/repos/kde-unstable-x86_64/PKGBUILD

-+
 /PKGBUILD   |  106 ++
 kde-unstable-i686/PKGBUILD  |   48 ---
 kde-unstable-i686/qt5-webengine-nss.patch   |   50 
 kde-unstable-x86_64/PKGBUILD|   48 ---
 kde-unstable-x86_64/qt5-webengine-nss.patch |   50 
 5 files changed, 206 insertions(+), 96 deletions(-)

Deleted: kde-unstable-i686/PKGBUILD
===
--- kde-unstable-i686/PKGBUILD  2016-03-05 17:16:33 UTC (rev 260955)
+++ kde-unstable-i686/PKGBUILD  2016-03-05 17:17:07 UTC (rev 260956)
@@ -1,48 +0,0 @@
-# $Id: PKGBUILD 240297 2015-06-03 10:22:03Z fyan $
-# Maintainer: Felix Yan 
-# Contributor: Andrea Scarpino 
-
-pkgname=qt5-webengine
-_qtver=5.6.0-rc
-pkgver=${_qtver/-/}
-pkgrel=1
-arch=('i686' 'x86_64')
-url='http://qt-project.org/'
-license=('GPL3' 'LGPL' 'FDL' 'custom')
-pkgdesc='A cross-platform application and UI framework'
-depends=('qt5-webchannel' 'libxcomposite' 'libxrandr' 'libxtst' 'libxcursor' 
'libpulse' 'pciutils' 'libxss' 'nss'
- 'libvpx' 'opus' 'libevent' 'libsrtp' 'jsoncpp' 'libwebp' 'snappy' 
'minizip')
-makedepends=('python2' 'git' 'gperf')
-conflicts=('qt')
-groups=('qt' 'qt5')
-_pkgfqn="${pkgname/5-/}-opensource-src-${_qtver}"
-source=("http://download.qt.io/development_releases/qt/${pkgver%.*}/${_qtver}/submodules/${_pkgfqn}.tar.xz;)
-md5sums=('af563195bc61e878e8de45658a1bd745')
-
-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 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/PKGBUILD (from rev 260955, 
qt5-webengine/trunk/PKGBUILD)
===
--- kde-unstable-i686/PKGBUILD  (rev 0)
+++ kde-unstable-i686/PKGBUILD  2016-03-05 17:17:07 UTC (rev 260956)
@@ -0,0 +1,53 @@
+# $Id: PKGBUILD 240297 2015-06-03 10:22:03Z fyan $
+# Maintainer: Felix Yan 
+# Contributor: Andrea Scarpino 
+
+pkgname=qt5-webengine
+_qtver=5.6.0-rc
+pkgver=${_qtver/-/}
+pkgrel=2
+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' 'libxcomposite' 'libxrandr' 'libxtst' 'libxcursor' 
'libpulse' 'pciutils' 'libxss' 'libvpx' 'opus'
+ 'libevent' 'libsrtp' 'jsoncpp' 'libwebp' 'snappy' 'minizip' 'nss' 
'libxml2' 'libxslt')
+makedepends=('python2' 'git' 'gperf')
+conflicts=('qt')
+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=('af563195bc61e878e8de45658a1bd745'
+ '26f5e1e96be524ccad564dc2fdb9766c')
+
+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
+  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