[arch-commits] Commit in qt5-webkit/trunk (PKGBUILD)

[Antonio Rojas]

    Date: Saturday, June 29, 2019 @ 19:07:01
  Author: arojas
Revision: 357062

Update to 5.212.0-alpha3

Modified:
  qt5-webkit/trunk/PKGBUILD

----------+
 PKGBUILD |   30 +++++++-----------------------
 1 file changed, 7 insertions(+), 23 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2019-06-29 14:20:44 UTC (rev 357061)
+++ PKGBUILD	2019-06-29 19:07:01 UTC (rev 357062)
@@ -3,28 +3,19 @@
 # Contributor: Andrea Scarpino <andrea at archlinux.org>
 
 pkgname=qt5-webkit
-_commit=186f5bff1071d2bc1a1bdd9f70045cf5fadcb04d
-pkgver=5.212.0alpha2+212+g186f5bff107
+_pkgver=5.212.0-alpha3
+pkgver=${_pkgver/-/}
 pkgrel=1
 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'
-depends=(qt5-location qt5-sensors qt5-webchannel libwebp libxslt libxcomposite gst-plugins-base hyphen)
-makedepends=(cmake ruby gperf python2 qt5-doc qt5-tools git)
+source=("https://github.com/qtwebkit/qtwebkit/releases/download/qtwebkit-$_pkgver/qtwebkit-$_pkgver.tar.xz")
+depends=(qt5-location qt5-sensors qt5-webchannel libwebp libxslt libxcomposite gst-plugins-base hyphen woff2)
+makedepends=(cmake ruby gperf python2 qt5-doc qt5-tools)
 optdepends=('gst-plugins-good: Webm codec support')
-conflicts=(qt5-webkit-ng)
-replaces=(qt5-webkit-ng)
-_pkgfqn="${pkgname/5-/}-opensource-src-${_qtver}"
-source=(git+https://github.com/annulen/webkit#commit=$_commit)
-#source=("https://github.com/annulen/webkit/releases/download/qtwebkit-$_qtver/qtwebkit-$_qtver.tar.xz")
-sha256sums=('SKIP')
+sha256sums=('35b9af61546b5ced8e15160d873781a201f8e4207c3da511b034147f3c4b433c')
 
-pkgver() {
-  cd webkit
-  git describe --tags | sed -e 's/-/+/g' -e 's/+alpha/alpha/' -e 's/qtwebkit+//' -e 's/v//'
-}
-
 prepare() {
   mkdir -p build
 }
@@ -32,9 +23,8 @@
 build() {
   cd build
 
-  cmake ../webkit \
+  cmake .. \
     -DCMAKE_INSTALL_PREFIX=/usr \
-    -DCMAKE_BUILD_TYPE=Release \
     -DPORT=Qt \
     -DENABLE_TOOLS=OFF
   make
@@ -46,10 +36,4 @@
 
   install -d "$pkgdir"/usr/share/licenses
   ln -s /usr/share/licenses/qt5-base "$pkgdir"/usr/share/licenses/${pkgname}
-
-# Fix pkgconfig files
-  sed -e 's|qt/Qt5WebKit|qt/QtWebKit|' -i "$pkgdir"/usr/lib/pkgconfig/Qt5WebKit.pc
-  sed -e 's|qt/Qt5WebKitWidgets|qt/QtWebKitWidgets|' -i "$pkgdir"/usr/lib/pkgconfig/Qt5WebKitWidgets.pc
-  sed -e '/Name/a Description: Qt WebKit module' -i "$pkgdir"/usr/lib/pkgconfig/Qt5WebKit.pc
-  sed -e '/Name/a Description: Qt WebKitWidgets module' -i "$pkgdir"/usr/lib/pkgconfig/Qt5WebKitWidgets.pc
 }