!8 update to 2.28.3

Merge pull request !8 from orange-snn/master

cloop-big-endians.patch

@@ -1,30 +0,0 @@
-diff -up webkitgtk-2.14.7/Source/JavaScriptCore/bytecode/CodeBlock.cpp.b132333 webkitgtk-2.14.7/Source/JavaScriptCore/bytecode/CodeBlock.cpp
---- webkitgtk-2.14.7/Source/JavaScriptCore/bytecode/CodeBlock.cpp.b132333	2017-02-07 09:05:07.000000000 +0100
-+++ webkitgtk-2.14.7/Source/JavaScriptCore/bytecode/CodeBlock.cpp	2017-06-16 10:34:57.859748036 +0200
-@@ -2186,7 +2186,12 @@ void CodeBlock::finishCreation(VM& vm, S
-                 instructions[i + 5].u.watchpointSet = op.watchpointSet;
-             else if (op.structure)
-                 instructions[i + 5].u.structure.set(vm, this, op.structure);
--            instructions[i + 6].u.pointer = reinterpret_cast<void*>(op.operand);
-+
-+            if (op.type == ClosureVar || op.type == ClosureVarWithVarInjectionChecks || op.type == GlobalProperty || op.type == GlobalPropertyWithVarInjectionChecks || op.type == ModuleVar)
-+                instructions[i + 6].u.operand = op.operand;
-+            else
-+                instructions[i + 6].u.pointer = reinterpret_cast<void*>(op.operand);
-+
-             break;
-         }
- 
-@@ -2222,7 +2227,11 @@ void CodeBlock::finishCreation(VM& vm, S
-                     op.watchpointSet->invalidate(vm, PutToScopeFireDetail(this, ident));
-             } else if (op.structure)
-                 instructions[i + 5].u.structure.set(vm, this, op.structure);
--            instructions[i + 6].u.pointer = reinterpret_cast<void*>(op.operand);
-+
-+            if (op.type == ClosureVar || op.type == ClosureVarWithVarInjectionChecks || op.type == GlobalProperty || op.type == GlobalPropertyWithVarInjectionChecks || op.type == ModuleVar)
-+                instructions[i + 6].u.operand = op.operand;
-+            else
-+                instructions[i + 6].u.pointer = reinterpret_cast<void*>(op.operand);
- 
-             break;
-         }

python2.patch

@@ -1,38 +0,0 @@
-From 494e4abb7a5130376d3cdb41a5e3963650b8659f Mon Sep 17 00:00:00 2001
-From: rpm-build <rpm-build>
-Date: Mon, 16 Jul 2018 06:34:53 +0200
-Subject: [PATCH] Fix the broken build due to python2
-
-/builddir/build/BUILD/webkitgtk-2.21.4/Tools/gtk/generate-gtkdoc
-/usr/bin/env: 'python': No such file or directory
----
- Source/WebInspectorUI/Scripts/copy-user-interface-resources.pl | 2 +-
- Tools/gtk/generate-gtkdoc                                      | 2 +-
- 2 files changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/Source/WebInspectorUI/Scripts/copy-user-interface-resources.pl b/Source/WebInspectorUI/Scripts/copy-user-interface-resources.pl
-index 4bb7037d..3071b45f 100755
---- a/Source/WebInspectorUI/Scripts/copy-user-interface-resources.pl
-+++ b/Source/WebInspectorUI/Scripts/copy-user-interface-resources.pl
-@@ -155,7 +155,7 @@ my $inspectorLicense = <<'EOF';
- EOF
- 
- my $perl = $^X;
--my $python = ($OSNAME =~ /cygwin/) ? "/usr/bin/python" : "python";
-+my $python = ($OSNAME =~ /cygwin/) ? "/usr/bin/python2" : "python2";
- my $derivedSourcesDir = $ENV{'DERIVED_SOURCES_DIR'};
- my $scriptsRoot = File::Spec->catdir($ENV{'SRCROOT'}, 'Scripts');
- my $sharedScriptsRoot = File::Spec->catdir($ENV{'JAVASCRIPTCORE_PRIVATE_HEADERS_DIR'});
-diff --git a/Tools/gtk/generate-gtkdoc b/Tools/gtk/generate-gtkdoc
-index 45c23dfb..a3f82984 100755
---- a/Tools/gtk/generate-gtkdoc
-+++ b/Tools/gtk/generate-gtkdoc
-@@ -1,4 +1,4 @@
--#!/usr/bin/env python
-+#!/usr/bin/env python2.7
- # Copyright (C) 2011 Igalia S.L.
- #
- # This library is free software; you can redistribute it and/or
--- 
-2.17.1
-

webkit-aarch64_page_size.patch

@@ -1,12 +0,0 @@
-diff -urNp a/Source/JavaScriptCore/heap/MarkedBlock.h b/Source/JavaScriptCore/heap/MarkedBlock.h
---- a/Source/JavaScriptCore/heap/MarkedBlock.h	2018-07-25 19:56:28.000000000 +0800
-+++ b/Source/JavaScriptCore/heap/MarkedBlock.h	2020-02-24 14:29:28.738218959 +0800
-@@ -68,7 +68,7 @@ public:
-     static constexpr size_t atomSize = 16; // bytes
- 
-     // Block size must be at least as large as the system page size.
--#if CPU(PPC64) || CPU(PPC64LE) || CPU(PPC) || CPU(UNKNOWN)
-+#if CPU(PPC64) || CPU(PPC64LE) || CPU(PPC) || CPU(ARM64) || CPU(UNKNOWN)
-     static constexpr size_t blockSize = 64 * KB;
- #else
-     static constexpr size_t blockSize = 16 * KB;

webkit2gtk3.spec

@@ -1,45 +1,35 @@
-#Global macro or variable
 %global __provides_exclude_from ^%{_libdir}/webkit2gtk-4\\.0/.*\\.so$
-# increase the DIE limit use linker flags to reduce memory consumption
-# https://bugzilla.redhat.com/show_bug.cgi?id=1456261
 %global _dwz_max_die_limit 250000000
 %global _dwz_max_die_limit_x86_64 250000000
-%global optflags %(echo %{optflags} | sed 's/-g /-g1 /')
 
 #Basic Information
 Name:           webkit2gtk3
-Version:        2.22.2
+Version:        2.28.3
-Release:        6
+Release:        1
 Summary:        GTK+ Web content engine library
 License:        LGPLv2 AND BSD-3-Clause AND ICU AND MIT
 URL:            http://www.webkitgtk.org/
 Source0:        http://webkitgtk.org/releases/webkitgtk-%{version}.tar.xz
 
-# https://bugs.webkit.org/show_bug.cgi?id=162611
+Patch0:         user-agent-branding.patch
-Patch0:     user-agent-branding.patch
-# https://bugs.webkit.org/show_bug.cgi?id=132333
-Patch2:     cloop-big-endians.patch
-# Explicitly specify python2 over python
-Patch3:     python2.patch
-Patch4:     webkit-aarch64_page_size.patch
 
 #Dependency
-BuildRequires:  at-spi2-core-devel bison cairo-devel cmake enchant-devel
+BuildRequires:  at-spi2-core-devel bison cairo-devel cmake enchant2-devel
 BuildRequires:  flex fontconfig-devel freetype-devel ninja-build
 BuildRequires:  git geoclue2-devel gettext gcc-c++ glib2-devel gnutls-devel
-BuildRequires:  gobject-introspection-devel gperf
+BuildRequires:  gobject-introspection-devel gperf gnupg2 wpebackend-fdo-devel
-BuildRequires:  gstreamer1-devel gstreamer1-plugins-base-devel
+BuildRequires:  gstreamer1-devel gstreamer1-plugins-base-devel rubygem-json
-BuildRequires:  gstreamer1-plugins-bad-free-devel
+BuildRequires:  gstreamer1-plugins-bad-free-devel libwpe-devel libseccomp-devel
-BuildRequires:  gtk2-devel gtk3-devel gtk-doc
+BuildRequires:  gtk2-devel gtk3-devel gtk-doc geoclue2-devel libjpeg-turbo-devel
-BuildRequires:  harfbuzz-devel hyphen-devel
+BuildRequires:  harfbuzz-devel hyphen-devel bubblewrap xdg-dbus-proxy
 BuildRequires:  libatomic libicu-devel libjpeg-devel libnotify-devel
 BuildRequires:  libpng-devel libsecret-devel libsoup-devel libwebp-devel
 BuildRequires:  libxslt-devel libXt-devel libwayland-client-devel
-BuildRequires:  libwayland-egl-devel libwayland-server-devel
+BuildRequires:  libwayland-egl-devel libwayland-server-devel openjpeg2-devel
 BuildRequires:  mesa-libEGL-devel mesa-libGL-devel mesa-libGLES-devel
 BuildRequires:  pcre-devel perl-File-Copy-Recursive perl-JSON-PP perl-Switch
-BuildRequires:  python2 ruby rubygems sqlite-devel upower-devel woff2-devel
+BuildRequires:  python3 ruby rubygems sqlite-devel upower-devel woff2-devel
-Requires:       geoclue2
+Requires:       geoclue2 bubblewrap xdg-dbus-proxy  xdg-desktop-portal-gtk
 Requires:       webkit2gtk3-jsc = %{version}-%{release}
 
 Provides:       bundled(angle)
@@ -103,7 +93,7 @@ files for developing applications that use JavaScript engine from webkit2gtk3.
 
 #Build sections
 %prep
-%autosetup -p1 -n webkitgtk-%{version} -S git
+%autosetup -p1 -n webkitgtk-%{version}
 
 # rm bundled libraries
 rm -rf Source/ThirdParty/gtest/
@@ -118,10 +108,7 @@ pushd %{_target_platform}
   -DCMAKE_BUILD_TYPE=Release \
   -DENABLE_GTKDOC=ON \
   -DENABLE_MINIBROWSER=ON \
-%ifarch s390x %{power64} aarch64
+  -DPYTHON_EXECUTABLE=%{_bindir}/python3 \
-  -DENABLE_JIT=OFF \
-  -DUSE_SYSTEM_MALLOC=ON \
-%endif
   ..
 popd
 
@@ -188,6 +175,12 @@ done
 %{_datadir}/gtk-doc/html/webkitdomgtk-4.0/
 
 %changelog
+* Thu Jul 23 2020 songnannan <songnannan2@huawei.com> - 2.28.3-1
+- Type:enhancement
+- Id:NA
+- SUG:NA
+- DESC: update to  2.28.3
+
 * Mon Feb 24 2020 openEuler Buildteam <buildteam@openeuler.org> - 2.22.2-6
 - Type:enhancement
 - Id:NA