diff options
| author |   Diego Elio Pettenò <flameeyes@gentoo.org> | 2008-05-11 18:43:21 +0000 |
|---|---|---|
| committer | Diego Elio Pettenò <flameeyes@gentoo.org> | 2008-05-11 18:43:21 +0000 |
| commit | 719b01c359965182e04dd61b17fe58a4d3969608 (patch) | |
| tree | 102df541e1360ae0d7782cb6ebc6799815dcd2a2 /x11-libs | |
| parent | revert stable KEYWORDS because the tarball is restricted and old ones won't b... (diff) | |
| download | gentoo-2-719b01c359965182e04dd61b17fe58a4d3969608.tar.gz gentoo-2-719b01c359965182e04dd61b17fe58a4d3969608.tar.bz2 gentoo-2-719b01c359965182e04dd61b17fe58a4d3969608.zip | |
Add patch to build with gcc-4.3 and immqt-bc USE flag enabled. Thanks to Matsuu for linking the Debian patch in bug #218447.
(Portage version: 2.1.5_rc10)
Diffstat (limited to 'x11-libs')
| -rw-r--r-- | x11-libs/qt/ChangeLog | 7 | ||||
| -rw-r--r-- | x11-libs/qt/files/qt-3.3.8-immqt+gcc-4.3.patch | 20 | ||||
| -rw-r--r-- | x11-libs/qt/qt-3.3.8-r4.ebuild | 8 |
3 files changed, 31 insertions, 4 deletions
diff --git a/x11-libs/qt/ChangeLog b/x11-libs/qt/ChangeLog index 1148180bc319..90e702e6c34b 100644 --- a/x11-libs/qt/ChangeLog +++ b/x11-libs/qt/ChangeLog @@ -1,6 +1,11 @@ # ChangeLog for x11-libs/qt # Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/x11-libs/qt/ChangeLog,v 1.535 2008/04/18 22:52:42 maekke Exp $ +# $Header: /var/cvsroot/gentoo-x86/x11-libs/qt/ChangeLog,v 1.536 2008/05/11 18:43:21 flameeyes Exp $ + + 11 May 2008; Diego Pettenò <flameeyes@gentoo.org> + +files/qt-3.3.8-immqt+gcc-4.3.patch, qt-3.3.8-r4.ebuild: + Add patch to build with gcc-4.3 and immqt-bc USE flag enabled. Thanks to + Matsuu for linking the Debian patch in bug #218447. 18 Apr 2008; Markus Meier <maekke@gentoo.org> qt-4.3.3.ebuild: amd64 stable, bug #217529 diff --git a/x11-libs/qt/files/qt-3.3.8-immqt+gcc-4.3.patch b/x11-libs/qt/files/qt-3.3.8-immqt+gcc-4.3.patch new file mode 100644 index 000000000000..65610e37276f --- /dev/null +++ b/x11-libs/qt/files/qt-3.3.8-immqt+gcc-4.3.patch @@ -0,0 +1,20 @@ +--- plugins/src/inputmethods/imsw-none/qnoneinputcontextplugin.cpp~ 2007-04-05 09:47:44.000000000 +0000 ++++ plugins/src/inputmethods/imsw-none/qnoneinputcontextplugin.cpp 2007-04-05 09:48:08.000000000 +0000 +@@ -44,6 +44,7 @@ + #include "qnoneinputcontextplugin.h" + #include <qinputcontextfactory.h> + #include <qsettings.h> ++#include <cstdlib> + + + QNoneInputContextPlugin::QNoneInputContextPlugin() +--- plugins/src/inputmethods/simple/qsimpleinputcontext.cpp~ 2007-04-05 09:48:46.000000000 +0000 ++++ plugins/src/inputmethods/simple/qsimpleinputcontext.cpp 2007-04-05 09:48:54.000000000 +0000 +@@ -45,6 +45,7 @@ + #include <qnamespace.h> + #include <qevent.h> + #include <qglobal.h> ++#include <algorithm> + + static const int ignoreKeys[] = { + Qt::Key_Shift, diff --git a/x11-libs/qt/qt-3.3.8-r4.ebuild b/x11-libs/qt/qt-3.3.8-r4.ebuild index 1fc761679e5e..3ab2057e1a1d 100644 --- a/x11-libs/qt/qt-3.3.8-r4.ebuild +++ b/x11-libs/qt/qt-3.3.8-r4.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2008 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/x11-libs/qt/qt-3.3.8-r4.ebuild,v 1.6 2008/03/03 20:24:38 ingmar Exp $ +# $Header: /var/cvsroot/gentoo-x86/x11-libs/qt/qt-3.3.8-r4.ebuild,v 1.7 2008/05/11 18:43:21 flameeyes Exp $ # *** Please remember to update qt3.eclass when revbumping this *** @@ -142,6 +142,8 @@ src_unpack() { if use immqt || use immqt-bc ; then epatch ../${IMMQT_P}.diff sh make-symlinks.sh || die "make symlinks failed" + + epatch "${FILESDIR}/${P}-immqt+gcc-4.3.patch" fi if use mips; then @@ -160,8 +162,8 @@ src_unpack() { fi sed -i -e "s:QMAKE_CFLAGS_RELEASE.*=.*:QMAKE_CFLAGS_RELEASE=${CFLAGS}:" \ - -e "s:QMAKE_CXXFLAGS_RELEASE.*=.*:QMAKE_CXXFLAGS_RELEASE=${CXXFLAGS}:" \ - -e "s:QMAKE_LFLAGS_RELEASE.*=.*:QMAKE_LFLAGS_RELEASE=${LDFLAGS}:" \ + -e "s:QMAKE_CXXFLAGS_RELEASE.*=.*:QMAKE_CXXFLAGS_RELEASE=${CXXFLAGS}:" \ + -e "s:QMAKE_LFLAGS_RELEASE.*=.*:QMAKE_LFLAGS_RELEASE=${LDFLAGS}:" \ -e "s:\<QMAKE_CC\>.*=.*:QMAKE_CC=$(tc-getCC):" \ -e "s:\<QMAKE_CXX\>.*=.*:QMAKE_CXX=$(tc-getCXX):" \ -e "s:\<QMAKE_LINK\>.*=.*:QMAKE_LINK=$(tc-getCXX):" \ |