summaryrefslogtreecommitdiffstats
path: root/package/qt/qt-4.6.2-fix-qt-uclibc-build.patch
diff options
context:
space:
mode:
authorPaul Jones <paul@pauljones.id.au>2010-08-18 22:11:34 +1000
committerPeter Korsgaard <jacmet@sunsite.dk>2010-09-09 10:30:19 +0200
commitf47b29353f31a11a466ca6e499812bc10186a9f8 (patch)
tree2c8eb1c9410525bba72d30f1bae1cc99b906618e /package/qt/qt-4.6.2-fix-qt-uclibc-build.patch
parentbb4ca92c401a54aa6f47c3c6688d00b0f7767dc8 (diff)
downloadbuildroot-novena-f47b29353f31a11a466ca6e499812bc10186a9f8.tar.gz
buildroot-novena-f47b29353f31a11a466ca6e499812bc10186a9f8.zip
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>
Diffstat (limited to 'package/qt/qt-4.6.2-fix-qt-uclibc-build.patch')
-rw-r--r--package/qt/qt-4.6.2-fix-qt-uclibc-build.patch27
1 files changed, 0 insertions, 27 deletions
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