commit: be5d2ed93a38d1208916f3f8a8aad476ead53c1b Author: Michael Mair-Keimberger <mmk <AT> levelnine <DOT> at> AuthorDate: Wed Mar 1 16:20:06 2023 +0000 Commit: Maciej Barć <xgqt <AT> gentoo <DOT> org> CommitDate: Fri Mar 3 21:21:04 2023 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=be5d2ed9
app-misc/openrgb: remove unused patches Signed-off-by: Michael Mair-Keimberger <mmk <AT> levelnine.at> Signed-off-by: Maciej Barć <xgqt <AT> gentoo.org> app-misc/openrgb/files/OpenRGB-0.7-json.patch | 24 ------------------------ app-misc/openrgb/files/OpenRGB-0.7-plugins.patch | 24 ------------------------ app-misc/openrgb/files/OpenRGB-0.7-udev.patch | 16 ---------------- 3 files changed, 64 deletions(-) diff --git a/app-misc/openrgb/files/OpenRGB-0.7-json.patch b/app-misc/openrgb/files/OpenRGB-0.7-json.patch deleted file mode 100644 index 32474f545dd0..000000000000 --- a/app-misc/openrgb/files/OpenRGB-0.7-json.patch +++ /dev/null @@ -1,24 +0,0 @@ -Fix build with dev-cpp/nlohmann_json-3.11.2 - -https://bugs.gentoo.org/865133 -https://gitlab.com/CalcProgrammer1/OpenRGB/-/merge_requests/1376 ---- a/Controllers/GigabyteRGBFusion2USBController/RGBController_GigabyteRGBFusion2USB.cpp -+++ b/Controllers/GigabyteRGBFusion2USBController/RGBController_GigabyteRGBFusion2USB.cpp -@@ -329,7 +329,7 @@ void RGBController_RGBFusion2USB::Load_Device_Config() - } - else - { -- for(nlohmann::detail::iteration_proxy_value<nlohmann::detail::iter_impl<nlohmann::json>>& it : device_settings[SectionLayout].items()) -+ for(const nlohmann::detail::iteration_proxy_value<nlohmann::detail::iter_impl<nlohmann::json>>& it : device_settings[SectionLayout].items()) - { - MBName2Layout.insert( std::pair<std::string, std::string>(it.key(), it.value() )); - } -@@ -380,7 +380,7 @@ void RGBController_RGBFusion2USB::Load_Device_Config() - json json_HCL = device_settings[SectionCustom]["Data"]; - layout.clear(); - -- for(nlohmann::detail::iteration_proxy_value<nlohmann::detail::iter_impl<nlohmann::json>>& json_layout_it : json_HCL.items()) -+ for(const nlohmann::detail::iteration_proxy_value<nlohmann::detail::iter_impl<nlohmann::json>>& json_layout_it : json_HCL.items()) - { - json json_zl = json_layout_it.value(); - std::vector<LedPort> v_lp; diff --git a/app-misc/openrgb/files/OpenRGB-0.7-plugins.patch b/app-misc/openrgb/files/OpenRGB-0.7-plugins.patch deleted file mode 100644 index b9a6fb2cd16a..000000000000 --- a/app-misc/openrgb/files/OpenRGB-0.7-plugins.patch +++ /dev/null @@ -1,24 +0,0 @@ -Allow installation of plugins not only in ~/.config - -Used by app-misc/openrgb-plugin-* packages - ---- a/PluginManager.cpp -+++ b/PluginManager.cpp -@@ -35,7 +35,8 @@ void PluginManager::ScanAndLoadPlugins() - | The plugins directory is a directory named "plugins" in | - | the configuration directory | - \*---------------------------------------------------------*/ -- const QDir plugins_dir = QString().fromStdString(ResourceManager::get()->GetConfigurationDirectory()) + "plugins/"; -+ for (const QDir plugins_dir : {QString().fromStdString(ResourceManager::get()->GetConfigurationDirectory()) + "plugins/", -+ QString().fromStdString(GENTOO_PLUGINS_DIR)}) { - - /*---------------------------------------------------------*\ - | Get a list of all files in the plugins directory | -@@ -56,6 +57,7 @@ void PluginManager::ScanAndLoadPlugins() - - AddPlugin(plugin_path); - } -+ } - } - - void PluginManager::AddPlugin(std::string path) diff --git a/app-misc/openrgb/files/OpenRGB-0.7-udev.patch b/app-misc/openrgb/files/OpenRGB-0.7-udev.patch deleted file mode 100644 index a2feaf1c9378..000000000000 --- a/app-misc/openrgb/files/OpenRGB-0.7-udev.patch +++ /dev/null @@ -1,16 +0,0 @@ -Install udev rules to correct dir - -Revert https://gitlab.com/CalcProgrammer1/OpenRGB/-/commit/ccbe83919a70be346eea948fb2c4122ef9f34214 - ---- a/OpenRGB.pro -+++ b/OpenRGB.pro -@@ -1246,7 +1246,7 @@ unix:!macx { - icon.files+=qt/OpenRGB.png - metainfo.path=$$PREFIX/share/metainfo/ - metainfo.files+=qt/org.openrgb.OpenRGB.metainfo.xml -+ rules.path=/lib/udev/rules.d/ -- rules.path=$$PREFIX/lib/udev/rules.d/ - rules.files+=60-openrgb.rules - INSTALLS += target desktop icon metainfo rules - } -GitLab
