Update to 2.22.4

Resolves: rhbz#1639754

.gitignore

@@ -61,3 +61,23 @@
 /webkitgtk-2.17.4.tar.xz
 /webkitgtk-2.17.5.tar.xz
 /webkitgtk-2.17.90.tar.xz
+/webkitgtk-2.17.91.tar.xz
+/webkitgtk-2.17.92.tar.xz
+/webkitgtk-2.18.0.tar.xz
+/webkitgtk-2.18.1.tar.xz
+/webkitgtk-2.18.2.tar.xz
+/webkitgtk-2.18.3.tar.xz
+/webkitgtk-2.18.4.tar.xz
+/webkitgtk-2.18.5.tar.xz
+/webkitgtk-2.18.6.tar.xz
+/webkitgtk-2.20.0.tar.xz
+/webkitgtk-2.20.1.tar.xz
+/webkitgtk-2.20.2.tar.xz
+/webkitgtk-2.20.3.tar.xz
+/webkitgtk-2.20.4.tar.xz
+/webkitgtk-2.20.5.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

0001-GTK-Require-woff2-1.0.2-and-drop-direct-brotli-depen.patch

@@ -0,0 +1,111 @@
+From aacbb7501a1c9b16a73211a8a67ff5b028e92988 Mon Sep 17 00:00:00 2001
+From: "mcatanzaro@igalia.com"
+ <mcatanzaro@igalia.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
+Date: Tue, 14 Nov 2017 00:42:20 +0000
+Subject: [PATCH] [GTK] Require woff2 1.0.2 and drop direct brotli dependency
+ https://bugs.webkit.org/show_bug.cgi?id=179630
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+Reviewed by Frédéric Wang.
+
+.:
+
+* Source/cmake/FindBrotliDec.cmake: Removed.
+* Source/cmake/OptionsGTK.cmake:
+
+Tools:
+
+* gtk/jhbuild.modules:
+
+
+git-svn-id: http://svn.webkit.org/repository/webkit/trunk@224793 268f45cc-cd09-0410-ab3c-d52691b4dbfc
+---
+ ChangeLog                        | 10 ++++++++
+ Source/cmake/FindBrotliDec.cmake | 53 ----------------------------------------
+ Source/cmake/OptionsGTK.cmake    |  6 +----
+ Tools/ChangeLog                  |  9 +++++++
+ Tools/gtk/jhbuild.modules        |  2 +-
+ 5 files changed, 21 insertions(+), 59 deletions(-)
+ delete mode 100644 Source/cmake/FindBrotliDec.cmake
+
+diff --git a/Source/cmake/FindBrotliDec.cmake b/Source/cmake/FindBrotliDec.cmake
+deleted file mode 100644
+index 3a8cf90357f..00000000000
+--- a/Source/cmake/FindBrotliDec.cmake
++++ /dev/null
+@@ -1,53 +0,0 @@
+-# - Try to find BrotliDec.
+-# Once done, this will define
+-#
+-#  BROTLIDEC_FOUND - system has BrotliDec.
+-#  BROTLIDEC_INCLUDE_DIRS - the BrotliDec include directories
+-#  BROTLIDEC_LIBRARIES - link these to use BrotliDec.
+-#
+-# Copyright (C) 2017 Igalia S.L.
+-#
+-# Redistribution and use in source and binary forms, with or without
+-# modification, are permitted provided that the following conditions
+-# are met:
+-# 1.  Redistributions of source code must retain the above copyright
+-#     notice, this list of conditions and the following disclaimer.
+-# 2.  Redistributions in binary form must reproduce the above copyright
+-#     notice, this list of conditions and the following disclaimer in the
+-#     documentation and/or other materials provided with the distribution.
+-#
+-# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDER AND ITS CONTRIBUTORS ``AS
+-# IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO,
+-# THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+-# PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR ITS
+-# CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
+-# EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+-# PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS;
+-# OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
+-# WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
+-# OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
+-# ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+-
+-find_package(PkgConfig)
+-pkg_check_modules(PC_BROTLIDEC libbrotlidec)
+-
+-find_path(BROTLIDEC_INCLUDE_DIRS
+-    NAMES brotli/decode.h
+-    HINTS ${PC_BROTLIDEC_INCLUDEDIR}
+-)
+-
+-find_library(BROTLIDEC_LIBRARIES
+-    NAMES brotlidec
+-    HINTS ${PC_BROTLIDEC_LIBDIR}
+-)
+-
+-include(FindPackageHandleStandardArgs)
+-find_package_handle_standard_args(BrotliDec
+-    REQUIRED_VARS BROTLIDEC_INCLUDE_DIRS BROTLIDEC_LIBRARIES
+-    FOUND_VAR BROTLIDEC_FOUND
+-    VERSION_VAR PC_BROTLIDEC_VERSION)
+-
+-mark_as_advanced(
+-    BROTLIDEC_INCLUDE_DIRS
+-    BROTLIDEC_LIBRARIES
+-)
+diff --git a/Source/cmake/OptionsGTK.cmake b/Source/cmake/OptionsGTK.cmake
+index ba7e134c7cc..39c3a9be47e 100644
+--- a/Source/cmake/OptionsGTK.cmake
++++ b/Source/cmake/OptionsGTK.cmake
+@@ -365,11 +365,7 @@ if (USE_UPOWER)
+ endif ()
+ 
+ if (USE_WOFF2)
+-    find_package(BrotliDec 1.0.1)
+-    if (NOT BROTLIDEC_FOUND)
+-       message(FATAL_ERROR "libbrotlidec is needed for USE_WOFF2.")
+-    endif ()
+-    find_package(WOFF2Dec 1.0.1)
++    find_package(WOFF2Dec 1.0.2)
+     if (NOT WOFF2DEC_FOUND)
+        message(FATAL_ERROR "libwoff2dec is needed for USE_WOFF2.")
+     endif ()
+-- 
+2.16.2
+

0001-Unreviewed-fix-typos-in-library-names-for-the-GTK-po.patch

@@ -0,0 +1,35 @@
+From ecbb859d88eacad10bf556044abaeaed6c9b32fc Mon Sep 17 00:00:00 2001
+From: "berto@igalia.com"
+ <berto@igalia.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
+Date: Thu, 2 Nov 2017 13:41:16 +0000
+Subject: [PATCH] Unreviewed, fix typos in library names for the GTK+ port.
+
+* Source/cmake/OptionsGTK.cmake:
+
+git-svn-id: http://svn.webkit.org/repository/webkit/trunk@224329 268f45cc-cd09-0410-ab3c-d52691b4dbfc
+---
+ ChangeLog                     | 6 ++++++
+ Source/cmake/OptionsGTK.cmake | 4 ++--
+ 2 files changed, 8 insertions(+), 2 deletions(-)
+
+diff --git a/Source/cmake/OptionsGTK.cmake b/Source/cmake/OptionsGTK.cmake
+index 2b440a27376..6c99868ae86 100644
+--- a/Source/cmake/OptionsGTK.cmake
++++ b/Source/cmake/OptionsGTK.cmake
+@@ -367,11 +367,11 @@ endif ()
+ if (USE_WOFF2)
+     find_package(BrotliDec 1.0.1)
+     if (NOT BROTLIDEC_FOUND)
+-       message(FATAL_ERROR "librotlidec is needed for USE_WOFF2.")
++       message(FATAL_ERROR "libbrotlidec is needed for USE_WOFF2.")
+     endif ()
+     find_package(WOFF2Dec 1.0.1)
+     if (NOT WOFF2DEC_FOUND)
+-       message(FATAL_ERROR "liwoff2dec is needed for USE_WOFF2.")
++       message(FATAL_ERROR "libwoff2dec is needed for USE_WOFF2.")
+     endif ()
+ endif ()
+ 
+-- 
+2.16.2
+

cloop-big-endians.patch

@@ -0,0 +1,30 @@
+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;
+         }

fedora-crypto-policy.patch

@@ -1,18 +1,6 @@
-diff -up webkitgtk-2.17.5/Source/WebKit/NetworkProcess/EntryPoint/unix/NetworkProcessMain.cpp.fedora-crypto-policy webkitgtk-2.17.5/Source/WebKit/NetworkProcess/EntryPoint/unix/NetworkProcessMain.cpp
---- webkitgtk-2.17.5/Source/WebKit/NetworkProcess/EntryPoint/unix/NetworkProcessMain.cpp.fedora-crypto-policy	2017-07-26 10:41:35.729680485 +0200
-+++ webkitgtk-2.17.5/Source/WebKit/NetworkProcess/EntryPoint/unix/NetworkProcessMain.cpp	2017-07-26 10:41:47.709611761 +0200
-@@ -39,7 +39,7 @@ int main(int argc, char** argv)
-     // overwrite this priority string if it's already set by the user.
-     // https://bugzilla.gnome.org/show_bug.cgi?id=738633
-     // WARNING: This needs to be KEPT IN SYNC with WebProcessMain.cpp.
--    setenv("G_TLS_GNUTLS_PRIORITY", "NORMAL:%COMPAT:!VERS-SSL3.0:!ARCFOUR-128", 0);
-+    setenv("G_TLS_GNUTLS_PRIORITY", "@SYSTEM:%COMPAT:!VERS-SSL3.0:!ARCFOUR-128", 0);
- 
-     return NetworkProcessMainUnix(argc, argv);
- }
-diff -up webkitgtk-2.17.5/Source/WebKit/WebProcess/EntryPoint/unix/WebProcessMain.cpp.fedora-crypto-policy webkitgtk-2.17.5/Source/WebKit/WebProcess/EntryPoint/unix/WebProcessMain.cpp
---- webkitgtk-2.17.5/Source/WebKit/WebProcess/EntryPoint/unix/WebProcessMain.cpp.fedora-crypto-policy	2017-07-26 10:38:08.202870988 +0200
-+++ webkitgtk-2.17.5/Source/WebKit/WebProcess/EntryPoint/unix/WebProcessMain.cpp	2017-07-26 10:38:35.342715297 +0200
+diff -up webkitgtk-2.17.92/Source/WebKit/NetworkProcess/EntryPoint/unix/NetworkProcessMain.cpp.fedora-crypto-policy webkitgtk-2.17.92/Source/WebKit/NetworkProcess/EntryPoint/unix/NetworkProcessMain.cpp
+--- webkitgtk-2.17.92/Source/WebKit/NetworkProcess/EntryPoint/unix/NetworkProcessMain.cpp.fedora-crypto-policy	2017-09-05 13:39:59.294426661 +0200
++++ webkitgtk-2.17.92/Source/WebKit/NetworkProcess/EntryPoint/unix/NetworkProcessMain.cpp	2017-09-05 13:40:09.144389997 +0200
 @@ -43,7 +43,7 @@ int main(int argc, char** argv)
      // overwrite this priority string if it's already set by the user.
      // https://bugzilla.gnome.org/show_bug.cgi?id=738633
@@ -21,4 +9,16 @@ diff -up webkitgtk-2.17.5/Source/WebKit/WebProcess/EntryPoint/unix/WebProcessMai
 +    setenv("G_TLS_GNUTLS_PRIORITY", "@SYSTEM:%COMPAT:!VERS-SSL3.0:!ARCFOUR-128", 0);
  
  #if USE(GCRYPT)
-     // Call gcry_check_version() before any other libgcrypt call, ignoring the
+     PAL::GCrypt::initialize();
+diff -up webkitgtk-2.17.92/Source/WebKit/WebProcess/EntryPoint/unix/WebProcessMain.cpp.fedora-crypto-policy webkitgtk-2.17.92/Source/WebKit/WebProcess/EntryPoint/unix/WebProcessMain.cpp
+--- webkitgtk-2.17.92/Source/WebKit/WebProcess/EntryPoint/unix/WebProcessMain.cpp.fedora-crypto-policy	2017-09-05 13:40:28.558317735 +0200
++++ webkitgtk-2.17.92/Source/WebKit/WebProcess/EntryPoint/unix/WebProcessMain.cpp	2017-09-05 13:40:56.057215378 +0200
+@@ -43,7 +43,7 @@ int main(int argc, char** argv)
+     // overwrite this priority string if it's already set by the user.
+     // https://bugzilla.gnome.org/show_bug.cgi?id=738633
+     // WARNING: This needs to be KEPT IN SYNC with WebProcessMain.cpp.
+-    setenv("G_TLS_GNUTLS_PRIORITY", "NORMAL:%COMPAT:!VERS-SSL3.0:!ARCFOUR-128", 0);
++    setenv("G_TLS_GNUTLS_PRIORITY", "@SYSTEM:%COMPAT:!VERS-SSL3.0:!ARCFOUR-128", 0);
+ 
+ #if USE(GCRYPT)
+     PAL::GCrypt::initialize();

sources

@@ -1 +1 @@
-SHA512 (webkitgtk-2.17.90.tar.xz) = 72993e7bf61607bf75682f387f2877492d0982f8c15de2ed8444d9ac889d635845d8b59b5f9373ef3605d9b376534ff923775a98d229da608c532508d5846aa4
+SHA512 (webkitgtk-2.22.4.tar.xz) = a46107f7da8513b06bd1e5685c03ca7f1a48af66b817908b8e61f1b343d98e122af73ccdeb47657cf4378fe33107fdc119a9a51d87db07ad5316ab39ed0db55f

user-agent-branding.patch

@@ -1,6 +1,6 @@
-diff -up webkitgtk-2.14.1/Source/WebCore/platform/gtk/UserAgentGtk.cpp.orig webkitgtk-2.14.1/Source/WebCore/platform/gtk/UserAgentGtk.cpp
---- webkitgtk-2.14.1/Source/WebCore/platform/gtk/UserAgentGtk.cpp.orig	2016-10-12 07:59:25.670057792 +0200
-+++ webkitgtk-2.14.1/Source/WebCore/platform/gtk/UserAgentGtk.cpp	2016-10-12 08:01:06.251878684 +0200
+diff -up webkitglib-2.14.1/Source/WebCore/platform/glib/UserAgentGLib.cpp.orig webkitglib-2.14.1/Source/WebCore/platform/glib/UserAgentGLib.cpp
+--- webkitglib-2.14.1/Source/WebCore/platform/glib/UserAgentGLib.cpp.orig	2016-10-12 07:59:25.670057792 +0200
++++ webkitglib-2.14.1/Source/WebCore/platform/glib/UserAgentGLib.cpp	2016-10-12 08:01:06.251878684 +0200
 @@ -85,6 +85,9 @@ static String buildUserAgentString(const UserAgentQuirks& quirks)
      else {
          uaString.append(platformForUAString());

webkit-jsc-use-ternary-operator.patch

@@ -0,0 +1,25 @@
+From 9154ea477728797b9d33b32fb36940485f6927fa Mon Sep 17 00:00:00 2001
+From: rpm-build <rpm-build>
+Date: Thu, 30 Aug 2018 07:04:58 +0200
+Subject: [PATCH] Use ternary operator instead of std::max
+
+---
+ Source/JavaScriptCore/heap/RegisterState.h | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/Source/JavaScriptCore/heap/RegisterState.h b/Source/JavaScriptCore/heap/RegisterState.h
+index baaef4c7..b3037dba 100644
+--- a/Source/JavaScriptCore/heap/RegisterState.h
++++ b/Source/JavaScriptCore/heap/RegisterState.h
+@@ -166,7 +166,7 @@ using RegisterState = jmp_buf;
+ #pragma warning(disable: 4611)
+ #endif
+ #define ALLOCATE_AND_GET_REGISTER_STATE(registers) \
+-    alignas(std::max(alignof(void*), alignof(RegisterState))) RegisterState registers; \
++    alignas(alignof(void*) > alignof(RegisterState) ? alignof(void*) : alignof(RegisterState)) RegisterState registers; \
+     setjmp(registers)
+ 
+ #if COMPILER(MSVC)
+-- 
+2.17.1
+

webkitgtk4.spec

@@ -6,7 +6,7 @@
         cp -p %1 _license_files/$(echo '%1' | sed -e 's!/!.!g')
 
 Name:           webkitgtk4
-Version:        2.17.90
+Version:        2.22.4
 Release:        1%{?dist}
 Summary:        GTK+ Web content engine library
 
@@ -15,11 +15,23 @@ URL:            http://www.webkitgtk.org/
 Source0:        http://webkitgtk.org/releases/webkitgtk-%{version}.tar.xz
 
 # https://bugs.webkit.org/show_bug.cgi?id=162611
-Patch0:     webkitgtk-2.14.1-user-agent-branding.patch
+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=173544
+# https://bugs.webkit.org/show_bug.cgi?id=132333
+Patch2:     cloop-big-endians.patch
+
+# Revert woff2 and brotli removal to bundle them again, as they are not
+# included in F26 and F27.
+# https://bugs.webkit.org/show_bug.cgi?id=179630
+Patch4:     0001-GTK-Require-woff2-1.0.2-and-drop-direct-brotli-depen.patch
+# https://trac.webkit.org/changeset/224329
+Patch5:     0001-Unreviewed-fix-typos-in-library-names-for-the-GTK-po.patch
+# https://bugs.webkit.org/show_bug.cgi?id=177862
+Patch6:     remove_woff2.patch
+# https://bugs.webkit.org/show_bug.cgi?id=177804
+Patch7:     remove_brotli.patch
 
 BuildRequires:  at-spi2-core-devel
 BuildRequires:  bison
@@ -136,7 +148,14 @@ Requires:       %{name}-jsc%{?_isa} = %{version}-%{release}
 Support for the GTK+ 2 based NPAPI plugins (such as Adobe Flash) for %{name}.
 
 %prep
-%autosetup -p1 -n webkitgtk-%{version}
+%setup -q -n webkitgtk-%{version}
+%patch0 -p1
+%patch1 -p1
+%patch2 -p1
+%patch4 -R -p1 -b .woff2_1.0.2
+%patch5 -R -p1 -b .typos
+%patch6 -p1 -b .remove_woff2
+%patch7 -p1 -b .remove_brotli
 
 # Remove bundled libraries
 rm -rf Source/ThirdParty/gtest/
@@ -176,6 +195,7 @@ rm -rf Source/ThirdParty/qunit/
 
 # 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.
+# Disable Media Source because we don't have new enough gstreamer in F27.
 mkdir -p %{_target_platform}
 pushd %{_target_platform}
 %cmake \
@@ -183,13 +203,12 @@ pushd %{_target_platform}
   -DCMAKE_BUILD_TYPE=Release \
   -DENABLE_GTKDOC=ON \
   -DENABLE_MINIBROWSER=ON \
+  -DENABLE_MEDIA_SOURCE=OFF \
 %ifarch s390 aarch64
   -DUSE_LD_GOLD=OFF \
 %endif
 %ifarch s390 s390x ppc %{power64}
   -DENABLE_JIT=OFF \
-%endif
-%ifarch s390 s390x ppc %{power64}
   -DUSE_SYSTEM_MALLOC=ON \
 %endif
   ..
@@ -206,14 +225,19 @@ make %{?_smp_mflags} -C %{_target_platform}
 %add_to_license_files Source/JavaScriptCore/COPYING.LIB
 %add_to_license_files Source/JavaScriptCore/icu/LICENSE
 %add_to_license_files Source/ThirdParty/ANGLE/LICENSE
+%add_to_license_files Source/ThirdParty/ANGLE/src/common/third_party/smhasher/LICENSE
 %add_to_license_files Source/ThirdParty/ANGLE/src/third_party/compiler/LICENSE
-%add_to_license_files Source/ThirdParty/ANGLE/src/third_party/murmurhash/LICENSE
+%add_to_license_files Source/ThirdParty/ANGLE/src/third_party/libXNVCtrl/LICENSE
+%add_to_license_files Source/ThirdParty/brotli/LICENSE
+%add_to_license_files Source/ThirdParty/woff2/LICENSE
 %add_to_license_files Source/WebCore/icu/LICENSE
 %add_to_license_files Source/WebCore/LICENSE-APPLE
 %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
 %add_to_license_files Source/WTF/wtf/dtoa/COPYING
 %add_to_license_files Source/WTF/wtf/dtoa/LICENSE
@@ -229,6 +253,7 @@ make %{?_smp_mflags} -C %{_target_platform}
 %license _license_files/*WebInspectorUI*
 %license _license_files/*WTF*
 %{_libdir}/libwebkit2gtk-4.0.so.*
+%dir %{_libdir}/girepository-1.0
 %{_libdir}/girepository-1.0/WebKit2-4.0.typelib
 %{_libdir}/girepository-1.0/WebKit2WebExtension-4.0.typelib
 %{_libdir}/webkit2gtk-4.0/
@@ -243,12 +268,14 @@ make %{?_smp_mflags} -C %{_target_platform}
 %{_libdir}/libwebkit2gtk-4.0.so
 %{_libdir}/pkgconfig/webkit2gtk-4.0.pc
 %{_libdir}/pkgconfig/webkit2gtk-web-extension-4.0.pc
+%dir %{_datadir}/gir-1.0
 %{_datadir}/gir-1.0/WebKit2-4.0.gir
 %{_datadir}/gir-1.0/WebKit2WebExtension-4.0.gir
 
 %files jsc
 %license _license_files/*JavaScriptCore*
 %{_libdir}/libjavascriptcoregtk-4.0.so.*
+%dir %{_libdir}/girepository-1.0
 %{_libdir}/girepository-1.0/JavaScriptCore-4.0.typelib
 
 %files jsc-devel
@@ -257,6 +284,7 @@ make %{?_smp_mflags} -C %{_target_platform}
 %{_includedir}/webkitgtk-4.0/JavaScriptCore/
 %{_libdir}/libjavascriptcoregtk-4.0.so
 %{_libdir}/pkgconfig/javascriptcoregtk-4.0.pc
+%dir %{_datadir}/gir-1.0
 %{_datadir}/gir-1.0/JavaScriptCore-4.0.gir
 
 %files plugin-process-gtk2
@@ -265,10 +293,82 @@ make %{?_smp_mflags} -C %{_target_platform}
 %files doc
 %dir %{_datadir}/gtk-doc
 %dir %{_datadir}/gtk-doc/html
+%{_datadir}/gtk-doc/html/jsc-glib-4.0/
 %{_datadir}/gtk-doc/html/webkit2gtk-4.0/
 %{_datadir}/gtk-doc/html/webkitdomgtk-4.0/
 
 %changelog
+* 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
+
+* Mon Sep 03 2018 Tomas Popela <tpopela@redhat.com> - 2.22.0-1
+- Update to 2.22.0
+
+* Tue Aug 14 2018 Tomas Popela <tpopela@redhat.com> - 2.20.5-1
+- Update to 2.20.5
+
+* Mon Aug 06 2018 Tomas Popela <tpopela@redhat.com> - 2.20.4-1
+- Update to 2.20.4
+
+* Mon Jun 11 2018 Tomas Popela <tpopela@redhat.com> - 2.20.3-1
+- Update to 2.20.3
+
+* Wed May 09 2018 Tomas Popela <tpopela@redhat.com> - 2.20.2-1
+- Update to 2.20.2
+
+* Tue Apr 10 2018 Tomas Popela <tpopela@redhat.com> - 2.20.1-1
+- Update to 2.20.1
+
+* Mon Mar 12 2018 Tomas Popela <tpopela@redhat.com> - 2.20.0-1
+- Update to 2.20.0
+
+* Wed Jan 24 2018 Tomas Popela <tpopela@redhat.com> - 2.18.6-1
+- Update to 2.18.6
+
+* Wed Jan 10 2018 Tomas Popela <tpopela@redhat.com> - 2.18.5-1
+- Update to 2.18.5
+
+* Tue Dec 19 2017 Tomas Popela <tpopela@redhat.com> - 2.18.4-1
+- Update to 2.18.4
+
+* Mon Nov 13 2017 Tomas Popela <tpopela@redhat.com> - 2.18.3-1
+- Update to 2.18.3
+
+* Thu Nov 02 2017 Kalev Lember <klember@redhat.com> - 2.18.2-2
+- Fix gir directory ownership
+
+* Fri Oct 27 2017 Tomas Popela <tpopela@redhat.com> - 2.18.2-1
+- Update to 2.18.2
+
+* Wed Oct 18 2017 Tomas Popela <tpopela@redhat.com> - 2.18.1-1
+- Update to 2.18.1
+
+* Wed Sep 13 2017 Richard W.M. Jones <rjones@redhat.com> - 2.18.0-2
+- Rebuild to try to fix: libwebkit2gtk-4.0.so.37: undefined symbol:
+  soup_auth_manager_clear_cached_credentials
+
+* Mon Sep 11 2017 Tomas Popela <tpopela@redhat.com> - 2.18.0-1
+- Update to 2.18.0
+
+* Tue Sep 05 2017 Tomas Popela <tpopela@redhat.com> - 2.17.92-1
+- Update to 2.17.92
+
+* Fri Aug 18 2017 Tomas Popela <tpopela@redhat.com> - 2.17.91-1
+- Update to 2.17.91
+
 * Wed Aug 09 2017 Tomas Popela <tpopela@redhat.com> - 2.17.90-1
 - Update to 2.17.90