[mingw-webkitgtk3] Update to 2.2.6
Erik van Pienbroek
epienbro at fedoraproject.org
Thu Mar 27 08:39:17 UTC 2014
commit 095635762c612f578c7bcb104aa0335081345c4e
Author: Erik van Pienbroek <epienbro at fedoraproject.org>
Date: Thu Mar 27 09:39:16 2014 +0100
Update to 2.2.6
and fix use-after-free in WTF threading code (WebKit bug #130122)
.gitignore | 1 +
0016-non-volatile-refc-in-audio.mingw.patch | 16 ++++++++++++++++
0028-Use-after-free-in-WTF-threading-code.patch | 15 +++++++++++++++
mingw-webkitgtk3.spec | 16 +++++++++++++++-
sources | 2 +-
webkit-fix-angle-windows-compilation.patch | 10 +++++-----
webkitgtk-dont-build-test-webkit-api.patch | 12 ++++++------
7 files changed, 59 insertions(+), 13 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index ade9597..11a3f28 100644
--- a/.gitignore
+++ b/.gitignore
@@ -9,3 +9,4 @@
/webkitgtk-2.0.3.tar.xz
/webkitgtk-2.0.4.tar.xz
/webkitgtk-2.2.3.tar.xz
+/webkitgtk-2.2.6.tar.xz
diff --git a/0016-non-volatile-refc-in-audio.mingw.patch b/0016-non-volatile-refc-in-audio.mingw.patch
new file mode 100644
index 0000000..f0a0635
--- /dev/null
+++ b/0016-non-volatile-refc-in-audio.mingw.patch
@@ -0,0 +1,16 @@
+--- webkitgtk-2.2.5/Source/WebCore/Modules/webaudio/AudioNode.h.orig 2014-02-17 11:24:03.000000000 +0000
++++ webkitgtk-2.2.5/Source/WebCore/Modules/webaudio/AudioNode.h 2014-03-05 16:49:58.061619400 +0000
+@@ -212,8 +212,13 @@
+ double m_lastNonSilentTime;
+
+ // Ref-counting
++#if OS(WINCE) || COMPILER(MINGW)
++ int m_normalRefCount;
++ int m_connectionRefCount;
++#else
+ volatile int m_normalRefCount;
+ volatile int m_connectionRefCount;
++#endif
+
+ bool m_isMarkedForDeletion;
+ bool m_isDisabled;
diff --git a/0028-Use-after-free-in-WTF-threading-code.patch b/0028-Use-after-free-in-WTF-threading-code.patch
new file mode 100644
index 0000000..d79f5f6
--- /dev/null
+++ b/0028-Use-after-free-in-WTF-threading-code.patch
@@ -0,0 +1,15 @@
+--- webkitgtk-2.2.5/Source/WTF/wtf/ThreadingWin.cpp.orig 2014-02-17 11:24:03.000000000 +0000
++++ webkitgtk-2.2.5/Source/WTF/wtf/ThreadingWin.cpp 2014-03-12 07:21:46.144842200 +0000
+@@ -212,8 +212,10 @@
+
+ static unsigned __stdcall wtfThreadEntryPoint(void* param)
+ {
+- OwnPtr<ThreadFunctionInvocation> invocation = adoptPtr(static_cast<ThreadFunctionInvocation*>(param));
+- invocation->function(invocation->data);
++ {
++ OwnPtr<ThreadFunctionInvocation> invocation = adoptPtr(static_cast<ThreadFunctionInvocation*>(param));
++ invocation->function(invocation->data);
++ }
+
+ #if !USE(PTHREADS) && OS(WINDOWS)
+ // Do the TLS cleanup.
diff --git a/mingw-webkitgtk3.spec b/mingw-webkitgtk3.spec
index f93bd46..bf738f1 100644
--- a/mingw-webkitgtk3.spec
+++ b/mingw-webkitgtk3.spec
@@ -11,7 +11,7 @@
cp -p %1 %{buildroot}%{_docdir}/mingw64-webkitgtk3/$(echo '%1' | sed -e 's!/!.!g')
Name: mingw-webkitgtk3
-Version: 2.2.3
+Version: 2.2.6
Release: 1%{?dist}
Summary: MinGW Windows GTK+ Web content engine library
@@ -69,6 +69,14 @@ Patch12: webkitgtk-redo-commit-148663.patch
# Workaround this for now
Patch13: webkitgtk-workaround-conflicting-htonl-on-win64.patch
+# Fix use-after-free in WTF threading code
+# https://bugs.webkit.org/show_bug.cgi?id=130122
+Patch14: 0028-Use-after-free-in-WTF-threading-code.patch
+
+# Compilation fix in atomics code
+# Taken from https://github.com/Alexpux/MINGW-packages/blob/master/mingw-w64-webkitgtk3/0016-non-volatile-refc-in-audio.mingw.patch
+Patch15: 0016-non-volatile-refc-in-audio.mingw.patch
+
BuildArch: noarch
BuildRequires: bison
@@ -172,6 +180,8 @@ This is the MinGW port of WebKitGTK+ for GTK+ 3.
%patch11 -p1 -b .test_webkit_api
%patch12 -p1 -b .jit_win64
%patch13 -p1 -b .htonl
+%patch14 -p1 -b .use_after_free
+%patch15 -p1 -b .audio_atomics
autoreconf --verbose --install -I Source/autotools
@@ -259,6 +269,10 @@ find $RPM_BUILD_ROOT -name "*.la" -delete
%changelog
+* Wed Mar 26 2014 Erik van Pienbroek <epienbro at fedoraproject.org> - 2.2.6-1
+- Update to 2.2.6
+- Fix use-after-free in WTF threading code (WebKit bug #130122)
+
* Wed Dec 4 2013 Erik van Pienbroek <epienbro at fedoraproject.org> - 2.2.3-1
- Update to 2.2.3
diff --git a/sources b/sources
index bdc6def..f5680c5 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-613e81c460368ff4d6e02c7887206572 webkitgtk-2.2.3.tar.xz
+245a9f8cac251662b7abf19903332038 webkitgtk-2.2.6.tar.xz
diff --git a/webkit-fix-angle-windows-compilation.patch b/webkit-fix-angle-windows-compilation.patch
index 0f7d6fb..c44dd1c 100644
--- a/webkit-fix-angle-windows-compilation.patch
+++ b/webkit-fix-angle-windows-compilation.patch
@@ -61,16 +61,16 @@
+
--- webkitgtk-2.2.3/Source/ThirdParty/ANGLE/GNUmakefile.am.orig 2013-12-04 23:12:01.034574086 +0100
+++ webkitgtk-2.2.3/Source/ThirdParty/ANGLE/GNUmakefile.am 2013-12-04 23:19:09.719774371 +0100
-@@ -75,7 +75,6 @@
- Source/ThirdParty/ANGLE/src/compiler/MapLongVariableNames.h \
+@@ -80,7 +80,6 @@
Source/ThirdParty/ANGLE/src/compiler/MMap.h \
+ Source/ThirdParty/ANGLE/src/compiler/NodeSearch.h \
Source/ThirdParty/ANGLE/src/compiler/osinclude.h \
- Source/ThirdParty/ANGLE/src/compiler/ossource_posix.cpp \
Source/ThirdParty/ANGLE/src/compiler/OutputESSL.cpp \
Source/ThirdParty/ANGLE/src/compiler/OutputESSL.h \
- Source/ThirdParty/ANGLE/src/compiler/OutputGLSL.cpp \
-@@ -154,3 +153,10 @@
- Source/ThirdParty/ANGLE/src/compiler/VariableInfo.h \
+ Source/ThirdParty/ANGLE/src/compiler/OutputGLSLBase.cpp \
+@@ -161,3 +160,10 @@
+ Source/ThirdParty/ANGLE/src/compiler/VersionGLSL.h \
Source/ThirdParty/ANGLE/src/third_party/compiler/ArrayBoundsClamper.cpp \
Source/ThirdParty/ANGLE/src/third_party/compiler/ArrayBoundsClamper.h
+
diff --git a/webkitgtk-dont-build-test-webkit-api.patch b/webkitgtk-dont-build-test-webkit-api.patch
index 324ab4d..b696d89 100644
--- a/webkitgtk-dont-build-test-webkit-api.patch
+++ b/webkitgtk-dont-build-test-webkit-api.patch
@@ -1,10 +1,10 @@
--- webkitgtk-2.2.3/Tools/TestWebKitAPI/GNUmakefile.am.orig 2013-12-11 20:44:41.223779759 +0100
+++ webkitgtk-2.2.3/Tools/TestWebKitAPI/GNUmakefile.am 2013-12-11 20:44:58.007779094 +0100
-@@ -23,7 +23,6 @@
+@@ -114,7 +114,6 @@
noinst_PROGRAMS += \
- Programs/TestWebKitAPI/TestWTF \
- Programs/TestWebKitAPI/TestJavaScriptCore \
-- Programs/TestWebKitAPI/TestWebCore \
- Programs/TestWebKitAPI/TestGtk
+ Programs/TestWebKitAPI/WTF/TestWTF \
+ Programs/TestWebKitAPI/JavaScriptCore/TestJavaScriptCore \
+- Programs/TestWebKitAPI/WebCore/TestWebCore \
+ Programs/TestWebKitAPI/WebCoreGtk/TestWebCoreGtk
- if ENABLE_WEBKIT2
+ if ENABLE_WEBKIT1
More information about the scm-commits
mailing list