From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) by finch.gentoo.org (Postfix) with ESMTP id 8F8EB198003 for ; Fri, 8 Mar 2013 18:39:43 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 1AFCBE05FE; Fri, 8 Mar 2013 18:39:43 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id AB619E05FE for ; Fri, 8 Mar 2013 18:39:42 +0000 (UTC) Received: from hornbill.gentoo.org (hornbill.gentoo.org [94.100.119.163]) (using TLSv1 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id BFBBD33DD4B for ; Fri, 8 Mar 2013 18:39:41 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by hornbill.gentoo.org (Postfix) with ESMTP id E7721E4073 for ; Fri, 8 Mar 2013 18:39:38 +0000 (UTC) From: "Markos Chandras" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Markos Chandras" Message-ID: <1362766351.60db688930cf450c24b716ce212824fd035aec54.hwoarang@gentoo> Subject: [gentoo-commits] proj/qt:master commit in: dev-qt/qtcore/, dev-qt/qtcore/files/ X-VCS-Repository: proj/qt X-VCS-Files: dev-qt/qtcore/files/moc-workaround-for-BOOST_JOIN.patch dev-qt/qtcore/qtcore-4.8.9999.ebuild X-VCS-Directories: dev-qt/qtcore/ dev-qt/qtcore/files/ X-VCS-Committer: hwoarang X-VCS-Committer-Name: Markos Chandras X-VCS-Revision: 60db688930cf450c24b716ce212824fd035aec54 X-VCS-Branch: master Date: Fri, 8 Mar 2013 18:39:38 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Archives-Salt: 41495085-a045-4b46-afc3-eb708bd2aaea X-Archives-Hash: b7eb688c17e59803884efe5ff8c2c760 commit: 60db688930cf450c24b716ce212824fd035aec54 Author: Markos Chandras gentoo org> AuthorDate: Fri Mar 8 18:12:31 2013 +0000 Commit: Markos Chandras gentoo org> CommitDate: Fri Mar 8 18:12:31 2013 +0000 URL: http://git.overlays.gentoo.org/gitweb/?p=proj/qt.git;a=commit;h=60db6889 Revert "dev-qt/qtcore: Remove obsolete boost patch." This reverts commit f8b0c3ab9de766567b5151cdd77070b8302ab410. --- .../files/moc-workaround-for-BOOST_JOIN.patch | 15 +++++++++++++++ dev-qt/qtcore/qtcore-4.8.9999.ebuild | 4 ++++ 2 files changed, 19 insertions(+), 0 deletions(-) diff --git a/dev-qt/qtcore/files/moc-workaround-for-BOOST_JOIN.patch b/dev-qt/qtcore/files/moc-workaround-for-BOOST_JOIN.patch new file mode 100644 index 0000000..fa82334 --- /dev/null +++ b/dev-qt/qtcore/files/moc-workaround-for-BOOST_JOIN.patch @@ -0,0 +1,15 @@ +diff -up qt-everywhere-opensource-src-4.8.4/src/tools/moc/main.cpp.moc-boost148 qt-everywhere-opensource-src-4.8.4/src/tools/moc/main.cpp +--- qt-everywhere-opensource-src-4.8.4/src/tools/moc/main.cpp.moc-boost148 2012-11-23 04:09:53.000000000 -0600 ++++ qt-everywhere-opensource-src-4.8.4/src/tools/moc/main.cpp 2013-02-11 07:07:18.942748176 -0600 +@@ -187,6 +187,11 @@ int runMoc(int _argc, char **_argv) + Moc moc; + pp.macros["Q_MOC_RUN"]; + pp.macros["__cplusplus"]; ++ ++ // 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; + FILE *in = 0; diff --git a/dev-qt/qtcore/qtcore-4.8.9999.ebuild b/dev-qt/qtcore/qtcore-4.8.9999.ebuild index ff004f9..583f197 100644 --- a/dev-qt/qtcore/qtcore-4.8.9999.ebuild +++ b/dev-qt/qtcore/qtcore-4.8.9999.ebuild @@ -27,6 +27,10 @@ PDEPEND=" qt3support? ( ~dev-qt/qtgui-${PV}[aqua=,debug=,glib=,qt3support] ) " +PATCHES=( + "${FILESDIR}/moc-workaround-for-BOOST_JOIN.patch" +) + pkg_setup() { QT4_TARGET_DIRECTORIES=" src/tools/bootstrap