RHEL 9.0.0 Alpha bootstrap

The content of this branch was automatically imported from Fedora ELN
with the following as its source:
https://src.fedoraproject.org/rpms/webkit2gtk3#876da26ba20c72c219459a27051817956613b027
This commit is contained in:
Troy Dawson 2020-11-16 14:05:24 -08:00
parent c649419865
commit cbfba480c6
2 changed files with 32 additions and 2 deletions

13
webkit2gtk3-gcc11.patch Normal file
View File

@ -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); \

View File

@ -7,9 +7,14 @@
mkdir -p _license_files ; \ mkdir -p _license_files ; \
cp -p %1 _license_files/$(echo '%1' | sed -e 's!/!.!g') 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 Name: webkit2gtk3
Version: 2.30.2 Version: 2.30.2
Release: 1%{?dist} Release: 2%{?dist}
Summary: GTK Web content engine library Summary: GTK Web content engine library
License: LGPLv2 License: LGPLv2
@ -27,6 +32,9 @@ Patch0: webkit-aarch64_page_size.patch
# https://github.com/WebPlatformForEmbedded/libwpe/issues/59 # https://github.com/WebPlatformForEmbedded/libwpe/issues/59
Patch1: wpebackend-fdo-soname.patch Patch1: wpebackend-fdo-soname.patch
# Fix bogus volatile use caught by gcc-11
Patch2: %{name}-gcc11.patch
BuildRequires: bison BuildRequires: bison
BuildRequires: bubblewrap BuildRequires: bubblewrap
BuildRequires: cmake BuildRequires: cmake
@ -143,6 +151,7 @@ Provides: webkitgtk4-devel = %{version}-%{release}
The %{name}-devel package contains libraries, build data, and header The %{name}-devel package contains libraries, build data, and header
files for developing applications that use %{name}. files for developing applications that use %{name}.
%if %{with docs}
%package doc %package doc
Summary: Documentation files for %{name} Summary: Documentation files for %{name}
BuildArch: noarch BuildArch: noarch
@ -152,6 +161,7 @@ Provides: webkitgtk4-doc = %{version}-%{release}
%description doc %description doc
This package contains developer documentation for %{name}. This package contains developer documentation for %{name}.
%endif
%package jsc %package jsc
Summary: JavaScript engine from %{name} Summary: JavaScript engine from %{name}
@ -209,9 +219,11 @@ rm -rf Source/ThirdParty/qunit/
-GNinja \ -GNinja \
-DPORT=GTK \ -DPORT=GTK \
-DCMAKE_BUILD_TYPE=Release \ -DCMAKE_BUILD_TYPE=Release \
-DENABLE_GTKDOC=ON \
-DENABLE_MINIBROWSER=ON \ -DENABLE_MINIBROWSER=ON \
-DPYTHON_EXECUTABLE=%{_bindir}/python3 \ -DPYTHON_EXECUTABLE=%{_bindir}/python3 \
%if %{with docs}
-DENABLE_GTKDOC=ON \
%endif
%if 0%{?fedora} %if 0%{?fedora}
-DUSER_AGENT_BRANDING="Fedora" \ -DUSER_AGENT_BRANDING="Fedora" \
%endif %endif
@ -293,14 +305,19 @@ export NINJA_STATUS="[%f/%t][%e] "
%dir %{_datadir}/gir-1.0 %dir %{_datadir}/gir-1.0
%{_datadir}/gir-1.0/JavaScriptCore-4.0.gir %{_datadir}/gir-1.0/JavaScriptCore-4.0.gir
%if %{with docs}
%files doc %files doc
%dir %{_datadir}/gtk-doc %dir %{_datadir}/gtk-doc
%dir %{_datadir}/gtk-doc/html %dir %{_datadir}/gtk-doc/html
%{_datadir}/gtk-doc/html/jsc-glib-4.0/ %{_datadir}/gtk-doc/html/jsc-glib-4.0/
%{_datadir}/gtk-doc/html/webkit2gtk-4.0/ %{_datadir}/gtk-doc/html/webkit2gtk-4.0/
%{_datadir}/gtk-doc/html/webkitdomgtk-4.0/ %{_datadir}/gtk-doc/html/webkitdomgtk-4.0/
%endif
%changelog %changelog
* Wed Nov 11 2020 Jeff Law <law@redhat.com> - 2.30.2-2
- Fix bogus volatile caught by gcc-11
* Mon Oct 26 2020 Michael Catanzaro <mcatanzaro@redhat.com> - 2.30.2-1 * Mon Oct 26 2020 Michael Catanzaro <mcatanzaro@redhat.com> - 2.30.2-1
- Update to 2.30.2 - Update to 2.30.2