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/webkit2gtk3.spec b/webkit2gtk3.spec index c750121e730332c9e2ef1e5222bd559f23cf79af..1f7ecb2e9fec24e620063a431aac8c06c6fead1f 100644 --- a/webkit2gtk3.spec +++ b/webkit2gtk3.spec @@ -4,14 +4,13 @@ #Basic Information Name: webkit2gtk3 -Version: 2.28.3 -Release: 3 +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 - -Patch0: user-agent-branding.patch +Source1: https://webkitgtk.org/releases/webkitgtk-%{version}.tar.xz.asc #Dependency BuildRequires: at-spi2-core-devel bison cairo-devel cmake enchant2-devel @@ -20,7 +19,7 @@ BuildRequires: git geoclue2-devel gettext gcc-c++ glib2-devel gnutls-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: gtk2-devel gtk3-devel gtk-doc geoclue2-devel libjpeg-turbo-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 @@ -28,11 +27,12 @@ BuildRequires: libxslt-devel libXt-devel libwayland-client-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: python3 ruby rubygems sqlite-devel upower-devel woff2-devel +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} @@ -100,6 +100,7 @@ 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 \ @@ -109,6 +110,19 @@ pushd %{_target_platform} -DENABLE_GTKDOC=ON \ -DENABLE_MINIBROWSER=ON \ -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 @@ -175,6 +189,9 @@ done %{_datadir}/gtk-doc/html/webkitdomgtk-4.0/ %changelog +* Fri Jun 11 2021 fandehui - 2.32.1-1 +- update to 2.32.1 + * Tue Dec 15 2020 hanhui - 2.28.3-3 - modify license diff --git a/webkitgtk-2.28.3.tar.xz b/webkitgtk-2.32.1.tar.xz similarity index 66% rename from webkitgtk-2.28.3.tar.xz rename to webkitgtk-2.32.1.tar.xz index 1ca526121ade323e8f8a319276bbf8013d30fca4..b2ce79ced239de701144b56ee7a078c46ad84f1c 100644 Binary files a/webkitgtk-2.28.3.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