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

2019-12-02 Thread Antonio Rojas via arch-commits
Date: Monday, December 2, 2019 @ 11:50:28
  Author: arojas
Revision: 370204

archrelease: copy trunk to extra-x86_64

Added:
  qt5-webengine/repos/extra-x86_64/PKGBUILD
(from rev 370203, qt5-webengine/trunk/PKGBUILD)
  qt5-webengine/repos/extra-x86_64/icu65.patch
(from rev 370203, qt5-webengine/trunk/icu65.patch)
Deleted:
  qt5-webengine/repos/extra-x86_64/PKGBUILD
  qt5-webengine/repos/extra-x86_64/icu65.patch

-+
 PKGBUILD|  111 ++
 icu65.patch |  128 +-
 2 files changed, 122 insertions(+), 117 deletions(-)

Deleted: PKGBUILD
===
--- PKGBUILD2019-12-02 11:50:03 UTC (rev 370203)
+++ PKGBUILD2019-12-02 11:50:28 UTC (rev 370204)
@@ -1,53 +0,0 @@
-# Maintainer: Felix Yan 
-# Contributor: Andrea Scarpino 
-
-pkgname=qt5-webengine
-_qtver=5.13.2
-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;
- icu65.patch
- 
CVE-2019-13720.patch::"https://code.qt.io/cgit/qt/qtwebengine-chromium.git/patch/?id=d6e5fc10;)
-sha256sums=('adcf56b5de6f34744bba2307b696fc75611884f4270e87dfa760d6e99dd711bb'
-'1de9bdbfed482295dda45c7d4e323cee55a34e42f66b892da1c1a778682b7a41'
-'3b2ce75214e757f5d0d268fbb1009c2e0c660d19620ae27e8d92a0e492e5d9da')
-
-prepare() {
-  mkdir -p build
-
-  cd $_pkgfqn/src/3rdparty
-  patch -p1 -i "$srcdir"/CVE-2019-13720.patch
-  patch -p1 -d chromium -i "$srcdir"/icu65.patch
-}
-
-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 370203, 
qt5-webengine/trunk/PKGBUILD)
===
--- PKGBUILD(rev 0)
+++ PKGBUILD2019-12-02 11:50:28 UTC (rev 370204)
@@ -0,0 +1,58 @@
+# Maintainer: Felix Yan 
+# Contributor: Andrea Scarpino 
+
+pkgname=qt5-webengine
+_qtver=5.13.2
+pkgver=${_qtver/-/}
+pkgrel=4
+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;
+ icu65.patch
+ 
CVE-2019-13720.patch::"https://code.qt.io/cgit/qt/qtwebengine-chromium.git/patch/?id=d6e5fc10;
+ 
qtwebengine-flash.patch::"https://code.qt.io/cgit/qt/qtwebengine.git/patch/?id=e72fd513;)
+sha256sums=('adcf56b5de6f34744bba2307b696fc75611884f4270e87dfa760d6e99dd711bb'
+'1de9bdbfed482295dda45c7d4e323cee55a34e42f66b892da1c1a778682b7a41'
+'3b2ce75214e757f5d0d268fbb1009c2e0c660d19620ae27e8d92a0e492e5d9da'
+'1a64c4418950b4f9da78fe88c602f7dc274c85197927a3335d35220378ade2df')
+
+prepare() {
+  mkdir -p build
+
+  cd $_pkgfqn
+  patch -p1 -i ../qtwebengine-flash.patch # Fix Flash plugin
+
+  cd src/3rdparty
+  patch -p1 -i "$srcdir"/CVE-2019-13720.patch
+  patch -p1 -d chromium -i "$srcdir"/icu65.patch
+}
+
+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: icu65.patch

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

2019-07-10 Thread Antonio Rojas via arch-commits
Date: Wednesday, July 10, 2019 @ 11:43:35
  Author: arojas
Revision: 357506

archrelease: copy trunk to extra-x86_64

Added:
  qt5-webengine/repos/extra-x86_64/PKGBUILD
(from rev 357505, qt5-webengine/trunk/PKGBUILD)
  qt5-webengine/repos/extra-x86_64/qtwebengine-glibc-2.29.patch
(from rev 357505, qt5-webengine/trunk/qtwebengine-glibc-2.29.patch)
Deleted:
  qt5-webengine/repos/extra-x86_64/PKGBUILD
  qt5-webengine/repos/extra-x86_64/qtwebengine-glibc-2.29.patch

--+
 PKGBUILD |  106 ++--
 qtwebengine-glibc-2.29.patch |  210 -
 2 files changed, 160 insertions(+), 156 deletions(-)

Deleted: PKGBUILD
===
--- PKGBUILD2019-07-10 11:43:07 UTC (rev 357505)
+++ PKGBUILD2019-07-10 11:43:35 UTC (rev 357506)
@@ -1,51 +0,0 @@
-# Maintainer: Felix Yan 
-# Contributor: Andrea Scarpino 
-
-pkgname=qt5-webengine
-_qtver=5.13.0
-pkgver=${_qtver/-/}
-pkgrel=1
-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;
-qtwebengine-glibc-2.29.patch)
-sha256sums=('e0af82ecee1ab41b6732697f667b98b7b0c53164bebcfaad8070e88b2e064efe'
-'dd791f154b48e69cd47fd94753c45448655b529590995fd71ac1591c53a3d60c')
-
-prepare() {
-  mkdir -p build
-
-  cd ${_pkgfqn}
-  cd src/3rdparty/chromium
-  patch -p1 -i "$srcdir"/qtwebengine-glibc-2.29.patch # Fix PPAPI plugins with 
glibc 2.29
-}
-
-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 357505, 
qt5-webengine/trunk/PKGBUILD)
===
--- PKGBUILD(rev 0)
+++ PKGBUILD2019-07-10 11:43:35 UTC (rev 357506)
@@ -0,0 +1,55 @@
+# Maintainer: Felix Yan 
+# Contributor: Andrea Scarpino 
+
+pkgname=qt5-webengine
+_qtver=5.13.0
+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')
+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;
+qtwebengine-glibc-2.29.patch
+
qtbug-76913.patch::"https://code.qt.io/cgit/qt/qtwebengine.git/patch/?id=4746bb90;)
+sha256sums=('e0af82ecee1ab41b6732697f667b98b7b0c53164bebcfaad8070e88b2e064efe'
+'dd791f154b48e69cd47fd94753c45448655b529590995fd71ac1591c53a3d60c'
+'5771af2442d7743ef7c59f0d3716a23985383e2b69ecb4fa9d4ea8e8f7c551fa')
+
+prepare() {
+  mkdir -p build
+
+  cd ${_pkgfqn}
+  patch -p1 -i ../qtbug-76913.patch # Fix crashes on media-heavy sites
+
+  cd src/3rdparty/chromium
+  patch -p1 -i "$srcdir"/qtwebengine-glibc-2.29.patch # Fix PPAPI plugins with 
glibc 2.29
+}
+
+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: qtwebengine-glibc-2.29.patch
===
--- qtwebengine-glibc-2.29.patch2019-07-10 11:43:07 UTC (rev 357505)
+++ qtwebengine-glibc-2.29.patch2019-07-10 11:43:35 UTC (rev 357506)
@@ -1,105 +0,0 @@
-From 

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

2019-03-08 Thread Antonio Rojas via arch-commits
Date: Friday, March 8, 2019 @ 09:21:58
  Author: arojas
Revision: 347436

archrelease: copy trunk to extra-x86_64

Added:
  qt5-webengine/repos/extra-x86_64/PKGBUILD
(from rev 347435, qt5-webengine/trunk/PKGBUILD)
  qt5-webengine/repos/extra-x86_64/qtwebengine-harmony.patch
(from rev 347435, qt5-webengine/trunk/qtwebengine-harmony.patch)
Deleted:
  qt5-webengine/repos/extra-x86_64/PKGBUILD
  qt5-webengine/repos/extra-x86_64/qtwebengine-harmony.patch

---+
 PKGBUILD  |  119 +-
 qtwebengine-harmony.patch |  154 ++--
 2 files changed, 139 insertions(+), 134 deletions(-)

Deleted: PKGBUILD
===
--- PKGBUILD2019-03-08 09:21:29 UTC (rev 347435)
+++ PKGBUILD2019-03-08 09:21:58 UTC (rev 347436)
@@ -1,57 +0,0 @@
-# Maintainer: Felix Yan 
-# Contributor: Andrea Scarpino 
-
-pkgname=qt5-webengine
-_qtver=5.12.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')
-makedepends=('python2' 'git' '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;
- qtwebengine-harmony.patch)
-sha256sums=('43e91e06bc4a60ef0f91d15ae06425cf9c6b4f7dafe960259a5b013c687c3bd0'
-'feca54ab09ac0fc9d0626770a6b899a6ac5a12173c7d0c1005bc3964ec83e7b3')
-
-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 ../qtwebengine-harmony.patch
-}
-
-build() {
-  cd build
-
-  export PATH="$srcdir/bin:$PATH"
-  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 347435, 
qt5-webengine/trunk/PKGBUILD)
===
--- PKGBUILD(rev 0)
+++ PKGBUILD2019-03-08 09:21:58 UTC (rev 347436)
@@ -0,0 +1,62 @@
+# Maintainer: Felix Yan 
+# Contributor: Andrea Scarpino 
+
+pkgname=qt5-webengine
+_qtver=5.12.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' 'git' '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;
+ qtwebengine-harmony.patch
+ 
CVE-2019-5786.patch::"http://code.qt.io/cgit/qt/qtwebengine-chromium.git/patch/?id=43316b15;)
+sha256sums=('43e91e06bc4a60ef0f91d15ae06425cf9c6b4f7dafe960259a5b013c687c3bd0'
+'feca54ab09ac0fc9d0626770a6b899a6ac5a12173c7d0c1005bc3964ec83e7b3'
+'d8434d27ac0dd8c4d49b0208fc2df91611440d3ee733bb8597212980f98d4b1b')
+
+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 ../qtwebengine-harmony.patch
+  
+  cd src/3rdparty
+  patch -p1 -i "$srcdir"/CVE-2019-5786.patch # 
https://bugreports.qt.io/browse/QTBUG-74254
+}
+
+build() {
+  cd build
+
+  export PATH="$srcdir/bin:$PATH"
+  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: qtwebengine-harmony.patch