[arch-commits] Commit in qt4/trunk (PKGBUILD qt4-glibc-2.25.patch)

[Antonio Rojas]

    Date: Wednesday, March 15, 2017 @ 18:55:49
  Author: arojas
Revision: 290884

Fix more build failures caused by glibc 2.25 (FS#53295)

Modified:
  qt4/trunk/PKGBUILD
  qt4/trunk/qt4-glibc-2.25.patch

----------------------+
 PKGBUILD             |    6 +++---
 qt4-glibc-2.25.patch |   17 +++++++++++++++++
 2 files changed, 20 insertions(+), 3 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2017-03-15 17:46:49 UTC (rev 290883)
+++ PKGBUILD	2017-03-15 18:55:49 UTC (rev 290884)
@@ -5,13 +5,13 @@
 
 pkgname=qt4
 pkgver=4.8.7
-pkgrel=15
+pkgrel=16
 arch=('i686' 'x86_64')
 url='http://www.qt.io'
 license=('GPL3' 'LGPL' 'FDL' 'custom')
 pkgdesc='A cross-platform application and UI framework'
 depends=('sqlite' 'ca-certificates' 'fontconfig' 'libgl' 'libxrandr' 'libxv' 'libxi' 'alsa-lib'
-        'xdg-utils' 'hicolor-icon-theme' 'desktop-file-utils' 'libmng' 'dbus' 'openssl-1.0')
+        'xdg-utils' 'hicolor-icon-theme' 'desktop-file-utils' 'libmng' 'dbus') 'openssl-1.0'
 makedepends=('postgresql-libs' 'mariadb' 'unixodbc' 'cups' 'gtk2' 'libfbclient'
              'mesa')
 optdepends=('postgresql-libs: PostgreSQL driver'
@@ -53,7 +53,7 @@
          '009de09b4e589a7770fba74405656c99'
          'addc5e88d538ee55e17bd49ba337ca67'
          '98e00c5c7e5fee12e11ecbedd03f01ff'
-         'a6e217c159d9c0f588d4b5611493f0ea')
+         '296a06554222ff5839cccc41c5d3987e')
 
 prepare() {
   cd ${_pkgfqn}

Modified: qt4-glibc-2.25.patch
===================================================================
--- qt4-glibc-2.25.patch	2017-03-15 17:46:49 UTC (rev 290883)
+++ qt4-glibc-2.25.patch	2017-03-15 18:55:49 UTC (rev 290884)
@@ -11,3 +11,20 @@
  
  #define QT_PACKAGEDATE_STR "2015-05-07"
  
+diff -up qt-everywhere-opensource-src-4.8.7/src/tools/moc/main.cpp.QTBUG-22829 qt-everywhere-opensource-src-4.8.7/src/tools/moc/main.cpp
+--- qt-everywhere-opensource-src-4.8.7/src/tools/moc/main.cpp.QTBUG-22829	2015-05-07 09:14:44.000000000 -0500
++++ qt-everywhere-opensource-src-4.8.7/src/tools/moc/main.cpp	2016-12-08 12:32:46.638962448 -0600
+@@ -188,10 +188,12 @@ int runMoc(int _argc, char **_argv)
+     pp.macros["Q_MOC_RUN"];
+     pp.macros["__cplusplus"];
+ 
+-    // Workaround a bug while parsing the boost/type_traits/has_operator.hpp header. See QTBUG-22829
++    // Workaround a bugs while parsing some boost headers. See QTBUG-22829 
+     pp.macros["BOOST_TT_HAS_OPERATOR_HPP_INCLUDED"];
+     pp.macros["BOOST_LEXICAL_CAST_INCLUDED"];
+     pp.macros["BOOST_NEXT_PRIOR_HPP_INCLUDED"];
++    pp.macros["BOOST_TYPE_TRAITS_HPP"];
++    pp.macros["_SYS_SYSMACROS_H_OUTER"];
+ 
+     QByteArray filename;
+     QByteArray output;