diff options
author | Theo Chatzimichos <tampakrap@gentoo.org> | 2009-11-02 16:01:32 +0000 |
---|---|---|
committer | Theo Chatzimichos <tampakrap@gentoo.org> | 2009-11-02 16:01:32 +0000 |
commit | 8bdf6b8c613f38155a7e0b9a1bdc1a71c04d8860 (patch) | |
tree | fce53ea051af7104852386aad6c35006378fbca6 /x11-libs/qt | |
parent | net-libs/libmfcr2: removing (pending 10/20/2009). (diff) | |
download | gentoo-2-8bdf6b8c613f38155a7e0b9a1bdc1a71c04d8860.tar.gz gentoo-2-8bdf6b8c613f38155a7e0b9a1bdc1a71c04d8860.tar.bz2 gentoo-2-8bdf6b8c613f38155a7e0b9a1bdc1a71c04d8860.zip |
Restore removed patch
(Portage version: 2.2_rc47/cvs/Linux x86_64)
Diffstat (limited to 'x11-libs/qt')
-rw-r--r-- | x11-libs/qt/ChangeLog | 6 | ||||
-rw-r--r-- | x11-libs/qt/files/qt-ulibc.patch | 13 |
2 files changed, 18 insertions, 1 deletions
diff --git a/x11-libs/qt/ChangeLog b/x11-libs/qt/ChangeLog index a9ee677264b9..afbb3a2a0022 100644 --- a/x11-libs/qt/ChangeLog +++ b/x11-libs/qt/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for x11-libs/qt # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/x11-libs/qt/ChangeLog,v 1.595 2009/11/02 09:13:31 abcd Exp $ +# $Header: /var/cvsroot/gentoo-x86/x11-libs/qt/ChangeLog,v 1.596 2009/11/02 16:01:31 tampakrap Exp $ + + 02 Nov 2009; Theo Chatzimichos <tampakrap@gentoo.org> + +files/qt-ulibc.patch: + Restore removed patch 02 Nov 2009; Jonathan Callen <abcd@gentoo.org> -files/0037-dnd-timestamp-fix.patch, diff --git a/x11-libs/qt/files/qt-ulibc.patch b/x11-libs/qt/files/qt-ulibc.patch new file mode 100644 index 000000000000..f188778e4bdf --- /dev/null +++ b/x11-libs/qt/files/qt-ulibc.patch @@ -0,0 +1,13 @@ +--- qt-x11-free-3.3.4.orig/src/tools/qlocale.cpp 2005-01-21 17:16:05.000000000 +0000 ++++ qt-x11-free-3.3.4/src/tools/qlocale.cpp 2005-02-18 13:36:59.000000000 +0000 +@@ -55,6 +55,10 @@ + # undef INFINITY + #endif + ++#if defined(Q_OS_LINUX) && defined(__UCLIBC__) ++# undef Q_OS_LINUX ++#endif ++ + #ifdef Q_OS_LINUX + # include <fenv.h> + #endif |