qt: Bump to 4.6.3

Also add option to build example and demo code

[Peter: fix patch handling]
Signed-off-by: Paul Jones <paul@pauljones.id.au>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>

5 files changed, 13 insertions, 31 deletions

diff --git a/CHANGES b/CHANGES
index 4d85796c5..9d1677ad3 100644
--- a/CHANGES
+++ b/CHANGES
@@ -6,7 +6,7 @@
 	misc fixes + nconfig and savedefconfig targets.
 
 	Updated/fixed packages: berkeleydb, busybox, dropbear,
-	iptables, kismet, openvpn
+	iptables, kismet, openvpn, qt
 
 2010.08: Released August 31th, 2010:
 
diff --git a/package/qt/Config.in b/package/qt/Config.in
index 93a8ab1a8..50c292991 100644
--- a/package/qt/Config.in
+++ b/package/qt/Config.in
@@ -16,6 +16,11 @@ config BR2_PACKAGE_QT_DEBUG
 	help
 	  If unsure, say N.
 
+config BR2_PACKAGE_QT_DEMOS
+	bool "Compile and install demos and examples (with code)"
+	help
+	  If unsure, say N.
+
 choice
 	prompt "Library type"
 	default BR2_PACKAGE_QT_SHARED
diff --git a/package/qt/qt-4.6.2-fix-qt-uclibc-build.patch b/package/qt/qt-4.6.2-fix-qt-uclibc-build.patch
deleted file mode 100644
index a76774bbc..000000000
--- a/package/qt/qt-4.6.2-fix-qt-uclibc-build.patch
+++ /dev/null
@@ -1,27 +0,0 @@
-From http://bugreports.qt.nokia.com/browse/QTBUG-8365
-
-Starting a QtEmbedded-4.6.2 application linked against uClibc 0.9.30.1 results
-in an immediate segmentation fault.
-This is due to an incompatibility of the uClibc with the standard libc about
-the "realpath" function. The man of the function clearly specifies that
-"if resolved path (the second argument) is NULL, then realpath uses malloc to
-allocate a buffer ...". However, uClibc doesn't support this functionality and
-issues a warning at compile-time when the function is called with a NULL
-argument. 
----
-diff -aurp -x '*.o' qt-everywhere-opensource-src-4.6.2-old/src/corelib/io/qfsfileengine.cpp qt-everywhere-opensource-src-4.6.2/src/corelib/io/qfsfileengine.cpp
---- qt-everywhere-opensource-src-4.6.2-old/src/corelib/io/qfsfileengine.cpp	2010-02-11 16:55:23.000000000 +0100
-+++ qt-everywhere-opensource-src-4.6.2/src/corelib/io/qfsfileengine.cpp	2010-02-19 14:57:06.000000000 +0100
-@@ -145,10 +145,9 @@ QString QFSFileEnginePrivate::canonicali
- #endif
-     // Mac OS X 10.5.x doesn't support the realpath(X,0) extenstion we use here.
- #if defined(Q_OS_LINUX) || defined(Q_OS_SYMBIAN)
--    char *ret = realpath(path.toLocal8Bit().constData(), (char*)0);
--    if (ret) {
-+    char ret[PATH_MAX];
-+    if (realpath(path.toLocal8Bit().constData(), ret)) {
-         QString canonicalPath = QDir::cleanPath(QString::fromLocal8Bit(ret));
--        free(ret);
-         return canonicalPath;
-     }
- #endif
diff --git a/package/qt/qt-4.6.2-pthread_getattr_np.patch b/package/qt/qt-4.6.3-pthread_getattr_np.patch
index 767818524..767818524 100644
--- a/package/qt/qt-4.6.2-pthread_getattr_np.patch
+++ b/package/qt/qt-4.6.3-pthread_getattr_np.patch
diff --git a/package/qt/qt.mk b/package/qt/qt.mk
index eb1ef0ffe..92f1253c7 100644
--- a/package/qt/qt.mk
+++ b/package/qt/qt.mk
@@ -12,7 +12,7 @@
 #
 ######################################################################
 
-QT_VERSION:=4.6.2
+QT_VERSION:=4.6.3
 QT_SOURCE:=qt-everywhere-opensource-src-$(QT_VERSION).tar.gz
 QT_SITE:=http://get.qt.nokia.com/qt/source
 QT_CAT:=$(ZCAT)
@@ -48,6 +48,12 @@ else
 QT_CONFIGURE+= -no-qt3support
 endif
 
+ifeq ($(BR2_PACKAGE_QT_DEMOS),y)
+QT_CONFIGURE+= -examplesdir $(TARGET_DIR)/usr/share/qt/examples -demosdir $(TARGET_DIR)/usr/share/qt/demos
+else
+QT_CONFIGURE+= -nomake examples -nomake demos
+endif
+
 # ensure glib is built first if enabled for Qt's glib support
 ifeq ($(BR2_PACKAGE_LIBGLIB2),y)
 QT_DEP_LIBS+=libglib2
@@ -520,8 +526,6 @@ endif
 		-hostprefix $(STAGING_DIR)/usr \
 		-fast \
 		-no-rpath \
-		-nomake examples \
-		-nomake demos \
 	)
 	touch $@