[SCM] Qt 4 packaging branch, master, updated. debian/4.8.5+dfsg-2-6-gbaa1cdc

[Pino Toscano]

Gitweb-URL: http://git.debian.org/?p=pkg-kde/qt/qt4-x11.git;a=commitdiff;h=baa1cdc

The following commit has been merged in the master branch:
commit baa1cdc41f0b11c4ae4105955ebdc09d837d7d8d
Author: Pino Toscano <pino at debian.org>
Date:   Mon Aug 19 12:33:21 2013 +0200

    workaround moc failures with recent Boost versions (#704045)
    
    patch qt-everywhere-opensource-src-4.8.5-QTBUG-22829.patch from Fedora (thanks!)
---
 debian/changelog                                   |    3 +++
 ...erywhere-opensource-src-4.8.5-QTBUG-22829.patch |   22 ++++++++++++++++++++
 debian/patches/series                              |    1 +
 3 files changed, 26 insertions(+)

diff --git a/debian/changelog b/debian/changelog
index 6296747..6fd593f 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -9,6 +9,9 @@ qt4-x11 (4:4.8.5+dfsg-3) UNRELEASED; urgency=low
 
   [ Pino Toscano ]
   * Fix description of qtcore4-l10n. (Closes: #717013)
+  * Workaround moc failures with recent versions of Boost; patch
+    qt-everywhere-opensource-src-4.8.5-QTBUG-22829.patch from Fedora (thanks!).
+    (Closes: #704045)
 
  -- Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>  Wed, 24 Jul 2013 00:20:19 -0300
 
diff --git a/debian/patches/qt-everywhere-opensource-src-4.8.5-QTBUG-22829.patch b/debian/patches/qt-everywhere-opensource-src-4.8.5-QTBUG-22829.patch
new file mode 100644
index 0000000..6fb2424
--- /dev/null
+++ b/debian/patches/qt-everywhere-opensource-src-4.8.5-QTBUG-22829.patch
@@ -0,0 +1,22 @@
+Description: fix moc in 4.x tripping over BOOST
+Origin: http://pkgs.fedoraproject.org/cgit/qt.git/plain/qt-everywhere-opensource-src-4.8.5-QTBUG-22829.patch?id=e41de7f53a97dd68f1bd13fe64b6d84cf945397a
+Bug: https://bugreports.qt-project.org/browse/QTBUG-22829
+Bug-Debian: http://bugs.debian.org/704045
+Bug-RedHat: https://bugzilla.redhat.com/756395
+Bug-Ubuntu: https://bugs.launchpad.net/ubuntu/+source/qt4-x11/+bug/1119656
+Applied-Upstream: Qt5 has proper parsing support.
+
+diff -up qt-everywhere-opensource-src-4.8.5/src/tools/moc/main.cpp.QTBUG-22829 qt-everywhere-opensource-src-4.8.5/src/tools/moc/main.cpp
+--- qt-everywhere-opensource-src-4.8.5/src/tools/moc/main.cpp.QTBUG-22829	2013-06-09 17:04:02.762459323 -0500
++++ qt-everywhere-opensource-src-4.8.5/src/tools/moc/main.cpp	2013-06-09 17:08:20.409680813 -0500
+@@ -188,8 +188,9 @@ 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"];
+ 
+     QByteArray filename;
+     QByteArray output;
diff --git a/debian/patches/series b/debian/patches/series
index 36cdb77..bb3af16 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -42,3 +42,4 @@ s390x_jscore.diff
 add_missing_method_for_QBasicAtomicPointer_on_s390.patch
 no_libicu_message.diff
 QTBUG-25324_assistant_segfault_on_start_with_gcc_4.7.patch
+qt-everywhere-opensource-src-4.8.5-QTBUG-22829.patch

-- 
Qt 4 packaging