[arch-commits] Commit in qt5-base/kde-unstable (PKGBUILD)

[Antonio Rojas]

    Date: Monday, April 6, 2020 @ 21:42:05
  Author: arojas
Revision: 379708

Fix double cmake targets

Modified:
  qt5-base/kde-unstable/PKGBUILD

----------+
 PKGBUILD |   12 +++++++++---
 1 file changed, 9 insertions(+), 3 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2020-04-06 21:21:15 UTC (rev 379707)
+++ PKGBUILD	2020-04-06 21:42:05 UTC (rev 379708)
@@ -5,7 +5,7 @@
 pkgname=(qt5-base qt5-xcb-private-headers)
 _qtver=5.15.0-beta3
 pkgver=${_qtver/-/}
-pkgrel=1
+pkgrel=2
 arch=('x86_64')
 url='https://www.qt.io'
 license=('GPL3' 'LGPL3' 'FDL' 'custom')
@@ -29,14 +29,20 @@
 groups=('qt' 'qt5')
 _pkgfqn="${pkgbase/5-/}-everywhere-src-${_qtver}"
 source=("https://download.qt.io/development_releases/qt/${pkgver%.*}/${_qtver}/submodules/${_pkgfqn}.tar.xz"
-         qt5-base-cflags.patch)
+         qt5-base-cflags.patch
+         qtbug-83282a.patch::"https://code.qt.io/cgit/qt/qtbase.git/patch/?id=7e7c6498"
+         qtbug-83282b.patch::"https://code.qt.io/cgit/qt/qtbase.git/patch/?id=3f9862db")
 sha256sums=('7a12551eb7a8924fe4bc01a2c14cdcbe884839146b6eb687fe87a35f55e0fbc5'
-            'cf707cd970650f8b60f8897692b36708ded9ba116723ec8fcd885576783fe85c')
+            'cf707cd970650f8b60f8897692b36708ded9ba116723ec8fcd885576783fe85c'
+            '9f55121e80ad0cae3619446efd90151bded04433518e95848677e142245fcfe3'
+            'a1593d8b133eaaf4ee7df61cb9265bd32f9fa566a3b8a5eb47e8ae6d7e3a009a')
 
 prepare() {
   cd ${_pkgfqn}
 
   patch -p1 -i ../qt5-base-cflags.patch # Use system CFLAGS
+  patch -p1 -i ../qtbug-83282a.patch # Fix double cmake targets
+  patch -p1 -i ../qtbug-83282b.patch
 }
 
 build() {