From 6682d9b37081a9367a79062a38d642a9b74700de Mon Sep 17 00:00:00 2001 From: CentOS Sources Date: Fri, 2 Aug 2019 03:53:00 -0400 Subject: [PATCH] import webkit2gtk3-2.24.2-2.el8 --- .gitignore | 1 + .webkit2gtk3.metadata | 1 + SOURCES/no-env-shebang.patch | 24 ++ SOURCES/webkit-aarch64_page_size.patch | 25 ++ SOURCES/webkit-atk_continuation_crash.patch | 15 + SOURCES/webkit-atk_crash.patch | 25 ++ SPECS/webkit2gtk3.spec | 378 ++++++++++++++++++++ 7 files changed, 469 insertions(+) create mode 100644 .gitignore create mode 100644 .webkit2gtk3.metadata create mode 100644 SOURCES/no-env-shebang.patch create mode 100644 SOURCES/webkit-aarch64_page_size.patch create mode 100644 SOURCES/webkit-atk_continuation_crash.patch create mode 100644 SOURCES/webkit-atk_crash.patch create mode 100644 SPECS/webkit2gtk3.spec diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000..7b39642 --- /dev/null +++ b/.gitignore @@ -0,0 +1 @@ +SOURCES/webkitgtk-2.24.2.tar.xz diff --git a/.webkit2gtk3.metadata b/.webkit2gtk3.metadata new file mode 100644 index 0000000..dee8846 --- /dev/null +++ b/.webkit2gtk3.metadata @@ -0,0 +1 @@ +632a65d93beb996bebdf7592ef9591f3993dea91 SOURCES/webkitgtk-2.24.2.tar.xz diff --git a/SOURCES/no-env-shebang.patch b/SOURCES/no-env-shebang.patch new file mode 100644 index 0000000..28ce8cc --- /dev/null +++ b/SOURCES/no-env-shebang.patch @@ -0,0 +1,24 @@ +From 494e4abb7a5130376d3cdb41a5e3963650b8659f Mon Sep 17 00:00:00 2001 +From: 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 + diff --git a/SOURCES/webkit-aarch64_page_size.patch b/SOURCES/webkit-aarch64_page_size.patch new file mode 100644 index 0000000..8012604 --- /dev/null +++ b/SOURCES/webkit-aarch64_page_size.patch @@ -0,0 +1,25 @@ +From f00a16d3e3b83f1cfa7d66bfc2369254abec58d4 Mon Sep 17 00:00:00 2001 +From: rpm-build +Date: Thu, 6 Sep 2018 12:03:53 +0200 +Subject: [PATCH] Fix the page size on aarch64 + +--- + Source/JavaScriptCore/heap/MarkedBlock.h | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/Source/JavaScriptCore/heap/MarkedBlock.h b/Source/JavaScriptCore/heap/MarkedBlock.h +index e240f0ae..6bf88692 100644 +--- a/Source/JavaScriptCore/heap/MarkedBlock.h ++++ b/Source/JavaScriptCore/heap/MarkedBlock.h +@@ -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; +-- +2.17.1 + diff --git a/SOURCES/webkit-atk_continuation_crash.patch b/SOURCES/webkit-atk_continuation_crash.patch new file mode 100644 index 0000000..c595dd6 --- /dev/null +++ b/SOURCES/webkit-atk_continuation_crash.patch @@ -0,0 +1,15 @@ +diff -up webkitgtk-2.20.4/Source/WebCore/accessibility/AccessibilityRenderObject.cpp.atk_continuation_crash webkitgtk-2.20.4/Source/WebCore/accessibility/AccessibilityRenderObject.cpp +--- webkitgtk-2.20.4/Source/WebCore/accessibility/AccessibilityRenderObject.cpp.atk_continuation_crash 2018-02-20 09:25:28.000000000 +0100 ++++ webkitgtk-2.20.4/Source/WebCore/accessibility/AccessibilityRenderObject.cpp 2018-08-07 11:43:19.438679595 +0200 +@@ -381,8 +381,9 @@ AccessibilityObject* AccessibilityRender + + // Case 5: node has no next sibling, and its parent is an inline with a continuation. + // Case 5.1: After case 4, (the element was inline w/ continuation but had no sibling), then check it's parent. +- if (!nextSibling && isInlineWithContinuation(*m_renderer->parent())) { +- auto& continuation = *downcast(*m_renderer->parent()).continuation(); ++ auto parent = m_renderer->parent(); ++ if (!nextSibling && parent && isInlineWithContinuation(*parent)) { ++ auto& continuation = *downcast(*parent).continuation(); + + // Case 5a: continuation is a block - in this case the block itself is the next sibling. + if (is(continuation)) diff --git a/SOURCES/webkit-atk_crash.patch b/SOURCES/webkit-atk_crash.patch new file mode 100644 index 0000000..f38eafc --- /dev/null +++ b/SOURCES/webkit-atk_crash.patch @@ -0,0 +1,25 @@ +diff --git a/Source/WebCore/accessibility/AccessibilityObject.cpp b/Source/WebCore/accessibility/AccessibilityObject.cpp +index f10a1519..523dfd46 100644 +--- a/Source/WebCore/accessibility/AccessibilityObject.cpp ++++ b/Source/WebCore/accessibility/AccessibilityObject.cpp +@@ -70,6 +70,7 @@ + #include "RenderWidget.h" + #include "RenderedPosition.h" + #include "RuntimeEnabledFeatures.h" ++#include "ScriptDisallowedScope.h" + #include "Settings.h" + #include "TextCheckerClient.h" + #include "TextCheckingHelper.h" +@@ -1783,7 +1784,11 @@ void AccessibilityObject::updateBackingStore() + // Updating the layout may delete this object. + RefPtr protectedThis(this); + if (auto* document = this->document()) { +- if (!document->view()->layoutContext().isInRenderTreeLayout() && !document->inRenderTreeUpdate() && !document->inStyleRecalc()) ++ if (!document->view()->layoutContext().isInRenderTreeLayout() ++ && !document->inRenderTreeUpdate() ++ && !document->inStyleRecalc() ++ && ScriptDisallowedScope::InMainThread::isScriptAllowed()) ++ + document->updateLayoutIgnorePendingStylesheets(); + } + diff --git a/SPECS/webkit2gtk3.spec b/SPECS/webkit2gtk3.spec new file mode 100644 index 0000000..5e6912b --- /dev/null +++ b/SPECS/webkit2gtk3.spec @@ -0,0 +1,378 @@ +## NOTE: Lots of files in various subdirectories have the same name (such as +## "LICENSE") so this short macro allows us to distinguish them by using their +## directory names (from the source tree) as prefixes for the files. +%global add_to_license_files() \ + mkdir -p _license_files ; \ + cp -p %1 _license_files/$(echo '%1' | sed -e 's!/!.!g') + +Name: webkit2gtk3 +Version: 2.24.2 +Release: 2%{?dist} +Summary: GTK Web content engine library + +License: LGPLv2 +URL: http://www.webkitgtk.org/ +Source0: http://webkitgtk.org/releases/webkitgtk-%{version}.tar.xz + +Patch1: webkit-aarch64_page_size.patch +# https://bugzilla.redhat.com/show_bug.cgi?id=1591638 +Patch2: webkit-atk_crash.patch +# https://bugzilla.redhat.com/show_bug.cgi?id=1503624 +Patch3: webkit-atk_continuation_crash.patch +# Don't use the shebang, but point straight to python 3 +Patch4: no-env-shebang.patch + +BuildRequires: bison +BuildRequires: bubblewrap +BuildRequires: cmake +BuildRequires: flex +BuildRequires: gcc-c++ +BuildRequires: gettext +BuildRequires: git +BuildRequires: gperf +BuildRequires: gtk-doc +BuildRequires: hyphen-devel +BuildRequires: libatomic +BuildRequires: ninja-build +BuildRequires: perl-File-Copy-Recursive +BuildRequires: perl-JSON-PP +BuildRequires: perl-Switch +BuildRequires: python3 +BuildRequires: ruby +BuildRequires: rubygems +#BuildRequires: xdg-dbus-proxy + +BuildRequires: pkgconfig(atspi-2) +BuildRequires: pkgconfig(cairo) +BuildRequires: pkgconfig(egl) +%ifarch aarch64 s390x +# On aarch64 and s390x enchant-2 is not available (gnome-less) +BuildRequires: pkgconfig(enchant) +%else +BuildRequires: pkgconfig(enchant-2) +%endif +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 +Provides: libwebkit2gtk = %{version}-%{release} + +# This package was renamed, so obsolete the old webkitgtk4 package +Obsoletes: webkitgtk4 < %{version}-%{release} +Provides: webkitgtk4 = %{version}-%{release} + +# We're supposed to specify versions here, but these crap Google libs don't do +# normal releases. Accordingly, they're not suitable to be system libs. +Provides: bundled(angle) + +# Require the jsc subpackage +Requires: %{name}-jsc%{?_isa} = %{version}-%{release} + +# 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. + +This package contains WebKit2 based WebKitGTK for GTK 3. + +%package devel +Summary: Development files for %{name} +Requires: %{name}%{?_isa} = %{version}-%{release} +Requires: %{name}-jsc%{?_isa} = %{version}-%{release} +Requires: %{name}-jsc-devel%{?_isa} = %{version}-%{release} +Obsoletes: webkitgtk4-devel < %{version}-%{release} +Provides: webkitgtk4-devel = %{version}-%{release} + +%description devel +The %{name}-devel package contains libraries, build data, and header +files for developing applications that use %{name}. + +%package doc +Summary: Documentation files for %{name} +BuildArch: noarch +Requires: %{name} = %{version}-%{release} +Obsoletes: webkitgtk4-doc < %{version}-%{release} +Provides: webkitgtk4-doc = %{version}-%{release} + +%description doc +This package contains developer documentation for %{name}. + +%package jsc +Summary: JavaScript engine from %{name} +Obsoletes: webkitgtk4-jsc < %{version}-%{release} +Provides: webkitgtk4-jsc = %{version}-%{release} + +%description jsc +This package contains JavaScript engine from %{name}. + +%package jsc-devel +Summary: Development files for JavaScript engine from %{name} +Requires: %{name}-jsc%{?_isa} = %{version}-%{release} +Obsoletes: webkitgtk4-jsc-devel < %{version}-%{release} +Provides: webkitgtk4-jsc-devel = %{version}-%{release} + +%description jsc-devel +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} +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}. + +%prep +%autosetup -p1 -n webkitgtk-%{version} -S git + +# Remove bundled libraries +rm -rf Source/ThirdParty/gtest/ +rm -rf Source/ThirdParty/qunit/ + +%build +# Increase the DIE limit so our debuginfo packages could be size optimized. +# Decreases the size for x86_64 from ~5G to ~1.1G. +# https://bugzilla.redhat.com/show_bug.cgi?id=1456261 +%global _dwz_max_die_limit 250000000 +# The _dwz_max_die_limit is being overridden by the arch specific ones from the +# redhat-rpm-config so we need to set the arch specific ones as well - now it +# is only needed for x86_64. +%global _dwz_max_die_limit_x86_64 250000000 + +# Decrease debuginfo even on ix86 because of: +# https://bugs.webkit.org/show_bug.cgi?id=140176 +%ifarch s390x %{arm} %{ix86} %{power64} %{mips} +# Decrease debuginfo verbosity to reduce memory consumption even more +%global optflags %(echo %{optflags} | sed 's/-g /-g1 /') +%endif + +# BMalloc and JIT are disabled on aarch64, because of the non-standard page size +# that's causing problems there (it's enabled on Fedora) +mkdir -p %{_target_platform} +pushd %{_target_platform} +%cmake \ + -GNinja \ + -DPORT=GTK \ + -DCMAKE_BUILD_TYPE=Release \ + -DENABLE_GTKDOC=ON \ + -DENABLE_MINIBROWSER=ON \ + -DPYTHON_EXECUTABLE=%{_bindir}/python3 \ +%ifarch s390x %{power64} aarch64 + -DENABLE_JIT=OFF \ + -DUSE_SYSTEM_MALLOC=ON \ +%endif + .. +popd + +# Show the build time in the status +export NINJA_STATUS="[%f/%t][%e] " +%ninja_build -C %{_target_platform} + +%install +%ninja_install -C %{_target_platform} + +%find_lang WebKit2GTK-4.0 + +# Finally, copy over and rename various files for %%license inclusion +%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/libXNVCtrl/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/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 + +%files -f WebKit2GTK-4.0.lang +%license _license_files/*ThirdParty* +%license _license_files/*WebCore* +%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/ +%{_libexecdir}/webkit2gtk-4.0/ +%exclude %{_libexecdir}/webkit2gtk-4.0/MiniBrowser +%exclude %{_libexecdir}/webkit2gtk-4.0/WebKitPluginProcess2 +%{_bindir}/WebKitWebDriver + +%files devel +%{_libexecdir}/webkit2gtk-4.0/MiniBrowser +%{_includedir}/webkitgtk-4.0/ +%exclude %{_includedir}/webkitgtk-4.0/JavaScriptCore +%{_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 +%{_libexecdir}/webkit2gtk-4.0/jsc +%dir %{_includedir}/webkitgtk-4.0 +%{_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 +%{_libexecdir}/webkit2gtk-4.0/WebKitPluginProcess2 + +%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 +* Wed May 22 2019 Eike Rathke - 2.24.2-2 +- Related: rhbz#1696708 Use enchant instead of enchant-2 on aarch64 and s390x + +* Tue May 21 2019 Eike Rathke - 2.24.2-1 +- Resolves: rhbz#1696708 Rebase to 2.24.2 +- Resolves: rhbz#1592271 Switch to Python 3 for build + +* Tue Feb 12 2019 Eike Rathke - 2.22.6-1 +- Resolves: rhbz#1676489 Update to 2.22.6 + +* Fri Jan 25 2019 Eike Rathke - 2.22.5-2 +- Resolves: rhbz#1666984 Fix gigacage + +* Tue Dec 18 2018 Eike Rathke - 2.22.5-1 +- Update to 2.22.5 + +* Tue Oct 30 2018 Tomas Popela - 2.22.3-1 +- Update to 2.22.3 +- Resolves: rhbz#1641009 + +* Mon Sep 24 2018 Tomas Popela - 2.22.2-1 +- Update to 2.22.2 +- Resolves: rhbz#1625602 + +* Thu Sep 20 2018 Tomas Popela - 2.22.1-1 +- Update to 2.22.1 +- Resolves: rhbz#1625602 + +* Tue Sep 11 2018 Tomas Popela - 2.22.0-2 +- Backport patches from RHEL 7 +- Resolves: rhbz#1625602 + +* Wed Sep 05 2018 Tomas Popela - 2.22.0-1 +- Update to 2.22.0 +- Resolves: rhbz#1625602 + +* Tue Jul 17 2018 Tomas Popela - 2.20.3-3 +- Update the python2 patch + +* Mon Jun 18 2018 Tomas Popela - 2.20.3-3 +- Export the python2 env variable +- Resolves: rhbz#1592264 + +* Mon Jun 11 2018 Tomas Popela - 2.20.3-1 +- Update to 2.20.3 + +* Thu May 24 2018 Tomas Popela - 2.20.2-4 +- Explicitly specify python2 over python and add python2 to BR + +* Tue May 22 2018 Tomas Popela - 2.20.2-3 +- aarch64 on RHEL 8 does have a 64kb page size +- Resolves: rhbz#1578576 + +* Tue May 22 2018 Tomas Popela - 2.20.2-2 +- Temporary disable JIT and BMalloc on aarch64 due to Gigacage problems +- Resolves: rhbz#1578576 + +* Tue May 15 2018 Tomas Popela - 2.20.2-1 +- Update to 2.20.2 +- Resolves: rhbz#1577388 + +* Tue Apr 10 2018 Tomas Popela - 2.20.1-1 +- Update to 2.20.1 + +* Mon Mar 12 2018 Kalev Lember - 2.20.0-2 +- Bump webkitgtk4 obsoletes versions + +* Mon Mar 12 2018 Tomas Popela - 2.20.0-1 +- Update to 2.20.0 + +* Tue Mar 06 2018 Tomas Popela - 2.19.92-1 +- Update to 2.19.92 + +* Wed Feb 21 2018 Tomas Popela - 2.19.91-1 +- Update to 2.19.91 + +* Fri Feb 09 2018 Fedora Release Engineering - 2.19.90-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild + +* Mon Feb 05 2018 Tomas Popela - 2.19.90-1 +- Update to 2.19.90 + +* Tue Jan 30 2018 Tomas Popela - 2.19.6-3 +- Remove obsoleted ldconfig scriptlets + +* Wed Jan 17 2018 Tomas Popela - 2.19.6-1 +- Update to 2.19.6 + +* Thu Jan 11 2018 Tomas Popela - 2.19.5-2 +- This package was formerly named webkitgtk4