From 36d22d82aa202bb199967e9512281e9a53db42c9 Mon Sep 17 00:00:00 2001 From: Daniel Baumann Date: Sun, 7 Apr 2024 21:33:14 +0200 Subject: Adding upstream version 115.7.0esr. Signed-off-by: Daniel Baumann --- ...90539-Fix-SK_COMPILE_ASSERT-build-warning.patch | 39 ++++++++++++++++++++++ 1 file changed, 39 insertions(+) create mode 100644 gfx/skia/patches/archive/0023-Bug-890539-Fix-SK_COMPILE_ASSERT-build-warning.patch (limited to 'gfx/skia/patches/archive/0023-Bug-890539-Fix-SK_COMPILE_ASSERT-build-warning.patch') diff --git a/gfx/skia/patches/archive/0023-Bug-890539-Fix-SK_COMPILE_ASSERT-build-warning.patch b/gfx/skia/patches/archive/0023-Bug-890539-Fix-SK_COMPILE_ASSERT-build-warning.patch new file mode 100644 index 0000000000..9bc7ddec46 --- /dev/null +++ b/gfx/skia/patches/archive/0023-Bug-890539-Fix-SK_COMPILE_ASSERT-build-warning.patch @@ -0,0 +1,39 @@ +# HG changeset patch +# Parent e378875000890099fffcdb4cbc4ab12828ac34ee +# User Daniel Holbert +Bug 890539: Annotate SK_COMPILE_ASSERT's typedef as permissibly unused, to fix GCC 4.8 build warning. r=gw280 + +diff --git a/gfx/skia/include/core/SkTypes.h b/gfx/skia/include/core/SkTypes.h +--- a/gfx/skia/include/core/SkTypes.h ++++ b/gfx/skia/include/core/SkTypes.h +@@ -121,18 +121,29 @@ inline void operator delete(void* p) { + #define SkDEVCODE(code) + #define SK_DEVELOPER_TO_STRING() + #endif + + template + struct SkCompileAssert { + }; + ++/* ++ * The SK_COMPILE_ASSERT definition creates an otherwise-unused typedef. This ++ * triggers compiler warnings with some versions of gcc, so mark the typedef ++ * as permissibly-unused to disable the warnings. ++ */ ++# if defined(__GNUC__) ++# define SK_COMPILE_ASSERT_UNUSED_ATTRIBUTE __attribute__((unused)) ++# else ++# define SK_COMPILE_ASSERT_UNUSED_ATTRIBUTE /* nothing */ ++# endif ++ + #define SK_COMPILE_ASSERT(expr, msg) \ +- typedef SkCompileAssert<(bool(expr))> msg[bool(expr) ? 1 : -1] ++ typedef SkCompileAssert<(bool(expr))> msg[bool(expr) ? 1 : -1] SK_COMPILE_ASSERT_UNUSED_ATTRIBUTE + + /* + * Usage: SK_MACRO_CONCAT(a, b) to construct the symbol ab + * + * SK_MACRO_CONCAT_IMPL_PRIV just exists to make this work. Do not use directly + * + */ + #define SK_MACRO_CONCAT(X, Y) SK_MACRO_CONCAT_IMPL_PRIV(X, Y) -- cgit v1.2.3