diff --git a/.gitignore b/.gitignore index 4a496c2..981aa21 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1 @@ -SOURCES/webkitgtk-2.28.2.tar.xz +SOURCES/webkitgtk-2.28.4.tar.xz diff --git a/.webkit2gtk3.metadata b/.webkit2gtk3.metadata index e611db0..092c9f9 100644 --- a/.webkit2gtk3.metadata +++ b/.webkit2gtk3.metadata @@ -1 +1 @@ -0aba97beba7b2677ed2d28aac51e429cb26c3fe6 SOURCES/webkitgtk-2.28.2.tar.xz +70e9dd80647b30eaaf8a7f5b30d8869cd1254056 SOURCES/webkitgtk-2.28.4.tar.xz diff --git a/SOURCES/fix-ppc64le-s390x.patch b/SOURCES/fix-ppc64le-s390x.patch deleted file mode 100644 index 3171b85..0000000 --- a/SOURCES/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/SPECS/webkit2gtk3.spec b/SPECS/webkit2gtk3.spec index 90c760e..f1ac082 100644 --- a/SPECS/webkit2gtk3.spec +++ b/SPECS/webkit2gtk3.spec @@ -6,8 +6,8 @@ cp -p %1 _license_files/$(echo '%1' | sed -e 's!/!.!g') Name: webkit2gtk3 -Version: 2.28.2 -Release: 2%{?dist} +Version: 2.28.4 +Release: 1%{?dist} Summary: GTK Web content engine library License: LGPLv2 @@ -16,10 +16,8 @@ Source0: http://webkitgtk.org/releases/webkitgtk-%{version}.tar.xz # https://bugs.webkit.org/show_bug.cgi?id=209360 Patch0: webkit-aarch64_page_size.patch -# https://bugs.webkit.org/show_bug.cgi?id=210685 -Patch1: fix-ppc64le-s390x.patch # https://bugs.webkit.org/show_bug.cgi?id=193749 -Patch2: evolution-shared-secondary-process.patch +Patch1: evolution-shared-secondary-process.patch BuildRequires: bison BuildRequires: bubblewrap @@ -207,9 +205,10 @@ pushd %{_target_platform} popd # Show the build time in the status -# Use -j6 to reduce maximum memory usage (relative to default-j24). export NINJA_STATUS="[%f/%t][%e] " -%ninja_build -C %{_target_platform} -j6 +# brew has run out of memory building WebKitGTK 2.28.4 with -j6, so +# use -j3 to reduce maximum memory usage. +%ninja_build -C %{_target_platform} -j3 %install %ninja_install -C %{_target_platform} @@ -282,6 +281,10 @@ export NINJA_STATUS="[%f/%t][%e] " %{_datadir}/gtk-doc/html/webkitdomgtk-4.0/ %changelog +* Mon Aug 03 2020 Michael Catanzaro - 2.28.4-1 +- Update to 2.28.4 +- Related: #1817143 + * Thu May 21 2020 Michael Catanzaro - 2.28.2-2 - Related: rhbz#1817143 Properly remove webkit2gtk3-plugin-process-gtk2 package