Gentoo Archives: gentoo-commits

From: Patrick McLean <chutzpah@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: app-misc/openrgb/files/, app-misc/openrgb/
Date: Wed, 22 Sep 2021 00:05:33
Message-Id: 1632269119.8236ce5cc2b9a7f00d1342da5d3e2504fa1b5101.chutzpah@gentoo
1 commit: 8236ce5cc2b9a7f00d1342da5d3e2504fa1b5101
2 Author: Alexey Sokolov <alexey+gentoo <AT> asokolov <DOT> org>
3 AuthorDate: Tue Sep 14 20:14:03 2021 +0000
4 Commit: Patrick McLean <chutzpah <AT> gentoo <DOT> org>
5 CommitDate: Wed Sep 22 00:05:19 2021 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8236ce5c
7
8 app-misc/openrgb: update live
9
10 Package-Manager: Portage-3.0.20, Repoman-3.0.3
11 Signed-off-by: Alexey Sokolov <alexey+gentoo <AT> asokolov.org>
12 Signed-off-by: Patrick McLean <chutzpah <AT> gentoo.org>
13
14 app-misc/openrgb/files/OpenRGB-0.7-plugins.patch | 24 ++++++++++++++++++++++++
15 app-misc/openrgb/openrgb-9999.ebuild | 3 +--
16 2 files changed, 25 insertions(+), 2 deletions(-)
17
18 diff --git a/app-misc/openrgb/files/OpenRGB-0.7-plugins.patch b/app-misc/openrgb/files/OpenRGB-0.7-plugins.patch
19 new file mode 100644
20 index 00000000000..b9a6fb2cd16
21 --- /dev/null
22 +++ b/app-misc/openrgb/files/OpenRGB-0.7-plugins.patch
23 @@ -0,0 +1,24 @@
24 +Allow installation of plugins not only in ~/.config
25 +
26 +Used by app-misc/openrgb-plugin-* packages
27 +
28 +--- a/PluginManager.cpp
29 ++++ b/PluginManager.cpp
30 +@@ -35,7 +35,8 @@ void PluginManager::ScanAndLoadPlugins()
31 + | The plugins directory is a directory named "plugins" in |
32 + | the configuration directory |
33 + \*---------------------------------------------------------*/
34 +- const QDir plugins_dir = QString().fromStdString(ResourceManager::get()->GetConfigurationDirectory()) + "plugins/";
35 ++ for (const QDir plugins_dir : {QString().fromStdString(ResourceManager::get()->GetConfigurationDirectory()) + "plugins/",
36 ++ QString().fromStdString(GENTOO_PLUGINS_DIR)}) {
37 +
38 + /*---------------------------------------------------------*\
39 + | Get a list of all files in the plugins directory |
40 +@@ -56,6 +57,7 @@ void PluginManager::ScanAndLoadPlugins()
41 +
42 + AddPlugin(plugin_path);
43 + }
44 ++ }
45 + }
46 +
47 + void PluginManager::AddPlugin(std::string path)
48
49 diff --git a/app-misc/openrgb/openrgb-9999.ebuild b/app-misc/openrgb/openrgb-9999.ebuild
50 index 9ea0dfa538f..a3d6ddefcc4 100644
51 --- a/app-misc/openrgb/openrgb-9999.ebuild
52 +++ b/app-misc/openrgb/openrgb-9999.ebuild
53 @@ -39,8 +39,7 @@ BDEPEND="
54 "
55
56 PATCHES+=(
57 - "${FILESDIR}"/OpenRGB-0.6-pkgconf.patch
58 - "${FILESDIR}"/OpenRGB-0.6-plugins.patch
59 + "${FILESDIR}"/OpenRGB-0.7-plugins.patch
60 )
61
62 src_prepare() {