[SCM] qt5webkit packaging branch, experimental, updated. debian/5.3.2+dfsg-3-4-geb88450
Dmitry Shachnev
mitya57 at moszumanska.debian.org
Fri Dec 19 12:58:28 UTC 2014
Gitweb-URL: http://git.debian.org/?p=pkg-kde/qt/qt5webkit.git;a=commitdiff;h=eb88450
The following commit has been merged in the experimental branch:
commit eb884508d5749aedbb1c5990b02cde93920e3578
Author: Dmitry Shachnev <mitya57 at gmail.com>
Date: Fri Dec 19 15:58:14 2014 +0300
Drop four upstream patches.
---
debian/changelog | 5 +
debian/patches/blacklist_libkpartsplugin.patch | 30 -----
.../do_not_use_jit_on_big_endian_machines.patch | 41 ------
.../patches/fix_cloop_on_big_endian_machines.patch | 142 ---------------------
..._request_is_aborted_while_forwarding_data.patch | 38 ------
debian/patches/reduce_memory_usage.patch | 2 +-
debian/patches/series | 6 -
7 files changed, 6 insertions(+), 258 deletions(-)
diff --git a/debian/changelog b/debian/changelog
index b75fe0a..3b4e200 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -5,6 +5,11 @@ qtwebkit-opensource-src (5.4.0+dfsg-1) UNRELEASED; urgency=medium
* Bump Qt build-dependencies to 5.4.0.
* Add qtbase5-doc-html to Build-Depends-Indep to make sure docs
are properly linked with qtbase.
+ * Drop these patches, applied upstream:
+ - do_not_use_jit_on_big_endian_machines.patch
+ - fix_cloop_on_big_endian_machines.patch
+ - fix_crash_when_a_network_request_is_aborted_while_forwarding_data.patch
+ - blacklist_libkpartsplugin.patch
-- Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org> Fri, 19 Dec 2014 14:52:47 +0300
diff --git a/debian/patches/blacklist_libkpartsplugin.patch b/debian/patches/blacklist_libkpartsplugin.patch
deleted file mode 100644
index 1508042..0000000
--- a/debian/patches/blacklist_libkpartsplugin.patch
+++ /dev/null
@@ -1,30 +0,0 @@
-From a322d1b1ba39bb83a2ffd41c4dc0c00de5bd77e0 Mon Sep 17 00:00:00 2001
-From: Sune Vuorela <sune at vuorela.dk>
-Date: Mon, 13 Oct 2014 20:39:26 +0200
-Subject: [PATCH] Blacklist libkpartsplugin
-
-KPartsPlugin is built using qt4, and loading that into a Qt5 QtWebkit
-makes stuff crash.
-
-Change-Id: I47d01dfe3b215192b012911013b352ea5b5b1530
----
- Source/WebCore/plugins/qt/PluginPackageQt.cpp | 3 ++-
- 1 file changed, 2 insertions(+), 1 deletion(-)
-
-diff --git a/Source/WebCore/plugins/qt/PluginPackageQt.cpp b/Source/WebCore/plugins/qt/PluginPackageQt.cpp
-index 679480b..a674ad3 100644
---- a/Source/WebCore/plugins/qt/PluginPackageQt.cpp
-+++ b/Source/WebCore/plugins/qt/PluginPackageQt.cpp
-@@ -146,7 +146,8 @@ bool PluginPackage::isPluginBlacklisted()
- {
- // TODO: enumerate all plugins that are incompatible with Qt5.
- const QLatin1String pluginBlacklist[] = {
-- QLatin1String("skypebuttons")
-+ QLatin1String("skypebuttons"),
-+ QLatin1String("libkpartsplugin")
- };
-
- QString baseName = QFileInfo(static_cast<QString>(m_path)).baseName();
---
-2.1.1
-
diff --git a/debian/patches/do_not_use_jit_on_big_endian_machines.patch b/debian/patches/do_not_use_jit_on_big_endian_machines.patch
deleted file mode 100644
index b50fdd7..0000000
--- a/debian/patches/do_not_use_jit_on_big_endian_machines.patch
+++ /dev/null
@@ -1,41 +0,0 @@
-From 0b6f959022700ecf9374bdbb13772242d3f7e617 Mon Sep 17 00:00:00 2001
-From: Allan Sandfeld Jensen <allan.jensen at digia.com>
-Date: Fri, 10 Oct 2014 14:50:18 +0200
-Subject: [PATCH] Do not use JIT on big endian architectures
-
-All the JIT implementations targets the little-endian versions of ARM,
-MIPS and SH4 respectively. So in case anyone builds on those platforms
-we should not enable JIT.
-
-Task-number: QTBUG-41896
-Change-Id: I5be167511e2c3eac6c63e603b82da84fb6b29eaa
-Reviewed-by: Julien Brianceau <jbriance at cisco.com>
-Reviewed-by: Michael Bruning <michael.bruning at digia.com>
----
- Source/WTF/wtf/Platform.h | 8 ++++++++
- 1 file changed, 8 insertions(+)
-
---- a/Source/WTF/wtf/Platform.h
-+++ b/Source/WTF/wtf/Platform.h
-@@ -128,6 +128,9 @@
- /* CPU(SH4) - SuperH SH-4 */
- #if defined(__SH4__)
- #define WTF_CPU_SH4 1
-+#ifdef __BIG_ENDIAN__
-+#define WTF_CPU_BIG_ENDIAN 1
-+#endif
- #endif
-
- /* CPU(SPARC32) - SPARC 32-bit */
-@@ -759,6 +762,11 @@
- #define ENABLE_JIT 0
- #endif
-
-+/* All the current JIT implementations target little-endian */
-+#if CPU(BIG_ENDIAN)
-+#define ENABLE_JIT 0
-+#endif
-+
- /* Disable JIT on x32 */
- #if CPU(X32)
- #define ENABLE_JIT 0
diff --git a/debian/patches/fix_cloop_on_big_endian_machines.patch b/debian/patches/fix_cloop_on_big_endian_machines.patch
deleted file mode 100644
index 45006d7..0000000
--- a/debian/patches/fix_cloop_on_big_endian_machines.patch
+++ /dev/null
@@ -1,142 +0,0 @@
-From 0c58a486f551e7e7b63d438e3d32f21f876327d1 Mon Sep 17 00:00:00 2001
-From: Allan Sandfeld Jensen <allan.jensen at digia.com>
-Date: Thu, 9 Oct 2014 17:40:37 +0200
-Subject: [PATCH] Fix CLoop on big-endian machines
-
-Callee and ScopeChain are JSObject pointers and saved in the 64bit
-structure for JS registers. On a 32bit big-endian machine the actual
-pointer is offset by the PayloadOffset of 4 bytes, but on little-endian
-and 64bit architectures there is no offset.
-
-This patch fixes four places the payloadOffset was not correctly added
-on 32bit big-endian, and six places it was added on 64big big-endian
-when it shouldn't.
-
-Task-number: QTBUG-41896
-Change-Id: I46b474bee9822b8040d1b7b2e8f31ce42e0adefe
-Reviewed-by: Jocelyn Turcotte <jocelyn.turcotte at digia.com>
----
- .../JavaScriptCore/llint/LowLevelInterpreter.asm | 25 +++++++++++++---------
- .../llint/LowLevelInterpreter32_64.asm | 2 +-
- 2 files changed, 16 insertions(+), 11 deletions(-)
-
-diff --git a/Source/JavaScriptCore/llint/LowLevelInterpreter.asm b/Source/JavaScriptCore/llint/LowLevelInterpreter.asm
-index 2b5a23c..c4d86ee 100644
---- a/Source/JavaScriptCore/llint/LowLevelInterpreter.asm
-+++ b/Source/JavaScriptCore/llint/LowLevelInterpreter.asm
-@@ -87,6 +87,12 @@ else
- const PayloadOffset = 0
- end
-
-+if JSVALUE64
-+ const JSCellPayloadOffset = 0
-+else
-+ const JSCellPayloadOffset = PayloadOffset
-+end
-+
- # Constant for reasoning about butterflies.
- const IsArray = 1
- const IndexingShapeMask = 30
-@@ -161,7 +167,6 @@ else
- const VectorSizeOffset = 8
- end
-
--
- # Some common utilities.
- macro crash()
- if C_LOOP
-@@ -267,13 +272,13 @@ macro assertNotConstant(index)
- end
-
- macro functionForCallCodeBlockGetter(targetRegister)
-- loadp Callee[cfr], targetRegister
-+ loadp Callee + JSCellPayloadOffset[cfr], targetRegister
- loadp JSFunction::m_executable[targetRegister], targetRegister
- loadp FunctionExecutable::m_codeBlockForCall[targetRegister], targetRegister
- end
-
- macro functionForConstructCodeBlockGetter(targetRegister)
-- loadp Callee[cfr], targetRegister
-+ loadp Callee + JSCellPayloadOffset[cfr], targetRegister
- loadp JSFunction::m_executable[targetRegister], targetRegister
- loadp FunctionExecutable::m_codeBlockForConstruct[targetRegister], targetRegister
- end
-@@ -671,7 +676,7 @@ _llint_op_resolve_global_var:
- macro resolveScopedVarBody(resolveOperations)
- # First ResolveOperation is to skip scope chain nodes
- getScope(macro(dest)
-- loadp ScopeChain + PayloadOffset[cfr], dest
-+ loadp ScopeChain + JSCellPayloadOffset[cfr], dest
- end,
- ResolveOperation::m_scopesToSkip[resolveOperations], t1, t2)
- loadp JSVariableObject::m_registers[t1], t1 # t1 now contains the activation registers
-@@ -696,7 +701,7 @@ _llint_op_resolve_scoped_var_on_top_scope:
- loadisFromInstruction(1, t3)
-
- # We know we want the top scope chain entry
-- loadp ScopeChain + PayloadOffset[cfr], t1
-+ loadp ScopeChain + JSCellPayloadOffset[cfr], t1
- loadp JSVariableObject::m_registers[t1], t1 # t1 now contains the activation registers
-
- # Second ResolveOperation tells us what offset to use
-@@ -718,7 +723,7 @@ _llint_op_resolve_scoped_var_with_top_scope_check:
- loadp JSScope::m_next[t1], dest
- jmp .done
- .scopeChainNotCreated:
-- loadp ScopeChain + PayloadOffset[cfr], dest
-+ loadp ScopeChain + JSCellPayloadOffset[cfr], dest
- .done:
- end,
- # Second ResolveOperation tells us how many more nodes to skip
-@@ -773,7 +778,7 @@ _llint_op_resolve_base_to_scope:
- getResolveOperation(4, t0)
- # First ResolveOperation is to skip scope chain nodes
- getScope(macro(dest)
-- loadp ScopeChain + PayloadOffset[cfr], dest
-+ loadp ScopeChain + JSCellPayloadOffset[cfr], dest
- end,
- ResolveOperation::m_scopesToSkip[t0], t1, t2)
- loadisFromInstruction(1, t3)
-@@ -798,7 +803,7 @@ _llint_op_resolve_base_to_scope_with_top_scope_check:
- loadp JSScope::m_next[t1], dest
- jmp .done
- .scopeChainNotCreated:
-- loadp ScopeChain + PayloadOffset[cfr], dest
-+ loadp ScopeChain + JSCellPayloadOffset[cfr], dest
- .done:
- end,
- # Second ResolveOperation tells us how many more nodes to skip
-@@ -823,7 +828,7 @@ macro interpretResolveWithBase(opcodeLength, slowPath)
- getResolveOperation(4, t0)
- btpz t0, .slowPath
-
-- loadp ScopeChain[cfr], t3
-+ loadp ScopeChain + JSCellPayloadOffset[cfr], t3
- # Get the base
- loadis ResolveOperation::m_operation[t0], t2
-
-@@ -845,7 +850,7 @@ macro interpretResolveWithBase(opcodeLength, slowPath)
- loadp JSScope::m_next[t1], dest
- jmp .done
- .scopeChainNotCreated:
-- loadp ScopeChain + PayloadOffset[cfr], dest
-+ loadp ScopeChain + JSCellPayloadOffset[cfr], dest
- .done:
- end,
- sizeof ResolveOperation + ResolveOperation::m_scopesToSkip[t0], t1, t2)
-diff --git a/Source/JavaScriptCore/llint/LowLevelInterpreter32_64.asm b/Source/JavaScriptCore/llint/LowLevelInterpreter32_64.asm
-index 89e40c7..87aa09e 100644
---- a/Source/JavaScriptCore/llint/LowLevelInterpreter32_64.asm
-+++ b/Source/JavaScriptCore/llint/LowLevelInterpreter32_64.asm
-@@ -1692,7 +1692,7 @@ _llint_op_next_pname:
- loadi 20[PC], t2
- loadi PayloadOffset[cfr, t2, 8], t2
- loadp JSPropertyNameIterator::m_jsStrings[t2], t3
-- loadi [t3, t0, 8], t3
-+ loadi PayloadOffset[t3, t0, 8], t3
- addi 1, t0
- storei t0, PayloadOffset[cfr, t1, 8]
- loadi 4[PC], t1
---
-2.1.1
-
diff --git a/debian/patches/fix_crash_when_a_network_request_is_aborted_while_forwarding_data.patch b/debian/patches/fix_crash_when_a_network_request_is_aborted_while_forwarding_data.patch
deleted file mode 100644
index 19ac009..0000000
--- a/debian/patches/fix_crash_when_a_network_request_is_aborted_while_forwarding_data.patch
+++ /dev/null
@@ -1,38 +0,0 @@
-From 13ebee35e169a8b1210851ec494951815c70620c Mon Sep 17 00:00:00 2001
-From: Allan Sandfeld Jensen <allan.jensen at digia.com>
-Date: Mon, 13 Oct 2014 15:32:14 +0200
-Subject: [PATCH] Fix crash when a network-request is aborted while forwarding
- data
-
-Since we forward data block-wise a network request may be aborted while
-we are still forwarding received data. In that case we should stop the
-forwarding.
-
-Task-number: QTBUG-41877
-Change-Id: Ia34bbdcacdc4eb70a2e814d3b4bada9844abbb83
-Reviewed-by: Michael Bruning <michael.bruning at digia.com>
----
- Source/WebCore/platform/network/qt/QNetworkReplyHandler.cpp | 5 ++++-
- 1 file changed, 4 insertions(+), 1 deletion(-)
-
-diff --git a/Source/WebCore/platform/network/qt/QNetworkReplyHandler.cpp b/Source/WebCore/platform/network/qt/QNetworkReplyHandler.cpp
-index 5990a40..fc69546 100644
---- a/Source/WebCore/platform/network/qt/QNetworkReplyHandler.cpp
-+++ b/Source/WebCore/platform/network/qt/QNetworkReplyHandler.cpp
-@@ -687,9 +687,12 @@ void QNetworkReplyHandler::forwardData()
- // -1 means we do not provide any data about transfer size to inspector so it would use
- // Content-Length headers or content size to show transfer size.
- client->didReceiveData(m_resourceHandle, buffer, readSize, -1);
-+ // Check if the request has been aborted or this reply-handler was otherwise released.
-+ if (wasAborted() || !m_replyWrapper)
-+ break;
- }
- delete[] buffer;
-- if (bytesAvailable > 0)
-+ if (bytesAvailable > 0 && m_replyWrapper)
- m_queue.requeue(&QNetworkReplyHandler::forwardData);
- }
-
---
-2.1.1
-
diff --git a/debian/patches/reduce_memory_usage.patch b/debian/patches/reduce_memory_usage.patch
index fe1ebb6..20ce5a4 100644
--- a/debian/patches/reduce_memory_usage.patch
+++ b/debian/patches/reduce_memory_usage.patch
@@ -14,7 +14,7 @@ Last-Update: 2014-03-05
--- a/Tools/qmake/mkspecs/features/unix/default_post.prf
+++ b/Tools/qmake/mkspecs/features/unix/default_post.prf
-@@ -68,3 +68,6 @@ CONFIG(debug, debug|release)|force_debug
+@@ -67,3 +67,6 @@
}
load(default_post)
diff --git a/debian/patches/series b/debian/patches/series
index 86c8cd0..ab2532d 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,9 +1,3 @@
-# Upstream patches
-do_not_use_jit_on_big_endian_machines.patch
-fix_cloop_on_big_endian_machines.patch
-fix_crash_when_a_network_request_is_aborted_while_forwarding_data.patch
-blacklist_libkpartsplugin.patch
-
# debian patches
reduce_memory_usage.patch
05_sparc_unaligned_access.diff
--
qt5webkit packaging
More information about the pkg-kde-commits
mailing list