mirror of
https://anongit.gentoo.org/git/repo/gentoo.git
synced 2025-12-21 02:42:18 +00:00
de321b8b2d- port a patch from bundled rapidjson - use upstream .desktop file - avoid evaluating `uselibupnp` if USE=miniupnp (default) Signed-off-by: Filip Kobierski <fkobi@pm.me> Closes: https://github.com/gentoo/gentoo/pull/39471 Signed-off-by: Joonas Niilola <juippis@gentoo.org>
24 lines
1.1 KiB
Diff
24 lines
1.1 KiB
Diff
This fixes a c23 issue in the rapidjson library:
|
|
|
|
error: assignment of read-only member 'rapidjson::GenericStringRef::length'
|
|
|
|
This was fixed upstream in 2016 and this patch combines two commit from PR
|
|
https://github.com/Tencent/rapidjson/pull/719
|
|
We are using OpenBuildService as the tarball source and it bundles libraries that old.
|
|
|
|
For Gentoo details see https://bugs.gentoo.org/945721
|
|
--- a/supportlibs/rapidjson/include/rapidjson/document.h
|
|
+++ b/supportlibs/rapidjson/include/rapidjson/document.h
|
|
@@ -316,10 +316,10 @@
|
|
|
|
GenericStringRef(const GenericStringRef& rhs) : s(rhs.s), length(rhs.length) {}
|
|
|
|
- GenericStringRef& operator=(const GenericStringRef& rhs) { s = rhs.s; length = rhs.length; }
|
|
-
|
|
//! implicit conversion to plain CharType pointer
|
|
operator const Ch *() const { return s; }
|
|
+ //! Copy assignment operator not permitted - immutable type
|
|
+ GenericStringRef& operator=(const GenericStringRef& rhs) /* = delete */;
|
|
|
|
const Ch* const s; //!< plain CharType pointer
|
|
const SizeType length; //!< length of the string (excluding the trailing NULL terminator)
|