From 1f8c4e5f53a799b88357eb02c078aba11442d819 Mon Sep 17 00:00:00 2001 From: mirko Date: Tue, 22 Jun 2010 10:04:32 +0000 Subject: [PATCH] uClibc doesn't support the -function properly which results in immediate segmentation faults when passing NULL as argument (as qt does). This patch - which adds checks before calling - went upstream in qt4.7 and therewith is not needed anymore. git-svn-id: svn://svn.openwrt.org/openwrt/packages@21875 3c298f89-4303-0410-b956-a3cf2f4a3e73 --- .../qt4/patches/000-fix-uclibc-segfaults.patch | 16 ---------------- 1 file changed, 16 deletions(-) delete mode 100644 Xorg/lib/qt4/patches/000-fix-uclibc-segfaults.patch diff --git a/Xorg/lib/qt4/patches/000-fix-uclibc-segfaults.patch b/Xorg/lib/qt4/patches/000-fix-uclibc-segfaults.patch deleted file mode 100644 index ce4755f14..000000000 --- a/Xorg/lib/qt4/patches/000-fix-uclibc-segfaults.patch +++ /dev/null @@ -1,16 +0,0 @@ -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