purge patches which don't apply anymore
authorMirko Vogt <mirko-dev@nanl.de>
Tue, 22 Nov 2016 18:46:58 +0000 (19:46 +0100)
committerMirko Vogt <mirko-dev@nanl.de>
Tue, 22 Nov 2016 18:46:58 +0000 (19:46 +0100)
frameworks/qt5base/patches/002-uclibc-execinfo.patch [deleted file]
frameworks/qt5base/patches/011-use-posix-iconv.patch [deleted file]

diff --git a/frameworks/qt5base/patches/002-uclibc-execinfo.patch b/frameworks/qt5base/patches/002-uclibc-execinfo.patch
deleted file mode 100644 (file)
index 6ad2624..0000000
+++ /dev/null
@@ -1,11 +0,0 @@
---- a/src/corelib/kernel/qcrashhandler.cpp
-+++ b/src/corelib/kernel/qcrashhandler.cpp
-@@ -62,7 +62,7 @@ QT_BEGIN_NAMESPACE
- QtCrashHandler QSegfaultHandler::callback = 0;
--#if defined(__GLIBC__) && (__GLIBC__ >= 2) && !defined(__UCLIBC__) && !defined(QT_LINUXBASE)
-+#if defined(__GLIBC__) && (__GLIBC__ >= 2) && (!defined(__UCLIBC__) || (defined(__UCLIBC__) && defined(UCLIBC_HAS_BACKTRACE))) && !defined(QT_LINUXBASE)
- QT_BEGIN_INCLUDE_NAMESPACE
- # include "qstring.h"
- # include <execinfo.h>
diff --git a/frameworks/qt5base/patches/011-use-posix-iconv.patch b/frameworks/qt5base/patches/011-use-posix-iconv.patch
deleted file mode 100644 (file)
index f58b06f..0000000
+++ /dev/null
@@ -1,6 +0,0 @@
---- a/config.tests/unix/iconv/iconv.pro
-+++ b/config.tests/unix/iconv/iconv.pro
-@@ -1,2 +1,2 @@
- CONFIG -= qt dylib       
--mac|mingw|qnx|haiku:LIBS += -liconv
-+mac|mingw|qnx|haiku|linux:LIBS += -liconv