From d1bef6c7858270212cbe2c3680d7faf1c9a9b953 Mon Sep 17 00:00:00 2001 From: "Jason E. Hale" Date: Sat, 26 Apr 2025 23:03:49 -0400 Subject: [PATCH] multimedia/ossia-score: Fix build with Qt 6.9 With hat: kde@ PR: 286051 --- ...ossia_3rdparty_verdigris_src_wobjectimpl.h | 32 +++++++++++++++++++ 1 file changed, 32 insertions(+) create mode 100644 multimedia/ossia-score/files/patch-3rdparty_libossia_3rdparty_verdigris_src_wobjectimpl.h diff --git a/multimedia/ossia-score/files/patch-3rdparty_libossia_3rdparty_verdigris_src_wobjectimpl.h b/multimedia/ossia-score/files/patch-3rdparty_libossia_3rdparty_verdigris_src_wobjectimpl.h new file mode 100644 index 000000000000..8eda9c163dd2 --- /dev/null +++ b/multimedia/ossia-score/files/patch-3rdparty_libossia_3rdparty_verdigris_src_wobjectimpl.h @@ -0,0 +1,32 @@ +Fix build with Qt >= 6.9.0 + +Backported from: https://github.com/woboq/verdigris/commit/9b3e3f26251444bf48011202db85c892b0f45c57 + +--- 3rdparty/libossia/3rdparty/verdigris/src/wobjectimpl.h.orig 2025-01-16 18:09:49 UTC ++++ 3rdparty/libossia/3rdparty/verdigris/src/wobjectimpl.h +@@ -796,13 +796,20 @@ struct DataBuilder { + intCount += sizeof... (Ts); + } + +-#if QT_VERSION >= QT_VERSION_CHECK(6,0,0) ++#if QT_VERSION >= QT_VERSION_CHECK(6, 0, 0) ++#if QT_VERSION >= QT_VERSION_CHECK(6, 9, 0) ++ template ++ static constexpr const QtPrivate::QMetaTypeInterface *metaTypeInterface = QtPrivate::qTryMetaTypeInterfaceForType>(); ++#else + template +- static constexpr const QtPrivate::QMetaTypeInterface *metaTypeInterface = QtPrivate::qTryMetaTypeInterfaceForType>>(); +- +- template ++ static constexpr const QtPrivate::QMetaTypeInterface *metaTypeInterface ++ = QtPrivate::qTryMetaTypeInterfaceForType< ++ T, ++ QtPrivate::TypeAndForceComplete>>(); ++#endif ++ template + constexpr void addMetaType() { +- *metaTypeP++ = metaTypeInterface; ++ *metaTypeP++ = metaTypeInterface; + metaTypeCount += 1; + } + #endif