From 99943e052fcf0da446b1056b2912711dd88a0a858d8f6543a12a2a7613d6e1f5 Mon Sep 17 00:00:00 2001 From: Dominique Leuenberger Date: Thu, 25 Feb 2016 12:18:20 +0000 Subject: [PATCH] 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 --- webkit2gtk3.changes | 6 ++++++ webkitgtk-typelib-sharelib-link.patch | 28 ++++++++++++++++++++++++--- 2 files changed, 31 insertions(+), 3 deletions(-) diff --git a/webkit2gtk3.changes b/webkit2gtk3.changes index 8ee4ded..a7af3ac 100644 --- a/webkit2gtk3.changes +++ b/webkit2gtk3.changes @@ -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 diff --git a/webkitgtk-typelib-sharelib-link.patch b/webkitgtk-typelib-sharelib-link.patch index 403dffa..82ddeb0 100644 --- a/webkitgtk-typelib-sharelib-link.patch +++ b/webkitgtk-typelib-sharelib-link.patch @@ -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.1.2/Source/JavaScriptCore/JavaScriptCore.gir.in +--- webkitgtk-2.11.90.orig/Source/JavaScriptCore/JavaScriptCore.gir.in ++++ webkitgtk-2.11.90/Source/JavaScriptCore/JavaScriptCore.gir.in @@ -3,7 +3,7 @@ xmlns="http://www.gtk.org/introspection/core/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:symbol-prefixes="JS"> +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); + }