[arch-commits] Commit in (3 files)

[Antonio Rojas]

    Date: Thursday, November 19, 2020 @ 20:53:25
  Author: arojas
Revision: 401448

Qt 5.15.2 rebuild

Modified:
  akonadi/trunk/PKGBUILD
  kwin/trunk/PKGBUILD
  qt5-webkit/trunk/PKGBUILD

---------------------------+
 akonadi/trunk/PKGBUILD    |    2 +-
 kwin/trunk/PKGBUILD       |    2 +-
 qt5-webkit/trunk/PKGBUILD |   22 ++++++++++++----------
 3 files changed, 14 insertions(+), 12 deletions(-)

Modified: akonadi/trunk/PKGBUILD
===================================================================
--- akonadi/trunk/PKGBUILD	2020-11-19 20:44:07 UTC (rev 401447)
+++ akonadi/trunk/PKGBUILD	2020-11-19 20:53:25 UTC (rev 401448)
@@ -6,7 +6,7 @@
 pkgbase=akonadi
 pkgname=(akonadi libakonadi)
 pkgver=20.08.3
-pkgrel=1
+pkgrel=2
 pkgdesc="PIM layer, which provides an asynchronous API to access all kind of PIM data"
 arch=(x86_64)
 url='https://kontact.kde.org'

Modified: kwin/trunk/PKGBUILD
===================================================================
--- kwin/trunk/PKGBUILD	2020-11-19 20:44:07 UTC (rev 401447)
+++ kwin/trunk/PKGBUILD	2020-11-19 20:53:25 UTC (rev 401448)
@@ -4,7 +4,7 @@
 
 pkgname=kwin
 pkgver=5.20.3
-pkgrel=1
+pkgrel=2
 pkgdesc='An easy to use, but flexible, composited Window Manager'
 arch=(x86_64)
 url='https://www.kde.org/workspaces/plasmadesktop/'

Modified: qt5-webkit/trunk/PKGBUILD
===================================================================
--- qt5-webkit/trunk/PKGBUILD	2020-11-19 20:44:07 UTC (rev 401447)
+++ qt5-webkit/trunk/PKGBUILD	2020-11-19 20:53:25 UTC (rev 401448)
@@ -5,35 +5,37 @@
 pkgname=qt5-webkit
 _pkgver=5.212.0-alpha4
 pkgver=${_pkgver/-/}
-pkgrel=7
+pkgrel=8
 arch=(x86_64)
 url='https://www.qt.io'
 license=(GPL3 LGPL3 FDL custom)
 pkgdesc='Classes for a WebKit2 based implementation and a new QML API'
-source=("https://github.com/qtwebkit/qtwebkit/releases/download/qtwebkit-$_pkgver/qtwebkit-$_pkgver.tar.xz")
+source=("https://github.com/qtwebkit/qtwebkit/releases/download/qtwebkit-$_pkgver/qtwebkit-$_pkgver.tar.xz"
+         qt5-webkit-python-3.9.patch::"https://github.com/qtwebkit/qtwebkit/commit/78360c01.patch"
+         qt5-webkit-bison-3.7.patch::"https://github.com/qtwebkit/qtwebkit/commit/d92b11fe.patch")
 depends=(qt5-location qt5-sensors qt5-webchannel libwebp libxslt libxcomposite gst-plugins-base hyphen woff2)
 makedepends=(cmake ruby gperf python qt5-doc qt5-tools)
 optdepends=('gst-plugins-good: Webm codec support')
-sha256sums=('9ca126da9273664dd23a3ccd0c9bebceb7bb534bddd743db31caf6a5a6d4a9e6')
+sha256sums=('9ca126da9273664dd23a3ccd0c9bebceb7bb534bddd743db31caf6a5a6d4a9e6'
+            '9db5480dfbd3c440489e8e4131e3555b2af61fa4b6c19f35227588c5996be128'
+            'cc5a2b762426e9cda5a3ae056bba266b5f775ee75c0590913839c255d5f10db0')
 
 prepare() {
-  mkdir -p build
+  patch -d qtwebkit-$_pkgver -p1 -i ../qt5-webkit-python-3.9.patch # Fix build with python 3.9
+  patch -d qtwebkit-$_pkgver -p1 -i ../qt5-webkit-bison-3.7.patch # Fix build with bison 3.7
 }
 
 build() {
-  cd build
-
-  cmake ../qtwebkit-$_pkgver \
+  cmake -B build -S qtwebkit-$_pkgver \
     -DCMAKE_INSTALL_PREFIX=/usr \
     -DCMAKE_CXX_FLAGS="${CXXFLAGS} -DNDEBUG" \
     -DPORT=Qt \
     -DENABLE_TOOLS=OFF
-  make
+  cmake --build build
 }
 
 package() {
-  cd build
-  make DESTDIR="$pkgdir" install
+  DESTDIR="$pkgdir" cmake --install build
 
   install -d "$pkgdir"/usr/share/licenses
   ln -s /usr/share/licenses/qt5-base "$pkgdir"/usr/share/licenses/${pkgname}