The package rpms/webkit2gtk3.git has added or updated architecture specific content in
its
spec file (ExclusiveArch/ExcludeArch or %ifarch/%ifnarch) in commit(s):
https://src.fedoraproject.org/cgit/rpms/webkit2gtk3.git/commit/?id=b724aa....
Change:
+%ifarch aarch64
Thanks.
Full change:
============
commit f0becf7e32307c497b8f4f71f9a7592472f48fd0
Merge: 5e86e79 58243ad
Author: Michael Catanzaro <mcatanzaro(a)gnome.org>
Date: Fri Mar 26 15:27:57 2021 -0500
Merge branch 'f34' into f33
diff --cc .gitignore
index 87065de,805cf9b..0b75b62
--- a/.gitignore
+++ b/.gitignore
@@@ -63,5 -63,11 +63,13 @@@
/webkitgtk-2.30.3.tar.xz.asc
/webkitgtk-2.30.4.tar.xz
/webkitgtk-2.30.4.tar.xz.asc
+/webkitgtk-2.30.5.tar.xz
+/webkitgtk-2.30.5.tar.xz.asc
+ /webkitgtk-2.31.1.tar.xz
+ /webkitgtk-2.31.1.tar.xz.asc
+ /webkitgtk-2.31.90.tar.xz.asc
+ /webkitgtk-2.31.90.tar.xz
+ /webkitgtk-2.31.91.tar.xz
+ /webkitgtk-2.31.91.tar.xz.asc
+ /webkitgtk-2.32.0.tar.xz
+ /webkitgtk-2.32.0.tar.xz.asc
diff --cc webkit2gtk3.spec
index dc1a6ae,e40b366..c8590e3
--- a/webkit2gtk3.spec
+++ b/webkit2gtk3.spec
@@@ -280,10 -303,29 +303,14 @@@ export NINJA_STATUS="[%f/%t][%e]
%{_datadir}/gtk-doc/html/jsc-glib-4.0/
%{_datadir}/gtk-doc/html/webkit2gtk-4.0/
%{_datadir}/gtk-doc/html/webkitdomgtk-4.0/
+ %endif
%changelog
+ * Fri Mar 26 2021 Michael Catanzaro <mcatanzaro(a)redhat.com> - 2.32.0-1
+ - Update to 2.32.0
+
-* Fri Mar 12 2021 Michael Catanzaro <mcatanzaro(a)redhat.com> - 2.31.91-1
-- Update to 2.31.91
-
-* Tue Mar 02 2021 Michael Catanzaro <mcatanzaro(a)redhat.com> - 2.31.90-1
-- Update to 2.31.90
-
-* Wed Jan 27 2021 Fedora Release Engineering <releng(a)fedoraproject.org> -
2.31.1-4
-- Rebuilt for
https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild
-
-* Thu Jan 14 2021 Michael Catanzaro <mcatanzaro(a)redhat.com> - 2.31.1-3
-- Fix multilib conflict in gir files
-
-* Wed Jan 13 2021 Michael Catanzaro <mcatanzaro(a)redhat.com> - 2.31.1-2
-- Disable gamepad support in RHEL
-
-* Tue Jan 12 2021 Michael Catanzaro <mcatanzaro(a)redhat.com> - 2.31.1-1
-- Update to 2.31.1
+* Mon Feb 15 2021 Michael Catanzaro <mcatanzaro(a)redhat.com> - 2.30.5-1
+- Update to 2.30.5
* Tue Dec 15 2020 Michael Catanzaro <mcatanzaro(a)redhat.com> - 2.30.4-1
- Update to 2.30.4
commit 58243adc6e894db0e47410cdc908772eefb2e5da
Author: Michael Catanzaro <mcatanzaro(a)gnome.org>
Date: Fri Mar 26 15:25:06 2021 -0500
Update to 2.32.0
diff --git a/.gitignore b/.gitignore
index 3def14a..805cf9b 100644
--- a/.gitignore
+++ b/.gitignore
@@ -69,3 +69,5 @@
/webkitgtk-2.31.90.tar.xz
/webkitgtk-2.31.91.tar.xz
/webkitgtk-2.31.91.tar.xz.asc
+/webkitgtk-2.32.0.tar.xz
+/webkitgtk-2.32.0.tar.xz.asc
diff --git a/sources b/sources
index 3871942..e3087ae 100644
--- a/sources
+++ b/sources
@@ -1,2 +1,2 @@
-SHA512 (webkitgtk-2.31.91.tar.xz) =
972761a0db13a7ffde547b65941cdc2d6fd76032d2ca7f28724b5fee15714fc486c7b3d977834d0fad51de13ad695290cae47b2642f4f57543e14fd2765d68ff
-SHA512 (webkitgtk-2.31.91.tar.xz.asc) =
746ca11f3088a1f235a12dc56d20cc9630c332026fb276f1fd4e16919f9f1082d2c03795281a56c7abc4c79234790bb0ebe3bac27e52026819358ce36b3c3f66
+SHA512 (webkitgtk-2.32.0.tar.xz) =
4832a4614be24481028ca8a6480a8e6cfacd8e22f5ba9f936703c09944550056f06f75ccf8fffa7dee3f5a1d11ab1870841407745be2e61ebad6557a0934db15
+SHA512 (webkitgtk-2.32.0.tar.xz.asc) =
0444f165a0438a6b089abe8ad29b26b0ae7fb8d27b8c1b7d76ec903336745334d13aae6748ae3ad53516c4936f16c0ba3e904572bcf3afe88161d61d09454015
diff --git a/webkit2gtk3.spec b/webkit2gtk3.spec
index e5de175..e40b366 100644
--- a/webkit2gtk3.spec
+++ b/webkit2gtk3.spec
@@ -16,7 +16,7 @@
%bcond_without docs
Name: webkit2gtk3
-Version: 2.31.91
+Version: 2.32.0
Release: 1%{?dist}
Summary: GTK Web content engine library
@@ -306,6 +306,9 @@ export NINJA_STATUS="[%f/%t][%e] "
%endif
%changelog
+* Fri Mar 26 2021 Michael Catanzaro <mcatanzaro(a)redhat.com> - 2.32.0-1
+- Update to 2.32.0
+
* Fri Mar 12 2021 Michael Catanzaro <mcatanzaro(a)redhat.com> - 2.31.91-1
- Update to 2.31.91
commit 20e8fac12a2c37fc0d92455451e5dce92fe3d32f
Author: Michael Catanzaro <mcatanzaro(a)gnome.org>
Date: Fri Mar 12 09:27:01 2021 -0600
Update to 2.31.91
diff --git a/.gitignore b/.gitignore
index 1d27dd7..3def14a 100644
--- a/.gitignore
+++ b/.gitignore
@@ -67,3 +67,5 @@
/webkitgtk-2.31.1.tar.xz.asc
/webkitgtk-2.31.90.tar.xz.asc
/webkitgtk-2.31.90.tar.xz
+/webkitgtk-2.31.91.tar.xz
+/webkitgtk-2.31.91.tar.xz.asc
diff --git a/2.31.90-fix-build.patch b/2.31.90-fix-build.patch
deleted file mode 100644
index 7512835..0000000
--- a/2.31.90-fix-build.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-Index: /Source/WebKit/Platform/IPC/StreamConnectionBuffer.h
-===================================================================
---- /Source/WebKit/Platform/IPC/StreamConnectionBuffer.h (revision 273642)
-+++ /Source/WebKit/Platform/IPC/StreamConnectionBuffer.h (revision 273643)
-@@ -115,5 +115,5 @@
- };
- Header& header() const { return
*reinterpret_cast<Header*>(m_sharedMemory->data()); }
-- static constexpr size_t headerSize() { return
roundUpToMultipleOf<sizeof(std::max_align_t)>(sizeof(Header)); }
-+ static constexpr size_t headerSize() { return
roundUpToMultipleOf<alignof(std::max_align_t)>(sizeof(Header)); }
-
- size_t m_dataSize { 0 };
-
diff --git a/sources b/sources
index 139a14a..3871942 100644
--- a/sources
+++ b/sources
@@ -1,2 +1,2 @@
-SHA512 (webkitgtk-2.31.90.tar.xz.asc) =
d1a89103f705300975493828c48c9eefd07f9e6dce82930b6f6d69ea1353511f7c076508d6d0b65ee813c59ef7694d7d5696926e673847b02720329d0b374cf6
-SHA512 (webkitgtk-2.31.90.tar.xz) =
82f21a6f74731da1f127e4c9cf653d20e0085d4aeae1cc4c1e7ad3d17d45ef9aa5ccbfcad9124ac0b7ae2c7e1178ce8e780193e8d8f23d05a388ee4e5ae48b11
+SHA512 (webkitgtk-2.31.91.tar.xz) =
972761a0db13a7ffde547b65941cdc2d6fd76032d2ca7f28724b5fee15714fc486c7b3d977834d0fad51de13ad695290cae47b2642f4f57543e14fd2765d68ff
+SHA512 (webkitgtk-2.31.91.tar.xz.asc) =
746ca11f3088a1f235a12dc56d20cc9630c332026fb276f1fd4e16919f9f1082d2c03795281a56c7abc4c79234790bb0ebe3bac27e52026819358ce36b3c3f66
diff --git a/webkit2gtk3.spec b/webkit2gtk3.spec
index 308141f..e5de175 100644
--- a/webkit2gtk3.spec
+++ b/webkit2gtk3.spec
@@ -16,7 +16,7 @@
%bcond_without docs
Name: webkit2gtk3
-Version: 2.31.90
+Version: 2.31.91
Release: 1%{?dist}
Summary: GTK Web content engine library
@@ -27,9 +27,6 @@ Source1:
https://webkitgtk.org/releases/webkitgtk-%{version}.tar.xz.asc
# Created from
http://hkps.pool.sks-keyservers.net/pks/lookup?op=get&search=0xF3D322...
Source2:
https://people.gnome.org/~mcatanzaro/gpg-key-D7FCF61CF9A2DEAB31D81BD3F3D3...
-#
https://bugs.webkit.org/show_bug.cgi?id=222480
-Patch0: 2.31.90-fix-build.patch
-
BuildRequires: bison
BuildRequires: bubblewrap
BuildRequires: cmake
@@ -309,6 +306,9 @@ export NINJA_STATUS="[%f/%t][%e] "
%endif
%changelog
+* Fri Mar 12 2021 Michael Catanzaro <mcatanzaro(a)redhat.com> - 2.31.91-1
+- Update to 2.31.91
+
* Tue Mar 02 2021 Michael Catanzaro <mcatanzaro(a)redhat.com> - 2.31.90-1
- Update to 2.31.90
commit 52256c580e859165c0c5466be4d573138781b9a1
Author: Michael Catanzaro <mcatanzaro(a)gnome.org>
Date: Tue Mar 2 14:43:23 2021 -0600
Update to 2.31.90
diff --git a/.gitignore b/.gitignore
index cd03efb..1d27dd7 100644
--- a/.gitignore
+++ b/.gitignore
@@ -65,3 +65,5 @@
/webkitgtk-2.30.4.tar.xz.asc
/webkitgtk-2.31.1.tar.xz
/webkitgtk-2.31.1.tar.xz.asc
+/webkitgtk-2.31.90.tar.xz.asc
+/webkitgtk-2.31.90.tar.xz
diff --git a/2.31.90-fix-build.patch b/2.31.90-fix-build.patch
new file mode 100644
index 0000000..7512835
--- /dev/null
+++ b/2.31.90-fix-build.patch
@@ -0,0 +1,12 @@
+Index: /Source/WebKit/Platform/IPC/StreamConnectionBuffer.h
+===================================================================
+--- /Source/WebKit/Platform/IPC/StreamConnectionBuffer.h (revision 273642)
++++ /Source/WebKit/Platform/IPC/StreamConnectionBuffer.h (revision 273643)
+@@ -115,5 +115,5 @@
+ };
+ Header& header() const { return
*reinterpret_cast<Header*>(m_sharedMemory->data()); }
+- static constexpr size_t headerSize() { return
roundUpToMultipleOf<sizeof(std::max_align_t)>(sizeof(Header)); }
++ static constexpr size_t headerSize() { return
roundUpToMultipleOf<alignof(std::max_align_t)>(sizeof(Header)); }
+
+ size_t m_dataSize { 0 };
+
diff --git a/gir-multilib.patch b/gir-multilib.patch
deleted file mode 100644
index f543683..0000000
--- a/gir-multilib.patch
+++ /dev/null
@@ -1,22 +0,0 @@
---- a/Source/JavaScriptCore/PlatformGTK.cmake
-+++ a/Source/JavaScriptCore/PlatformGTK.cmake
-@@ -79,6 +79,8 @@ if (ENABLE_INTROSPECTION)
- --pkg-export=javascriptcoregtk-${WEBKITGTK_API_VERSION}
- --output=${CMAKE_BINARY_DIR}/JavaScriptCore-${WEBKITGTK_API_VERSION}.gir
- --c-include="jsc/jsc.h"
-+ --sources-top-dirs=${CMAKE_BINARY_DIR}
-+ --sources-top-dirs=${CMAKE_SOURCE_DIR}
- -DJSC_COMPILATION
- -I${CMAKE_SOURCE_DIR}/Source
- -I${JAVASCRIPTCORE_DIR}
---- a/Source/WebKit/PlatformGTK.cmake
-+++ a/Source/WebKit/PlatformGTK.cmake
-@@ -678,6 +678,8 @@ if (ENABLE_INTROSPECTION)
- --pkg-export=webkit2gtk-${WEBKITGTK_API_VERSION}
- --output=${CMAKE_BINARY_DIR}/WebKit2-${WEBKITGTK_API_VERSION}.gir
- --c-include="webkit2/webkit2.h"
-+ --sources-top-dirs=${CMAKE_BINARY_DIR}
-+ --sources-top-dirs=${CMAKE_SOURCE_DIR}
- -DBUILDING_WEBKIT
- -DWEBKIT2_COMPILATION
- -I${CMAKE_SOURCE_DIR}/Source
diff --git a/sources b/sources
index a112d67..139a14a 100644
--- a/sources
+++ b/sources
@@ -1,2 +1,2 @@
-SHA512 (webkitgtk-2.31.1.tar.xz) =
23a3d28f7cd95281b2b1dbd75b5522f9fea735e883d8d080d572e9124e6711ee7704635fd4de337a1d8a51a0a61cc47f016a082bf15360e36655de3f97b127ea
-SHA512 (webkitgtk-2.31.1.tar.xz.asc) =
3f816714f08de59da9a9935771aaa2f9b892766397a60fe987e2382a11d32a4d5e6bda2d923bad347505b7998eaafe9fca76689e1556f524a60369337f8d4c98
+SHA512 (webkitgtk-2.31.90.tar.xz.asc) =
d1a89103f705300975493828c48c9eefd07f9e6dce82930b6f6d69ea1353511f7c076508d6d0b65ee813c59ef7694d7d5696926e673847b02720329d0b374cf6
+SHA512 (webkitgtk-2.31.90.tar.xz) =
82f21a6f74731da1f127e4c9cf653d20e0085d4aeae1cc4c1e7ad3d17d45ef9aa5ccbfcad9124ac0b7ae2c7e1178ce8e780193e8d8f23d05a388ee4e5ae48b11
diff --git a/webkit2gtk3.spec b/webkit2gtk3.spec
index 3b0f411..308141f 100644
--- a/webkit2gtk3.spec
+++ b/webkit2gtk3.spec
@@ -16,8 +16,8 @@
%bcond_without docs
Name: webkit2gtk3
-Version: 2.31.1
-Release: 4%{?dist}
+Version: 2.31.90
+Release: 1%{?dist}
Summary: GTK Web content engine library
License: LGPLv2
@@ -27,8 +27,8 @@ Source1:
https://webkitgtk.org/releases/webkitgtk-%{version}.tar.xz.asc
# Created from
http://hkps.pool.sks-keyservers.net/pks/lookup?op=get&search=0xF3D322...
Source2:
https://people.gnome.org/~mcatanzaro/gpg-key-D7FCF61CF9A2DEAB31D81BD3F3D3...
-#
https://bugs.webkit.org/show_bug.cgi?id=220636
-Patch0: gir-multilib.patch
+#
https://bugs.webkit.org/show_bug.cgi?id=222480
+Patch0: 2.31.90-fix-build.patch
BuildRequires: bison
BuildRequires: bubblewrap
@@ -309,6 +309,9 @@ export NINJA_STATUS="[%f/%t][%e] "
%endif
%changelog
+* Tue Mar 02 2021 Michael Catanzaro <mcatanzaro(a)redhat.com> - 2.31.90-1
+- Update to 2.31.90
+
* Wed Jan 27 2021 Fedora Release Engineering <releng(a)fedoraproject.org> - 2.31.1-4
- Rebuilt for
https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild
commit f4df4985e4d77b54332aa5d73c47c15616189ec5
Author: Fedora Release Engineering <releng(a)fedoraproject.org>
Date: Wed Jan 27 23:24:29 2021 +0000
- Rebuilt for
https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild
Signed-off-by: Fedora Release Engineering <releng(a)fedoraproject.org>
diff --git a/webkit2gtk3.spec b/webkit2gtk3.spec
index b200405..3b0f411 100644
--- a/webkit2gtk3.spec
+++ b/webkit2gtk3.spec
@@ -17,7 +17,7 @@
Name: webkit2gtk3
Version: 2.31.1
-Release: 3%{?dist}
+Release: 4%{?dist}
Summary: GTK Web content engine library
License: LGPLv2
@@ -309,6 +309,9 @@ export NINJA_STATUS="[%f/%t][%e] "
%endif
%changelog
+* Wed Jan 27 2021 Fedora Release Engineering <releng(a)fedoraproject.org> - 2.31.1-4
+- Rebuilt for
https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild
+
* Thu Jan 14 2021 Michael Catanzaro <mcatanzaro(a)redhat.com> - 2.31.1-3
- Fix multilib conflict in gir files
commit ce1992db560d7f8bb3499b9b3984d3eaec2b2218
Author: Michael Catanzaro <mcatanzaro(a)gnome.org>
Date: Thu Jan 21 08:47:52 2021 -0600
Remove hack to use ld.bfd
diff --git a/webkit2gtk3.spec b/webkit2gtk3.spec
index 81662f7..b200405 100644
--- a/webkit2gtk3.spec
+++ b/webkit2gtk3.spec
@@ -215,7 +215,6 @@ rm -rf Source/ThirdParty/qunit/
-DPORT=GTK \
-DCMAKE_BUILD_TYPE=Release \
-DENABLE_MINIBROWSER=ON \
- -DUSE_LD_GOLD=OFF \
%if %{with docs}
-DENABLE_GTKDOC=ON \
%endif
commit 1d4a0af2f091b6853e1bf83fad2be784ee9c0ac8
Author: Michael Catanzaro <mcatanzaro(a)gnome.org>
Date: Fri Jan 15 13:28:05 2021 -0600
Disable ld.gold
It prints this warning during gtk-doc generation:
/usr/bin/ld.gold: warning:
/usr/lib/gcc/x86_64-redhat-linux/11/../../../../lib64/Scrt1.o: unknown program property
type 0xc0008002 in .note.gnu.property section
And that causes the entire build to fail, because we do not allow
warnings during gtk-doc generation.
diff --git a/webkit2gtk3.spec b/webkit2gtk3.spec
index b200405..81662f7 100644
--- a/webkit2gtk3.spec
+++ b/webkit2gtk3.spec
@@ -215,6 +215,7 @@ rm -rf Source/ThirdParty/qunit/
-DPORT=GTK \
-DCMAKE_BUILD_TYPE=Release \
-DENABLE_MINIBROWSER=ON \
+ -DUSE_LD_GOLD=OFF \
%if %{with docs}
-DENABLE_GTKDOC=ON \
%endif
commit 7c56d4a3c6bc886dc72b45c02f7e04636ffed71e
Author: Michael Catanzaro <mcatanzaro(a)gnome.org>
Date: Thu Jan 14 17:13:28 2021 -0600
Fix multilib conflict in gir files
diff --git a/gir-multilib.patch b/gir-multilib.patch
new file mode 100644
index 0000000..f543683
--- /dev/null
+++ b/gir-multilib.patch
@@ -0,0 +1,22 @@
+--- a/Source/JavaScriptCore/PlatformGTK.cmake
++++ a/Source/JavaScriptCore/PlatformGTK.cmake
+@@ -79,6 +79,8 @@ if (ENABLE_INTROSPECTION)
+ --pkg-export=javascriptcoregtk-${WEBKITGTK_API_VERSION}
+ --output=${CMAKE_BINARY_DIR}/JavaScriptCore-${WEBKITGTK_API_VERSION}.gir
+ --c-include="jsc/jsc.h"
++ --sources-top-dirs=${CMAKE_BINARY_DIR}
++ --sources-top-dirs=${CMAKE_SOURCE_DIR}
+ -DJSC_COMPILATION
+ -I${CMAKE_SOURCE_DIR}/Source
+ -I${JAVASCRIPTCORE_DIR}
+--- a/Source/WebKit/PlatformGTK.cmake
++++ a/Source/WebKit/PlatformGTK.cmake
+@@ -678,6 +678,8 @@ if (ENABLE_INTROSPECTION)
+ --pkg-export=webkit2gtk-${WEBKITGTK_API_VERSION}
+ --output=${CMAKE_BINARY_DIR}/WebKit2-${WEBKITGTK_API_VERSION}.gir
+ --c-include="webkit2/webkit2.h"
++ --sources-top-dirs=${CMAKE_BINARY_DIR}
++ --sources-top-dirs=${CMAKE_SOURCE_DIR}
+ -DBUILDING_WEBKIT
+ -DWEBKIT2_COMPILATION
+ -I${CMAKE_SOURCE_DIR}/Source
diff --git a/webkit2gtk3.spec b/webkit2gtk3.spec
index 15a9c5b..b200405 100644
--- a/webkit2gtk3.spec
+++ b/webkit2gtk3.spec
@@ -17,7 +17,7 @@
Name: webkit2gtk3
Version: 2.31.1
-Release: 2%{?dist}
+Release: 3%{?dist}
Summary: GTK Web content engine library
License: LGPLv2
@@ -27,6 +27,9 @@ Source1:
https://webkitgtk.org/releases/webkitgtk-%{version}.tar.xz.asc
# Created from
http://hkps.pool.sks-keyservers.net/pks/lookup?op=get&search=0xF3D322...
Source2:
https://people.gnome.org/~mcatanzaro/gpg-key-D7FCF61CF9A2DEAB31D81BD3F3D3...
+#
https://bugs.webkit.org/show_bug.cgi?id=220636
+Patch0: gir-multilib.patch
+
BuildRequires: bison
BuildRequires: bubblewrap
BuildRequires: cmake
@@ -306,6 +309,9 @@ export NINJA_STATUS="[%f/%t][%e] "
%endif
%changelog
+* Thu Jan 14 2021 Michael Catanzaro <mcatanzaro(a)redhat.com> - 2.31.1-3
+- Fix multilib conflict in gir files
+
* Wed Jan 13 2021 Michael Catanzaro <mcatanzaro(a)redhat.com> - 2.31.1-2
- Disable gamepad support in RHEL
commit a159a070a4b86fa9dd2f07d675a5a573b23ce710
Author: Michael Catanzaro <mcatanzaro(a)gnome.org>
Date: Wed Jan 13 11:16:30 2021 -0600
Fix previous commit
diff --git a/webkit2gtk3.spec b/webkit2gtk3.spec
index 78eecbc..15a9c5b 100644
--- a/webkit2gtk3.spec
+++ b/webkit2gtk3.spec
@@ -6,7 +6,7 @@
cp -p %1 _license_files/$(echo '%1' | sed -e 's!/!.!g')
# No libmanette in RHEL
-%if !0%{?fedora}
+%if !0%{?rhel}
%global with_gampad 1
%endif
@@ -17,7 +17,7 @@
Name: webkit2gtk3
Version: 2.31.1
-Release: 1%{?dist}
+Release: 2%{?dist}
Summary: GTK Web content engine library
License: LGPLv2
commit a9b9280c9a7cb27b668d936e164e96a26935815b
Author: Michael Catanzaro <mcatanzaro(a)gnome.org>
Date: Wed Jan 13 11:09:58 2021 -0600
Disable gamepad support in RHEL
diff --git a/webkit2gtk3.spec b/webkit2gtk3.spec
index 879f770..78eecbc 100644
--- a/webkit2gtk3.spec
+++ b/webkit2gtk3.spec
@@ -5,6 +5,11 @@
mkdir -p _license_files ; \
cp -p %1 _license_files/$(echo '%1' | sed -e 's!/!.!g')
+# No libmanette in RHEL
+%if !0%{?fedora}
+%global with_gampad 1
+%endif
+
# Build documentation by default (use `rpmbuild --without docs` to override it).
# This is used by Coverity. Coverity injects custom compiler warnings, but
# any warning during WebKit docs build is fatal!
@@ -76,7 +81,9 @@ BuildRequires: pkgconfig(libsystemd)
BuildRequires: pkgconfig(libwebp)
BuildRequires: pkgconfig(libwoff2dec)
BuildRequires: pkgconfig(libxslt)
+%if 0%{?with_gamepad}
BuildRequires: pkgconfig(manette-0.2)
+%endif
BuildRequires: pkgconfig(sqlite3)
BuildRequires: pkgconfig(upower-glib)
BuildRequires: pkgconfig(wayland-client)
@@ -208,6 +215,9 @@ rm -rf Source/ThirdParty/qunit/
%if %{with docs}
-DENABLE_GTKDOC=ON \
%endif
+%if !0%{?with_gamepad}
+ -DENABLE_GAMEPAD=OFF \
+%endif
%if 0%{?fedora}
-DUSER_AGENT_BRANDING="Fedora" \
%endif
@@ -296,7 +306,10 @@ export NINJA_STATUS="[%f/%t][%e] "
%endif
%changelog
-* Tue Jan 12 2020 Michael Catanzaro <mcatanzaro(a)redhat.com> - 2.31.1-1
+* Wed Jan 13 2021 Michael Catanzaro <mcatanzaro(a)redhat.com> - 2.31.1-2
+- Disable gamepad support in RHEL
+
+* Tue Jan 12 2021 Michael Catanzaro <mcatanzaro(a)redhat.com> - 2.31.1-1
- Update to 2.31.1
* Tue Dec 15 2020 Michael Catanzaro <mcatanzaro(a)redhat.com> - 2.30.4-1
commit 7a0dcddc5c51e48e3446f9285548227959764014
Author: Michael Catanzaro <mcatanzaro(a)gnome.org>
Date: Tue Jan 12 11:36:38 2021 -0600
Update to 2.31.1
diff --git a/.gitignore b/.gitignore
index bfbf6f1..cd03efb 100644
--- a/.gitignore
+++ b/.gitignore
@@ -63,3 +63,5 @@
/webkitgtk-2.30.3.tar.xz.asc
/webkitgtk-2.30.4.tar.xz
/webkitgtk-2.30.4.tar.xz.asc
+/webkitgtk-2.31.1.tar.xz
+/webkitgtk-2.31.1.tar.xz.asc
diff --git a/sources b/sources
index 0ea7a5a..a112d67 100644
--- a/sources
+++ b/sources
@@ -1,2 +1,2 @@
-SHA512 (webkitgtk-2.30.4.tar.xz) =
dff9e3bd17de8481d940a48b0697458a0c1c71a987f4d50ee7bc46b0203ed6802a9ec82c3a21ea9b7211ab900fa75b89b2a05b0ca6aed319ad66ec317d02c571
-SHA512 (webkitgtk-2.30.4.tar.xz.asc) =
531b8d0644d51a7a00088e1be77e162cb61a0b06825022587ff488bd96d6993cbc06e8a8a19e81c66140e04af45cc5d393e5b6e022a1d067e8ed6409bb656b07
+SHA512 (webkitgtk-2.31.1.tar.xz) =
23a3d28f7cd95281b2b1dbd75b5522f9fea735e883d8d080d572e9124e6711ee7704635fd4de337a1d8a51a0a61cc47f016a082bf15360e36655de3f97b127ea
+SHA512 (webkitgtk-2.31.1.tar.xz.asc) =
3f816714f08de59da9a9935771aaa2f9b892766397a60fe987e2382a11d32a4d5e6bda2d923bad347505b7998eaafe9fca76689e1556f524a60369337f8d4c98
diff --git a/webkit2gtk3-gcc11.patch b/webkit2gtk3-gcc11.patch
deleted file mode 100644
index 4ec898a..0000000
--- a/webkit2gtk3-gcc11.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-diff --git a/Source/WTF/wtf/glib/WTFGType.h b/Source/WTF/wtf/glib/WTFGType.h
-index 203522e6..9953fe80 100644
---- a/Source/WTF/wtf/glib/WTFGType.h
-+++ b/Source/WTF/wtf/glib/WTFGType.h
-@@ -74,7 +74,7 @@ static void type_name##_init(TypeName* self, gpointer) \
- \
- GType type_name##_get_type(void) \
- { \
-- static volatile gsize g_define_type_id__volatile = 0; \
-+ static gsize g_define_type_id__volatile = 0; \
- if (g_once_init_enter(&g_define_type_id__volatile)) { \
- GType g_define_type_id = type_name##_get_type_once(); \
- g_once_init_leave(&g_define_type_id__volatile, g_define_type_id); \
diff --git a/webkit2gtk3.spec b/webkit2gtk3.spec
index 0b76d81..879f770 100644
--- a/webkit2gtk3.spec
+++ b/webkit2gtk3.spec
@@ -11,7 +11,7 @@
%bcond_without docs
Name: webkit2gtk3
-Version: 2.30.4
+Version: 2.31.1
Release: 1%{?dist}
Summary: GTK Web content engine library
@@ -22,9 +22,6 @@ Source1:
https://webkitgtk.org/releases/webkitgtk-%{version}.tar.xz.asc
# Created from
http://hkps.pool.sks-keyservers.net/pks/lookup?op=get&search=0xF3D322...
Source2:
https://people.gnome.org/~mcatanzaro/gpg-key-D7FCF61CF9A2DEAB31D81BD3F3D3...
-# Fix bogus volatile use caught by gcc-11
-Patch0: %{name}-gcc11.patch
-
BuildRequires: bison
BuildRequires: bubblewrap
BuildRequires: cmake
@@ -79,6 +76,7 @@ BuildRequires: pkgconfig(libsystemd)
BuildRequires: pkgconfig(libwebp)
BuildRequires: pkgconfig(libwoff2dec)
BuildRequires: pkgconfig(libxslt)
+BuildRequires: pkgconfig(manette-0.2)
BuildRequires: pkgconfig(sqlite3)
BuildRequires: pkgconfig(upower-glib)
BuildRequires: pkgconfig(wayland-client)
@@ -298,6 +296,9 @@ export NINJA_STATUS="[%f/%t][%e] "
%endif
%changelog
+* Tue Jan 12 2020 Michael Catanzaro <mcatanzaro(a)redhat.com> - 2.31.1-1
+- Update to 2.31.1
+
* Tue Dec 15 2020 Michael Catanzaro <mcatanzaro(a)redhat.com> - 2.30.4-1
- Update to 2.30.4
commit 5793491e1b359bf1b6222d9d47794a06d2ea34a3
Author: Michael Catanzaro <mcatanzaro(a)gnome.org>
Date: Tue Dec 15 09:53:44 2020 -0600
Update to 2.30.4
diff --git a/.gitignore b/.gitignore
index 6446386..bfbf6f1 100644
--- a/.gitignore
+++ b/.gitignore
@@ -61,3 +61,5 @@
/webkitgtk-2.30.2.tar.xz.asc
/webkitgtk-2.30.3.tar.xz
/webkitgtk-2.30.3.tar.xz.asc
+/webkitgtk-2.30.4.tar.xz
+/webkitgtk-2.30.4.tar.xz.asc
diff --git a/sources b/sources
index 4978769..0ea7a5a 100644
--- a/sources
+++ b/sources
@@ -1,2 +1,2 @@
-SHA512 (webkitgtk-2.30.3.tar.xz) =
cbb8298bdb791eb60a214c36ec9ced398fc5c07f580d60d001483ca3f616a309394013239affd16f6eefd8c2fb178bbf5b566ab4480fe3349e1856c80ec78ddf
-SHA512 (webkitgtk-2.30.3.tar.xz.asc) =
a6614652f35431e54a612a74e75e679a829dedffa4240cc8dde442adcb1606fd91bc400fe87109c618d2760c76927cdeaa1d0949f4038e6fac9cf7809d940ee8
+SHA512 (webkitgtk-2.30.4.tar.xz) =
dff9e3bd17de8481d940a48b0697458a0c1c71a987f4d50ee7bc46b0203ed6802a9ec82c3a21ea9b7211ab900fa75b89b2a05b0ca6aed319ad66ec317d02c571
+SHA512 (webkitgtk-2.30.4.tar.xz.asc) =
531b8d0644d51a7a00088e1be77e162cb61a0b06825022587ff488bd96d6993cbc06e8a8a19e81c66140e04af45cc5d393e5b6e022a1d067e8ed6409bb656b07
diff --git a/webkit2gtk3.spec b/webkit2gtk3.spec
index 1943147..0b76d81 100644
--- a/webkit2gtk3.spec
+++ b/webkit2gtk3.spec
@@ -11,7 +11,7 @@
%bcond_without docs
Name: webkit2gtk3
-Version: 2.30.3
+Version: 2.30.4
Release: 1%{?dist}
Summary: GTK Web content engine library
@@ -298,6 +298,9 @@ export NINJA_STATUS="[%f/%t][%e] "
%endif
%changelog
+* Tue Dec 15 2020 Michael Catanzaro <mcatanzaro(a)redhat.com> - 2.30.4-1
+- Update to 2.30.4
+
* Tue Nov 24 2020 Michael Catanzaro <mcatanzaro(a)redhat.com> - 2.30.3-1
- Update to 2.30.3
commit 31a0b375d1877e768a983eec9337317ad5d46902
Author: Michael Catanzaro <mcatanzaro(a)gnome.org>
Date: Tue Nov 24 15:21:35 2020 -0600
CMake builds are now out-of-source by default
diff --git a/webkit2gtk3.spec b/webkit2gtk3.spec
index 0067c56..1943147 100644
--- a/webkit2gtk3.spec
+++ b/webkit2gtk3.spec
@@ -1,5 +1,3 @@
-%undefine __cmake_in_source_build
-
## 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.
commit 1434b2e3d131b3255d9542f0a836170f52bc24d7
Author: Michael Catanzaro <mcatanzaro(a)gnome.org>
Date: Tue Nov 24 15:19:55 2020 -0600
Configuring PYTHON_EXECUTABLE is no longer needed
diff --git a/webkit2gtk3.spec b/webkit2gtk3.spec
index f984a3b..0067c56 100644
--- a/webkit2gtk3.spec
+++ b/webkit2gtk3.spec
@@ -209,7 +209,6 @@ rm -rf Source/ThirdParty/qunit/
-DPORT=GTK \
-DCMAKE_BUILD_TYPE=Release \
-DENABLE_MINIBROWSER=ON \
- -DPYTHON_EXECUTABLE=%{_bindir}/python3 \
%if %{with docs}
-DENABLE_GTKDOC=ON \
%endif
commit cffb12155898494a1814c18bc02836e6e5b8a989
Author: Michael Catanzaro <mcatanzaro(a)gnome.org>
Date: Tue Nov 24 15:13:44 2020 -0600
Update to 2.30.3
diff --git a/.gitignore b/.gitignore
index cc83147..6446386 100644
--- a/.gitignore
+++ b/.gitignore
@@ -59,3 +59,5 @@
/webkitgtk-2.30.1.tar.xz.asc
/webkitgtk-2.30.2.tar.xz
/webkitgtk-2.30.2.tar.xz.asc
+/webkitgtk-2.30.3.tar.xz
+/webkitgtk-2.30.3.tar.xz.asc
diff --git a/sources b/sources
index ab6eb51..4978769 100644
--- a/sources
+++ b/sources
@@ -1,2 +1,2 @@
-SHA512 (webkitgtk-2.30.2.tar.xz) =
caecd765ce92942fc07d0d18b834b8f1acb13e6dc1e504ed9f104862285a6032a8824ab98a7439e6f8664d83dacb4ece2011f4ec822308e5b40d1f82ca601243
-SHA512 (webkitgtk-2.30.2.tar.xz.asc) =
1d4ddf2bd926f29b1f6d0f464b3e76774c111f2dc6480eb3f1f12efb10529071d29d9b1e7fd276898f29506a80b27133918d19919e2ef9c693661197072566d7
+SHA512 (webkitgtk-2.30.3.tar.xz) =
cbb8298bdb791eb60a214c36ec9ced398fc5c07f580d60d001483ca3f616a309394013239affd16f6eefd8c2fb178bbf5b566ab4480fe3349e1856c80ec78ddf
+SHA512 (webkitgtk-2.30.3.tar.xz.asc) =
a6614652f35431e54a612a74e75e679a829dedffa4240cc8dde442adcb1606fd91bc400fe87109c618d2760c76927cdeaa1d0949f4038e6fac9cf7809d940ee8
diff --git a/webkit-aarch64_page_size.patch b/webkit-aarch64_page_size.patch
deleted file mode 100644
index 4df6fdb..0000000
--- a/webkit-aarch64_page_size.patch
+++ /dev/null
@@ -1,16 +0,0 @@
-diff --git a/Source/WTF/wtf/PageBlock.h b/Source/WTF/wtf/PageBlock.h
-index cf5cf31b2c93..412ab0836209 100644
---- a/Source/WTF/wtf/PageBlock.h
-+++ b/Source/WTF/wtf/PageBlock.h
-@@ -49,9 +49,9 @@ namespace WTF {
- // Use 64 KiB for any unknown CPUs to be conservative.
- #if OS(DARWIN) || PLATFORM(PLAYSTATION)
- constexpr size_t CeilingOnPageSize = 16 * KB;
--#elif OS(WINDOWS) || CPU(MIPS) || CPU(MIPS64) || CPU(X86) || CPU(X86_64) || CPU(ARM) ||
CPU(ARM64)
-+#elif OS(WINDOWS) || CPU(MIPS) || CPU(MIPS64) || CPU(X86) || CPU(X86_64) || CPU(ARM)
- constexpr size_t CeilingOnPageSize = 4 * KB;
--#elif CPU(UNKNOWN) || CPU(PPC) || CPU(PPC64) || CPU(PPC64LE)
-+#elif CPU(UNKNOWN) || CPU(PPC) || CPU(PPC64) || CPU(PPC64LE) || CPU(ARM64)
- constexpr size_t CeilingOnPageSize = 64 * KB;
- #else
- #error Must set CeilingOnPageSize in PageBlock.h when adding a new CPU architecture!
diff --git a/webkit2gtk3.spec b/webkit2gtk3.spec
index aa81d35..f984a3b 100644
--- a/webkit2gtk3.spec
+++ b/webkit2gtk3.spec
@@ -13,8 +13,8 @@
%bcond_without docs
Name: webkit2gtk3
-Version: 2.30.2
-Release: 2%{?dist}
+Version: 2.30.3
+Release: 1%{?dist}
Summary: GTK Web content engine library
License: LGPLv2
@@ -24,16 +24,8 @@ Source1:
https://webkitgtk.org/releases/webkitgtk-%{version}.tar.xz.asc
# Created from
http://hkps.pool.sks-keyservers.net/pks/lookup?op=get&search=0xF3D322...
Source2:
https://people.gnome.org/~mcatanzaro/gpg-key-D7FCF61CF9A2DEAB31D81BD3F3D3...
-%if 0%{?rhel}
-#
https://bugs.webkit.org/show_bug.cgi?id=217989
-Patch0: webkit-aarch64_page_size.patch
-%endif
-
-#
https://github.com/WebPlatformForEmbedded/libwpe/issues/59
-Patch1: wpebackend-fdo-soname.patch
-
# Fix bogus volatile use caught by gcc-11
-Patch2: %{name}-gcc11.patch
+Patch0: %{name}-gcc11.patch
BuildRequires: bison
BuildRequires: bubblewrap
@@ -191,7 +183,7 @@ rm -rf Source/ThirdParty/qunit/
%build
# This package fails to build with LTO due to undefined symbols. LTO
-# was disabled in OpenSuSE as well, but with no real explanation why
+# was disabled in openSUSE as well, but with no real explanation why
# beyond the undefined symbols. It really shold be investigated further.
# Disable LTO
%define _lto_cflags %{nil}
@@ -212,9 +204,6 @@ rm -rf Source/ThirdParty/qunit/
%global optflags %(echo %{optflags} | sed 's/-g /-g1 /')
%endif
-# bmalloc and JIT are disabled on aarch64 only in RHEL because of the nonstandard
-# page size that's causing problems there. WebKit's build system sets
appropriate
-# defaults for all other architectures, and all other distros except RHEL.
%cmake \
-GNinja \
-DPORT=GTK \
@@ -229,10 +218,7 @@ rm -rf Source/ThirdParty/qunit/
%endif
%if 0%{?rhel}
%ifarch aarch64
- -DENABLE_C_LOOP=ON \
- -DENABLE_JIT=OFF \
- -DENABLE_SAMPLING_PROFILER=OFF \
- -DUSE_SYSTEM_MALLOC=ON \
+ -DUSE_64KB_PAGE_BLOCK=ON \
%endif
%endif
%{nil}
@@ -315,6 +301,9 @@ export NINJA_STATUS="[%f/%t][%e] "
%endif
%changelog
+* Tue Nov 24 2020 Michael Catanzaro <mcatanzaro(a)redhat.com> - 2.30.3-1
+- Update to 2.30.3
+
* Wed Nov 11 2020 Jeff Law <law(a)redhat.com> - 2.30.2-2
- Fix bogus volatile caught by gcc-11
diff --git a/wpebackend-fdo-soname.patch b/wpebackend-fdo-soname.patch
deleted file mode 100644
index 43cabc7..0000000
--- a/wpebackend-fdo-soname.patch
+++ /dev/null
@@ -1,14 +0,0 @@
-Index: webkitgtk-2.29.92/Source/WebKit/UIProcess/glib/WebProcessPoolGLib.cpp
-===================================================================
---- webkitgtk-2.29.92.orig/Source/WebKit/UIProcess/glib/WebProcessPoolGLib.cpp
-+++ webkitgtk-2.29.92/Source/WebKit/UIProcess/glib/WebProcessPoolGLib.cpp
-@@ -115,7 +115,7 @@ void WebProcessPool::platformInitializeW
- #if PLATFORM(WAYLAND)
- if (WebCore::PlatformDisplay::sharedDisplay().type() ==
WebCore::PlatformDisplay::Type::Wayland) {
- #if USE(WPE_RENDERER)
-- wpe_loader_init("libWPEBackend-fdo-1.0.so");
-+ wpe_loader_init("libWPEBackend-fdo-1.0.so.1");
- if (AcceleratedBackingStoreWayland::checkRequirements()) {
- parameters.hostClientFileDescriptor = wpe_renderer_host_create_client();
- parameters.implementationLibraryName =
FileSystem::fileSystemRepresentation(wpe_loader_get_loaded_implementation_library_name());
-
commit 876da26ba20c72c219459a27051817956613b027
Author: Jeff Law <law(a)redhat.com>
Date: Wed Nov 11 16:45:39 2020 -0700
Fix bogus volatile caught by gcc-11
diff --git a/webkit2gtk3-gcc11.patch b/webkit2gtk3-gcc11.patch
new file mode 100644
index 0000000..4ec898a
--- /dev/null
+++ b/webkit2gtk3-gcc11.patch
@@ -0,0 +1,13 @@
+diff --git a/Source/WTF/wtf/glib/WTFGType.h b/Source/WTF/wtf/glib/WTFGType.h
+index 203522e6..9953fe80 100644
+--- a/Source/WTF/wtf/glib/WTFGType.h
++++ b/Source/WTF/wtf/glib/WTFGType.h
+@@ -74,7 +74,7 @@ static void type_name##_init(TypeName* self, gpointer) \
+ \
+ GType type_name##_get_type(void) \
+ { \
+- static volatile gsize g_define_type_id__volatile = 0; \
++ static gsize g_define_type_id__volatile = 0; \
+ if (g_once_init_enter(&g_define_type_id__volatile)) { \
+ GType g_define_type_id = type_name##_get_type_once(); \
+ g_once_init_leave(&g_define_type_id__volatile, g_define_type_id); \
diff --git a/webkit2gtk3.spec b/webkit2gtk3.spec
index 4dba382..aa81d35 100644
--- a/webkit2gtk3.spec
+++ b/webkit2gtk3.spec
@@ -14,7 +14,7 @@
Name: webkit2gtk3
Version: 2.30.2
-Release: 1%{?dist}
+Release: 2%{?dist}
Summary: GTK Web content engine library
License: LGPLv2
@@ -32,6 +32,9 @@ Patch0: webkit-aarch64_page_size.patch
#
https://github.com/WebPlatformForEmbedded/libwpe/issues/59
Patch1: wpebackend-fdo-soname.patch
+# Fix bogus volatile use caught by gcc-11
+Patch2: %{name}-gcc11.patch
+
BuildRequires: bison
BuildRequires: bubblewrap
BuildRequires: cmake
@@ -312,6 +315,9 @@ export NINJA_STATUS="[%f/%t][%e] "
%endif
%changelog
+* Wed Nov 11 2020 Jeff Law <law(a)redhat.com> - 2.30.2-2
+- Fix bogus volatile caught by gcc-11
+
* Mon Oct 26 2020 Michael Catanzaro <mcatanzaro(a)redhat.com> - 2.30.2-1
- Update to 2.30.2
commit d3fba6cbad8b3b5d7bc4bd429bd6f892b566de43
Author: Michael Catanzaro <mcatanzaro(a)gnome.org>
Date: Thu Oct 29 14:30:24 2020 -0500
Make gtkdoc optional
This is mostly work by Kamil Dudka <kdudka(a)redhat.com>. Thanks Kamil!
I just wrote a longer comment to explain why the condition should not be
removed.
diff --git a/webkit2gtk3.spec b/webkit2gtk3.spec
index 30b6004..4dba382 100644
--- a/webkit2gtk3.spec
+++ b/webkit2gtk3.spec
@@ -7,6 +7,11 @@
mkdir -p _license_files ; \
cp -p %1 _license_files/$(echo '%1' | sed -e 's!/!.!g')
+# Build documentation by default (use `rpmbuild --without docs` to override it).
+# This is used by Coverity. Coverity injects custom compiler warnings, but
+# any warning during WebKit docs build is fatal!
+%bcond_without docs
+
Name: webkit2gtk3
Version: 2.30.2
Release: 1%{?dist}
@@ -143,6 +148,7 @@ Provides: webkitgtk4-devel = %{version}-%{release}
The %{name}-devel package contains libraries, build data, and header
files for developing applications that use %{name}.
+%if %{with docs}
%package doc
Summary: Documentation files for %{name}
BuildArch: noarch
@@ -152,6 +158,7 @@ Provides: webkitgtk4-doc = %{version}-%{release}
%description doc
This package contains developer documentation for %{name}.
+%endif
%package jsc
Summary: JavaScript engine from %{name}
@@ -209,9 +216,11 @@ rm -rf Source/ThirdParty/qunit/
-GNinja \
-DPORT=GTK \
-DCMAKE_BUILD_TYPE=Release \
- -DENABLE_GTKDOC=ON \
-DENABLE_MINIBROWSER=ON \
-DPYTHON_EXECUTABLE=%{_bindir}/python3 \
+%if %{with docs}
+ -DENABLE_GTKDOC=ON \
+%endif
%if 0%{?fedora}
-DUSER_AGENT_BRANDING="Fedora" \
%endif
@@ -293,12 +302,14 @@ export NINJA_STATUS="[%f/%t][%e] "
%dir %{_datadir}/gir-1.0
%{_datadir}/gir-1.0/JavaScriptCore-4.0.gir
+%if %{with docs}
%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/
+%endif
%changelog
* Mon Oct 26 2020 Michael Catanzaro <mcatanzaro(a)redhat.com> - 2.30.2-1
commit dbefe87698f4e476efe431e319f6efb3ed7ff7b4
Author: Michael Catanzaro <mcatanzaro(a)gnome.org>
Date: Mon Oct 26 11:45:47 2020 -0500
Update to 2.30.2
diff --git a/.gitignore b/.gitignore
index ee1eede..cc83147 100644
--- a/.gitignore
+++ b/.gitignore
@@ -57,3 +57,5 @@
/webkitgtk-2.30.0.tar.xz
/webkitgtk-2.30.1.tar.xz
/webkitgtk-2.30.1.tar.xz.asc
+/webkitgtk-2.30.2.tar.xz
+/webkitgtk-2.30.2.tar.xz.asc
diff --git a/sources b/sources
index c78ee90..ab6eb51 100644
--- a/sources
+++ b/sources
@@ -1,2 +1,2 @@
-SHA512 (webkitgtk-2.30.1.tar.xz) =
059f87a35468d3984187c6afb2c9142baf21a3fb6d69db1abcea567a5e910581596a3e420820ffe23c3ec87832eaca282bc3c0f86c7031f728eb168dae27147e
-SHA512 (webkitgtk-2.30.1.tar.xz.asc) =
358ea379156295f65193305e5fcb2b19131754eba2f3d785eda293e7c2de7d9f6c13ca6ea476cb59b61278068036d8cf42d5f210dd734fe88e43676a01352f08
+SHA512 (webkitgtk-2.30.2.tar.xz) =
caecd765ce92942fc07d0d18b834b8f1acb13e6dc1e504ed9f104862285a6032a8824ab98a7439e6f8664d83dacb4ece2011f4ec822308e5b40d1f82ca601243
+SHA512 (webkitgtk-2.30.2.tar.xz.asc) =
1d4ddf2bd926f29b1f6d0f464b3e76774c111f2dc6480eb3f1f12efb10529071d29d9b1e7fd276898f29506a80b27133918d19919e2ef9c693661197072566d7
diff --git a/webkit2gtk3.spec b/webkit2gtk3.spec
index 82cee2d..30b6004 100644
--- a/webkit2gtk3.spec
+++ b/webkit2gtk3.spec
@@ -8,7 +8,7 @@
cp -p %1 _license_files/$(echo '%1' | sed -e 's!/!.!g')
Name: webkit2gtk3
-Version: 2.30.1
+Version: 2.30.2
Release: 1%{?dist}
Summary: GTK Web content engine library
@@ -301,6 +301,9 @@ export NINJA_STATUS="[%f/%t][%e] "
%{_datadir}/gtk-doc/html/webkitdomgtk-4.0/
%changelog
+* Mon Oct 26 2020 Michael Catanzaro <mcatanzaro(a)redhat.com> - 2.30.2-1
+- Update to 2.30.2
+
* Mon Sep 21 2020 Michael Catanzaro <mcatanzaro(a)redhat.com> - 2.30.1-1
- Update to 2.30.1
commit 5822f45c5c858ec5ee8d17c8d03b4255cd0d1b1c
Author: Michael Catanzaro <mcatanzaro(a)gnome.org>
Date: Tue Oct 20 16:59:17 2020 -0500
Add aarch64 page size patch for ELN
diff --git a/webkit-aarch64_page_size.patch b/webkit-aarch64_page_size.patch
new file mode 100644
index 0000000..4df6fdb
--- /dev/null
+++ b/webkit-aarch64_page_size.patch
@@ -0,0 +1,16 @@
+diff --git a/Source/WTF/wtf/PageBlock.h b/Source/WTF/wtf/PageBlock.h
+index cf5cf31b2c93..412ab0836209 100644
+--- a/Source/WTF/wtf/PageBlock.h
++++ b/Source/WTF/wtf/PageBlock.h
+@@ -49,9 +49,9 @@ namespace WTF {
+ // Use 64 KiB for any unknown CPUs to be conservative.
+ #if OS(DARWIN) || PLATFORM(PLAYSTATION)
+ constexpr size_t CeilingOnPageSize = 16 * KB;
+-#elif OS(WINDOWS) || CPU(MIPS) || CPU(MIPS64) || CPU(X86) || CPU(X86_64) || CPU(ARM) ||
CPU(ARM64)
++#elif OS(WINDOWS) || CPU(MIPS) || CPU(MIPS64) || CPU(X86) || CPU(X86_64) || CPU(ARM)
+ constexpr size_t CeilingOnPageSize = 4 * KB;
+-#elif CPU(UNKNOWN) || CPU(PPC) || CPU(PPC64) || CPU(PPC64LE)
++#elif CPU(UNKNOWN) || CPU(PPC) || CPU(PPC64) || CPU(PPC64LE) || CPU(ARM64)
+ constexpr size_t CeilingOnPageSize = 64 * KB;
+ #else
+ #error Must set CeilingOnPageSize in PageBlock.h when adding a new CPU architecture!
diff --git a/webkit2gtk3.spec b/webkit2gtk3.spec
index 44f5786..82cee2d 100644
--- a/webkit2gtk3.spec
+++ b/webkit2gtk3.spec
@@ -19,8 +19,13 @@ Source1:
https://webkitgtk.org/releases/webkitgtk-%{version}.tar.xz.asc
# Created from
http://hkps.pool.sks-keyservers.net/pks/lookup?op=get&search=0xF3D322...
Source2:
https://people.gnome.org/~mcatanzaro/gpg-key-D7FCF61CF9A2DEAB31D81BD3F3D3...
+%if 0%{?rhel}
+#
https://bugs.webkit.org/show_bug.cgi?id=217989
+Patch0: webkit-aarch64_page_size.patch
+%endif
+
#
https://github.com/WebPlatformForEmbedded/libwpe/issues/59
-Patch0: wpebackend-fdo-soname.patch
+Patch1: wpebackend-fdo-soname.patch
BuildRequires: bison
BuildRequires: bubblewrap
commit b724aacf0cec590321cf4aa1783a9719de251cbc
Author: Michael Catanzaro <mcatanzaro(a)gnome.org>
Date: Tue Oct 20 12:55:51 2020 -0500
Use RHEL build flags for ELN
diff --git a/webkit2gtk3.spec b/webkit2gtk3.spec
index 8c58739..44f5786 100644
--- a/webkit2gtk3.spec
+++ b/webkit2gtk3.spec
@@ -197,6 +197,9 @@ rm -rf Source/ThirdParty/qunit/
%global optflags %(echo %{optflags} | sed 's/-g /-g1 /')
%endif
+# bmalloc and JIT are disabled on aarch64 only in RHEL because of the nonstandard
+# page size that's causing problems there. WebKit's build system sets
appropriate
+# defaults for all other architectures, and all other distros except RHEL.
%cmake \
-GNinja \
-DPORT=GTK \
@@ -206,6 +209,14 @@ rm -rf Source/ThirdParty/qunit/
-DPYTHON_EXECUTABLE=%{_bindir}/python3 \
%if 0%{?fedora}
-DUSER_AGENT_BRANDING="Fedora" \
+%endif
+%if 0%{?rhel}
+%ifarch aarch64
+ -DENABLE_C_LOOP=ON \
+ -DENABLE_JIT=OFF \
+ -DENABLE_SAMPLING_PROFILER=OFF \
+ -DUSE_SYSTEM_MALLOC=ON \
+%endif
%endif
%{nil}
commit 1cf5dc56f74422db9c5940f6277c0b06dea3c5ac
Author: Michael Catanzaro <mcatanzaro(a)gnome.org>
Date: Mon Sep 21 12:11:37 2020 -0500
Update to 2.30.1
diff --git a/.gitignore b/.gitignore
index fefb1e8..ee1eede 100644
--- a/.gitignore
+++ b/.gitignore
@@ -55,3 +55,5 @@
/webkitgtk-2.29.92.tar.xz.asc
/webkitgtk-2.30.0.tar.xz.asc
/webkitgtk-2.30.0.tar.xz
+/webkitgtk-2.30.1.tar.xz
+/webkitgtk-2.30.1.tar.xz.asc
diff --git a/sources b/sources
index cc78888..c78ee90 100644
--- a/sources
+++ b/sources
@@ -1,2 +1,2 @@
-SHA512 (webkitgtk-2.30.0.tar.xz.asc) =
3ca5fa95eb79c5598242d48efab187816c27a3085892a6f66831c0f47ff081cfc0e343486f82c6d8ff709dcb7f34d6fbf2827a3a992f76037dc72dee09a3f64e
-SHA512 (webkitgtk-2.30.0.tar.xz) =
5610f99f8c61c9b41490dca005866557bed99ab9ae1f9c8466ddc42f015d834738762d54e2a86c75caa588edd3dd6cba883f58e05c43bf988d3766b887147d79
+SHA512 (webkitgtk-2.30.1.tar.xz) =
059f87a35468d3984187c6afb2c9142baf21a3fb6d69db1abcea567a5e910581596a3e420820ffe23c3ec87832eaca282bc3c0f86c7031f728eb168dae27147e
+SHA512 (webkitgtk-2.30.1.tar.xz.asc) =
358ea379156295f65193305e5fcb2b19131754eba2f3d785eda293e7c2de7d9f6c13ca6ea476cb59b61278068036d8cf42d5f210dd734fe88e43676a01352f08
diff --git a/webkit2gtk3.spec b/webkit2gtk3.spec
index 577573c..8c58739 100644
--- a/webkit2gtk3.spec
+++ b/webkit2gtk3.spec
@@ -8,7 +8,7 @@
cp -p %1 _license_files/$(echo '%1' | sed -e 's!/!.!g')
Name: webkit2gtk3
-Version: 2.30.0
+Version: 2.30.1
Release: 1%{?dist}
Summary: GTK Web content engine library
@@ -285,6 +285,9 @@ export NINJA_STATUS="[%f/%t][%e] "
%{_datadir}/gtk-doc/html/webkitdomgtk-4.0/
%changelog
+* Mon Sep 21 2020 Michael Catanzaro <mcatanzaro(a)redhat.com> - 2.30.1-1
+- Update to 2.30.1
+
* Fri Sep 11 2020 Michael Catanzaro <mcatanzaro(a)redhat.com> - 2.30.0-1
- Update to 2.30.0. Add patch for libwpe#59.