[arch-commits] Commit in qt5-webengine/repos/extra-x86_64 (3 files)

[Antonio Rojas]

    Date: Thursday, September 26, 2019 @ 19:56:46
  Author: arojas
Revision: 363475

archrelease: copy trunk to extra-x86_64

Added:
  qt5-webengine/repos/extra-x86_64/PKGBUILD
    (from rev 363474, qt5-webengine/trunk/PKGBUILD)
Deleted:
  qt5-webengine/repos/extra-x86_64/PKGBUILD
  qt5-webengine/repos/extra-x86_64/qtbug-77037-workaround.patch

------------------------------+
 PKGBUILD                     |  104 +++++++++++++++++++++--------------------
 qtbug-77037-workaround.patch |   11 ----
 2 files changed, 54 insertions(+), 61 deletions(-)

Deleted: PKGBUILD
===================================================================
--- PKGBUILD	2019-09-26 19:56:27 UTC (rev 363474)
+++ PKGBUILD	2019-09-26 19:56:46 UTC (rev 363475)
@@ -1,50 +0,0 @@
-# Maintainer: Felix Yan <felixonmars at archlinux.org>
-# Contributor: Andrea Scarpino <andrea at archlinux.org>
-
-pkgname=qt5-webengine
-_qtver=5.13.1
-pkgver=${_qtver/-/}
-pkgrel=2
-arch=('x86_64')
-url='https://www.qt.io'
-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' 
-         'libevent' 'snappy' 'nss' 'libxslt' 'minizip' 'ffmpeg' 're2' 'libvpx' 'libpulse')
-makedepends=('python2' 'gperf' 'jsoncpp' 'ninja' 'qt5-tools' 'poppler')
-groups=('qt' 'qt5')
-_pkgfqn="${pkgname/5-/}-everywhere-src-${_qtver}"
-source=("https://download.qt.io/official_releases/qt/${pkgver%.*}/${_qtver}/submodules/${_pkgfqn}.tar.xz"
-        qtbug-77037-workaround.patch)
-sha256sums=('7f12e710b76ff2be4497bf368fc01ecd2419e2e962fb90599b0ece00ae2eb7d0'
-            '3e3bb8ecf292e7f249d001db4a4a072ca4ba38f713f496122bd7c73d93d5def9')
-
-prepare() {
-  mkdir -p build
-
-  cd ${_pkgfqn}
-  patch -p1 -i "$srcdir"/qtbug-77037-workaround.patch # Fix build with pulseaudio 13
-}
-
-build() {
-  cd build
-
-  qmake ../${_pkgfqn} -- \
-    -proprietary-codecs \
-    -system-ffmpeg \
-    -webp \
-    -spellchecker \
-    -webengine-icu
-  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/extra-x86_64/PKGBUILD (from rev 363474, qt5-webengine/trunk/PKGBUILD)
===================================================================
--- PKGBUILD	                        (rev 0)
+++ PKGBUILD	2019-09-26 19:56:46 UTC (rev 363475)
@@ -0,0 +1,54 @@
+# Maintainer: Felix Yan <felixonmars at archlinux.org>
+# Contributor: Andrea Scarpino <andrea at archlinux.org>
+
+pkgname=qt5-webengine
+_qtver=5.13.1
+pkgver=${_qtver/-/}
+pkgrel=3
+arch=('x86_64')
+url='https://www.qt.io'
+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' 
+         'libevent' 'snappy' 'nss' 'libxslt' 'minizip' 'ffmpeg' 're2' 'libvpx')
+makedepends=('python2' 'gperf' 'jsoncpp' 'ninja' 'qt5-tools' 'poppler')
+groups=('qt' 'qt5')
+_pkgfqn="${pkgname/5-/}-everywhere-src-${_qtver}"
+source=("https://download.qt.io/official_releases/qt/${pkgver%.*}/${_qtver}/submodules/${_pkgfqn}.tar.xz"
+        qtbug-77209.patch::"https://code.qt.io/cgit/qt/qtwebengine.git/patch/?id=1c33a4a6"
+        qtwebengine-pulseaudio-13.patch::"https://code.qt.io/cgit/qt/qtwebengine-chromium.git/patch/?id=0b57f159")
+sha256sums=('7f12e710b76ff2be4497bf368fc01ecd2419e2e962fb90599b0ece00ae2eb7d0'
+            '9773e1fed9b8998dd800ea89315b4ea70ed81b568b0a740945ac76577c62e6f1'
+            '7ed06cc2d0e3cc86df33bb80468a5f0422ed2cc5985db86444949ef3b9a12f02')
+
+prepare() {
+  mkdir -p build
+
+  cd $_pkgfqn
+  patch -p1 -i ../qtbug-77209.patch # Fix QWebEnginePage visibility state
+  cd src/3rdparty
+  patch -p1 -i "$srcdir"/qtwebengine-pulseaudio-13.patch # Fix build with pulseaudio 13
+}
+
+build() {
+  cd build
+
+  qmake ../${_pkgfqn} -- \
+    -proprietary-codecs \
+    -system-ffmpeg \
+    -webp \
+    -spellchecker \
+    -webengine-icu
+  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: qtbug-77037-workaround.patch
===================================================================
--- qtbug-77037-workaround.patch	2019-09-26 19:56:27 UTC (rev 363474)
+++ qtbug-77037-workaround.patch	2019-09-26 19:56:46 UTC (rev 363475)
@@ -1,11 +0,0 @@
---- qtwebengine-everywhere-src-5.13.0/src/core/config/linux.pri.orig	2019-08-06 08:23:45.385072740 +0300
-+++ qtwebengine-everywhere-src-5.13.0/src/core/config/linux.pri	2019-08-06 08:23:51.085237082 +0300
-@@ -162,7 +162,7 @@ host_build {
-     qtConfig(webengine-system-harfbuzz): gn_args += use_system_harfbuzz=true
-     !qtConfig(webengine-system-glib): gn_args += use_glib=false
-     qtConfig(webengine-pulseaudio) {
--        gn_args += use_pulseaudio=true
-+        gn_args += use_pulseaudio=true link_pulseaudio=true
-     } else {
-         gn_args += use_pulseaudio=false
-     }