actually delete patches no more applied

9 files changed, 0 insertions, 586 deletions

diff --git a/debian/patches/Fix-cursor-truncate-to-include-line-position.patch b/debian/patches/Fix-cursor-truncate-to-include-line-position.patch
deleted file mode 100644
index 25d4a7a..0000000
--- a/debian/patches/Fix-cursor-truncate-to-include-line-position.patch
+++ /dev/null
@@ -1,32 +0,0 @@
-Description: Fix cursor truncate to include line position
- Since we could have moved the line position (QTextLine::setPosition),
- the truncating position should be adjusted with that.
-
-Origin: commit ca89c49fa2c5cbb3945897046f33eed9f7da846c
-Author: Jiang Jiang <jiang.jiang@nokia.com>
-Reviewed-by: Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@nokia.com>
-Applied-Upstream: yes
-Forwarded: not-needed
-
----
- src/gui/text/qtextlayout.cpp |    4 ++--
- 1 file changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/src/gui/text/qtextlayout.cpp b/src/gui/text/qtextlayout.cpp
-index 16f7150..52f2793 100644
---- a/src/gui/text/qtextlayout.cpp
-+++ b/src/gui/text/qtextlayout.cpp
-@@ -2616,8 +2616,8 @@ qreal QTextLine::cursorToX(int *cursorPos, Edge edge) const
-         x += eng->offsetInLigature(si, pos, end, glyph_pos);
-     }
- 
--    if (eng->option.wrapMode() != QTextOption::NoWrap && x > line.width)
--        x = line.width;
-+    if (eng->option.wrapMode() != QTextOption::NoWrap && x > line.x + line.width)
-+        x = line.x + line.width;
- 
-     *cursorPos = pos + si->position;
-     return x.toReal();
--- 
-1.7.10.4
-
diff --git a/debian/patches/QElfParser-fix-type-of-sh_size.patch b/debian/patches/QElfParser-fix-type-of-sh_size.patch
deleted file mode 100644
index 1c30f9a..0000000
--- a/debian/patches/QElfParser-fix-type-of-sh_size.patch
+++ /dev/null
@@ -1,41 +0,0 @@
-From 9e981c4dd03effc2c52b52f529edfa8955e534ce Mon Sep 17 00:00:00 2001
-From: Pino Toscano <toscano.pino@tiscali.it>
-Date: Tue, 15 May 2012 14:40:15 +0200
-Subject: [PATCH] QElfParser: fix type of sh_size
-
-The type of the sh_size field of a section header is either Elf32_Word or Elf64_Xword,
-so the type used cannot be qelfword_t (always 32 bits) but qelfoff_t.
-
-Change-Id: Ia380b6823913fee7a96b39f742630ae3a9ca0cb8
-Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
-Reviewed-by: Arvid Picciani <arvid.picciani@nokia.com>
-(backport of 77b179689ba37dc909778fdd00df2701f83a2868 from qtbase)
----
- src/corelib/plugin/qelfparser_p.cpp |    4 ++--
- src/corelib/plugin/qelfparser_p.h   |    2 +-
- 2 files changed, 3 insertions(+), 3 deletions(-)
-
---- a/src/corelib/plugin/qelfparser_p.cpp
-+++ b/src/corelib/plugin/qelfparser_p.cpp
-@@ -61,8 +61,8 @@ const char *QElfParser::parseSectionHead
-          + sizeof(qelfaddr_t);  // sh_addr
-     sh->offset = read<qelfoff_t>(data);
-     data += sizeof(qelfoff_t);  // sh_offset
--    sh->size = read<qelfword_t>(data);
--    data += sizeof(qelfword_t); // sh_size
-+    sh->size = read<qelfoff_t>(data);
-+    data += sizeof(qelfoff_t);  // sh_size
-     return data;
- }
- 
---- a/src/corelib/plugin/qelfparser_p.h
-+++ b/src/corelib/plugin/qelfparser_p.h
-@@ -80,7 +80,7 @@ public:
-         qelfword_t name;
-         qelfword_t type;
-         qelfoff_t  offset;
--        qelfword_t size;
-+        qelfoff_t  size;
-     };
- 
-     int m_endian;
diff --git a/debian/patches/QTBUG-14724_close_orphaned_file_descriptors_after_printing.patch b/debian/patches/QTBUG-14724_close_orphaned_file_descriptors_after_printing.patch
deleted file mode 100644
index 9acae10..0000000
--- a/debian/patches/QTBUG-14724_close_orphaned_file_descriptors_after_printing.patch
+++ /dev/null
@@ -1,37 +0,0 @@
-Description:
- QPainter together with QPrinter leaves a lot of temporary files in
- /tmp with every printout. That is a problem for embedded devices,
- which have not such a large /tmp-partition. We are using 80 MByte as
- tmpfs, i.e. in RAM. After some printounts cups deactivates the printer
- because there is no space to copy the temporary files to /tmp.
-
- What happened: In QPdfBaseEnginePrivate::openPrintDevice() noone
- remembers the file descriptor opened by tempFile() which is a call to
- the cups library to cupsTempFile()
-
- Later in closePrintDevice the check for fd<0 fails, so no one closes
- the file descriptor. If you later remove the file, the descriptor is
- still open and cannot removed until you close the application.
-
- If you print 20 times and more during your application is running and
- you print out large files (complicate forms with a lot of elements
- produces files with 3-4 MByte) your temporary file can be full, but
- you don't see (with ls) files in it.
-
-Bug: https://bugreports.qt.nokia.com/browse/QTBUG-14724
-Author: Georg Scherzer
-
----
- src/gui/painting/qpdf.cpp |    1 +
- 1 file changed, 1 insertion(+)
-
---- a/src/gui/painting/qpdf.cpp
-+++ b/src/gui/painting/qpdf.cpp
-@@ -1686,6 +1686,7 @@ bool QPdfBaseEnginePrivate::openPrintDev
-         cupsTempFile = ret.second;
-         outDevice = new QFile();
-         static_cast<QFile *>(outDevice)->open(ret.first, QIODevice::WriteOnly);
-+        fd = ret.first;
- #endif
- #ifndef QT_NO_LPR
-     } else {
diff --git a/debian/patches/add_missing_map_noreserve.patch b/debian/patches/add_missing_map_noreserve.patch
deleted file mode 100644
index b658b54..0000000
--- a/debian/patches/add_missing_map_noreserve.patch
+++ /dev/null
@@ -1,33 +0,0 @@
-From 24318c77d3fd7441e045c91e1e689391a79b6353 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?J=C4=99drzej=20Nowacki?= <jedrzej.nowacki@digia.com>
-Date: Mon, 22 Oct 2012 15:17:19 +0200
-Subject: [PATCH] Fix mmap usage.
-
-Add missing MAP_NORESERVE and fix error checking.
-
-Special thanks to Olivier JG for debugging the issue.
-
-Task-number: QTBUG-27322
-Change-Id: Ia9f4aa80415f0127318714912b524131a5b0f18a
----
- .../JavaScriptCore/jit/ExecutableAllocatorFixedVMPool.cpp          |    4 ++--
- 1 file changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/src/3rdparty/javascriptcore/JavaScriptCore/jit/ExecutableAllocatorFixedVMPool.cpp b/src/3rdparty/javascriptcore/JavaScriptCore/jit/ExecutableAllocatorFixedVMPool.cpp
-index 16d0fb1..e1237e4 100644
---- a/src/3rdparty/javascriptcore/JavaScriptCore/jit/ExecutableAllocatorFixedVMPool.cpp
-+++ b/src/3rdparty/javascriptcore/JavaScriptCore/jit/ExecutableAllocatorFixedVMPool.cpp
-@@ -305,8 +305,8 @@ public:
-         randomLocation += (1 << 24);
-         randomLocation <<= 21;
- #endif
--        m_base = mmap(reinterpret_cast<void*>(randomLocation), m_totalHeapSize, INITIAL_PROTECTION_FLAGS, MAP_PRIVATE | MAP_ANON, VM_TAG_FOR_EXECUTABLEALLOCATOR_MEMORY, 0);
--        if (!m_base)
-+        m_base = mmap(reinterpret_cast<void*>(randomLocation), m_totalHeapSize, INITIAL_PROTECTION_FLAGS, MAP_PRIVATE | MAP_ANON | MAP_NORESERVE, VM_TAG_FOR_EXECUTABLEALLOCATOR_MEMORY, 0);
-+        if (m_base == MAP_FAILED)
-             CRASH();
- 
-         // For simplicity, we keep all memory in m_freeList in a 'released' state.
--- 
-1.7.10.4
-
diff --git a/debian/patches/disable-SSL-compression-by-default.patch b/debian/patches/disable-SSL-compression-by-default.patch
deleted file mode 100644
index bf7d695..0000000
--- a/debian/patches/disable-SSL-compression-by-default.patch
+++ /dev/null
@@ -1,65 +0,0 @@
-Description:: Disable SSL compression by default.
- Disable SSL compression by default since this appears to be the a likely
- cause of the currently hyped CRIME attack.
- .
- This is a backport of 5ea896fbc63593f424a7dfbb11387599c0025c74
-From: commit d41dc3e101a694dec98d7bbb582d428d209e5401 Mon Sep 17 00:00:00 2001
-Author: Richard Moore <rich@kde.org>
-Change-Id: I6eeefb23c6b140a9633b28ed85879459c474348a
-Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
-Reviewed-by: Peter Hartmann <phartmann@rim.com>
----
- src/network/ssl/qssl.cpp              |    5 +++--
- src/network/ssl/qsslconfiguration.cpp |    4 +++-
- src/network/ssl/qsslconfiguration_p.h |    4 +++-
- 3 files changed, 9 insertions(+), 4 deletions(-)
-
-diff --git a/src/network/ssl/qssl.cpp b/src/network/ssl/qssl.cpp
-index 49e086f..9578178 100644
---- a/src/network/ssl/qssl.cpp
-+++ b/src/network/ssl/qssl.cpp
-@@ -148,8 +148,9 @@ QT_BEGIN_NAMESPACE
- 
-     By default, SslOptionDisableEmptyFragments is turned on since this causes
-     problems with a large number of servers. SslOptionDisableLegacyRenegotiation
--    is also turned on, since it introduces a security risk. The other options
--    are turned off.
-+    is also turned on, since it introduces a security risk.
-+    SslOptionDisableCompression is turned on to prevent the attack publicised by
-+    CRIME. The other options are turned off.
- 
-     Note: Availability of above options depends on the version of the SSL
-     backend in use.
-diff --git a/src/network/ssl/qsslconfiguration.cpp b/src/network/ssl/qsslconfiguration.cpp
-index 24c7b77..3a05f54 100644
---- a/src/network/ssl/qsslconfiguration.cpp
-+++ b/src/network/ssl/qsslconfiguration.cpp
-@@ -201,7 +201,9 @@ bool QSslConfiguration::isNull() const
-             d->privateKey.isNull() &&
-             d->peerCertificate.isNull() &&
-             d->peerCertificateChain.count() == 0 &&
--            d->sslOptions == (QSsl::SslOptionDisableEmptyFragments|QSsl::SslOptionDisableLegacyRenegotiation));
-+            d->sslOptions == ( QSsl::SslOptionDisableEmptyFragments
-+                              |QSsl::SslOptionDisableLegacyRenegotiation
-+                              |QSsl::SslOptionDisableCompression));
- }
- 
- /*!
-diff --git a/src/network/ssl/qsslconfiguration_p.h b/src/network/ssl/qsslconfiguration_p.h
-index 74f17cd..c36b651 100644
---- a/src/network/ssl/qsslconfiguration_p.h
-+++ b/src/network/ssl/qsslconfiguration_p.h
-@@ -83,7 +83,9 @@ public:
-         : protocol(QSsl::SecureProtocols),
-           peerVerifyMode(QSslSocket::AutoVerifyPeer),
-           peerVerifyDepth(0),
--          sslOptions(QSsl::SslOptionDisableEmptyFragments|QSsl::SslOptionDisableLegacyRenegotiation)
-+          sslOptions(QSsl::SslOptionDisableEmptyFragments
-+                     |QSsl::SslOptionDisableLegacyRenegotiation
-+                     |QSsl::SslOptionDisableCompression)
-     { }
- 
-     QSslCertificate peerCertificate;
--- 
-1.7.10.4
-
diff --git a/debian/patches/fix_jit_crash_on_x86_64.patch b/debian/patches/fix_jit_crash_on_x86_64.patch
deleted file mode 100644
index 71f7dde..0000000
--- a/debian/patches/fix_jit_crash_on_x86_64.patch
+++ /dev/null
@@ -1,283 +0,0 @@
-From 353d77098aa7c4cd1e795feeb035799cf70f5c72 Mon Sep 17 00:00:00 2001
-From: Kent Hansen <kent.hansen@nokia.com>
-Date: Thu, 8 Jul 2010 17:26:50 +0000
-Subject: [PATCH] Fix JIT crash on x86-64 (avoid 32-bit branch offset
- overflow)
-
-Cherry-picked from webkit commit
-a5b3261a8c4386b4e14ce40a34c7fc933a5f7001
-
-Task-number: QTBUG-23871
-Change-Id: Ia028fe072b349e3a7883ae0f6f7298941cc1bc9e
-Reviewed-by: Simon Hausmann <simon.hausmann@nokia.com>
-(cherry picked from commit 79ebd39d0d4846cb911ae122d2059e5add568d7e in qtscript)
----
- .../javascriptcore/JavaScriptCore/ChangeLog        |   27 +++++++++++++++++
- .../JavaScriptCore/JavaScriptCore.pri              |    1 +
- .../JavaScriptCore/jit/ExecutableAllocator.cpp     |   21 +++++++++++++
- .../jit/ExecutableAllocatorFixedVMPool.cpp         |   31 +++++++++++++-------
- .../jit/ExecutableAllocatorPosix.cpp               |   29 ++----------------
- .../jit/ExecutableAllocatorSymbian.cpp             |    2 +-
- .../JavaScriptCore/jit/ExecutableAllocatorWin.cpp  |    2 +-
- .../javascriptcore/JavaScriptCore/wtf/Platform.h   |   10 +++++++
- 8 files changed, 84 insertions(+), 39 deletions(-)
-
-diff --git a/src/3rdparty/javascriptcore/JavaScriptCore/ChangeLog b/src/3rdparty/javascriptcore/JavaScriptCore/ChangeLog
-index 9cbf0c1..5ab23e6 100644
---- a/src/3rdparty/javascriptcore/JavaScriptCore/ChangeLog
-+++ b/src/3rdparty/javascriptcore/JavaScriptCore/ChangeLog
-@@ -1,3 +1,30 @@
-+2010-07-08  Gavin Barraclough  <barraclough@apple.com>
-+
-+        Reviewed by Sam Weinig.
-+
-+        https://bugs.webkit.org/show_bug.cgi?id=41641
-+
-+        Update compile flags to allow use of ExecutableAllocatorFixedVMPool on platforms
-+        other than x86-64 (this may be useful on 32-bit platforms, too).
-+
-+        Simplify ifdefs by dividing into thwo broad allocation strategies
-+        (ENABLE_EXECUTABLE_ALLOCATOR_FIXED & ENABLE_EXECUTABLE_ALLOCATOR_DEMAND).
-+
-+        Rename constant used in the code to have names descriptive of their purpose,
-+        rather than their specific value on a given platform.
-+
-+        * jit/ExecutableAllocator.cpp:
-+        (JSC::ExecutableAllocator::reprotectRegion):
-+        (JSC::ExecutableAllocator::cacheFlush):
-+        * jit/ExecutableAllocatorFixedVMPool.cpp:
-+        (JSC::FixedVMPoolAllocator::FixedVMPoolAllocator):
-+        (JSC::FixedVMPoolAllocator::free):
-+        (JSC::ExecutablePool::systemAlloc):
-+        * jit/ExecutableAllocatorPosix.cpp:
-+        * jit/ExecutableAllocatorSymbian.cpp:
-+        * jit/ExecutableAllocatorWin.cpp:
-+        * wtf/Platform.h:
-+
- 2010-08-24  Oliver Hunt  <oliver@apple.com>
- 
-         Reviewed by Geoff Garen.
-diff --git a/src/3rdparty/javascriptcore/JavaScriptCore/JavaScriptCore.pri b/src/3rdparty/javascriptcore/JavaScriptCore/JavaScriptCore.pri
-index b061321..847f69c 100644
---- a/src/3rdparty/javascriptcore/JavaScriptCore/JavaScriptCore.pri
-+++ b/src/3rdparty/javascriptcore/JavaScriptCore/JavaScriptCore.pri
-@@ -100,6 +100,7 @@ SOURCES += \
-     interpreter/CallFrame.cpp \
-     interpreter/Interpreter.cpp \
-     interpreter/RegisterFile.cpp \
-+    jit/ExecutableAllocatorFixedVMPool.cpp \
-     jit/ExecutableAllocatorPosix.cpp \
-     jit/ExecutableAllocatorSymbian.cpp \
-     jit/ExecutableAllocatorWin.cpp \
-diff --git a/src/3rdparty/javascriptcore/JavaScriptCore/jit/ExecutableAllocator.cpp b/src/3rdparty/javascriptcore/JavaScriptCore/jit/ExecutableAllocator.cpp
-index f6b27ec..f0ebbab 100644
---- a/src/3rdparty/javascriptcore/JavaScriptCore/jit/ExecutableAllocator.cpp
-+++ b/src/3rdparty/javascriptcore/JavaScriptCore/jit/ExecutableAllocator.cpp
-@@ -33,6 +33,27 @@ namespace JSC {
- 
- size_t ExecutableAllocator::pageSize = 0;
- 
-+#if ENABLE(ASSEMBLER_WX_EXCLUSIVE)
-+void ExecutableAllocator::reprotectRegion(void* start, size_t size, ProtectionSeting setting)
-+{
-+    if (!pageSize)
-+        intializePageSize();
-+
-+    // Calculate the start of the page containing this region,
-+    // and account for this extra memory within size.
-+    intptr_t startPtr = reinterpret_cast<intptr_t>(start);
-+    intptr_t pageStartPtr = startPtr & ~(pageSize - 1);
-+    void* pageStart = reinterpret_cast<void*>(pageStartPtr);
-+    size += (startPtr - pageStartPtr);
-+
-+    // Round size up
-+    size += (pageSize - 1);
-+    size &= ~(pageSize - 1);
-+
-+    mprotect(pageStart, size, (setting == Writable) ? PROTECTION_FLAGS_RW : PROTECTION_FLAGS_RX);
-+}
-+#endif
-+
- }
- 
- #endif // HAVE(ASSEMBLER)
-diff --git a/src/3rdparty/javascriptcore/JavaScriptCore/jit/ExecutableAllocatorFixedVMPool.cpp b/src/3rdparty/javascriptcore/JavaScriptCore/jit/ExecutableAllocatorFixedVMPool.cpp
-index dd1db4e..16d0fb1 100644
---- a/src/3rdparty/javascriptcore/JavaScriptCore/jit/ExecutableAllocatorFixedVMPool.cpp
-+++ b/src/3rdparty/javascriptcore/JavaScriptCore/jit/ExecutableAllocatorFixedVMPool.cpp
-@@ -27,25 +27,33 @@
- 
- #include "ExecutableAllocator.h"
- 
--#include <errno.h>
-+#if ENABLE(EXECUTABLE_ALLOCATOR_FIXED)
- 
--#if ENABLE(ASSEMBLER) && OS(DARWIN) && CPU(X86_64)
-+#include <errno.h>
- 
- #include "TCSpinLock.h"
--#include <mach/mach_init.h>
--#include <mach/vm_map.h>
- #include <sys/mman.h>
- #include <unistd.h>
- #include <wtf/AVLTree.h>
- #include <wtf/VMTags.h>
- 
-+#if CPU(X86_64)
-+    // These limits suitable on 64-bit platforms (particularly x86-64, where we require all jumps to have a 2Gb max range).
-+    #define VM_POOL_SIZE (2u * 1024u * 1024u * 1024u) // 2Gb
-+    #define COALESCE_LIMIT (16u * 1024u * 1024u) // 16Mb
-+#else
-+    // These limits are hopefully sensible on embedded platforms.
-+    #define VM_POOL_SIZE (32u * 1024u * 1024u) // 32Mb
-+    #define COALESCE_LIMIT (4u * 1024u * 1024u) // 4Mb
-+#endif
-+
-+// ASLR currently only works on darwin (due to arc4random) & 64-bit (due to address space size).
-+#define VM_POOL_ASLR (OS(DARWIN) && CPU(X86_64))
-+
- using namespace WTF;
- 
- namespace JSC {
- 
--#define TWO_GB (2u * 1024u * 1024u * 1024u)
--#define SIXTEEN_MB (16u * 1024u * 1024u)
--
- // FreeListEntry describes a free chunk of memory, stored in the freeList.
- struct FreeListEntry {
-     FreeListEntry(void* pointer, size_t size)
-@@ -291,9 +299,12 @@ public:
-         // for now instead of 2^26 bits of ASLR lets stick with 25 bits of randomization plus
-         // 2^24, which should put up somewhere in the middle of usespace (in the address range
-         // 0x200000000000 .. 0x5fffffffffff).
--        intptr_t randomLocation = arc4random() & ((1 << 25) - 1);
-+        intptr_t randomLocation = 0;
-+#if VM_POOL_ASLR
-+        randomLocation = arc4random() & ((1 << 25) - 1);
-         randomLocation += (1 << 24);
-         randomLocation <<= 21;
-+#endif
-         m_base = mmap(reinterpret_cast<void*>(randomLocation), m_totalHeapSize, INITIAL_PROTECTION_FLAGS, MAP_PRIVATE | MAP_ANON, VM_TAG_FOR_EXECUTABLEALLOCATOR_MEMORY, 0);
-         if (!m_base)
-             CRASH();
-@@ -387,7 +398,7 @@ public:
-         // 16MB of allocations have been freed, sweep m_freeList
-         // coalescing any neighboring fragments.
-         m_countFreedSinceLastCoalesce += size;
--        if (m_countFreedSinceLastCoalesce >= SIXTEEN_MB) {
-+        if (m_countFreedSinceLastCoalesce >= COALESCE_LIMIT) {
-             m_countFreedSinceLastCoalesce = 0;
-             coalesceFreeSpace();
-         }
-@@ -429,7 +440,7 @@ ExecutablePool::Allocation ExecutablePool::systemAlloc(size_t size)
-   SpinLockHolder lock_holder(&spinlock);
- 
-     if (!allocator)
--        allocator = new FixedVMPoolAllocator(JIT_ALLOCATOR_LARGE_ALLOC_SIZE, TWO_GB);
-+        allocator = new FixedVMPoolAllocator(JIT_ALLOCATOR_LARGE_ALLOC_SIZE, VM_POOL_SIZE);
-     ExecutablePool::Allocation alloc = {reinterpret_cast<char*>(allocator->alloc(size)), size};
-     return alloc;
- }
-diff --git a/src/3rdparty/javascriptcore/JavaScriptCore/jit/ExecutableAllocatorPosix.cpp b/src/3rdparty/javascriptcore/JavaScriptCore/jit/ExecutableAllocatorPosix.cpp
-index 2eb0c87..b04049c 100644
---- a/src/3rdparty/javascriptcore/JavaScriptCore/jit/ExecutableAllocatorPosix.cpp
-+++ b/src/3rdparty/javascriptcore/JavaScriptCore/jit/ExecutableAllocatorPosix.cpp
-@@ -27,7 +27,7 @@
- 
- #include "ExecutableAllocator.h"
- 
--#if ENABLE(ASSEMBLER) && OS(UNIX) && !OS(SYMBIAN)
-+#if ENABLE(EXECUTABLE_ALLOCATOR_DEMAND) && !OS(WINDOWS) && !OS(SYMBIAN)
- 
- #include <sys/mman.h>
- #include <unistd.h>
-@@ -35,8 +35,6 @@
- 
- namespace JSC {
- 
--#if !(OS(DARWIN) && !PLATFORM(QT) && CPU(X86_64))
--
- void ExecutableAllocator::intializePageSize()
- {
-     ExecutableAllocator::pageSize = getpagesize();
-@@ -57,29 +55,6 @@ void ExecutablePool::systemRelease(const ExecutablePool::Allocation& alloc)
-     ASSERT_UNUSED(result, !result);
- }
- 
--#endif // !(OS(DARWIN) && !PLATFORM(QT) && CPU(X86_64))
--
--#if ENABLE(ASSEMBLER_WX_EXCLUSIVE)
--void ExecutableAllocator::reprotectRegion(void* start, size_t size, ProtectionSeting setting)
--{
--    if (!pageSize)
--        intializePageSize();
--
--    // Calculate the start of the page containing this region,
--    // and account for this extra memory within size.
--    intptr_t startPtr = reinterpret_cast<intptr_t>(start);
--    intptr_t pageStartPtr = startPtr & ~(pageSize - 1);
--    void* pageStart = reinterpret_cast<void*>(pageStartPtr);
--    size += (startPtr - pageStartPtr);
--
--    // Round size up
--    size += (pageSize - 1);
--    size &= ~(pageSize - 1);
--
--    mprotect(pageStart, size, (setting == Writable) ? PROTECTION_FLAGS_RW : PROTECTION_FLAGS_RX);
--}
--#endif
--
- }
- 
--#endif // HAVE(ASSEMBLER)
-+#endif
-diff --git a/src/3rdparty/javascriptcore/JavaScriptCore/jit/ExecutableAllocatorSymbian.cpp b/src/3rdparty/javascriptcore/JavaScriptCore/jit/ExecutableAllocatorSymbian.cpp
-index e82975c..9028f50 100644
---- a/src/3rdparty/javascriptcore/JavaScriptCore/jit/ExecutableAllocatorSymbian.cpp
-+++ b/src/3rdparty/javascriptcore/JavaScriptCore/jit/ExecutableAllocatorSymbian.cpp
-@@ -22,7 +22,7 @@
- 
- #include "ExecutableAllocator.h"
- 
--#if ENABLE(ASSEMBLER) && OS(SYMBIAN)
-+#if ENABLE(EXECUTABLE_ALLOCATOR_DEMAND) && OS(SYMBIAN)
- 
- #include <e32hal.h>
- #include <e32std.h>
-diff --git a/src/3rdparty/javascriptcore/JavaScriptCore/jit/ExecutableAllocatorWin.cpp b/src/3rdparty/javascriptcore/JavaScriptCore/jit/ExecutableAllocatorWin.cpp
-index e38323c..72a1d5f 100644
---- a/src/3rdparty/javascriptcore/JavaScriptCore/jit/ExecutableAllocatorWin.cpp
-+++ b/src/3rdparty/javascriptcore/JavaScriptCore/jit/ExecutableAllocatorWin.cpp
-@@ -27,7 +27,7 @@
- 
- #include "ExecutableAllocator.h"
- 
--#if ENABLE(ASSEMBLER) && OS(WINDOWS)
-+#if ENABLE(EXECUTABLE_ALLOCATOR_DEMAND) && OS(WINDOWS)
- 
- #include "windows.h"
- 
-diff --git a/src/3rdparty/javascriptcore/JavaScriptCore/wtf/Platform.h b/src/3rdparty/javascriptcore/JavaScriptCore/wtf/Platform.h
-index 700977e..d930ed7 100644
---- a/src/3rdparty/javascriptcore/JavaScriptCore/wtf/Platform.h
-+++ b/src/3rdparty/javascriptcore/JavaScriptCore/wtf/Platform.h
-@@ -1016,6 +1016,16 @@ on MinGW. See https://bugs.webkit.org/show_bug.cgi?id=29268 */
- #define ENABLE_ASSEMBLER_WX_EXCLUSIVE 0
- #endif
- 
-+/* Pick which allocator to use; we only need an executable allocator if the assembler is compiled in.
-+   On x86-64 we use a single fixed mmap, on other platforms we mmap on demand. */
-+#if ENABLE(ASSEMBLER)
-+#if CPU(X86_64)
-+#define ENABLE_EXECUTABLE_ALLOCATOR_FIXED 1
-+#else
-+#define ENABLE_EXECUTABLE_ALLOCATOR_DEMAND 1
-+#endif
-+#endif
-+
- #if !defined(ENABLE_PAN_SCROLLING) && OS(WINDOWS)
- #define ENABLE_PAN_SCROLLING 1
- #endif
--- 
-1.7.10.4
-
diff --git a/debian/patches/fix_use_after_free_qlocale_unix.patch b/debian/patches/fix_use_after_free_qlocale_unix.patch
deleted file mode 100644
index 32e4654..0000000
--- a/debian/patches/fix_use_after_free_qlocale_unix.patch
+++ /dev/null
@@ -1,24 +0,0 @@
-Description: fix use after free in qlocale_unix.cpp
- This patch avoids the use of the returned variable when the destructor
- gets called.
- .
- Lisandro: this patch will certainly work within all architectures
- that Debian supports, although I don't know if it will work in QNX.
-Author: Julien Cristau <julien.cristau@logilab.fr>
-Bug-Debian: http://bugs.debian.org/681476
-Origin: http://bugs.debian.org/681476
-Forwarded: https://bugreports.qt-project.org/browse/QTBUG-26602
-Reviewed-By: Lisandro Damián Nicanor Pérez Meyer <lisandro@debian.org>
-Last-Update: 2012-07-20
-
---- a/src/corelib/tools/qlocale_unix.cpp
-+++ b/src/corelib/tools/qlocale_unix.cpp
-@@ -52,7 +52,7 @@
- 
- QT_BEGIN_NAMESPACE
- 
--static const char *getSystemLocale()
-+static QByteArray getSystemLocale()
- {
- #if defined(Q_OS_QNX)
-     static char buff[257];
diff --git a/debian/patches/make_rules_for_redirect_stricter.patch b/debian/patches/make_rules_for_redirect_stricter.patch
deleted file mode 100644
index 3622927..0000000
--- a/debian/patches/make_rules_for_redirect_stricter.patch
+++ /dev/null
@@ -1,32 +0,0 @@
-From 8ca687050b2c9789724df2cf9955d7ad7dd2c060 Mon Sep 17 00:00:00 2001
-From: Richard Moore <rich@kde.org>
-Date: Mon, 19 Nov 2012 20:48:39 +0000
-Subject: [PATCH] Make the rules for redirects a bit stricter.
-
-Change-Id: I7a3cec664aa028202de3d3bda9f499e4deb2998d
----
- src/declarative/qml/qdeclarativexmlhttprequest.cpp |    8 +++++---
- 1 file changed, 5 insertions(+), 3 deletions(-)
-
-diff --git a/src/declarative/qml/qdeclarativexmlhttprequest.cpp b/src/declarative/qml/qdeclarativexmlhttprequest.cpp
-index 5378a15..3de89a5 100644
---- a/src/declarative/qml/qdeclarativexmlhttprequest.cpp
-+++ b/src/declarative/qml/qdeclarativexmlhttprequest.cpp
-@@ -1272,9 +1272,11 @@ void QDeclarativeXMLHttpRequest::finished()
-         QVariant redirect = m_network->attribute(QNetworkRequest::RedirectionTargetAttribute);
-         if (redirect.isValid()) {
-             QUrl url = m_network->url().resolved(redirect.toUrl());
--            destroyNetwork();
--            requestFromUrl(url);
--            return;
-+            if (url.scheme().toLower() != QLatin1String("file")) {
-+                destroyNetwork();
-+                requestFromUrl(url);
-+                return;
-+            }
-         }
-     }
- 
--- 
-1.7.10.4
-
diff --git a/debian/patches/qt_atomic_sparc64.patch b/debian/patches/qt_atomic_sparc64.patch
deleted file mode 100644
index c49acb9..0000000
--- a/debian/patches/qt_atomic_sparc64.patch
+++ /dev/null
@@ -1,39 +0,0 @@
-Author: Aurelien Jarno <aurel32@debian.org>
-Description: Fix atomic support on sparc64
-Bug: https://bugreports.qt-project.org/browse/QTBUG-22479
-Bug-Debian: http://bugs.debian.org/647265
-
----
- src/corelib/arch/qatomic_sparc.h |   18 ++++++++++--------
- 1 file changed, 10 insertions(+), 8 deletions(-)
-
---- a/src/corelib/arch/qatomic_sparc.h
-+++ b/src/corelib/arch/qatomic_sparc.h
-@@ -127,17 +127,19 @@ extern "C" {
-     Q_CORE_EXPORT int q_atomic_fetch_and_add_acquire_int(volatile int *ptr, int value);
-     Q_CORE_EXPORT int q_atomic_fetch_and_add_release_int(volatile int *ptr, int value);
- 
--    Q_CORE_EXPORT int q_atomic_test_and_set_ptr(volatile void *ptr, void *expected, void *newval);
-+    Q_CORE_EXPORT int q_atomic_test_and_set_ptr(volatile void *ptr,
-+                                                const void *expected,
-+                                                const void *newval);
-     Q_CORE_EXPORT int q_atomic_test_and_set_acquire_ptr(volatile void *ptr,
--                                                        void *expected,
--                                                        void *newval);
-+                                                        const void *expected,
-+                                                        const void *newval);
-     Q_CORE_EXPORT int q_atomic_test_and_set_release_ptr(volatile void *ptr,
--                                                        void *expected,
--                                                        void *newval);
-+                                                        const void *expected,
-+                                                        const void *newval);
- 
--    Q_CORE_EXPORT void *q_atomic_set_ptr(volatile void *ptr, void *newval);
--    Q_CORE_EXPORT void *q_atomic_fetch_and_store_acquire_ptr(volatile void *ptr, void *newval);
--    Q_CORE_EXPORT void *q_atomic_fetch_and_store_release_ptr(volatile void *ptr, void *newval);
-+    Q_CORE_EXPORT void *q_atomic_set_ptr(volatile void *ptr, const void *newval);
-+    Q_CORE_EXPORT void *q_atomic_fetch_and_store_acquire_ptr(volatile void *ptr, const void *newval);
-+    Q_CORE_EXPORT void *q_atomic_fetch_and_store_release_ptr(volatile void *ptr, const void *newval);
- 
-     Q_CORE_EXPORT void *q_atomic_fetch_and_add_ptr(volatile void *ptr, int value);
-     Q_CORE_EXPORT void *q_atomic_fetch_and_add_acquire_ptr(volatile void *ptr, int value);