Accepting request 361312 from GNOME:Next

1

OBS-URL: https://build.opensuse.org/request/show/361312
OBS-URL: https://build.opensuse.org/package/show/GNOME:Factory/webkit2gtk3?expand=0&rev=54
This commit is contained in:
Dominique Leuenberger 2016-02-25 12:18:20 +00:00 committed by Git OBS Bridge
parent c7faa06827
commit 99943e052f
2 changed files with 31 additions and 3 deletions

View File

@ -1,3 +1,9 @@
-------------------------------------------------------------------
Tue Feb 23 11:34:42 CET 2016 - fcrozat@suse.com
- Update webkitgtk-disable-gcc-version-checks.patch to fix building
with gcc 4.8 (fix from Mike Gorse).
------------------------------------------------------------------- -------------------------------------------------------------------
Fri Feb 19 15:19:20 UTC 2016 - dimstar@opensuse.org Fri Feb 19 15:19:20 UTC 2016 - dimstar@opensuse.org

View File

@ -1,7 +1,7 @@
Index: webkitgtk-2.1.2/Source/JavaScriptCore/JavaScriptCore.gir.in Index: webkitgtk-2.11.90/Source/JavaScriptCore/JavaScriptCore.gir.in
=================================================================== ===================================================================
--- webkitgtk-2.1.2.orig/Source/JavaScriptCore/JavaScriptCore.gir.in --- webkitgtk-2.11.90.orig/Source/JavaScriptCore/JavaScriptCore.gir.in
+++ webkitgtk-2.1.2/Source/JavaScriptCore/JavaScriptCore.gir.in +++ webkitgtk-2.11.90/Source/JavaScriptCore/JavaScriptCore.gir.in
@@ -3,7 +3,7 @@ @@ -3,7 +3,7 @@
xmlns="http://www.gtk.org/introspection/core/1.0" xmlns="http://www.gtk.org/introspection/core/1.0"
xmlns:c="http://www.gtk.org/introspection/c/1.0"> xmlns:c="http://www.gtk.org/introspection/c/1.0">
@ -11,3 +11,25 @@ Index: webkitgtk-2.1.2/Source/JavaScriptCore/JavaScriptCore.gir.in
c:identifier-prefixes="JS" c:identifier-prefixes="JS"
c:symbol-prefixes="JS"> c:symbol-prefixes="JS">
<record name="GlobalContext" c:type="JSGlobalContextRef" foreign="1"/> <record name="GlobalContext" c:type="JSGlobalContextRef" foreign="1"/>
Index: webkitgtk-2.11.90/Source/WebKit2/UIProcess/UserContent/WebUserContentControllerProxy.cpp
===================================================================
--- webkitgtk-2.11.90.orig/Source/WebKit2/UIProcess/UserContent/WebUserContentControllerProxy.cpp
+++ webkitgtk-2.11.90/Source/WebKit2/UIProcess/UserContent/WebUserContentControllerProxy.cpp
@@ -116,7 +116,7 @@ void WebUserContentControllerProxy::addU
void WebUserContentControllerProxy::removeUserScript(const API::UserScript& userScript)
{
for (WebProcessProxy* process : m_processes)
- process->connection()->send(Messages::WebUserContentController::RemoveUserScript({ userScript.userScript().url().string() }), m_identifier);
+ process->connection()->send(Messages::WebUserContentController::RemoveUserScript(userScript.userScript().url().string()), m_identifier);
m_userScripts->elements().removeAll(&userScript);
}
@@ -140,7 +140,7 @@ void WebUserContentControllerProxy::addU
void WebUserContentControllerProxy::removeUserStyleSheet(const API::UserStyleSheet& userStyleSheet)
{
for (WebProcessProxy* process : m_processes)
- process->connection()->send(Messages::WebUserContentController::RemoveUserStyleSheet({ userStyleSheet.userStyleSheet().url().string() }), m_identifier);
+ process->connection()->send(Messages::WebUserContentController::RemoveUserStyleSheet(userStyleSheet.userStyleSheet().url().string()), m_identifier);
m_userStyleSheets->elements().removeAll(&userStyleSheet);
}