Date: Wed, 18 Jul 2012 20:23:09 +0000 (UTC) From: Raphael Kubo da Costa <rakuco@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r301122 - in head: devel/dbus-qt4/files devel/qt4-corelib/files x11/qt4-opengl/files Message-ID: <201207182023.q6IKN9QL007518@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: rakuco Date: Wed Jul 18 20:23:09 2012 New Revision: 301122 URL: http://svn.freebsd.org/changeset/ports/301122 Log: Add my upstream patch to make these Qt ports build with libc++. The original patch was written by Jan Beich in the PR mentioned below. I haven't been able to fully build x11/qt4-opengl yet due to other errors which show up later, but at least this one problem is solved, and the fix will be included in the next Qt 4.8 release. No PORTREVISION bump, as users of other standard C++ libraries are not affected, and no dependencies have been changed. PR: ports/169871 Submitted by: Jan Beich <jbeich@tormail.org> Added: head/devel/dbus-qt4/files/ head/devel/dbus-qt4/files/patch-src__corelib__tools__qiterator.h (contents, props changed) head/devel/qt4-corelib/files/patch-src__corelib__tools__qiterator.h (contents, props changed) head/x11/qt4-opengl/files/ head/x11/qt4-opengl/files/patch-src__corelib__tools__qiterator.h (contents, props changed) Added: head/devel/dbus-qt4/files/patch-src__corelib__tools__qiterator.h ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/devel/dbus-qt4/files/patch-src__corelib__tools__qiterator.h Wed Jul 18 20:23:09 2012 (r301122) @@ -0,0 +1,38 @@ +commit 5210d47aa66214e3cb16f394d0510a91f770c1b1 +Author: Raphael Kubo da Costa <rakuco@FreeBSD.org> +Date: Mon Jul 16 23:39:07 2012 -0300 + + Only forward-declare some std classes if QT_NO_STL is defined. + + If that is not done, building with clang, libc++ and C++11 support + does not work: libc++ defines the iterator tag classes in an inline + namespace inside the std namespace, and forward-declaring those + classes inside the std namespace itself in qiterator.h causes an + ambiguity that clang solves by choosing the incomplete-declared class + declared in the enclosing std namespace. + + This is probably the "clang build problem" reported in commit + 19e2b4d6eb733d9fd4eb69c0622b699fd08a3203 to qtbase, which cannot be + directly cherry-picked without breaking other classes due to QT_NO_STL + still being present in Qt 4. + + Change-Id: I26e33915347d3f94ef2e10b68fca6b2099ec9491 + Reviewed-by: Bradley T. Hughes <bradley.hughes@nokia.com> + +diff --git a/src/corelib/tools/qiterator.h b/src/corelib/tools/qiterator.h +index 0747940..b9d8da6 100644 +--- ./src/corelib/tools/qiterator.h ++++ ./src/corelib/tools/qiterator.h +@@ -46,10 +46,12 @@ + + QT_BEGIN_HEADER + ++#ifdef QT_NO_STL + namespace std { + struct bidirectional_iterator_tag; + struct random_access_iterator_tag; + } ++#endif + + QT_BEGIN_NAMESPACE + Added: head/devel/qt4-corelib/files/patch-src__corelib__tools__qiterator.h ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/devel/qt4-corelib/files/patch-src__corelib__tools__qiterator.h Wed Jul 18 20:23:09 2012 (r301122) @@ -0,0 +1,38 @@ +commit 5210d47aa66214e3cb16f394d0510a91f770c1b1 +Author: Raphael Kubo da Costa <rakuco@FreeBSD.org> +Date: Mon Jul 16 23:39:07 2012 -0300 + + Only forward-declare some std classes if QT_NO_STL is defined. + + If that is not done, building with clang, libc++ and C++11 support + does not work: libc++ defines the iterator tag classes in an inline + namespace inside the std namespace, and forward-declaring those + classes inside the std namespace itself in qiterator.h causes an + ambiguity that clang solves by choosing the incomplete-declared class + declared in the enclosing std namespace. + + This is probably the "clang build problem" reported in commit + 19e2b4d6eb733d9fd4eb69c0622b699fd08a3203 to qtbase, which cannot be + directly cherry-picked without breaking other classes due to QT_NO_STL + still being present in Qt 4. + + Change-Id: I26e33915347d3f94ef2e10b68fca6b2099ec9491 + Reviewed-by: Bradley T. Hughes <bradley.hughes@nokia.com> + +diff --git a/src/corelib/tools/qiterator.h b/src/corelib/tools/qiterator.h +index 0747940..b9d8da6 100644 +--- ./src/corelib/tools/qiterator.h ++++ ./src/corelib/tools/qiterator.h +@@ -46,10 +46,12 @@ + + QT_BEGIN_HEADER + ++#ifdef QT_NO_STL + namespace std { + struct bidirectional_iterator_tag; + struct random_access_iterator_tag; + } ++#endif + + QT_BEGIN_NAMESPACE + Added: head/x11/qt4-opengl/files/patch-src__corelib__tools__qiterator.h ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/x11/qt4-opengl/files/patch-src__corelib__tools__qiterator.h Wed Jul 18 20:23:09 2012 (r301122) @@ -0,0 +1,38 @@ +commit 5210d47aa66214e3cb16f394d0510a91f770c1b1 +Author: Raphael Kubo da Costa <rakuco@FreeBSD.org> +Date: Mon Jul 16 23:39:07 2012 -0300 + + Only forward-declare some std classes if QT_NO_STL is defined. + + If that is not done, building with clang, libc++ and C++11 support + does not work: libc++ defines the iterator tag classes in an inline + namespace inside the std namespace, and forward-declaring those + classes inside the std namespace itself in qiterator.h causes an + ambiguity that clang solves by choosing the incomplete-declared class + declared in the enclosing std namespace. + + This is probably the "clang build problem" reported in commit + 19e2b4d6eb733d9fd4eb69c0622b699fd08a3203 to qtbase, which cannot be + directly cherry-picked without breaking other classes due to QT_NO_STL + still being present in Qt 4. + + Change-Id: I26e33915347d3f94ef2e10b68fca6b2099ec9491 + Reviewed-by: Bradley T. Hughes <bradley.hughes@nokia.com> + +diff --git a/src/corelib/tools/qiterator.h b/src/corelib/tools/qiterator.h +index 0747940..b9d8da6 100644 +--- ./src/corelib/tools/qiterator.h ++++ ./src/corelib/tools/qiterator.h +@@ -46,10 +46,12 @@ + + QT_BEGIN_HEADER + ++#ifdef QT_NO_STL + namespace std { + struct bidirectional_iterator_tag; + struct random_access_iterator_tag; + } ++#endif + + QT_BEGIN_NAMESPACE +
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201207182023.q6IKN9QL007518>