pool/webkit2gtk3
SHA256
4
0
Fork 1
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Accepting request 365012 from GNOME:Next

Browse Source 
1

OBS-URL: https://build.opensuse.org/request/show/365012
OBS-URL: https://build.opensuse.org/package/show/GNOME:Factory/webkit2gtk3?expand=0&rev=56
This commit is contained in:
Bjørn Lie 2016-03-03 00:06:31 +00:00 committed by Git OBS Bridge
parent 6467b9a1f5
commit 0b1cbd191e
2 changed files with 40 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
webkit2gtk3.changes
View File

@ -1,3 +1,16 @@
-------------------------------------------------------------------
Wed Mar 2 16:51:29 UTC 2016 - fcrozat@suse.com
- Update webkitgtk-disable-gcc-version-checks.patch to properly
disable terminateDatabaseProcess method when it is disabled at
compilation time.
-------------------------------------------------------------------
Wed Mar 2 14:00:04 UTC 2016 - fcrozat@suse.com
- Refresh webkitgtk-disable-gcc-version-checks.patch for latest
webkitgtk.
------------------------------------------------------------------- -------------------------------------------------------------------
Tue Mar 1 14:30:40 UTC 2016 - zaitor@opensuse.org Tue Mar 1 14:30:40 UTC 2016 - zaitor@opensuse.org

35
webkitgtk-disable-gcc-version-checks.patch
View File

@ -11,11 +11,11 @@ process code.
Source/cmake/OptionsGTK.cmake | 7 ------- Source/cmake/OptionsGTK.cmake | 7 -------
1 file changed, 7 deletions(-) 1 file changed, 7 deletions(-)
Index: webkitgtk-2.11.90/Source/cmake/OptionsGTK.cmake Index: webkitgtk-2.11.91/Source/cmake/OptionsGTK.cmake
=================================================================== ===================================================================
--- webkitgtk-2.11.90.orig/Source/cmake/OptionsGTK.cmake --- webkitgtk-2.11.91.orig/Source/cmake/OptionsGTK.cmake
+++ webkitgtk-2.11.90/Source/cmake/OptionsGTK.cmake +++ webkitgtk-2.11.91/Source/cmake/OptionsGTK.cmake
@@ -6,13 +6,6 @@ set(PROJECT_VERSION_MICRO 90) @@ -6,13 +6,6 @@ set(PROJECT_VERSION_MICRO 91)
set(PROJECT_VERSION ${PROJECT_VERSION_MAJOR}.${PROJECT_VERSION_MINOR}.${PROJECT_VERSION_MICRO}) set(PROJECT_VERSION ${PROJECT_VERSION_MAJOR}.${PROJECT_VERSION_MINOR}.${PROJECT_VERSION_MICRO})
set(WEBKITGTK_API_VERSION 4.0) set(WEBKITGTK_API_VERSION 4.0)
@ -28,11 +28,11 @@ Index: webkitgtk-2.11.90/Source/cmake/OptionsGTK.cmake
- -
# Libtool library version, not to be confused with API version. # Libtool library version, not to be confused with API version.
# See http://www.gnu.org/software/libtool/manual/html_node/Libtool-versioning.html # See http://www.gnu.org/software/libtool/manual/html_node/Libtool-versioning.html
CALCULATE_LIBRARY_VERSIONS_FROM_LIBTOOL_TRIPLE(WEBKIT2 50 3 13) CALCULATE_LIBRARY_VERSIONS_FROM_LIBTOOL_TRIPLE(WEBKIT2 50 4 13)
Index: webkitgtk-2.11.90/Source/WTF/wtf/Compiler.h Index: webkitgtk-2.11.91/Source/WTF/wtf/Compiler.h
=================================================================== ===================================================================
--- webkitgtk-2.11.90.orig/Source/WTF/wtf/Compiler.h --- webkitgtk-2.11.91.orig/Source/WTF/wtf/Compiler.h
+++ webkitgtk-2.11.90/Source/WTF/wtf/Compiler.h +++ webkitgtk-2.11.91/Source/WTF/wtf/Compiler.h
@@ -20,7 +20,7 @@ @@ -20,7 +20,7 @@
* PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY
* OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT * OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
@ -53,3 +53,22 @@ Index: webkitgtk-2.11.90/Source/WTF/wtf/Compiler.h
#endif #endif
#if defined(__STDC_VERSION__) && __STDC_VERSION__ >= 201112L #if defined(__STDC_VERSION__) && __STDC_VERSION__ >= 201112L
Index: webkitgtk-2.11.91/Source/WebKit2/UIProcess/WebProcessPool.cpp
===================================================================
--- webkitgtk-2.11.91.orig/Source/WebKit2/UIProcess/WebProcessPool.cpp
+++ webkitgtk-2.11.91/Source/WebKit2/UIProcess/WebProcessPool.cpp
@@ -1074,12 +1074,14 @@ void WebProcessPool::clearCachedCredenti
void WebProcessPool::terminateDatabaseProcess()
{
+#if ENABLE(DATABASE_PROCESS)
ASSERT(m_processes.isEmpty());
if (!m_databaseProcess)
return;
m_databaseProcess->terminate();
m_databaseProcess = nullptr;
+#endif
}
void WebProcessPool::allowSpecificHTTPSCertificateForHost(const WebCertificateInfo* certificate, const String& host)