diff --git a/cloop-big-endians.patch b/cloop-big-endians.patch deleted file mode 100644 index 7bb12dfb98c0a32baeb3c9ada8af2657e13f5a68..0000000000000000000000000000000000000000 --- a/cloop-big-endians.patch +++ /dev/null @@ -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(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(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(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(op.operand); - - break; - } diff --git a/python2.patch b/python2.patch deleted file mode 100644 index 2a04ca3ccc497935f6d03026f6b903f746ae8205..0000000000000000000000000000000000000000 --- a/python2.patch +++ /dev/null @@ -1,38 +0,0 @@ -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.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 - diff --git a/user-agent-branding.patch b/user-agent-branding.patch deleted file mode 100644 index d87f3e78751a35e7e62daa2fdea2a9cf6c41f97a..0000000000000000000000000000000000000000 --- a/user-agent-branding.patch +++ /dev/null @@ -1,13 +0,0 @@ -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()); - uaString.appendLiteral("; "); -+#if defined(USER_AGENT_GTK_DISTRIBUTOR_NAME) -+ uaString.appendLiteral(USER_AGENT_GTK_DISTRIBUTOR_NAME "; "); -+#endif - uaString.append(platformVersionForUAString()); - } - diff --git a/webkit-aarch64_page_size.patch b/webkit-aarch64_page_size.patch deleted file mode 100644 index 2112a9d4af3316123fbfd65adcb9742ee229d6d9..0000000000000000000000000000000000000000 --- a/webkit-aarch64_page_size.patch +++ /dev/null @@ -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; diff --git a/webkit2gtk3.spec b/webkit2gtk3.spec index a6265168201a5d1156e841ea60d8cd6f727a8420..453fc2942422332a7bdef79485c2da273668b60d 100644 --- a/webkit2gtk3.spec +++ b/webkit2gtk3.spec @@ -1,48 +1,44 @@ -#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 /') +#build gtkdoc failed on x86_64 +%ifarch aarch64 +%bcond_without docs +%endif + #Basic Information Name: webkit2gtk3 -Version: 2.22.2 -Release: 11 +Version: 2.32.1 +Release: 1 Summary: GTK+ Web content engine library License: LGPLv2 URL: http://www.webkitgtk.org/ Source0: http://webkitgtk.org/releases/webkitgtk-%{version}.tar.xz +Source1: https://webkitgtk.org/releases/webkitgtk-%{version}.tar.xz.asc -# https://bugs.webkit.org/show_bug.cgi?id=162611 -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 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: gstreamer1-devel gstreamer1-plugins-base-devel -BuildRequires: gstreamer1-plugins-bad-free-devel -BuildRequires: gtk2-devel gtk3-devel gtk-doc -BuildRequires: harfbuzz-devel hyphen-devel +BuildRequires: gobject-introspection-devel gperf gnupg2 wpebackend-fdo-devel +BuildRequires: gstreamer1-devel gstreamer1-plugins-base-devel rubygem-json +BuildRequires: gstreamer1-plugins-bad-free-devel libwpe-devel libseccomp-devel +BuildRequires: gtk3-devel gtk-doc geoclue2-devel libjpeg-turbo-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 libglvnd-devel BuildRequires: pcre-devel perl-File-Copy-Recursive perl-JSON-PP perl-Switch -BuildRequires: python2 ruby rubygems sqlite-devel upower-devel woff2-devel -Requires: geoclue2 +BuildRequires: python3 ruby rubygems sqlite-devel upower-devel woff2-devel pkgconfig(libsystemd) +Requires: geoclue2 bubblewrap xdg-dbus-proxy xdg-desktop-portal-gtk Requires: webkit2gtk3-jsc = %{version}-%{release} Provides: bundled(angle) +Provides: bundled(xdgmime) Obsoletes: libwebkit2gtk < 2.5.0 Provides: libwebkit2gtk = %{version}-%{release} @@ -71,6 +67,7 @@ Provides: webkitgtk4-devel = %{version}-%{release} The webkit2gtk3-devel package contains libraries, build data, and header files for developing applications that use webkit2gtk3. +%if %{with docs} %package help Summary: Documentation files for webkit2gtk3 BuildArch: noarch @@ -82,6 +79,7 @@ Provides: webkitgtk4-doc = %{version}-%{release} %description help This package contains developer documentation for webkit2gtk3. +%endif %package jsc Summary: JavaScript engine from webkit2gtk3 @@ -103,24 +101,37 @@ 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/ rm -rf Source/ThirdParty/qunit/ %build +%global optflags %(echo %{optflags} -Wl,--no-keep-memory | sed 's/-g /-g1 /') mkdir -p %{_target_platform} pushd %{_target_platform} %cmake \ -GNinja \ -DPORT=GTK \ -DCMAKE_BUILD_TYPE=Release \ +%if %{with docs} -DENABLE_GTKDOC=ON \ +%endif -DENABLE_MINIBROWSER=ON \ -%ifarch s390x %{power64} aarch64 + -DPYTHON_EXECUTABLE=%{_bindir}/python3 \ + -DENABLE_GAMEPAD=OFF \ + -DCMAKE_EXE_LINKER_FLAGS="-Wl,--as-needed -Wl,-z,now -pthread" \ + -DCMAKE_MODULE_LINKER_FLAGS="-Wl,--as-needed -Wl,-z,now -pthread" \ + -DCMAKE_SHARED_LINKER_FLAGS="-Wl,--as-needed -Wl,-z,now -pthread" \ +%ifarch aarch64 -DENABLE_JIT=OFF \ -DUSE_SYSTEM_MALLOC=ON \ +%endif +%if 0%{?openEuler} +%ifarch aarch64 + -DUSE_64KB_PAGE_BLOCK=ON \ +%endif %endif .. popd @@ -180,28 +191,30 @@ done %dir %{_datadir}/gir-1.0 %{_datadir}/gir-1.0/JavaScriptCore-4.0.gir +%if %{with docs} %files help %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/ +%endif %changelog -* Mon Jan 18 2021 jinzhimin - 2.22.2-11 -- modify BuildRequires to enchant2-devel +* Mon Jun 21 2021 wangkerong - 2.32.1-1 +- upgrade to 2.32.1 -* Tue Dec 15 2020 hanhui - 2.22.2-10 +* Tue Dec 15 2020 hanhui - 2.28.3-3 - modify license -* Tue Oct 13 2020 hanhui - 2.22.2-9 -- change mesa-libEGL-devel to libglvnd-devel in buildrequires - -* Tue Aug 18 2020 smileknife - 2.22.2-8 -- update release for rebuilding +* Wed Aug 05 2020 songnannan - 2.28.3-2 +- change the mesa-libELGS-devel to libglvnd-devel -* Tue May 19 2020 openEuler Buildteam - 2.22.2-7 -- rebuild for libwebp +* Thu Jul 23 2020 songnannan - 2.28.3-1 +- Type:enhancement +- Id:NA +- SUG:NA +- DESC: update to 2.28.3 * Mon Feb 24 2020 openEuler Buildteam - 2.22.2-6 - Type:enhancement diff --git a/webkitgtk-2.22.2.tar.xz b/webkitgtk-2.32.1.tar.xz similarity index 56% rename from webkitgtk-2.22.2.tar.xz rename to webkitgtk-2.32.1.tar.xz index 369007162ccb35c8dac2fa4d1347e11a5edf0ab3..b2ce79ced239de701144b56ee7a078c46ad84f1c 100644 Binary files a/webkitgtk-2.22.2.tar.xz and b/webkitgtk-2.32.1.tar.xz differ diff --git a/webkitgtk-2.32.1.tar.xz.asc b/webkitgtk-2.32.1.tar.xz.asc new file mode 100644 index 0000000000000000000000000000000000000000..b2ce79ced239de701144b56ee7a078c46ad84f1c Binary files /dev/null and b/webkitgtk-2.32.1.tar.xz.asc differ