diff --git a/.gitignore b/.gitignore index c8d01fc..a8ac3f8 100644 --- a/.gitignore +++ b/.gitignore @@ -42,3 +42,4 @@ /webkitgtk-2.28.0.tar.xz /webkitgtk-2.28.1.tar.xz /webkitgtk-2.28.2.tar.xz +/webkitgtk-2.29.1.tar.xz diff --git a/fix-ppc64le-s390x.patch b/fix-ppc64le-s390x.patch deleted file mode 100644 index 3171b85..0000000 --- a/fix-ppc64le-s390x.patch +++ /dev/null @@ -1,25 +0,0 @@ -Index: /Source/JavaScriptCore/heap/GCMemoryOperations.h -=================================================================== ---- /Source/JavaScriptCore/heap/GCMemoryOperations.h (revision 261325) -+++ /Source/JavaScriptCore/heap/GCMemoryOperations.h (revision 261326) -@@ -54,5 +54,5 @@ - }; - --#if COMPILER(GCC_COMPATIBLE) && USE(JSVALUE64) -+#if COMPILER(GCC_COMPATIBLE) && (CPU(X86_64) || CPU(ARM64)) - if (bytes <= smallCutoff) - slowPathForwardMemcpy(); -@@ -122,6 +122,4 @@ - : "d0", "d1", "memory" - ); --#else -- slowPathForwardMemcpy(); - #endif // CPU(X86_64) - } else { -@@ -140,5 +138,5 @@ - #else - slowPathForwardMemcpy(); --#endif // COMPILER(GCC_COMPATIBLE) -+#endif // COMPILER(GCC_COMPATIBLE) && (CPU(X86_64) || CPU(ARM64)) - #else - memcpy(dst, src, bytes); diff --git a/sources b/sources index d094351..8ec4f6f 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (webkitgtk-2.28.2.tar.xz) = c7c0c55b1ebc61c0ec9cd9af96a12058a96ba9b011330b12c7c2776685736e0edf604f5eee639637cb50b2967d77c2db4dea15050a575fd34a1f6f0a8b8c56f8 +SHA512 (webkitgtk-2.29.1.tar.xz) = 6a97e53f6bc853b0031e8aee21ed5b1bc97e9d277f18176f2850f88e45c97941aa2887e81623d29ce72798e16a5807e86a52cf5bc4028385866842b44a92cc4f diff --git a/user-agent-branding.patch b/user-agent-branding.patch deleted file mode 100644 index d87f3e7..0000000 --- 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 9219691..2cec7c8 100644 --- a/webkit2gtk3.spec +++ b/webkit2gtk3.spec @@ -6,8 +6,8 @@ cp -p %1 _license_files/$(echo '%1' | sed -e 's!/!.!g') Name: webkit2gtk3 -Version: 2.28.2 -Release: 3%{?dist} +Version: 2.29.1 +Release: 1%{?dist} Summary: GTK Web content engine library License: LGPLv2 @@ -17,11 +17,6 @@ Source1: https://webkitgtk.org/releases/webkitgtk-%{version}.tar.xz.asc # Created from http://hkps.pool.sks-keyservers.net/pks/lookup?op=get&search=0xF3D322D0EC4582C3 Source2: https://people.gnome.org/~mcatanzaro/gpg-key-D7FCF61CF9A2DEAB31D81BD3F3D322D0EC4582C3.gpg -# https://bugs.webkit.org/show_bug.cgi?id=162611 -Patch0: user-agent-branding.patch -# https://bugs.webkit.org/show_bug.cgi?id=210685 -Patch1: fix-ppc64le-s390x.patch - BuildRequires: bison BuildRequires: bubblewrap BuildRequires: cmake @@ -72,6 +67,7 @@ BuildRequires: pkgconfig(libpng) BuildRequires: pkgconfig(libseccomp) BuildRequires: pkgconfig(libsecret-1) BuildRequires: pkgconfig(libsoup-2.4) +BuildRequires: pkgconfig(libsystemd) BuildRequires: pkgconfig(libwebp) BuildRequires: pkgconfig(libwoff2dec) BuildRequires: pkgconfig(libxslt) @@ -182,10 +178,6 @@ rm -rf Source/ThirdParty/qunit/ %global optflags %(echo %{optflags} | sed 's/-g /-g1 /') %endif -%if 0%{?fedora} -%global optflags %{optflags} -DUSER_AGENT_GTK_DISTRIBUTOR_NAME=\'\\"Fedora\\"\' -%endif - mkdir -p %{_target_platform} pushd %{_target_platform} %cmake \ @@ -195,6 +187,9 @@ pushd %{_target_platform} -DENABLE_GTKDOC=ON \ -DENABLE_MINIBROWSER=ON \ -DPYTHON_EXECUTABLE=%{_bindir}/python3 \ +%if 0%{?fedora} + -DUSER_AGENT_BRANDING="Fedora" \ +%endif .. popd @@ -209,12 +204,10 @@ export NINJA_STATUS="[%f/%t][%e] " # 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 @@ -276,6 +269,9 @@ export NINJA_STATUS="[%f/%t][%e] " %{_datadir}/gtk-doc/html/webkitdomgtk-4.0/ %changelog +* Mon May 18 2020 Michael Catanzaro - 2.29.1-1 +- Update to 2.29.1 + * Sat May 16 2020 Pete Walter - 2.28.2-3 - Rebuild for ICU 67 diff --git a/webkitgtk-2.28.2.tar.xz.asc b/webkitgtk-2.28.2.tar.xz.asc deleted file mode 100644 index f6fbf75..0000000 --- a/webkitgtk-2.28.2.tar.xz.asc +++ /dev/null @@ -1,6 +0,0 @@ ------BEGIN PGP SIGNATURE----- - -iF0EABEDAB0WIQTX/PYc+aLeqzHYG9Pz0yLQ7EWCwwUCXqK4bQAKCRDz0yLQ7EWC -wyc4AKDvvzbZygtiXvWU7VESwg7E79oLMACeOKkEjYKgiaxA/OAGQ3TzF8vazT0= -=jnoc ------END PGP SIGNATURE----- diff --git a/webkitgtk-2.29.1.tar.xz.asc b/webkitgtk-2.29.1.tar.xz.asc new file mode 100644 index 0000000..1a2ec48 --- /dev/null +++ b/webkitgtk-2.29.1.tar.xz.asc @@ -0,0 +1,6 @@ +-----BEGIN PGP SIGNATURE----- + +iF0EABEDAB0WIQTX/PYc+aLeqzHYG9Pz0yLQ7EWCwwUCXsJxhgAKCRDz0yLQ7EWC +w+CnAKCOVf8vxloTzTrQH0n5JN1GDNT4fACdG6sTJIweryEdioy+I9/EHSY2Hz0= +=UXuI +-----END PGP SIGNATURE-----