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

[Antonio Rojas]

    Date: Saturday, May 30, 2015 @ 13:40:18
  Author: arojas
Revision: 239907

Fix build with GCC 5, update QWebView plugin to 4.8.7

Modified:
  qtwebkit/trunk/PKGBUILD

----------+
 PKGBUILD |   14 +++++++++-----
 1 file changed, 9 insertions(+), 5 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2015-05-30 11:34:57 UTC (rev 239906)
+++ PKGBUILD	2015-05-30 11:40:18 UTC (rev 239907)
@@ -3,7 +3,7 @@
 
 pkgname=qtwebkit
 pkgver=2.3.4
-pkgrel=1
+pkgrel=2
 arch=('i686' 'x86_64')
 url='http://trac.webkit.org/wiki/QtWebKit'
 pkgdesc='An open source web browser engine (Qt port)'
@@ -11,20 +11,24 @@
 depends=('qt4' 'systemd' 'gst-plugins-base-libs')
 makedepends=('gperf' 'python2' 'ruby' 'git' 'mesa')
 conflicts=('qt<4.8')
-_qtver=4.8.6
+_qtver=4.8.7
 source=("https://sources.archlinux.org/other/packages/${pkgname}/${pkgname}-${pkgver}.tar.xz"
         "http://download.qt-project.org/official_releases/qt/4.8/${_qtver}/qt-everywhere-opensource-src-${_qtver}.tar.gz"
         'use-python2.patch'
-        'qwebview.patch')
+        'qwebview.patch' 'gcc-5.patch')
 sha1sums=('31bc60de1cf26bb0766d539b4d564651ddbb0650'
-          'ddf9c20ca8309a116e0466c42984238009525da6'
+          '76aef40335c0701e5be7bb3a9101df5d22fe3666'
           '315b6ff603f35e5492a036f7082f6aa075dfb607'
-          'c3df6107233f466a032e36681cee07f16536657c')
+          'c3df6107233f466a032e36681cee07f16536657c'
+          '5d506578ea30daeeeb1e91ab83876fe6d5669715')
 
 prepare() {
   cd ${pkgname}-${pkgver}
   patch -p1 -i "${srcdir}"/use-python2.patch
 
+# Fix build with GCC 5 (Fedora)
+  patch -p1 -i "$srcdir"/gcc-5.patch
+
   cd ../qt-everywhere-opensource-src-${_qtver}
   patch -p1 -i "${srcdir}"/qwebview.patch
 }