[gentoo-commits] repo/gentoo:master commit in: app-misc/openrgb/files/, app-misc/openrgb/

["Patrick McLean" <chutzpah@gentoo.org>]

commit:     8236ce5cc2b9a7f00d1342da5d3e2504fa1b5101
Author:     Alexey Sokolov <alexey+gentoo <AT> asokolov <DOT> org>
AuthorDate: Tue Sep 14 20:14:03 2021 +0000
Commit:     Patrick McLean <chutzpah <AT> gentoo <DOT> org>
CommitDate: Wed Sep 22 00:05:19 2021 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8236ce5c

app-misc/openrgb: update live

Package-Manager: Portage-3.0.20, Repoman-3.0.3
Signed-off-by: Alexey Sokolov <alexey+gentoo <AT> asokolov.org>
Signed-off-by: Patrick McLean <chutzpah <AT> gentoo.org>

 app-misc/openrgb/files/OpenRGB-0.7-plugins.patch | 24 ++++++++++++++++++++++++
 app-misc/openrgb/openrgb-9999.ebuild             |  3 +--
 2 files changed, 25 insertions(+), 2 deletions(-)

diff --git a/app-misc/openrgb/files/OpenRGB-0.7-plugins.patch b/app-misc/openrgb/files/OpenRGB-0.7-plugins.patch
new file mode 100644
index 00000000000..b9a6fb2cd16
--- /dev/null
+++ b/app-misc/openrgb/files/OpenRGB-0.7-plugins.patch
@@ -0,0 +1,24 @@
+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/openrgb-9999.ebuild b/app-misc/openrgb/openrgb-9999.ebuild
index 9ea0dfa538f..a3d6ddefcc4 100644
--- a/app-misc/openrgb/openrgb-9999.ebuild
+++ b/app-misc/openrgb/openrgb-9999.ebuild
@@ -39,8 +39,7 @@ BDEPEND="
 "
 
 PATCHES+=(
-	"${FILESDIR}"/OpenRGB-0.6-pkgconf.patch
-	"${FILESDIR}"/OpenRGB-0.6-plugins.patch
+	"${FILESDIR}"/OpenRGB-0.7-plugins.patch
 )
 
 src_prepare() {