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

[Antonio Rojas]

    Date: Tuesday, November 14, 2017 @ 07:43:52
  Author: arojas
Revision: 309905

ICU 60.1 rebuild

Modified:
  qt4/trunk/PKGBUILD

----------+
 PKGBUILD |    6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2017-11-14 05:05:40 UTC (rev 309904)
+++ PKGBUILD	2017-11-14 07:43:52 UTC (rev 309905)
@@ -5,7 +5,7 @@
 
 pkgname=qt4
 pkgver=4.8.7
-pkgrel=22
+pkgrel=23
 arch=('i686' 'x86_64')
 url='http://www.qt.io'
 license=('GPL3' 'LGPL' 'FDL' 'custom')
@@ -102,12 +102,14 @@
 
   # Fix build with OpenSSL 1.1 (Debian + OpenMandriva)
   patch -p1 -i "$srcdir"/qt4-openssl-1.1.patch
+
+  echo "QMAKE_CXXFLAGS += -std=gnu++98" >> src/3rdparty/javascriptcore/JavaScriptCore/JavaScriptCore.pri
+  echo "QMAKE_CXXFLAGS += -std=gnu++98" >> src/plugins/accessible/qaccessiblebase.pri
 }
 
 build() {
   export QT4DIR="${srcdir}"/${_pkgfqn}
   export LD_LIBRARY_PATH=${QT4DIR}/lib:${LD_LIBRARY_PATH}
-  export CXXFLAGS+=" -std=gnu++98" # Fix build with GCC 6
 
   cd ${_pkgfqn}