public inbox for gentoo-commits@lists.gentoo.org
 help / color / mirror / Atom feed
From: "Markos Chandras" <hwoarang@gentoo.org>
To: gentoo-commits@lists.gentoo.org
Subject: [gentoo-commits] proj/qt:master commit in: dev-qt/qtcore/, dev-qt/qtcore/files/
Date: Thu,  7 Mar 2013 21:13:25 +0000 (UTC)	[thread overview]
Message-ID: <1362687495.f8b0c3ab9de766567b5151cdd77070b8302ab410.hwoarang@gentoo> (raw)

commit:     f8b0c3ab9de766567b5151cdd77070b8302ab410
Author:     Markos Chandras <hwoarang <AT> gentoo <DOT> org>
AuthorDate: Thu Mar  7 20:14:06 2013 +0000
Commit:     Markos Chandras <hwoarang <AT> gentoo <DOT> org>
CommitDate: Thu Mar  7 20:18:15 2013 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/qt.git;a=commit;h=f8b0c3ab

dev-qt/qtcore: Remove obsolete boost patch.

Applied upstream in

http://qt.gitorious.org/qt/qt/commit/a6305580b27f0bf1d268b5a3531c8332a57c3864

---
 .../files/moc-workaround-for-BOOST_JOIN.patch      |   15 ---------------
 dev-qt/qtcore/qtcore-4.8.9999.ebuild               |    4 ----
 2 files changed, 0 insertions(+), 19 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
deleted file mode 100644
index fa82334..0000000
--- a/dev-qt/qtcore/files/moc-workaround-for-BOOST_JOIN.patch
+++ /dev/null
@@ -1,15 +0,0 @@
-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 583f197..ff004f9 100644
--- a/dev-qt/qtcore/qtcore-4.8.9999.ebuild
+++ b/dev-qt/qtcore/qtcore-4.8.9999.ebuild
@@ -27,10 +27,6 @@ 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


             reply	other threads:[~2013-03-07 21:13 UTC|newest]

Thread overview: 9+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2013-03-07 21:13 Markos Chandras [this message]
  -- strict thread matches above, loose matches on Subject: below --
2013-03-08 18:39 [gentoo-commits] proj/qt:master commit in: dev-qt/qtcore/, dev-qt/qtcore/files/ Markos Chandras
2013-07-10  9:05 Davide Pesavento
2013-11-13 19:47 Johannes Huber
2014-05-12 16:32 Davide Pesavento
2014-07-07 20:46 Davide Pesavento
2016-04-10 13:21 Davide Pesavento
2018-06-14 22:14 Andreas Sturmlechner
2019-09-23 18:36 Andreas Sturmlechner

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=1362687495.f8b0c3ab9de766567b5151cdd77070b8302ab410.hwoarang@gentoo \
    --to=hwoarang@gentoo.org \
    --cc=gentoo-commits@lists.gentoo.org \
    --cc=gentoo-dev@lists.gentoo.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox