diff --git a/MozillaFirefox.changes b/MozillaFirefox.changes index 2a49628..b7b94bf 100644 --- a/MozillaFirefox.changes +++ b/MozillaFirefox.changes @@ -1,3 +1,10 @@ +------------------------------------------------------------------- +Thu Jul 18 15:27:13 UTC 2024 - Martin Jambor + +- Add firefox-3781e3117706.patch to fix boo#1227856 aka bmo#1905018 + where an incompatible pointer assignment is not accepted in C by + GCC 14. + ------------------------------------------------------------------- Mon Jul 8 20:25:10 UTC 2024 - Wolfgang Rosenauer diff --git a/MozillaFirefox.spec b/MozillaFirefox.spec index e70860c..75af304 100644 --- a/MozillaFirefox.spec +++ b/MozillaFirefox.spec @@ -1,5 +1,5 @@ # -# spec file for package MozillaFirefox +# spec file # # Copyright (c) 2024 SUSE LLC # Copyright (c) 2006-2024 Wolfgang Rosenauer @@ -233,10 +233,12 @@ Patch26: mozilla-bmo1907511.patch # Firefox/browser Patch101: firefox-kde.patch Patch102: firefox-branded-icons.patch +# PATCH-FIX-UPSTREAM MozillaFirefox-3781e3117706.patch bsc#1227856 +Patch103: firefox-3781e3117706.patch %endif BuildRoot: %{_tmppath}/%{name}-%{version}-build Requires(post): coreutils shared-mime-info desktop-file-utils -Requires(postun): shared-mime-info desktop-file-utils +Requires(postun):shared-mime-info desktop-file-utils Requires: %{name}-branding >= 68 %requires_ge mozilla-nspr %requires_ge mozilla-nss diff --git a/firefox-3781e3117706.patch b/firefox-3781e3117706.patch new file mode 100644 index 0000000..9932e72 --- /dev/null +++ b/firefox-3781e3117706.patch @@ -0,0 +1,33 @@ + +# HG changeset patch +# User Paul Adenot +# Date 1721290421 0 +# Node ID 3781e311770684d79c1c8112d18abce258e29e7f +# Parent fd4c60ac71c20d0cac519b517f32fc4956e0cfe3 +Bug 1905018 - Fix logctx type in dovi_rpu stub. r=media-playback-reviewers,alwu + +Differential Revision: https://phabricator.services.mozilla.com/D216832 + +diff --git a/media/ffvpx/libavcodec/dovi_rpu.h b/media/ffvpx/libavcodec/dovi_rpu.h +--- a/media/ffvpx/libavcodec/dovi_rpu.h ++++ b/media/ffvpx/libavcodec/dovi_rpu.h +@@ -5,17 +5,17 @@ + * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ + + /* Stubs for dovi_rpu.{c,h} */ + + typedef struct AVCtx AVContext; + + typedef struct DOVICtx { + int dv_profile; +- AVContext* logctx; ++ void* logctx; + int operating_point; + } DOVIContext; + + typedef struct AVDOVICConfRecord { + } AVDOVIDecoderConfigurationRecord; + + static void ff_dovi_ctx_unref(DOVIContext* ctx) {} + static void ff_dovi_update_cfg(DOVIContext* ctx, +