Update to 2.24.4

Merged from F30 for consistency:
Switch to Ninja
Switch to python3
Switch to using pkgconfig build requires
Switch to enchant-2

.gitignore

@@ -10,3 +10,17 @@
 /webkitgtk-2.21.3.tar.xz
 /webkitgtk-2.21.4.tar.xz
 /webkitgtk-2.21.5.tar.xz
+/webkitgtk-2.21.91.tar.xz
+/webkitgtk-2.21.92.tar.xz
+/webkitgtk-2.22.0.tar.xz
+/webkitgtk-2.22.1.tar.xz
+/webkitgtk-2.22.2.tar.xz
+/webkitgtk-2.22.3.tar.xz
+/webkitgtk-2.22.4.tar.xz
+/webkitgtk-2.22.5.tar.xz
+/webkitgtk-2.22.6.tar.xz
+/webkitgtk-2.22.7.tar.xz
+/webkitgtk-2.24.1.tar.xz
+/webkitgtk-2.24.2.tar.xz
+/webkitgtk-2.24.3.tar.xz
+/webkitgtk-2.24.4.tar.xz

0001-Revert-run-gtk-tests-glib-common.py-cannot-determine.patch

@@ -1,61 +0,0 @@
-From c331a4ba5c85c85f33b4431fb557fd9985f5c983 Mon Sep 17 00:00:00 2001
-From: Tomas Popela <tpopela@redhat.com>
-Date: Mon, 23 Jul 2018 12:19:21 +0200
-Subject: [PATCH] Revert "run-gtk-tests (glib/common.py) cannot determine build
- directory when webKitBranchBuild=true"
-
-This reverts commit 31869f9ac67935d20059f9b1b9d1b28aa5b424a8.
-
-diff --git a/Tools/glib/common.py b/Tools/glib/common.py
-index 453078272f5..8a7b2fb465b 100644
---- a/Tools/glib/common.py
-+++ b/Tools/glib/common.py
-@@ -21,15 +21,6 @@ import select
- import subprocess
- import sys
- 
--tools_dir = os.path.abspath(os.path.join(os.path.dirname(__file__), '..', '..', 'Tools', 'Scripts'))
--if tools_dir not in sys.path:
--    sys.path.insert(0, tools_dir)
--
--from webkitpy.common.checkout.scm import Git
--from webkitpy.common.checkout.scm.detection import SCMDetector
--from webkitpy.common.system.executive import Executive
--from webkitpy.common.system.filesystem import FileSystem
--
- top_level_dir = None
- build_dir = None
- library_build_dir = None
-@@ -84,19 +75,9 @@ def get_build_path(fatal=True):
-     if is_valid_build_directory(build_dir):
-         return build_dir
- 
--    base_build_dir = top_level_path('WebKitBuild')
--
--    scm = SCMDetector(FileSystem(), Executive()).default_scm()
--    if isinstance(scm, Git):
--        is_branch_build = scm.read_config('core.webKitBranchBuild', bool)
--        if is_branch_build and is_branch_build.lower() == 'true':
--            current_branch = scm._current_branch()
--            if current_branch != 'master':
--                base_build_dir = os.path.join(base_build_dir, scm._current_branch())
--
-     global build_types
-     for build_type in build_types:
--        build_dir = os.path.join(base_build_dir, build_type)
-+        build_dir = top_level_path('WebKitBuild', build_type)
-         if is_valid_build_directory(build_dir):
-             return build_dir
- 
-@@ -109,7 +90,7 @@ def get_build_path(fatal=True):
-     if is_valid_build_directory(build_dir):
-         return build_dir
- 
--    build_dir = base_build_dir
-+    build_dir = top_level_path("WebKitBuild")
-     if is_valid_build_directory(build_dir):
-         return build_dir
- 
--- 
-2.17.1
-

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;
-         }

no-env-shebang.patch

@@ -0,0 +1,24 @@
+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.23.3/Tools/gtkdoc/generate-gtkdoc
+/usr/bin/env: 'python': No such file or directory
+---
+ Tools/gtk/generate-gtkdoc                                      | 2 +-
+ 2 files changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/Tools/gtk/generate-gtkdoc b/Tools/gtk/generate-gtkdoc
+index 45c23dfb..a3f82984 100755
+--- a/Tools/gtkdoc/generate-gtkdoc
++++ b/Tools/gtkdoc/generate-gtkdoc
+@@ -1,4 +1,4 @@
+-#!/usr/bin/env python
++#!/usr/bin/python3
+ # Copyright (C) 2011 Igalia S.L.
+ #
+ # This library is free software; you can redistribute it and/or
+-- 
+2.17.1
+

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
-

sources

@@ -1 +1 @@
-SHA512 (webkitgtk-2.21.5.tar.xz) = 74f0398bad7863af6a61fe1433fa4ffa2afb26780f65e9f2bded1b133ee067ecbc31db6df22322ade1f2f8c4942582f0e3e9bfcfa58acea3be22344fb3c6e927
+SHA512 (webkitgtk-2.24.4.tar.xz) = 1d713955a735ae2e2229beea7bda7f518a6247c6aa7f5753aeb5b5c6395339d451d0d146f7188e7ba65cb82ea5a74a5e73e956fe59d5f5f97659a44af33df112

webkit2gtk3.spec

@@ -6,9 +6,9 @@
         cp -p %1 _license_files/$(echo '%1' | sed -e 's!/!.!g')
 
 Name:           webkit2gtk3
-Version:        2.21.5
+Version:        2.24.4
 Release:        1%{?dist}
-Summary:        GTK+ Web content engine library
+Summary:        GTK Web content engine library
 
 License:        LGPLv2
 URL:            http://www.webkitgtk.org/
@@ -19,65 +19,69 @@ Patch0:     user-agent-branding.patch
 # https://fedoraproject.org/wiki/Packaging:CryptoPolicies
 # https://bugs.webkit.org/show_bug.cgi?id=158785
 Patch1:     fedora-crypto-policy.patch
-# https://bugs.webkit.org/show_bug.cgi?id=132333
-Patch2:     cloop-big-endians.patch
-# Explicitly specify python2 over python
-Patch3:     python2.patch
-# https://bugs.webkit.org/show_bug.cgi?id=187900
-Patch4:     0001-Revert-run-gtk-tests-glib-common.py-cannot-determine.patch
+# Don't use the shebang, but point straight to python 3
+Patch2:     no-env-shebang.patch
 
-BuildRequires:  at-spi2-core-devel
 BuildRequires:  bison
-BuildRequires:  cairo-devel
+BuildRequires:  bubblewrap
 BuildRequires:  cmake
-BuildRequires:  enchant-devel
 BuildRequires:  flex
-BuildRequires:  fontconfig-devel
-BuildRequires:  freetype-devel
-BuildRequires:  git
-BuildRequires:  geoclue2-devel
-BuildRequires:  gettext
 BuildRequires:  gcc-c++
-BuildRequires:  glib2-devel
-BuildRequires:  gnutls-devel
-BuildRequires:  gobject-introspection-devel
+BuildRequires:  gettext
+BuildRequires:  git
 BuildRequires:  gperf
-BuildRequires:  gstreamer1-devel
-BuildRequires:  gstreamer1-plugins-base-devel
-BuildRequires:  gstreamer1-plugins-bad-free-devel
-BuildRequires:  gtk2-devel
-BuildRequires:  gtk3-devel
 BuildRequires:  gtk-doc
-BuildRequires:  harfbuzz-devel
 BuildRequires:  hyphen-devel
 BuildRequires:  libatomic
-BuildRequires:  libicu-devel
-BuildRequires:  libjpeg-devel
-BuildRequires:  libnotify-devel
-BuildRequires:  libpng-devel
-BuildRequires:  libsecret-devel
-BuildRequires:  libsoup-devel
-BuildRequires:  libwebp-devel
-BuildRequires:  libxslt-devel
-BuildRequires:  libXt-devel
-BuildRequires:  libwayland-client-devel
-BuildRequires:  libwayland-egl-devel
-BuildRequires:  libwayland-server-devel
-BuildRequires:  mesa-libEGL-devel
-BuildRequires:  mesa-libGL-devel
-BuildRequires:  mesa-libGLES-devel
-BuildRequires:  pcre-devel
+BuildRequires:  ninja-build
 BuildRequires:  perl-File-Copy-Recursive
 BuildRequires:  perl-JSON-PP
 BuildRequires:  perl-Switch
-BuildRequires:  python2
+BuildRequires:  python3
 BuildRequires:  ruby
 BuildRequires:  rubygems
-BuildRequires:  sqlite-devel
-BuildRequires:  upower-devel
-BuildRequires:  woff2-devel
+BuildRequires:  xdg-dbus-proxy
 
+BuildRequires:  pkgconfig(atspi-2)
+BuildRequires:  pkgconfig(cairo)
+BuildRequires:  pkgconfig(egl)
+BuildRequires:  pkgconfig(enchant-2)
+BuildRequires:  pkgconfig(fontconfig)
+BuildRequires:  pkgconfig(freetype2)
+BuildRequires:  pkgconfig(geoclue-2.0)
+BuildRequires:  pkgconfig(gl)
+BuildRequires:  pkgconfig(glib-2.0)
+BuildRequires:  pkgconfig(glesv2)
+BuildRequires:  pkgconfig(gnutls)
+BuildRequires:  pkgconfig(gobject-introspection-1.0)
+BuildRequires:  pkgconfig(gstreamer-1.0)
+BuildRequires:  pkgconfig(gstreamer-plugins-base-1.0)
+BuildRequires:  pkgconfig(gstreamer-plugins-bad-1.0)
+BuildRequires:  pkgconfig(gtk+-2.0)
+BuildRequires:  pkgconfig(gtk+-3.0)
+BuildRequires:  pkgconfig(harfbuzz)
+BuildRequires:  pkgconfig(icu-uc)
+BuildRequires:  pkgconfig(libjpeg)
+BuildRequires:  pkgconfig(libnotify)
+BuildRequires:  pkgconfig(libopenjp2)
+BuildRequires:  pkgconfig(libpcre)
+BuildRequires:  pkgconfig(libpng)
+BuildRequires:  pkgconfig(libseccomp)
+BuildRequires:  pkgconfig(libsecret-1)
+BuildRequires:  pkgconfig(libsoup-2.4)
+BuildRequires:  pkgconfig(libwebp)
+BuildRequires:  pkgconfig(libwoff2dec)
+BuildRequires:  pkgconfig(libxslt)
+BuildRequires:  pkgconfig(sqlite3)
+BuildRequires:  pkgconfig(upower-glib)
+BuildRequires:  pkgconfig(wayland-client)
+BuildRequires:  pkgconfig(wayland-egl)
+BuildRequires:  pkgconfig(wayland-server)
+BuildRequires:  pkgconfig(xt)
+
+Requires:       bubblewrap
 Requires:       geoclue2
+Requires:       xdg-dbus-proxy
 
 # Obsolete libwebkit2gtk from the webkitgtk3 package
 Obsoletes:      libwebkit2gtk < 2.5.0
@@ -94,17 +98,17 @@ Provides:       bundled(angle)
 # Require the jsc subpackage
 Requires:       %{name}-jsc%{?_isa} = %{version}-%{release}
 
-# Recommend the support for the GTK+ 2 based NPAPI plugins
+# Recommend the support for the GTK 2 based NPAPI plugins
 Recommends:     %{name}-plugin-process-gtk2%{?_isa} = %{version}-%{release}
 
 # Filter out provides for private libraries
 %global __provides_exclude_from ^%{_libdir}/webkit2gtk-4\\.0/.*\\.so$
 
 %description
-WebKitGTK+ is the port of the portable web rendering engine WebKit to the
-GTK+ platform.
+WebKitGTK is the port of the portable web rendering engine WebKit to the
+GTK platform.
 
-This package contains WebKit2 based WebKitGTK+ for GTK+ 3.
+This package contains WebKit2 based WebKitGTK for GTK 3.
 
 %package        devel
 Summary:        Development files for %{name}
@@ -147,14 +151,14 @@ The %{name}-jsc-devel package contains libraries, build data, and header
 files for developing applications that use JavaScript engine from %{name}.
 
 %package        plugin-process-gtk2
-Summary:        GTK+ 2 based NPAPI plugins support for %{name}
+Summary:        GTK 2 based NPAPI plugins support for %{name}
 Requires:       %{name}-jsc%{?_isa} = %{version}-%{release}
 Obsoletes:      %{name} < 2.12.0-3
 Obsoletes:      webkitgtk4-plugin-process-gtk2 < %{version}-%{release}
 Provides:       webkitgtk4-plugin-process-gtk2 = %{version}-%{release}
 
 %description    plugin-process-gtk2
-Support for the GTK+ 2 based NPAPI plugins (such as Adobe Flash) for %{name}.
+Support for the GTK 2 based NPAPI plugins (such as Adobe Flash) for %{name}.
 
 %prep
 %autosetup -p1 -n webkitgtk-%{version} -S git
@@ -173,51 +177,35 @@ rm -rf Source/ThirdParty/qunit/
 # is only needed for x86_64.
 %global _dwz_max_die_limit_x86_64 250000000
 
-%ifarch s390 aarch64
-# Use linker flags to reduce memory consumption - on other arches the ld.gold is
-# used and also it doesn't have the --reduce-memory-overheads option
-%global optflags %{optflags} -Wl,--no-keep-memory -Wl,--reduce-memory-overheads
-%endif
-
 # Decrease debuginfo even on ix86 because of:
 # https://bugs.webkit.org/show_bug.cgi?id=140176
-%ifarch s390 s390x %{arm} %{ix86} ppc %{power64} %{mips}
+%ifarch s390x %{arm} %{ix86} %{power64} %{mips}
 # Decrease debuginfo verbosity to reduce memory consumption even more
 %global optflags %(echo %{optflags} | sed 's/-g /-g1 /')
 %endif
 
-%ifarch ppc
-# Use linker flag -relax to get WebKit build under ppc(32) with JIT disabled
-%global optflags %{optflags} -Wl,-relax
-%endif
-
 %if 0%{?fedora}
 %global optflags %{optflags} -DUSER_AGENT_GTK_DISTRIBUTOR_NAME=\'\\"Fedora\\"\'
 %endif
 
-# Disable ld.gold on s390 as it does not have it.
-# Also for aarch64 as the support is in upstream, but not packaged in Fedora.
 mkdir -p %{_target_platform}
 pushd %{_target_platform}
 %cmake \
+  -GNinja \
   -DPORT=GTK \
   -DCMAKE_BUILD_TYPE=Release \
   -DENABLE_GTKDOC=ON \
   -DENABLE_MINIBROWSER=ON \
-%ifarch s390 aarch64
-  -DUSE_LD_GOLD=OFF \
-%endif
-%ifarch s390 s390x ppc %{power64}
-  -DENABLE_JIT=OFF \
-  -DUSE_SYSTEM_MALLOC=ON \
-%endif
+  -DPYTHON_EXECUTABLE=%{_bindir}/python3 \
   ..
 popd
 
-make %{?_smp_mflags} -C %{_target_platform}
+# Show the build time in the status
+export NINJA_STATUS="[%f/%t][%e] "
+%ninja_build -C %{_target_platform}
 
 %install
-%make_install -C %{_target_platform}
+%ninja_install -C %{_target_platform}
 
 %find_lang WebKit2GTK-4.0
 
@@ -233,7 +221,6 @@ make %{?_smp_mflags} -C %{_target_platform}
 %add_to_license_files Source/WebCore/LICENSE-LGPL-2
 %add_to_license_files Source/WebCore/LICENSE-LGPL-2.1
 %add_to_license_files Source/WebInspectorUI/UserInterface/External/CodeMirror/LICENSE
-%add_to_license_files Source/WebInspectorUI/UserInterface/External/ESLint/LICENSE
 %add_to_license_files Source/WebInspectorUI/UserInterface/External/Esprima/LICENSE
 %add_to_license_files Source/WebInspectorUI/UserInterface/External/three.js/LICENSE
 %add_to_license_files Source/WTF/icu/LICENSE
@@ -292,6 +279,66 @@ make %{?_smp_mflags} -C %{_target_platform}
 %{_datadir}/gtk-doc/html/webkitdomgtk-4.0/
 
 %changelog
+* Wed Aug 28 2019 Tomas Popela <tpopela@redhat.com> - 2.24.4-1
+- Update to 2.24.4
+
+* Tue Jul 02 2019 Tomas Popela <tpopela@redhat.com> - 2.24.3-1
+- Update to 2.24.3
+
+* Fri May 17 2019 Eike Rathke <erack@redhat.com> - 2.24.2-1
+- Update to 2.24.2
+
+* Tue Apr 09 2019 Eike Rathke <erack@redhat.com> - 2.24.1-1
+- Update to 2.24.1
+- Merged from F30 for consistency:
+- Switch to Ninja
+- Switch to python3
+- Switch to using pkgconfig build requires
+- Switch to enchant-2
+
+* Mon Mar 04 2019 Eike Rathke <erack@redhat.com> - 2.22.7-1
+- Update to 2.22.7
+
+* Mon Feb 11 2019 Eike Rathke <erack@redhat.com> - 2.22.6-1
+- Update to 2.22.6
+
+* Mon Dec 17 2018 Eike Rathke <erack@redhat.com> - 2.22.5-1
+- Update to 2.22.5
+
+* Thu Nov 22 2018 Tomáš Popela <tpopela@redhat.com> - 2.22.4-1
+- Update to 2.22.4
+
+* Mon Oct 29 2018 Tomas Popela <tpopela@redhat.com> - 2.22.3-1
+- Update to 2.22.3
+
+* Fri Oct 19 2018 Tomas Popela <tpopela@redhat.com> - 2.22.2-2
+- Fix WebProcess crash while printing
+- Resolves: rhbz#1639754
+
+* Sun Sep 23 2018 Tomas Popela <tpopela@redhat.com> - 2.22.2-1
+- Update to 2.22.2
+
+* Thu Sep 20 2018 Tomas Popela <tpopela@redhat.com> - 2.22.1-1
+- Update to 2.22.1
+
+* Fri Sep 07 2018 Kalev Lember <klember@redhat.com> - 2.22.0-3
+- Rebuilt against fixed atk (#1626575)
+
+* Fri Sep 07 2018 Kalev Lember <klember@redhat.com> - 2.22.0-2
+- Rebuilt for GNOME 3.30.0 megaupdate
+
+* Mon Sep 03 2018 Tomas Popela <tpopela@redhat.com> - 2.22.0-1
+- Update to 2.22.0
+
+* Thu Aug 30 2018 Tomas Popela <tpopela@redhat.com> - 2.21.92-2
+- Update the JSC build fix patch
+
+* Wed Aug 29 2018 Tomas Popela <tpopela@redhat.com> - 2.21.92-1
+- Update to 2.21.92
+
+* Thu Aug 16 2018 Tomas Popela <tpopela@redhat.com> - 2.21.91-1
+- Update to 2.21.91
+
 * Fri Jul 20 2018 Tomas Popela <tpopela@redhat.com> - 2.21.5-1
 - Update to 2.21.5