diff options
| -rw-r--r-- | firefox.spec | 6 | ||||
| -rw-r--r-- | mozilla-1726515.patch | 36 |
2 files changed, 41 insertions, 1 deletions
diff --git a/firefox.spec b/firefox.spec index 40d5c12..37b61f5 100644 --- a/firefox.spec +++ b/firefox.spec @@ -237,6 +237,7 @@ Patch407: mozilla-1667096.patch Patch408: mozilla-1663844.patch Patch415: mozilla-1670333.patch Patch420: mochitest-wayland-workaround.patch +Patch421: mozilla-1726515.patch # PGO/LTO patches Patch600: pgo.patch @@ -474,6 +475,7 @@ This package contains results of tests executed during build. %patch408 -p1 -b .1663844 %patch415 -p1 -b .1670333 %patch420 -p1 -b .mochitest-wayland-workaround +%patch421 -p1 -b .1726515 # PGO patches %if %{build_with_pgo} @@ -1044,10 +1046,12 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || : #--------------------------------------------------------------------- %changelog -* Mon Aug 23 2021 Timm Bäder <tbaeder@redhat.com> - 91.0.1-2 +* Mon Aug 23 2021 Martin Stransky <stransky@redhat.com> - 91.0.1-2 - Set %%build_with_clang automatically based on %%toolchain + by Timm Bäder <tbaeder@redhat.com> - Updated Fedora UA patch by Eric Engestrom (https://src.fedoraproject.org/rpms/firefox/pull-request/21) +- Added fix for mozbz#1726515 * Mon Aug 23 2021 Martin Stransky <stransky@redhat.com> - 91.0.1-1 - Updated to 91.0.1 diff --git a/mozilla-1726515.patch b/mozilla-1726515.patch new file mode 100644 index 0000000..91605d5 --- /dev/null +++ b/mozilla-1726515.patch @@ -0,0 +1,36 @@ +diff --git a/gfx/thebes/gfxTypes.h b/gfx/thebes/gfxTypes.h +--- a/gfx/thebes/gfxTypes.h ++++ b/gfx/thebes/gfxTypes.h +@@ -10,7 +10,7 @@ + #include "mozilla/TypedEnumBits.h" + + namespace mozilla { +-enum class StyleGenericFontFamily : uint8_t; ++enum class StyleGenericFontFamily : uint32_t; + } + + typedef struct _cairo_surface cairo_surface_t; +diff --git a/servo/components/style/values/computed/font.rs b/servo/components/style/values/computed/font.rs +--- a/servo/components/style/values/computed/font.rs ++++ b/servo/components/style/values/computed/font.rs +@@ -382,6 +382,10 @@ + /// The order here is important, if you change it make sure that + /// `gfxPlatformFontList.h`s ranged array and `gfxFontFamilyList`'s + /// sSingleGenerics are updated as well. ++/// ++/// NOTE(emilio): Should be u8, but it's a u32 because of ABI issues between GCC ++/// and LLVM see https://bugs.llvm.org/show_bug.cgi?id=44228 / bug 1600735 / ++/// bug 1726515. + #[derive( + Clone, + Copy, +@@ -397,7 +401,7 @@ + ToShmem, + )] + #[cfg_attr(feature = "servo", derive(Deserialize, Serialize))] +-#[repr(u8)] ++#[repr(u32)] + #[allow(missing_docs)] + pub enum GenericFontFamily { + /// No generic family specified, only for internal usage. + |