Add a uclibc patch to allow Qt to compile with ulibc (bug #100246)

Package-Manager: portage-2.1_pre3-r1

5 files changed, 30 insertions, 16 deletions

diff --git a/x11-libs/qt/ChangeLog b/x11-libs/qt/ChangeLog
index acf428af1727..c55e0f72ff9e 100644
--- a/x11-libs/qt/ChangeLog
+++ b/x11-libs/qt/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for x11-libs/qt
 # Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/qt/ChangeLog,v 1.284 2006/01/18 19:28:22 josejx Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/qt/ChangeLog,v 1.285 2006/01/19 13:54:31 caleb Exp $
+
+  19 Jan 2006; Caleb Tennis <caleb@gentoo.org> +files/qt-ulibc.patch,
+  qt-3.3.4-r8.ebuild, qt-3.3.5.ebuild:
+  Add a uclibc patch to allow Qt to compile with ulibc (bug #100246)
 
   18 Jan 2006; Joseph Jezak <josejx@gentoo.org> qt-4.1.0-r2.ebuild:
   Marked ~ppc for bug #112811.
diff --git a/x11-libs/qt/Manifest b/x11-libs/qt/Manifest
index a6dce7f6ab2b..13e9194e0eff 100644
--- a/x11-libs/qt/Manifest
+++ b/x11-libs/qt/Manifest
@@ -1,7 +1,4 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
-MD5 c61e9e550d52d5d6f2ea4a28062765e1 ChangeLog 5969
+MD5 e4e3a0b73ef0007f425d62361dfa65de ChangeLog 6147
 MD5 8ffca1b1b7523339af04fd24b4595ce4 files/0001-dnd_optimization.patch 5623
 MD5 8b3da5dae8babfcbdee3be465579d6c2 files/0002-dnd_active_window_fix.patch 7289
 MD5 0cc401186f490faf55906cd458280db8 files/0037-dnd-timestamp-fix.patch 2138
@@ -23,18 +20,12 @@ MD5 dda33293dab89d46ad43994002aae1da files/qt-3.3.5-macos.patch 18154
 MD5 08ed7e5a6f33e7f88c7e86f13898fca2 files/qt-3.3.5-uic-fix.patch 711
 MD5 0495f1d3f467a2972feccba453135258 files/qt-4.1.0-configure-no-mysql.diff 11142
 MD5 b50b8f687bb25b6b372b22abc591e20c files/qt-4.1.0-debug-and-release.diff 1727
+MD5 dcd3368171f2b284381e1cbc0de6a5a5 files/qt-ulibc.patch 355
 MD5 fff1c03b4a3ad38904a30d1b2de88a07 files/qt4-nomkdir.patch 866
 MD5 512150b47a904b0240101e319856aab1 metadata.xml 156
-MD5 1b4fc334dc9741170b8ea213e4d90884 qt-3.3.4-r8.ebuild 10372
-MD5 68b81681b9aca62a38e23e0d881b55a0 qt-3.3.5.ebuild 10338
+MD5 86967c56c6785cfb1c8c5699aaad04e4 qt-3.3.4-r8.ebuild 10441
+MD5 4ba765b84ddaa695b81a865a608d63cd qt-3.3.5.ebuild 10407
 MD5 b3c513259a35a93f7887b52ce29fdd16 qt-4.0.1.ebuild 5950
 MD5 d2603f63c8272769089394a4f2ef8e37 qt-4.1.0-r1.ebuild 6259
 MD5 a04ae47c7787c6585983cbdac19eaf90 qt-4.1.0-r2.ebuild 6451
 MD5 646d36bb71f8b40f3f91ee8bed5e059a qt-4.1.0.ebuild 6251
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.2 (GNU/Linux)
-
-iD8DBQFDzpbhcsIHjyDViGQRAlbTAJ9uZlgO+pzBRHkAkQ8Hbe95G2r+ZACgnO0t
-0TZJyyAlBAZluCHhUYWIVfw=
-=nQhQ
------END PGP SIGNATURE-----
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
diff --git a/x11-libs/qt/qt-3.3.4-r8.ebuild b/x11-libs/qt/qt-3.3.4-r8.ebuild
index c72e99bfcf3a..fbb2f549a360 100644
--- a/x11-libs/qt/qt-3.3.4-r8.ebuild
+++ b/x11-libs/qt/qt-3.3.4-r8.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/qt/qt-3.3.4-r8.ebuild,v 1.14 2006/01/14 14:10:44 grobian Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/qt/qt-3.3.4-r8.ebuild,v 1.15 2006/01/19 13:54:31 caleb Exp $
 
 inherit eutils flag-o-matic toolchain-funcs
 
@@ -113,6 +113,9 @@ src_unpack() {
 	epatch "${FILESDIR}/${P}-gcc4.patch"
 	epatch "${FILESDIR}/${P}-gcc4-volatile.patch"
 
+	# patch for ulibc (bug #100246)
+	epatch "${FILESDIR}/qt-ulibc.patch"
+
 	if use immqt || use immqt-bc ; then
 		epatch ../${IMMQT_P}.diff
 		epatch ${FILESDIR}/${P}-immodule-focus.patch
diff --git a/x11-libs/qt/qt-3.3.5.ebuild b/x11-libs/qt/qt-3.3.5.ebuild
index 835bb7bee84f..0e9ec4e02f13 100644
--- a/x11-libs/qt/qt-3.3.5.ebuild
+++ b/x11-libs/qt/qt-3.3.5.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/qt/qt-3.3.5.ebuild,v 1.8 2006/01/13 12:56:28 caleb Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/qt/qt-3.3.5.ebuild,v 1.9 2006/01/19 13:54:31 caleb Exp $
 
 inherit eutils flag-o-matic toolchain-funcs
 
@@ -118,6 +118,9 @@ src_unpack() {
 #	epatch ${FILESDIR}/${P}-0051-qtoolbar_77047.patch
 #	epatch ${FILESDIR}/${P}-0047-fix-kmenu-widget.diff
 
+   # ulibc patch (bug #100246)
+   epatch ${FILESDIR}/qt-ulibc.patch
+
 	if use immqt || use immqt-bc ; then
 		epatch ../${IMMQT_P}.diff
 		sh make-symlinks.sh || die "make symlinks failed"