rpms/firefox
7
0
Fork 0
Code Issues Pull Requests Releases Activity

Merge #45 work around broken moz.build file on ppc64le

Browse Source
This commit is contained in:
Jan Horak 2022-08-23 06:26:16 +00:00
commit 809044f0dd
2 changed files with 22 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
firefox.spec
View File

@ -33,10 +33,6 @@
# https://bugzilla.redhat.com/show_bug.cgi?id=1897522 # https://bugzilla.redhat.com/show_bug.cgi?id=1897522
ExcludeArch: s390x ExcludeArch: s390x
# Temporary disabled due to webrtc build failures
# https://bugzilla.redhat.com/show_bug.cgi?id=2113850
ExcludeArch: ppc64le
# Disabled due to # Disabled due to
# https://bugzilla.redhat.com/show_bug.cgi?id=1966949 # https://bugzilla.redhat.com/show_bug.cgi?id=1966949
%if 0%{?fedora} > 36 %if 0%{?fedora} > 36
@ -272,6 +268,9 @@ Patch990: work-around-GCC-ICE-on-arm.patch
# Backported WebRTC changes for PipeWire/Wayland screen sharing support # Backported WebRTC changes for PipeWire/Wayland screen sharing support
Patch1000: libwebrtc-screen-cast-sync-1.patch Patch1000: libwebrtc-screen-cast-sync-1.patch
# Work around broken moz.build file on ppc64le (mozb#1779545, mozb#1775202)
Patch1100: mozilla-1775202.patch
%if %{?system_nss} %if %{?system_nss}
BuildRequires: pkgconfig(nspr) >= %{nspr_version} BuildRequires: pkgconfig(nspr) >= %{nspr_version}
BuildRequires: pkgconfig(nss) >= %{nss_version} BuildRequires: pkgconfig(nss) >= %{nss_version}
@ -539,6 +538,8 @@ This package contains results of tests executed during build.
%patch1000 -p1 -b .libwebrtc-screen-cast-sync %patch1000 -p1 -b .libwebrtc-screen-cast-sync
%endif %endif
%patch1100 -p1 -b .ppc-mobzuild
%{__rm} -f .mozconfig %{__rm} -f .mozconfig
%{__cp} %{SOURCE10} .mozconfig %{__cp} %{SOURCE10} .mozconfig
echo "ac_add_options --enable-default-toolkit=cairo-gtk3-wayland" >> .mozconfig echo "ac_add_options --enable-default-toolkit=cairo-gtk3-wayland" >> .mozconfig

17
mozilla-1775202.patch Normal file
View File

@ -0,0 +1,17 @@
diff --git a/third_party/libwebrtc/moz.build b/third_party/libwebrtc/moz.build
index 8579f8bb3622..d9ca79d4fcb8 100644
--- a/third_party/libwebrtc/moz.build
+++ b/third_party/libwebrtc/moz.build
@@ -520,7 +520,10 @@ if CONFIG["CPU_ARCH"] == "ppc64" and CONFIG["OS_TARGET"] == "Linux":
"/third_party/libwebrtc/api/audio_codecs/isac/audio_decoder_isac_float_gn",
"/third_party/libwebrtc/api/audio_codecs/isac/audio_encoder_isac_float_gn",
"/third_party/libwebrtc/modules/audio_coding/isac_c_gn",
- "/third_party/libwebrtc/modules/audio_coding/isac_gn"
+ "/third_party/libwebrtc/modules/audio_coding/isac_gn",
+ "/third_party/libwebrtc/modules/desktop_capture/desktop_capture_generic_gn",
+ "/third_party/libwebrtc/modules/desktop_capture/desktop_capture_gn",
+ "/third_party/libwebrtc/modules/desktop_capture/primitives_gn"
]
if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Linux":