diff options
| author |   Davide Pesavento <pesa@gentoo.org> | 2013-07-10 09:02:41 +0000 |
|---|---|---|
| committer | Davide Pesavento <pesa@gentoo.org> | 2013-07-10 09:02:41 +0000 |
| commit | c52570ea2d98869e1f8b397100024f55458b3f30 (patch) | |
| tree | 2151984b9730f2d42a88b89f93edc03c58a3be69 /dev-qt/qtcore | |
| parent | Version bump (bug #474602) (diff) | |
| download | gentoo-2-c52570ea2d98869e1f8b397100024f55458b3f30.tar.gz gentoo-2-c52570ea2d98869e1f8b397100024f55458b3f30.tar.bz2 gentoo-2-c52570ea2d98869e1f8b397100024f55458b3f30.zip | |
Update moc patch.
(Portage version: 2.2.0_alpha186/cvs/Linux x86_64, signed Manifest commit with key 17A85C72)
Diffstat (limited to 'dev-qt/qtcore')
| -rw-r--r-- | dev-qt/qtcore/ChangeLog | 6 | ||||
| -rw-r--r-- | dev-qt/qtcore/files/moc-boost-lexical-cast.patch | 12 | ||||
| -rw-r--r-- | dev-qt/qtcore/qtcore-4.8.5.ebuild | 17 |
3 files changed, 22 insertions, 13 deletions
diff --git a/dev-qt/qtcore/ChangeLog b/dev-qt/qtcore/ChangeLog index d816741dc197..eaafbed2d661 100644 --- a/dev-qt/qtcore/ChangeLog +++ b/dev-qt/qtcore/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for dev-qt/qtcore # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/dev-qt/qtcore/ChangeLog,v 1.18 2013/07/10 05:07:52 patrick Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-qt/qtcore/ChangeLog,v 1.19 2013/07/10 09:02:41 pesa Exp $ + + 10 Jul 2013; Davide Pesavento <pesa@gentoo.org> + +files/moc-boost-lexical-cast.patch, qtcore-4.8.5.ebuild: + Update moc patch. 10 Jul 2013; Patrick Lauer <patrick@gentoo.org> qtcore-4.8.5.ebuild: Disabling patch for 4.8.5 that is not needed / does not apply diff --git a/dev-qt/qtcore/files/moc-boost-lexical-cast.patch b/dev-qt/qtcore/files/moc-boost-lexical-cast.patch new file mode 100644 index 000000000000..b464c926b0e1 --- /dev/null +++ b/dev-qt/qtcore/files/moc-boost-lexical-cast.patch @@ -0,0 +1,12 @@ +Index: qt-everywhere-opensource-src-4.8.9999/src/tools/moc/main.cpp +=================================================================== +--- qt-everywhere-opensource-src-4.8.9999.orig/src/tools/moc/main.cpp ++++ qt-everywhere-opensource-src-4.8.9999/src/tools/moc/main.cpp +@@ -190,6 +190,7 @@ 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"]; + + QByteArray filename; + QByteArray output; diff --git a/dev-qt/qtcore/qtcore-4.8.5.ebuild b/dev-qt/qtcore/qtcore-4.8.5.ebuild index 4549ebae743c..d2b8df68644b 100644 --- a/dev-qt/qtcore/qtcore-4.8.5.ebuild +++ b/dev-qt/qtcore/qtcore-4.8.5.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2013 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/dev-qt/qtcore/qtcore-4.8.5.ebuild,v 1.2 2013/07/10 05:07:52 patrick Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-qt/qtcore/qtcore-4.8.5.ebuild,v 1.3 2013/07/10 09:02:41 pesa Exp $ EAPI=5 @@ -27,10 +27,9 @@ PDEPEND=" qt3support? ( ~dev-qt/qtgui-${PV}[aqua=,debug=,glib=,qt3support] ) " -# Doesn't apply, partially present in the source. Check if obsolete. -#PATCHES=( -# "${FILESDIR}/moc-workaround-for-BOOST_JOIN.patch" -#) +PATCHES=( + "${FILESDIR}/moc-boost-lexical-cast.patch" +) pkg_setup() { QT4_TARGET_DIRECTORIES=" @@ -47,13 +46,7 @@ pkg_setup() { tools/linguist/lupdate" QT4_EXTRACT_DIRECTORIES="${QT4_TARGET_DIRECTORIES} - include/Qt - include/QtCore - include/QtDeclarative - include/QtGui - include/QtNetwork - include/QtScript - include/QtXml + include src/plugins/plugins.pro src/plugins/qpluginbase.pri src/src.pro |