From aa56d99a45eff677328f0364c5180f47dc231397 Mon Sep 17 00:00:00 2001 From: Dmitry Shachnev Date: Fri, 25 Aug 2017 21:20:10 +0300 Subject: Drop all patches, they no longer apply to the new codebase. --- debian/changelog | 1 + debian/patches/05_sparc_unaligned_access.diff | 41 -------------------------- debian/patches/fix_nonlinux_glibc_linkage.diff | 16 ---------- debian/patches/hurd.diff | 33 --------------------- debian/patches/leveldb_memenv_path.diff | 28 ------------------ debian/patches/no_gc_sections.diff | 25 ---------------- debian/patches/reduce_memory_usage.patch | 23 --------------- debian/patches/series | 7 ----- debian/patches/webkit_qt_hide_symbols.diff | 28 ------------------ 9 files changed, 1 insertion(+), 201 deletions(-) delete mode 100644 debian/patches/05_sparc_unaligned_access.diff delete mode 100644 debian/patches/fix_nonlinux_glibc_linkage.diff delete mode 100644 debian/patches/hurd.diff delete mode 100644 debian/patches/leveldb_memenv_path.diff delete mode 100644 debian/patches/no_gc_sections.diff delete mode 100644 debian/patches/reduce_memory_usage.patch delete mode 100644 debian/patches/series delete mode 100644 debian/patches/webkit_qt_hide_symbols.diff diff --git a/debian/changelog b/debian/changelog index 97da428..4fa9d21 100644 --- a/debian/changelog +++ b/debian/changelog @@ -5,6 +5,7 @@ qtwebkit-opensource-src (5.212.0~alpha2-1) UNRELEASED; urgency=medium * Update debian/watch to track release tarballs on GitHub. * Stop repacking the upstream tarball. Two of three previously excluded files no longer exist, and the third one has changed license to Expat. + * Drop all patches, they no longer apply to the new codebase. -- Debian Qt/KDE Maintainers Fri, 25 Aug 2017 20:50:49 +0300 diff --git a/debian/patches/05_sparc_unaligned_access.diff b/debian/patches/05_sparc_unaligned_access.diff deleted file mode 100644 index f875008..0000000 --- a/debian/patches/05_sparc_unaligned_access.diff +++ /dev/null @@ -1,41 +0,0 @@ -Description: fix some alignment problems on sparc. -Author: Mike Hommey -Author: Timo Jyrinki -Last-Update: 2013-12-17 - ---- - Source/JavaScriptCore/wtf/ListHashSet.h | 9 +++------ - 1 file changed, 3 insertions(+), 6 deletions(-) - ---- a/Source/WTF/wtf/ListHashSet.h -+++ b/Source/WTF/wtf/ListHashSet.h -@@ -173,7 +173,7 @@ namespace WTF { - : m_freeList(pool()) - , m_isDoneWithInitialFreeList(false) - { -- memset(m_pool.pool, 0, sizeof(m_pool.pool)); -+ memset(m_pool, 0, sizeof(m_pool)); - } - - Node* allocate() -@@ -217,7 +217,7 @@ namespace WTF { - } - - private: -- Node* pool() { return reinterpret_cast_ptr(m_pool.pool); } -+ Node* pool() { return reinterpret_cast_ptr(m_pool); } - Node* pastPool() { return pool() + m_poolSize; } - bool inPool(Node* node) - { -@@ -227,10 +227,7 @@ namespace WTF { - Node* m_freeList; - bool m_isDoneWithInitialFreeList; - static const size_t m_poolSize = inlineCapacity; -- union { -- char pool[sizeof(Node) * m_poolSize]; -- double forAlignment; -- } m_pool; -+ uint32_t m_pool[(sizeof(Node) * m_poolSize + sizeof(uint32_t) - 1) / sizeof(uint32_t)]; - }; - - template struct ListHashSetNode { diff --git a/debian/patches/fix_nonlinux_glibc_linkage.diff b/debian/patches/fix_nonlinux_glibc_linkage.diff deleted file mode 100644 index 566389a..0000000 --- a/debian/patches/fix_nonlinux_glibc_linkage.diff +++ /dev/null @@ -1,16 +0,0 @@ -Author: Sune Vuorela -Description: Ensures we link with rt on all the platforms where we -have glibc. Not yet upstreamed. Requires a upstreamming of the gnukfreebsd patch -Index: b/Source/WebKit2/WebKit2.pri -=================================================================== ---- a/Source/WebKit2/WebKit2.pri -+++ b/Source/WebKit2/WebKit2.pri -@@ -75,7 +75,7 @@ - - INCLUDEPATH += $$WEBKIT2_GENERATED_SOURCES_DIR - --linux-*:!android { -+linux-*:!android|hurd-*|gnukfreebsd-* { - # -lrt is required for shm_open and shm_unlink. - LIBS += -lrt - } diff --git a/debian/patches/hurd.diff b/debian/patches/hurd.diff deleted file mode 100644 index 46318d3..0000000 --- a/debian/patches/hurd.diff +++ /dev/null @@ -1,33 +0,0 @@ -Author: Pino Toscano -Description: fix (workaround) build on GNU/Hurd - Apparently PTHREAD_MUTEX_NORMAL and PTHREAD_MUTEX_DEFAULT cannot be used - in preprocessor expressions, so temporarly use directly the code which would - be used on GNU/Hurd. -Origin: vendor -Forwarded: not-needed -Last-Update: 2011-12-30 - ---- - Source/JavaScriptCore/wtf/FastMalloc.cpp | 4 ++++ - 1 file changed, 4 insertions(+) - ---- a/Source/WTF/wtf/FastMalloc.cpp -+++ b/Source/WTF/wtf/FastMalloc.cpp -@@ -1966,6 +1966,9 @@ ALWAYS_INLINE void TCMalloc_PageHeap::su - void TCMalloc_PageHeap::initializeScavenger() - { - // Create a non-recursive mutex. -+#if defined(__GNU__) -+ pthread_mutex_init(&m_scavengeMutex, 0); -+#else - #if !defined(PTHREAD_MUTEX_NORMAL) || PTHREAD_MUTEX_NORMAL == PTHREAD_MUTEX_DEFAULT - pthread_mutex_init(&m_scavengeMutex, 0); - #else -@@ -1977,6 +1980,7 @@ void TCMalloc_PageHeap::initializeScaven - - pthread_mutexattr_destroy(&attr); - #endif -+#endif - - pthread_cond_init(&m_scavengeCondition, 0); - m_scavengeThreadActive = true; diff --git a/debian/patches/leveldb_memenv_path.diff b/debian/patches/leveldb_memenv_path.diff deleted file mode 100644 index 5d1f6b1..0000000 --- a/debian/patches/leveldb_memenv_path.diff +++ /dev/null @@ -1,28 +0,0 @@ -Description: in Debian, memenv.h is on a different path - See 0113-makefile_memenv.patch in leveldb packaging. -Author: Dmitry Shachnev -Forwarded: not-needed -Last-Update: 2015-03-02 - ---- a/Tools/qmake/config.tests/leveldb/leveldb.cpp -+++ b/Tools/qmake/config.tests/leveldb/leveldb.cpp -@@ -19,7 +19,7 @@ - - #include - #include --#include -+#include - - int main(int, char**) - { ---- a/Source/WebCore/platform/leveldb/LevelDBDatabase.cpp -+++ b/Source/WebCore/platform/leveldb/LevelDBDatabase.cpp -@@ -38,7 +38,7 @@ - #include - #include - #include --#include -+#include - #include - #include - #include diff --git a/debian/patches/no_gc_sections.diff b/debian/patches/no_gc_sections.diff deleted file mode 100644 index 79f20af..0000000 --- a/debian/patches/no_gc_sections.diff +++ /dev/null @@ -1,25 +0,0 @@ -Description: do not pass -Wl,--gc-sections on powerpc, s390, arm*, mips*, iX86 when building - libQtWebKit.so; works around a binutils bug that results in a - segfault on powerpc, internal link error on s390 and OOM on armel/mipsel. -Author: Steve Langasek -Author: Modestas Vainius -Author: Timo Jyrinki -Origin: vendor -Forwarded: no -Last-Update: 2013-02-07 (add i686) - ---- - Source/WebCore/WebCore.pri | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - ---- a/Source/WebCore/WebCore.pri -+++ b/Source/WebCore/WebCore.pri -@@ -314,7 +314,7 @@ - unix:!mac:*-g++*:QMAKE_CXXFLAGS += -ffunction-sections - } - unix:!mac:*-g++*:QMAKE_CXXFLAGS += -fdata-sections --unix:!mac:*-g++*:QMAKE_LFLAGS += -Wl,--gc-sections -+unix:!mac:*-g++*:!equals(QT_ARCH, powerpc):!equals(QT_ARCH, s390):!equals(QT_ARCH, mips):!equals(QT_ARCH, arm):!equals(QT_ARCH, i386):!equals(QT_ARCH, i686):QMAKE_LFLAGS += -Wl,--gc-sections - linux*-g++*:QMAKE_LFLAGS += $$QMAKE_LFLAGS_NOUNDEF - - enable_fast_mobile_scrolling: DEFINES += ENABLE_FAST_MOBILE_SCROLLING=1 diff --git a/debian/patches/reduce_memory_usage.patch b/debian/patches/reduce_memory_usage.patch deleted file mode 100644 index c58569a..0000000 --- a/debian/patches/reduce_memory_usage.patch +++ /dev/null @@ -1,23 +0,0 @@ -Description: force ld to not cache symbols tables. - This patch, wich should be considered Debian-only (in other words, it should - not be pushed upstream), forces ld to not cache the symbol tables of input - files in memory to avoid memory exhaustion during the linking phase. - . - This might make linking slower but reducing the overall memory consumption. -Author: Lisandro Damián Nicanor Pérez Meyer -Forwarded: not-needed -Last-Update: 2014-03-05 - ---- - Tools/qmake/mkspecs/features/unix/default_post.prf | 3 +++ - 1 file changed, 3 insertions(+) - ---- a/Tools/qmake/mkspecs/features/unix/default_post.prf -+++ b/Tools/qmake/mkspecs/features/unix/default_post.prf -@@ -69,3 +69,6 @@ - } - - load(default_post) -+ -+# Make ld not cache the symbol tables of input files in memory to avoid memory exhaustion during the linking phase. -+QMAKE_LFLAGS += -Wl,--no-keep-memory diff --git a/debian/patches/series b/debian/patches/series deleted file mode 100644 index ab2532d..0000000 --- a/debian/patches/series +++ /dev/null @@ -1,7 +0,0 @@ -# debian patches -reduce_memory_usage.patch -05_sparc_unaligned_access.diff -no_gc_sections.diff -hurd.diff -webkit_qt_hide_symbols.diff -fix_nonlinux_glibc_linkage.diff diff --git a/debian/patches/webkit_qt_hide_symbols.diff b/debian/patches/webkit_qt_hide_symbols.diff deleted file mode 100644 index b881ac7..0000000 --- a/debian/patches/webkit_qt_hide_symbols.diff +++ /dev/null @@ -1,28 +0,0 @@ -From: Modestas Vainius -SUbject: Make hide_symbols to cover all QtWebKit portions -Origin: vendor -Author: Timo Jyrinki -Last-Update: 2013-01-28 (use a similar patch on Qt 5) -Forwarded: no - -Almost everything in Source/WebCore/generated was not build with --fvisibility=hidden resulting into redundantly polluted and huge dynamic symbol -list in libQtWebKit.so. - -Therefore, move +hide_symbols configuration parameter upwards in order for it -to cover everything including the offending Source/WebCore/CodeGenerators.pri - ---- a/Source/QtWebKit.pro 2012-12-18 19:04:43.000000000 +0000 -+++ b/Source/QtWebKit.pro 2013-01-28 08:25:56.342911517 +0000 -@@ -7,6 +7,11 @@ - TEMPLATE = subdirs - CONFIG += ordered - -+CONFIG(release):!CONFIG(standalone_package) { -+ contains(QT_CONFIG, reduce_exports):CONFIG += hide_symbols -+ unix:contains(QT_CONFIG, reduce_relocations):CONFIG += bsymbolic_functions -+} -+ - api.file = api.pri - SUBDIRS += api - -- cgit v1.2.3