From f1aa825b8483db57bf28d0772acfa10aeebe83c3 Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Sat, 27 Aug 2022 02:53:16 +0100 Subject: gentoo auto-resync : 27:08:2022 - 02:53:16 --- app-misc/openrgb/files/OpenRGB-0.6-pkgconf.patch | 11 ----------- app-misc/openrgb/files/OpenRGB-0.6-plugins.patch | 24 ------------------------ app-misc/openrgb/files/OpenRGB-0.7-json.patch | 24 ++++++++++++++++++++++++ app-misc/openrgb/files/OpenRGB-0.7-r1-udev.patch | 15 +++++++++++++++ 4 files changed, 39 insertions(+), 35 deletions(-) delete mode 100644 app-misc/openrgb/files/OpenRGB-0.6-pkgconf.patch delete mode 100644 app-misc/openrgb/files/OpenRGB-0.6-plugins.patch create mode 100644 app-misc/openrgb/files/OpenRGB-0.7-json.patch create mode 100644 app-misc/openrgb/files/OpenRGB-0.7-r1-udev.patch (limited to 'app-misc/openrgb/files') diff --git a/app-misc/openrgb/files/OpenRGB-0.6-pkgconf.patch b/app-misc/openrgb/files/OpenRGB-0.6-pkgconf.patch deleted file mode 100644 index 380b1091d225..000000000000 --- a/app-misc/openrgb/files/OpenRGB-0.6-pkgconf.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- a/OpenRGB.pro 2021-06-06 22:51:12.022561718 +0100 -+++ b/OpenRGB.pro 2021-06-06 22:51:24.466105358 +0100 -@@ -837,7 +837,7 @@ unix:!macx { - # hidapi-hidraw >= 0.10.1 supports USAGE/USAGE_PAGE # - # Define USE_HID_USAGE if hidapi-hidraw supports it # - #---------------------------------------------------------------------------------------# -- HIDAPI_HIDRAW_VERSION = $$system(pkgconf --modversion hidapi-hidraw) -+ HIDAPI_HIDRAW_VERSION = $$system(pkg-config --modversion hidapi-hidraw) - if(versionAtLeast(HIDAPI_HIDRAW_VERSION, "0.10.1")) { - DEFINES += USE_HID_USAGE - } diff --git a/app-misc/openrgb/files/OpenRGB-0.6-plugins.patch b/app-misc/openrgb/files/OpenRGB-0.6-plugins.patch deleted file mode 100644 index ccc83de27ebe..000000000000 --- a/app-misc/openrgb/files/OpenRGB-0.6-plugins.patch +++ /dev/null @@ -1,24 +0,0 @@ -Allow installation of plugins not only in ~/.config - -Used by app-misc/openrgb-plugin-* packages - -diff --git a/PluginManager.cpp b/PluginManager.cpp -index b424b8b..991fb75 100644 ---- a/PluginManager.cpp -+++ b/PluginManager.cpp -@@ -15,7 +15,8 @@ void PluginManager::ScanAndLoadPlugins(bool dark_theme) - \*--------------------------------------------------------------------------------------*/ - OpenRGBPluginInterface *OpenRGBPlugin = nullptr; - -- const QDir pluginsDir = QString().fromStdString(ResourceManager::get()->GetConfigurationDirectory()) + "plugins/"; -+ for (const QDir pluginsDir : {QString().fromStdString(ResourceManager::get()->GetConfigurationDirectory()) + "plugins/", -+ QString().fromStdString(GENTOO_PLUGINS_DIR)}) { - - std::vector FileList; - -@@ -54,4 +56,5 @@ void PluginManager::ScanAndLoadPlugins(bool dark_theme) - std::cout << loader.errorString().toStdString() << std::endl; - } - } -+ } - } diff --git a/app-misc/openrgb/files/OpenRGB-0.7-json.patch b/app-misc/openrgb/files/OpenRGB-0.7-json.patch new file mode 100644 index 000000000000..32474f545dd0 --- /dev/null +++ b/app-misc/openrgb/files/OpenRGB-0.7-json.patch @@ -0,0 +1,24 @@ +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>& it : device_settings[SectionLayout].items()) ++ for(const nlohmann::detail::iteration_proxy_value>& it : device_settings[SectionLayout].items()) + { + MBName2Layout.insert( std::pair(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>& json_layout_it : json_HCL.items()) ++ for(const nlohmann::detail::iteration_proxy_value>& json_layout_it : json_HCL.items()) + { + json json_zl = json_layout_it.value(); + std::vector v_lp; diff --git a/app-misc/openrgb/files/OpenRGB-0.7-r1-udev.patch b/app-misc/openrgb/files/OpenRGB-0.7-r1-udev.patch new file mode 100644 index 000000000000..54646dc66a50 --- /dev/null +++ b/app-misc/openrgb/files/OpenRGB-0.7-r1-udev.patch @@ -0,0 +1,15 @@ +Don't install udev rules + +This is handled by udev eclass instead + +--- a/OpenRGB.pro ++++ b/OpenRGB.pro +@@ -1246,7 +1246,5 @@ unix:!macx { + icon.files+=qt/OpenRGB.png + metainfo.path=$$PREFIX/share/metainfo/ + metainfo.files+=qt/org.openrgb.OpenRGB.metainfo.xml +- rules.path=$$PREFIX/lib/udev/rules.d/ +- rules.files+=60-openrgb.rules + INSTALLS += target desktop icon metainfo rules + } +GitLab -- cgit v1.2.3