Accepting request 500063 from GNOME:Factory

1

OBS-URL: https://build.opensuse.org/request/show/500063
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/webkit2gtk3?expand=0&rev=39

webkit2gtk3.changes

@@ -1,3 +1,15 @@
+-------------------------------------------------------------------
+Mon May 29 16:31:21 UTC 2017 - zaitor@opensuse.org
+
+- Add conditional gcc6-c++ BuildRequires and #!BuildIgnore:
+  libgcc_s1 and also and pass -DCMAKE_C_COMPILER=gcc-6 and
+  -DCMAKE_CXX_COMPILER=g++-6 to cmake for SLE/Leap, so we can fully
+  build Webkit2gtk3 without disabling features.
+- Drop webkitgtk-disable-gcc-version-checks.patch, no longer needed
+  following above changes.
+- Remove the compilation flag to disable FTL JIT, no longer needed
+  following above changes.
+
 -------------------------------------------------------------------
 Thu May 25 09:33:35 UTC 2017 - zaitor@opensuse.org
 

webkit2gtk3.spec

@@ -36,18 +36,16 @@ Source:         http://webkitgtk.org/releases/%{_name}-%{version}.tar.xz
 Source1:        baselibs.conf
 # PATCH-FIX-OPENSUSE webkitgtk-typelib-sharelib-link.patch dimstar@opensuse.org -- Fixup the .gir file to contain the full library name for libjavascriptcore.
 Patch0:         webkitgtk-typelib-sharelib-link.patch
-# PATCH-FIX-SLE webkitgtk-disable-gcc-version-checks.patch mcatanzaro@igalia.com -- Allow building with GCC 4.8, which is currently safe if IndexedDB is disabled.
-Patch1:         webkitgtk-disable-gcc-version-checks.patch
 %ifnarch s390 s390x
 BuildRequires:  binutils-gold
 %endif
 BuildRequires:  bison >= 2.3
 BuildRequires:  cmake
-%if %{?suse_version} > 1315
+%if 0%{?suse_version} == 1315
-BuildRequires:  gcc-c++ >= 4.9
+BuildRequires:  gcc6-c++
+#!BuildIgnore:  libgcc_s1
 %else
-BuildRequires:  gcc-c++ >= 4.8
+BuildRequires:  gcc-c++ >= 4.9
-BuildRequires:  libedit-devel
 %endif
 BuildRequires:  gobject-introspection-devel
 BuildRequires:  gperf >= 3.0.1
@@ -231,9 +229,6 @@ more.
 %prep
 %setup -q -n webkitgtk-%{version}
 %patch0 -p1
-%if %{?suse_version} == 1315
-%patch1 -p1
-%endif
 
 %build
 # Use linker flags to reduce memory consumption
@@ -243,16 +238,10 @@ more.
 %else
 %global optflags %(echo %{optflags} -Wl,--no-keep-memory | sed 's/-g /-g1 /')
 %endif
-# IndexedDB support (including DB process) support requires GCC 4.9.
-# Use some hidden, not-really-supported build options to avoid this.
-# See webkit#98932.
-# Disable FTL JIT on SLE until we get llvm >= 3.7 or until
-# upstream switches from LLVM to B3 (requires gcc >= 4.9).
 %cmake \
 %if 0%{?suse_version} == 1315
-  -DENABLE_DATABASE_PROCESS=OFF \
+  -DCMAKE_C_COMPILER=gcc-6 \
-  -DENABLE_INDEXED_DATABASE=OFF \
+  -DCMAKE_CXX_COMPILER=g++-6 \
-  -DENABLE_FTL_JIT=OFF \
 %endif
   -DCMAKE_BUILD_TYPE=Release \
   -DLIBEXEC_INSTALL_DIR=%{_libexecdir}/libwebkit2gtk%{_wk2sover} \

webkitgtk-disable-gcc-version-checks.patch

@@ -1,46 +0,0 @@
-From 8b666dae1a0f9454c7bb32386b4bed027b481426 Mon Sep 17 00:00:00 2001
-From: Michael Catanzaro <mcatanzaro@igalia.com>
-Date: Mon, 28 Dec 2015 21:53:54 -0600
-Subject: [PATCH] Disable GCC version check
-
-For openSUSE to compile with GCC 4.8, with -DENABLE_INDEXED_DATABASE=OFF
-and -DENABLE_DATABASE_PROCESS=OFF. It will probably work. The GCC 4.9
-requirement is because GCC 4.8 cannot handle some of the database
-process code.
----
- Source/cmake/OptionsGTK.cmake | 7 -------
- 1 file changed, 7 deletions(-)
-
-Index: webkitgtk-2.14.0/Source/cmake/OptionsGTK.cmake
-===================================================================
---- webkitgtk-2.14.0.orig/Source/cmake/OptionsGTK.cmake
-+++ webkitgtk-2.14.0/Source/cmake/OptionsGTK.cmake
-@@ -6,13 +6,6 @@ set(PROJECT_VERSION_MICRO 0)
- set(PROJECT_VERSION ${PROJECT_VERSION_MAJOR}.${PROJECT_VERSION_MINOR}.${PROJECT_VERSION_MICRO})
- set(WEBKITGTK_API_VERSION 4.0)
- 
--# IndexedDB support requires GCC 4.9, see https://bugs.webkit.org/show_bug.cgi?id=98932.
--if (CMAKE_CXX_COMPILER_ID STREQUAL "GNU")
--    if (CMAKE_CXX_COMPILER_VERSION VERSION_LESS "4.9.0")
--        message(FATAL_ERROR "GCC 4.9.0 is required to build WebKitGTK+, use a newer GCC version or clang")
--    endif ()
--endif ()
--
- # Libtool library version, not to be confused with API version.
- # See http://www.gnu.org/software/libtool/manual/html_node/Libtool-versioning.html
- CALCULATE_LIBRARY_VERSIONS_FROM_LIBTOOL_TRIPLE(WEBKIT2 51 7 14)
-Index: webkitgtk-2.14.0/Source/WTF/wtf/Compiler.h
-===================================================================
---- webkitgtk-2.14.0.orig/Source/WTF/wtf/Compiler.h
-+++ webkitgtk-2.14.0/Source/WTF/wtf/Compiler.h
-@@ -89,8 +89,8 @@
- #define GCC_VERSION (__GNUC__ * 10000 + __GNUC_MINOR__ * 100 + __GNUC_PATCHLEVEL__)
- #define GCC_VERSION_AT_LEAST(major, minor, patch) (GCC_VERSION >= (major * 10000 + minor * 100 + patch))
- 
--#if !GCC_VERSION_AT_LEAST(4, 9, 0)
--#error "Please use a newer version of GCC. WebKit requires GCC 4.9.0 or newer to compile."
-+#if !GCC_VERSION_AT_LEAST(4, 7, 0)
-+#error "Please use a newer version of GCC. WebKit requires GCC 4.7.0 or newer to compile."
- #endif
- 
- #if defined(__STDC_VERSION__) && __STDC_VERSION__ >= 201112L