[qtwebkit] 2.3.1-1
Rex Dieter
rdieter at fedoraproject.org
Fri Apr 19 14:51:05 UTC 2013
commit 4acbe02d36c733f32adf2d25abaa6e92f11aec34
Author: Rex Dieter <rdieter at math.unl.edu>
Date: Fri Apr 19 09:51:04 2013 -0500
2.3.1-1
- qtwebkit-2.3.1
- -devel: drop explicit Requires: qt4-devel (let pkgconfig deps do it)
.gitignore | 2 +-
qtwebkit-2.3-debuginfo.patch | 66 +---------------------------
qtwebkit-23-LLInt-C-Loop-backend-ppc.patch | 37 ++++------------
qtwebkit-ppc.patch | 12 -----
qtwebkit.spec | 10 +++-
sources | 2 +-
6 files changed, 19 insertions(+), 110 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 5a272a2..6d491cd 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,3 +1,3 @@
/qtwebkit-developers-qtwebkit-qtwebkit-2.1.1.tar.xz
/qtwebkit-2.2.2-source.tar.xz
-/qtwebkit-2.3.0.tar.xz
+/qtwebkit-2.3.1.tar.xz
diff --git a/qtwebkit-2.3-debuginfo.patch b/qtwebkit-2.3-debuginfo.patch
index 8014056..dff6233 100644
--- a/qtwebkit-2.3-debuginfo.patch
+++ b/qtwebkit-2.3-debuginfo.patch
@@ -1,19 +1,3 @@
-diff -up webkit-qtwebkit-23/Source/JavaScriptCore/JavaScriptCore.pri.debuginfo webkit-qtwebkit-23/Source/JavaScriptCore/JavaScriptCore.pri
---- webkit-qtwebkit-23/Source/JavaScriptCore/JavaScriptCore.pri.debuginfo 2013-02-15 09:46:12.000000000 -0600
-+++ webkit-qtwebkit-23/Source/JavaScriptCore/JavaScriptCore.pri 2013-02-21 22:28:57.786764106 -0600
-@@ -7,6 +7,12 @@
-
- SOURCE_DIR = $${ROOT_WEBKIT_DIR}/Source/JavaScriptCore
-
-+#equals(QT_ARCH, s390)|equals(QT_ARCH, arm)|equals(QT_ARCH, mips)|equals(QT_ARCH, i386)|equals(QT_ARCH, i686)|equals(QT_ARCH, x86_64) {
-+# message("JavaScriptCore workaround for QtWebkit: do not build with -g, but with -g1")
-+# QMAKE_CXXFLAGS_RELEASE -= -g
-+# QMAKE_CXXFLAGS_RELEASE += -g1
-+#}
-+
- JAVASCRIPTCORE_GENERATED_SOURCES_DIR = $${ROOT_BUILD_DIR}/Source/JavaScriptCore/$${GENERATED_SOURCES_DESTDIR}
-
- INCLUDEPATH += \
diff -up webkit-qtwebkit-23/Source/WebCore/WebCore.pri.debuginfo webkit-qtwebkit-23/Source/WebCore/WebCore.pri
--- webkit-qtwebkit-23/Source/WebCore/WebCore.pri.debuginfo 2013-02-21 22:28:57.791764043 -0600
+++ webkit-qtwebkit-23/Source/WebCore/WebCore.pri 2013-02-21 22:31:02.994198797 -0600
@@ -21,7 +5,7 @@ diff -up webkit-qtwebkit-23/Source/WebCore/WebCore.pri.debuginfo webkit-qtwebkit
SOURCE_DIR = $${ROOT_WEBKIT_DIR}/Source/WebCore
-+equals(QT_ARCH, s390)|equals(QT_ARCH, arm)|equals(QT_ARCH, mips)|equals(QT_ARCH, i386)|equals(QT_ARCH, i686)|equals(QT_ARCH, x86_64) {
++equals(QT_ARCH, s390)|equals(QT_ARCH, arm)|equals(QT_ARCH, mips)|equals(QT_ARCH, i386)|equals(QT_ARCH, i686)|equals(QT_ARCH, x86_64)|equals(QT_ARCH, powerpc64)|equals(QT_ARCH, powerpc) {
+ message("WebCore workaround for QtWebkit: do not build with -g, but with -g1")
+ QMAKE_CXXFLAGS_RELEASE -= -g
+ QMAKE_CXXFLAGS_RELEASE += -g1
@@ -30,51 +14,3 @@ diff -up webkit-qtwebkit-23/Source/WebCore/WebCore.pri.debuginfo webkit-qtwebkit
QT *= network
haveQt(5): QT *= core-private gui-private
-diff -up webkit-qtwebkit-23/Source/WebKit2/WebKit2.pri.debuginfo webkit-qtwebkit-23/Source/WebKit2/WebKit2.pri
---- webkit-qtwebkit-23/Source/WebKit2/WebKit2.pri.debuginfo 2013-02-15 09:46:12.000000000 -0600
-+++ webkit-qtwebkit-23/Source/WebKit2/WebKit2.pri 2013-02-21 22:28:57.786764106 -0600
-@@ -9,6 +9,12 @@ SOURCE_DIR = $${ROOT_WEBKIT_DIR}/Source/
-
- WEBKIT2_GENERATED_SOURCES_DIR = $${ROOT_BUILD_DIR}/Source/WebKit2/$${GENERATED_SOURCES_DESTDIR}
-
-+#equals(QT_ARCH, s390)|equals(QT_ARCH, arm)|equals(QT_ARCH, mips)|equals(QT_ARCH, i386)|equals(QT_ARCH, i686)|equals(QT_ARCH, x86_64) {
-+# message("WebKit2 workaround for QtWebkit: do not build with -g, but with -g1")
-+# QMAKE_CXXFLAGS_RELEASE -= -g
-+# QMAKE_CXXFLAGS_RELEASE += -g1
-+#}
-+
- INCLUDEPATH += \
- $$SOURCE_DIR \
- $$SOURCE_DIR/Platform \
-diff -up webkit-qtwebkit-23/Source/WebKit/WebKit1.pri.debuginfo webkit-qtwebkit-23/Source/WebKit/WebKit1.pri
---- webkit-qtwebkit-23/Source/WebKit/WebKit1.pri.debuginfo 2013-02-15 09:46:12.000000000 -0600
-+++ webkit-qtwebkit-23/Source/WebKit/WebKit1.pri 2013-02-21 22:28:57.787764093 -0600
-@@ -7,6 +7,12 @@
-
- SOURCE_DIR = $${ROOT_WEBKIT_DIR}/Source/WebKit
-
-+#equals(QT_ARCH, s390)|equals(QT_ARCH, arm)|equals(QT_ARCH, mips)|equals(QT_ARCH, i386)|equals(QT_ARCH, i686)|equals(QT_ARCH, x86_64) {
-+# message("WebKit workaround for QtWebkit: do not build with -g, but with -g1")
-+# QMAKE_CXXFLAGS_RELEASE -= -g
-+# QMAKE_CXXFLAGS_RELEASE += -g1
-+#}
-+
- INCLUDEPATH += \
- $$SOURCE_DIR/qt/Api \
- $$SOURCE_DIR/qt/WebCoreSupport \
-diff -up webkit-qtwebkit-23/Source/WTF/WTF.pri.debuginfo webkit-qtwebkit-23/Source/WTF/WTF.pri
---- webkit-qtwebkit-23/Source/WTF/WTF.pri.debuginfo 2013-02-15 09:46:12.000000000 -0600
-+++ webkit-qtwebkit-23/Source/WTF/WTF.pri 2013-02-21 22:28:57.787764093 -0600
-@@ -8,6 +8,12 @@
- # All external modules should include WTF headers by prefixing with "wtf" (#include <wtf/some/thing.h>).
- INCLUDEPATH += $$PWD
-
-+#equals(QT_ARCH, s390)|equals(QT_ARCH, arm)|equals(QT_ARCH, mips)|equals(QT_ARCH, i386)|equals(QT_ARCH, i686)|equals(QT_ARCH, x86_64) {
-+# message("WTF workaround for QtWebkit: do not build with -g, but with -g1")
-+# QMAKE_CXXFLAGS_RELEASE -= -g
-+# QMAKE_CXXFLAGS_RELEASE += -g1
-+#}
-+
- haveQt(5) {
- mac {
- # Mac OS does ship libicu but not the associated header files.
diff --git a/qtwebkit-23-LLInt-C-Loop-backend-ppc.patch b/qtwebkit-23-LLInt-C-Loop-backend-ppc.patch
index 644af5a..e530a97 100644
--- a/qtwebkit-23-LLInt-C-Loop-backend-ppc.patch
+++ b/qtwebkit-23-LLInt-C-Loop-backend-ppc.patch
@@ -1,6 +1,6 @@
-diff -up webkit-qtwebkit-23/Source/JavaScriptCore/llint/LowLevelInterpreter32_64.asm.me webkit-qtwebkit-23/Source/JavaScriptCore/llint/LowLevelInterpreter32_64.asm
---- webkit-qtwebkit-23/Source/JavaScriptCore/llint/LowLevelInterpreter32_64.asm.me 2013-03-05 11:04:22.310433797 -0500
-+++ webkit-qtwebkit-23/Source/JavaScriptCore/llint/LowLevelInterpreter32_64.asm 2013-03-05 11:06:38.090812599 -0500
+diff -up webkit-qtwebkit-23/Source/JavaScriptCore/llint/LowLevelInterpreter32_64.asm.Double2Ints webkit-qtwebkit-23/Source/JavaScriptCore/llint/LowLevelInterpreter32_64.asm
+--- webkit-qtwebkit-23/Source/JavaScriptCore/llint/LowLevelInterpreter32_64.asm.Double2Ints 2013-04-16 04:49:21.000000000 -0500
++++ webkit-qtwebkit-23/Source/JavaScriptCore/llint/LowLevelInterpreter32_64.asm 2013-04-19 09:38:20.133519114 -0500
@@ -1708,7 +1708,7 @@ _llint_op_next_pname:
loadi 20[PC], t2
loadi PayloadOffset[cfr, t2, 8], t2
@@ -10,9 +10,9 @@ diff -up webkit-qtwebkit-23/Source/JavaScriptCore/llint/LowLevelInterpreter32_64
addi 1, t0
storei t0, PayloadOffset[cfr, t1, 8]
loadi 4[PC], t1
-diff -up webkit-qtwebkit-23/Source/JavaScriptCore/llint/LowLevelInterpreter.asm.me webkit-qtwebkit-23/Source/JavaScriptCore/llint/LowLevelInterpreter.asm
---- webkit-qtwebkit-23/Source/JavaScriptCore/llint/LowLevelInterpreter.asm.me 2013-03-05 11:06:49.860844108 -0500
-+++ webkit-qtwebkit-23/Source/JavaScriptCore/llint/LowLevelInterpreter.asm 2013-03-05 11:08:11.801073003 -0500
+diff -up webkit-qtwebkit-23/Source/JavaScriptCore/llint/LowLevelInterpreter.asm.Double2Ints webkit-qtwebkit-23/Source/JavaScriptCore/llint/LowLevelInterpreter.asm
+--- webkit-qtwebkit-23/Source/JavaScriptCore/llint/LowLevelInterpreter.asm.Double2Ints 2013-04-16 04:49:21.000000000 -0500
++++ webkit-qtwebkit-23/Source/JavaScriptCore/llint/LowLevelInterpreter.asm 2013-04-19 09:38:20.133519114 -0500
@@ -267,13 +267,13 @@ macro assertNotConstant(index)
end
@@ -38,9 +38,9 @@ diff -up webkit-qtwebkit-23/Source/JavaScriptCore/llint/LowLevelInterpreter.asm.
# Get the base
loadis ResolveOperation::m_operation[t0], t2
-diff -up webkit-qtwebkit-23/Source/JavaScriptCore/llint/LowLevelInterpreter.cpp.me webkit-qtwebkit-23/Source/JavaScriptCore/llint/LowLevelInterpreter.cpp
---- webkit-qtwebkit-23/Source/JavaScriptCore/llint/LowLevelInterpreter.cpp.me 2013-03-05 09:52:14.957967552 -0500
-+++ webkit-qtwebkit-23/Source/JavaScriptCore/llint/LowLevelInterpreter.cpp 2013-03-05 11:09:32.411298487 -0500
+diff -up webkit-qtwebkit-23/Source/JavaScriptCore/llint/LowLevelInterpreter.cpp.Double2Ints webkit-qtwebkit-23/Source/JavaScriptCore/llint/LowLevelInterpreter.cpp
+--- webkit-qtwebkit-23/Source/JavaScriptCore/llint/LowLevelInterpreter.cpp.Double2Ints 2013-04-16 04:49:21.000000000 -0500
++++ webkit-qtwebkit-23/Source/JavaScriptCore/llint/LowLevelInterpreter.cpp 2013-04-19 09:38:20.134519102 -0500
@@ -33,6 +33,7 @@
#if ENABLE(LLINT_C_LOOP)
@@ -49,22 +49,3 @@ diff -up webkit-qtwebkit-23/Source/JavaScriptCore/llint/LowLevelInterpreter.cpp.
#include "LLIntCLoop.h"
#include "LLIntSlowPaths.h"
#include "VMInspector.h"
-@@ -116,6 +117,18 @@ static double Ints2Double(uint32_t lo, u
- u.ival64 = (static_cast<uint64_t>(hi) << 32) | lo;
- return u.dval;
- }
-+
-+static void Double2Ints(double input, intptr_t& lo, intptr_t& hi)
-+{
-+ union {
-+ double dval;
-+ uint64_t ival64;
-+ } u;
-+ u.dval = input;
-+ hi = static_cast<intptr_t>(u.ival64 >> 32);
-+ lo = static_cast<intptr_t>(u.ival64);
-+}
-+
- #endif // USE(JSVALUE32_64)
-
- } // namespace LLint
diff --git a/qtwebkit-ppc.patch b/qtwebkit-ppc.patch
index 6eb0a5f..3486c24 100644
--- a/qtwebkit-ppc.patch
+++ b/qtwebkit-ppc.patch
@@ -24,18 +24,6 @@ diff -up webkit-qtwebkit-23/Source/WTF/wtf/PageAllocationAligned.cpp.me webkit-q
// Resererve with suffcient additional VM to correctly align.
size_t reservationSize = size + alignmentDelta;
-diff -up webkit-qtwebkit-23/Source/WebCore/WebCore.pri.me webkit-qtwebkit-23/Source/WebCore/WebCore.pri
---- webkit-qtwebkit-23/Source/WebCore/WebCore.pri.me 2013-02-27 16:28:34.011342949 +0100
-+++ webkit-qtwebkit-23/Source/WebCore/WebCore.pri 2013-02-27 16:31:35.961855804 +0100
-@@ -7,7 +7,7 @@
-
- SOURCE_DIR = $${ROOT_WEBKIT_DIR}/Source/WebCore
-
--equals(QT_ARCH, s390)|equals(QT_ARCH, arm)|equals(QT_ARCH, mips)|equals(QT_ARCH, i386)|equals(QT_ARCH, i686)|equals(QT_ARCH, x86_64) {
-+equals(QT_ARCH, s390)|equals(QT_ARCH, arm)|equals(QT_ARCH, mips)|equals(QT_ARCH, i386)|equals(QT_ARCH, i686)|equals(QT_ARCH, x86_64)|equals(QT_ARCH, powerpc64)|equals(QT_ARCH, powerpc) {
- message("WebCore workaround for QtWebkit: do not build with -g, but with -g1")
- QMAKE_CXXFLAGS_RELEASE -= -g
- QMAKE_CXXFLAGS_RELEASE += -g1
--- webkit-qtwebkit-23/Source/WTF/wtf/Platform.h.system-malloc 2013-02-15 16:46:12.000000000 +0100
+++ webkit-qtwebkit-23/Source/WTF/wtf/Platform.h 2013-02-27 14:50:28.044688152 +0100
@@ -1011,7 +1011,7 @@
diff --git a/qtwebkit.spec b/qtwebkit.spec
index cd3116b..d8b719f 100644
--- a/qtwebkit.spec
+++ b/qtwebkit.spec
@@ -2,8 +2,8 @@
Name: qtwebkit
Summary: Qt WebKit bindings
-Version: 2.3.0
-Release: 2%{?dist}
+Version: 2.3.1
+Release: 1%{?dist}
License: LGPLv2 with exceptions or GPLv3 with exceptions
URL: http://trac.webkit.org/wiki/QtWebKit
@@ -39,6 +39,7 @@ Patch4: qtwebkit-2.3-save_memory.patch
Patch10: qtwebkit-ppc.patch
# add missing function Double2Ints(), backport
+# rebased for 2.3.1, not sure if this is still needed? -- rex
Patch11: qtwebkit-23-LLInt-C-Loop-backend-ppc.patch
## upstream patches
@@ -81,7 +82,6 @@ Provides: qt4-webkit%{?_isa} = 2:%{version}-%{release}
%package devel
Summary: Development files for %{name}
Requires: %{name}%{?_isa} = %{version}-%{release}
-Requires: qt4-devel
Obsoletes: qt-webkit-devel < 1:4.9.0
Provides: qt-webkit-devel = 2:%{version}-%{release}
Provides: qt4-webkit-devel = 2:%{version}-%{release}
@@ -154,6 +154,10 @@ popd
%changelog
+* Thu Apr 18 2013 Rex Dieter <rdieter at fedoraproject.org> - 2.3.1-1
+- qtwebkit-2.3.1
+- -devel: drop explicit Requires: qt4-devel (let pkgconfig deps do it)
+
* Mon Mar 25 2013 Dan Horák <dan[at]danny.cz> 2.3.0-2
- use ppc fixes also on s390
diff --git a/sources b/sources
index cbf18ea..8bfa20d 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-26f7ef9659aeb96ae0730014d9a86a16 qtwebkit-2.3.0.tar.xz
+8f16a98c0072f81c30422fd6644a0cf1 qtwebkit-2.3.1.tar.xz
More information about the scm-commits
mailing list