From e626039f13b521d2b9991beb9b76ebac36b2e3dd Mon Sep 17 00:00:00 2001 From: Mirko Vogt Date: Tue, 22 Nov 2016 19:46:58 +0100 Subject: [PATCH] purge patches which don't apply anymore --- frameworks/qt5base/patches/002-uclibc-execinfo.patch | 11 ----------- frameworks/qt5base/patches/011-use-posix-iconv.patch | 6 ------ 2 files changed, 17 deletions(-) delete mode 100644 frameworks/qt5base/patches/002-uclibc-execinfo.patch delete mode 100644 frameworks/qt5base/patches/011-use-posix-iconv.patch diff --git a/frameworks/qt5base/patches/002-uclibc-execinfo.patch b/frameworks/qt5base/patches/002-uclibc-execinfo.patch deleted file mode 100644 index 6ad2624..0000000 --- a/frameworks/qt5base/patches/002-uclibc-execinfo.patch +++ /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 diff --git a/frameworks/qt5base/patches/011-use-posix-iconv.patch b/frameworks/qt5base/patches/011-use-posix-iconv.patch deleted file mode 100644 index f58b06f..0000000 --- a/frameworks/qt5base/patches/011-use-posix-iconv.patch +++ /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 -- 2.30.2