[arch-commits] Commit in qt4/trunk (PKGBUILD moc-boost-workaround.patch)

Evangelos Foutras foutrelis at archlinux.org
Thu Nov 6 00:59:39 UTC 2014


    Date: Thursday, November 6, 2014 @ 01:59:39
  Author: foutrelis
Revision: 225647

upgpkg: qt4 4.8.6-3

Extend moc's boost workaround to more recent boost versions.

Added:
  qt4/trunk/moc-boost-workaround.patch
Modified:
  qt4/trunk/PKGBUILD

----------------------------+
 PKGBUILD                   |    7 ++++++-
 moc-boost-workaround.patch |   12 ++++++++++++
 2 files changed, 18 insertions(+), 1 deletion(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2014-11-05 22:14:28 UTC (rev 225646)
+++ PKGBUILD	2014-11-06 00:59:39 UTC (rev 225647)
@@ -4,7 +4,7 @@
 
 pkgname=qt4
 pkgver=4.8.6
-pkgrel=2
+pkgrel=3
 arch=('i686' 'x86_64')
 url='http://qt-project.org/'
 license=('GPL3' 'LGPL' 'FDL' 'custom')
@@ -32,6 +32,7 @@
         'qtconfig-qt4.desktop' 'assistant-qt4.desktop' 'designer-qt4.desktop'
         'linguist-qt4.desktop' 'qdbusviewer-qt4.desktop'
         'improve-cups-support.patch'
+        'moc-boost-workaround.patch'
         'CVE-2014-0190.patch')
 md5sums=('2edbe4d6c2eff33ef91732602f3518eb'
          'a16638f4781e56e7887ff8212a322ecc'
@@ -40,6 +41,7 @@
          '0e384663d3dd32abe35f5331c4147569'
          'b859c5673e5098c39f72b2252947049e'
          'c439c7731c25387352d8453ca7574971'
+         'da387bde22ae1c446f12525d2a31f070'
          '34ed257109afb83342cfe514c8abe027')
 
 prepare() {
@@ -48,6 +50,9 @@
   # (FS#28381) (KDEBUG#180051)
   patch -p1 -i "${srcdir}"/improve-cups-support.patch
 
+  # QTBUG#22829
+  patch -p1 -i "${srcdir}"/moc-boost-workaround.patch
+
   # QTBUG#38367
   patch -p1 -i "${srcdir}"/CVE-2014-0190.patch
 

Added: moc-boost-workaround.patch
===================================================================
--- moc-boost-workaround.patch	                        (rev 0)
+++ moc-boost-workaround.patch	2014-11-06 00:59:39 UTC (rev 225647)
@@ -0,0 +1,12 @@
+diff -upr qt-everywhere-opensource-src-4.8.6.orig/src/tools/moc/main.cpp qt-everywhere-opensource-src-4.8.6/src/tools/moc/main.cpp
+--- qt-everywhere-opensource-src-4.8.6.orig/src/tools/moc/main.cpp	2014-04-10 21:37:12.000000000 +0300
++++ qt-everywhere-opensource-src-4.8.6/src/tools/moc/main.cpp	2014-11-06 02:24:44.287305916 +0200
+@@ -190,6 +190,8 @@ int runMoc(int _argc, char **_argv)
+ 
+     // Workaround a bug while parsing the boost/type_traits/has_operator.hpp header. See QTBUG-22829
+     pp.macros["BOOST_TT_HAS_OPERATOR_HPP_INCLUDED"];
++    pp.macros["BOOST_LEXICAL_CAST_INCLUDED"];
++    pp.macros["BOOST_NEXT_PRIOR_HPP_INCLUDED"];
+ 
+     QByteArray filename;
+     QByteArray output;


More information about the arch-commits mailing list