GNOME.org
 

[gnome-continuous-yocto/gnomeostree-3.28-rocko: 5823/8267] webkitgtk: Upgrade to 2.16.1

commit 99df0c34705006cbab9de58bf6b796728a295b7a
Author: Khem Raj <raj khem gmail com>
Date:   Fri Apr 21 08:09:12 2017 -0700

    webkitgtk: Upgrade to 2.16.1
    
    Fix build with gcc7
    Move all patches to webkit folder
    Drop patches that were backports or have been upstreamed
    
    (From OE-Core rev: bfbdd1a2069f199be9ba0909dd512469ff17b65e)
    
    Signed-off-by: Khem Raj <raj khem gmail com>
    Signed-off-by: Ross Burton <ross burton intel com>
    Signed-off-by: Richard Purdie <richard purdie linuxfoundation org>

 ...bKitMacros-Append-to-I-and-not-to-isystem.patch |  185 --------------------
 .../recipes-sato/webkit/files/detect_atomics.patch |   38 ----
 ...Introspection.cmake-prefix-variables-obta.patch |    0
 ...ix-racy-parallel-build-of-WebKit2-4.0.gir.patch |    0
 ...cmake-drop-the-hardcoded-introspection-gt.patch |    0
 ...c-settings-so-that-gtkdoc-generation-work.patch |    0
 ...ng-introspection-files-add-CMAKE_C_FLAGS-.patch |    0
 .../{files => webkitgtk}/cross-compile.patch       |    0
 meta/recipes-sato/webkit/webkitgtk/gcc7.patch      |   23 +++
 .../webkit/{files => webkitgtk}/musl-fixes.patch   |    0
 .../webkit/{files => webkitgtk}/ppc-musl-fix.patch |    0
 .../webkit/webkitgtk/x32_support.patch             |   13 +-
 .../{webkitgtk_2.14.5.bb => webkitgtk_2.16.1.bb}   |    8 +-
 13 files changed, 32 insertions(+), 235 deletions(-)
---
diff --git a/meta/recipes-sato/webkit/files/0001-FindGObjectIntrospection.cmake-prefix-variables-obta.patch 
b/meta/recipes-sato/webkit/webkitgtk/0001-FindGObjectIntrospection.cmake-prefix-variables-obta.patch
similarity index 100%
rename from meta/recipes-sato/webkit/files/0001-FindGObjectIntrospection.cmake-prefix-variables-obta.patch
rename to meta/recipes-sato/webkit/webkitgtk/0001-FindGObjectIntrospection.cmake-prefix-variables-obta.patch
diff --git a/meta/recipes-sato/webkit/files/0001-Fix-racy-parallel-build-of-WebKit2-4.0.gir.patch 
b/meta/recipes-sato/webkit/webkitgtk/0001-Fix-racy-parallel-build-of-WebKit2-4.0.gir.patch
similarity index 100%
rename from meta/recipes-sato/webkit/files/0001-Fix-racy-parallel-build-of-WebKit2-4.0.gir.patch
rename to meta/recipes-sato/webkit/webkitgtk/0001-Fix-racy-parallel-build-of-WebKit2-4.0.gir.patch
diff --git a/meta/recipes-sato/webkit/files/0001-OptionsGTK.cmake-drop-the-hardcoded-introspection-gt.patch 
b/meta/recipes-sato/webkit/webkitgtk/0001-OptionsGTK.cmake-drop-the-hardcoded-introspection-gt.patch
similarity index 100%
rename from meta/recipes-sato/webkit/files/0001-OptionsGTK.cmake-drop-the-hardcoded-introspection-gt.patch
rename to meta/recipes-sato/webkit/webkitgtk/0001-OptionsGTK.cmake-drop-the-hardcoded-introspection-gt.patch
diff --git a/meta/recipes-sato/webkit/files/0001-Tweak-gtkdoc-settings-so-that-gtkdoc-generation-work.patch 
b/meta/recipes-sato/webkit/webkitgtk/0001-Tweak-gtkdoc-settings-so-that-gtkdoc-generation-work.patch
similarity index 100%
rename from meta/recipes-sato/webkit/files/0001-Tweak-gtkdoc-settings-so-that-gtkdoc-generation-work.patch
rename to meta/recipes-sato/webkit/webkitgtk/0001-Tweak-gtkdoc-settings-so-that-gtkdoc-generation-work.patch
diff --git a/meta/recipes-sato/webkit/files/0001-When-building-introspection-files-add-CMAKE_C_FLAGS-.patch 
b/meta/recipes-sato/webkit/webkitgtk/0001-When-building-introspection-files-add-CMAKE_C_FLAGS-.patch
similarity index 100%
rename from meta/recipes-sato/webkit/files/0001-When-building-introspection-files-add-CMAKE_C_FLAGS-.patch
rename to meta/recipes-sato/webkit/webkitgtk/0001-When-building-introspection-files-add-CMAKE_C_FLAGS-.patch
diff --git a/meta/recipes-sato/webkit/files/cross-compile.patch 
b/meta/recipes-sato/webkit/webkitgtk/cross-compile.patch
similarity index 100%
rename from meta/recipes-sato/webkit/files/cross-compile.patch
rename to meta/recipes-sato/webkit/webkitgtk/cross-compile.patch
diff --git a/meta/recipes-sato/webkit/webkitgtk/gcc7.patch b/meta/recipes-sato/webkit/webkitgtk/gcc7.patch
new file mode 100644
index 0000000..aee29a9
--- /dev/null
+++ b/meta/recipes-sato/webkit/webkitgtk/gcc7.patch
@@ -0,0 +1,23 @@
+Imported from
+https://src.fedoraproject.org/cgit/rpms/webkitgtk4.git/plain/gcc7.patch
+
+Add to CXX flags since webkitgtk uses c++ compiler by default
+Fixes
+Source/JavaScriptCore/runtime/JSGenericTypedArrayView.h:119:67: error: no matching function for call to 
'JSC::JSGenericTypedArrayView<Adaptor>::vector() const'
+|          return bitwise_cast<const typename Adaptor::Type*>(vector());
+
+Signed-off-by: Khem Raj <raj khem gmail com
+Upstream-Status: Pending
+
+diff -up webkitgtk-2.15.90/Source/cmake/OptionsCommon.cmake.gcc7 
webkitgtk-2.15.90/Source/cmake/OptionsCommon.cmake
+--- webkitgtk-2.15.90/Source/cmake/OptionsCommon.cmake.gcc7    2017-02-21 09:57:13.168916004 +0100
++++ webkitgtk-2.15.90/Source/cmake/OptionsCommon.cmake 2017-02-21 09:58:12.811563156 +0100
+@@ -41,6 +41,8 @@ if (COMPILER_IS_GCC_OR_CLANG)
+     set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -fno-exceptions -fno-strict-aliasing")
+     set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fno-exceptions -fno-strict-aliasing -fno-rtti")
+     set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++1y")
++    set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Wno-expansion-to-defined")
++    set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wno-expansion-to-defined")
+ endif ()
+ 
+ if (COMPILER_IS_CLANG AND CMAKE_GENERATOR STREQUAL "Ninja")
diff --git a/meta/recipes-sato/webkit/files/musl-fixes.patch 
b/meta/recipes-sato/webkit/webkitgtk/musl-fixes.patch
similarity index 100%
rename from meta/recipes-sato/webkit/files/musl-fixes.patch
rename to meta/recipes-sato/webkit/webkitgtk/musl-fixes.patch
diff --git a/meta/recipes-sato/webkit/files/ppc-musl-fix.patch 
b/meta/recipes-sato/webkit/webkitgtk/ppc-musl-fix.patch
similarity index 100%
rename from meta/recipes-sato/webkit/files/ppc-musl-fix.patch
rename to meta/recipes-sato/webkit/webkitgtk/ppc-musl-fix.patch
diff --git a/meta/recipes-sato/webkit/webkitgtk/x32_support.patch 
b/meta/recipes-sato/webkit/webkitgtk/x32_support.patch
index fea4c27..5f23837 100644
--- a/meta/recipes-sato/webkit/webkitgtk/x32_support.patch
+++ b/meta/recipes-sato/webkit/webkitgtk/x32_support.patch
@@ -3,11 +3,11 @@ Subject: Fix FTBFS in x32
 Bug-Debian: https://bugs.debian.org/700795
 Upstream-Status: Pending
 Signed-off-by: Christopher Larson <chris_larson mentor com>
-Index: webkitgtk/Source/WTF/wtf/Platform.h
+Index: webkitgtk-2.16.1/Source/WTF/wtf/Platform.h
 ===================================================================
---- webkitgtk.orig/Source/WTF/wtf/Platform.h
-+++ webkitgtk/Source/WTF/wtf/Platform.h
-@@ -182,8 +182,12 @@
+--- webkitgtk-2.16.1.orig/Source/WTF/wtf/Platform.h
++++ webkitgtk-2.16.1/Source/WTF/wtf/Platform.h
+@@ -172,7 +172,11 @@
  /* CPU(X86_64) - AMD64 / Intel64 / x86_64 64-bit */
  #if   defined(__x86_64__) \
      || defined(_M_X64)
@@ -15,8 +15,7 @@ Index: webkitgtk/Source/WTF/wtf/Platform.h
 +#define WTF_CPU_X86_64_32 1
 +#else
  #define WTF_CPU_X86_64 1
- #endif
 +#endif
+ #define WTF_CPU_X86_SSE2 1
+ #endif
  
- /* CPU(ARM64) - Apple */
- #if (defined(__arm64__) && defined(__APPLE__)) || defined(__aarch64__)
diff --git a/meta/recipes-sato/webkit/webkitgtk_2.14.5.bb b/meta/recipes-sato/webkit/webkitgtk_2.16.1.bb
similarity index 95%
rename from meta/recipes-sato/webkit/webkitgtk_2.14.5.bb
rename to meta/recipes-sato/webkit/webkitgtk_2.16.1.bb
index daa17a9..4443a59 100644
--- a/meta/recipes-sato/webkit/webkitgtk_2.14.5.bb
+++ b/meta/recipes-sato/webkit/webkitgtk_2.16.1.bb
@@ -17,14 +17,12 @@ SRC_URI = "http://www.webkitgtk.org/releases/${BPN}-${PV}.tar.xz \
            file://ppc-musl-fix.patch \
            file://0001-Fix-racy-parallel-build-of-WebKit2-4.0.gir.patch \
            file://0001-Tweak-gtkdoc-settings-so-that-gtkdoc-generation-work.patch \
-           file://0001-WebKitMacros-Append-to-I-and-not-to-isystem.patch \
-           file://detect_atomics.patch \
            file://x32_support.patch \
            file://cross-compile.patch \
+           file://gcc7.patch \
            "
-
-SRC_URI[md5sum] = "7fe3cb2699e64f969b285823c5ae2516"
-SRC_URI[sha256sum] = "3ca8f1c33a9b43d6c753dcac1c0788656930e06382b10fdf5c2805ea8f96369f"
+SRC_URI[md5sum] = "d3bcf995a667fd9febb9ab991acf0ca7"
+SRC_URI[sha256sum] = "eb92383232328ce655b703c64370ed3795662479719ad1b4a869ed46769d2945"
 
 inherit cmake pkgconfig gobject-introspection perlnative distro_features_check upstream-version-is-even 
gtk-doc
[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]