mirror of
https://anongit.gentoo.org/git/repo/gentoo.git
synced 2025-12-14 22:19:55 +00:00
b5e1f322c3Commit 56a02b6294 ("media-libs/tg_owt: fix
build with abseil-cpp-20250814.1"), fixing bug 964949, introduced a
regression for <=dev-cpp/abseil-cpp-20250512.1: redefinition of
absl::Nonnull and absl::Nullable.
Later versions of abseil, i.e. >dev-cpp/abseil-cpp-20250512.1,
completely remove absl::Nonnull and absl::Nullable so their redefinition
is fine.
This commit #ifdef's the patch added in the aforementioned commit to
abseil versions > 20250512, fixing the regression. The patch was
proposed by Nikita Kostovsky[1].
[1]: https://bugs.gentoo.org/965838#c6
See-also: https://github.com/desktop-app/tg_owt/pull/164
See-also: https://github.com/desktop-app/tg_owt/pull/169
Bug: https://bugs.gentoo.org/964949
Closes: https://bugs.gentoo.org/965838
Signed-off-by: Zurab Kvachadze <zurabid2016@gmail.com>
Part-of: https://github.com/gentoo/gentoo/pull/44634
Closes: https://github.com/gentoo/gentoo/pull/44634
Signed-off-by: Sam James <sam@gentoo.org>
22 lines
581 B
Diff
22 lines
581 B
Diff
diff --git a/src/api/scoped_refptr.h b/src/api/scoped_refptr.h
|
|
index 6ff8a3cf..5d58968e 100644
|
|
--- a/src/api/scoped_refptr.h
|
|
+++ b/src/api/scoped_refptr.h
|
|
@@ -68,6 +68,9 @@
|
|
|
|
#include "absl/base/nullability.h"
|
|
|
|
+// Compatibility shim for abseil versions that remove absl::Nonnull and
|
|
+// absl::Nullable.
|
|
+#if ABSL_LTS_RELEASE_VERSION > 20250512
|
|
namespace absl {
|
|
#ifdef absl_nonnull
|
|
template<typename T>
|
|
@@ -79,6 +82,7 @@ template<typename T>
|
|
using Nullable = T absl_nullable;
|
|
#endif // absl_nullable
|
|
}
|
|
+#endif // ABSL_LTS_RELEASE_VERSION > 20250512
|
|
|
|
namespace webrtc {
|
|
|