| 1 |
commit: 4afe1169372beb379f024cc5acdcdb2c48b6fe8b |
| 2 |
Author: Alexey Sokolov <alexey+gentoo <AT> asokolov <DOT> org> |
| 3 |
AuthorDate: Mon Aug 22 23:42:01 2022 +0000 |
| 4 |
Commit: Patrick McLean <chutzpah <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Fri Aug 26 23:56:53 2022 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4afe1169 |
| 7 |
|
| 8 |
app-misc/openrgb: fix build with dev-cpp/nlohmann_json-3.11.2 |
| 9 |
|
| 10 |
Closes: https://bugs.gentoo.org/865133 |
| 11 |
Package-Manager: Portage-3.0.30, Repoman-3.0.3 |
| 12 |
Signed-off-by: Alexey Sokolov <alexey+gentoo <AT> asokolov.org> |
| 13 |
Signed-off-by: Patrick McLean <chutzpah <AT> gentoo.org> |
| 14 |
|
| 15 |
app-misc/openrgb/files/OpenRGB-0.7-json.patch | 24 ++++++++++++++++++++++++ |
| 16 |
app-misc/openrgb/openrgb-0.7.ebuild | 1 + |
| 17 |
2 files changed, 25 insertions(+) |
| 18 |
|
| 19 |
diff --git a/app-misc/openrgb/files/OpenRGB-0.7-json.patch b/app-misc/openrgb/files/OpenRGB-0.7-json.patch |
| 20 |
new file mode 100644 |
| 21 |
index 000000000000..32474f545dd0 |
| 22 |
--- /dev/null |
| 23 |
+++ b/app-misc/openrgb/files/OpenRGB-0.7-json.patch |
| 24 |
@@ -0,0 +1,24 @@ |
| 25 |
+Fix build with dev-cpp/nlohmann_json-3.11.2 |
| 26 |
+ |
| 27 |
+https://bugs.gentoo.org/865133 |
| 28 |
+https://gitlab.com/CalcProgrammer1/OpenRGB/-/merge_requests/1376 |
| 29 |
+--- a/Controllers/GigabyteRGBFusion2USBController/RGBController_GigabyteRGBFusion2USB.cpp |
| 30 |
++++ b/Controllers/GigabyteRGBFusion2USBController/RGBController_GigabyteRGBFusion2USB.cpp |
| 31 |
+@@ -329,7 +329,7 @@ void RGBController_RGBFusion2USB::Load_Device_Config() |
| 32 |
+ } |
| 33 |
+ else |
| 34 |
+ { |
| 35 |
+- for(nlohmann::detail::iteration_proxy_value<nlohmann::detail::iter_impl<nlohmann::json>>& it : device_settings[SectionLayout].items()) |
| 36 |
++ for(const nlohmann::detail::iteration_proxy_value<nlohmann::detail::iter_impl<nlohmann::json>>& it : device_settings[SectionLayout].items()) |
| 37 |
+ { |
| 38 |
+ MBName2Layout.insert( std::pair<std::string, std::string>(it.key(), it.value() )); |
| 39 |
+ } |
| 40 |
+@@ -380,7 +380,7 @@ void RGBController_RGBFusion2USB::Load_Device_Config() |
| 41 |
+ json json_HCL = device_settings[SectionCustom]["Data"]; |
| 42 |
+ layout.clear(); |
| 43 |
+ |
| 44 |
+- for(nlohmann::detail::iteration_proxy_value<nlohmann::detail::iter_impl<nlohmann::json>>& json_layout_it : json_HCL.items()) |
| 45 |
++ for(const nlohmann::detail::iteration_proxy_value<nlohmann::detail::iter_impl<nlohmann::json>>& json_layout_it : json_HCL.items()) |
| 46 |
+ { |
| 47 |
+ json json_zl = json_layout_it.value(); |
| 48 |
+ std::vector<LedPort> v_lp; |
| 49 |
|
| 50 |
diff --git a/app-misc/openrgb/openrgb-0.7.ebuild b/app-misc/openrgb/openrgb-0.7.ebuild |
| 51 |
index bbc124653d95..a8ef5e62540f 100644 |
| 52 |
--- a/app-misc/openrgb/openrgb-0.7.ebuild |
| 53 |
+++ b/app-misc/openrgb/openrgb-0.7.ebuild |
| 54 |
@@ -42,6 +42,7 @@ BDEPEND=" |
| 55 |
PATCHES+=( |
| 56 |
"${FILESDIR}"/OpenRGB-0.7-plugins.patch |
| 57 |
"${FILESDIR}"/OpenRGB-0.7-udev.patch |
| 58 |
+ "${FILESDIR}"/OpenRGB-0.7-json.patch |
| 59 |
) |
| 60 |
|
| 61 |
src_prepare() { |
Archives