| 1 |
commit: cea9a32d1acd79e89520b6aa6f6a550f3372af11 |
| 2 |
Author: Andrew Ammerlaan <andrewammerlaan <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Sat Nov 26 16:16:48 2022 +0000 |
| 4 |
Commit: Andrew Ammerlaan <andrewammerlaan <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Sun Nov 27 21:09:28 2022 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=cea9a32d |
| 7 |
|
| 8 |
app-misc/openrgb: update patch in 9999 ebuild |
| 9 |
|
| 10 |
Signed-off-by: Andrew Ammerlaan <andrewammerlaan <AT> gentoo.org> |
| 11 |
Closes: https://github.com/gentoo/gentoo/pull/28439 |
| 12 |
Signed-off-by: Andrew Ammerlaan <andrewammerlaan <AT> gentoo.org> |
| 13 |
|
| 14 |
app-misc/openrgb/files/OpenRGB-0.8-plugins.patch | 26 ++++++++++++++++++++++++ |
| 15 |
app-misc/openrgb/openrgb-9999.ebuild | 2 +- |
| 16 |
2 files changed, 27 insertions(+), 1 deletion(-) |
| 17 |
|
| 18 |
diff --git a/app-misc/openrgb/files/OpenRGB-0.8-plugins.patch b/app-misc/openrgb/files/OpenRGB-0.8-plugins.patch |
| 19 |
new file mode 100644 |
| 20 |
index 000000000000..a2d02cde3c7f |
| 21 |
--- /dev/null |
| 22 |
+++ b/app-misc/openrgb/files/OpenRGB-0.8-plugins.patch |
| 23 |
@@ -0,0 +1,26 @@ |
| 24 |
+Allow installation of plugins not only in ~/.config |
| 25 |
+ |
| 26 |
+Used by app-misc/openrgb-plugin-* packages |
| 27 |
+ |
| 28 |
+diff --git a/PluginManager.cpp b/PluginManager.cpp |
| 29 |
+index 6ccad72c..7b12f32e 100644 |
| 30 |
+--- a/PluginManager.cpp |
| 31 |
++++ b/PluginManager.cpp |
| 32 |
+@@ -41,7 +41,8 @@ void PluginManager::ScanAndLoadPlugins() |
| 33 |
+ | The plugins directory is a directory named "plugins" in | |
| 34 |
+ | the configuration directory | |
| 35 |
+ \*---------------------------------------------------------*/ |
| 36 |
+- const QDir plugins_dir = QString(ResourceManager::get()->GetConfigurationDirectory().c_str()).append(plugins_path); |
| 37 |
++ for (const QDir plugins_dir : {QString(ResourceManager::get()->GetConfigurationDirectory().c_str()).append(plugins_path), |
| 38 |
++ QString().fromStdString(GENTOO_PLUGINS_DIR)}) { |
| 39 |
+ LOG_INFO("[PluginManager] Scanning plugin directory: %s", plugins_dir.absolutePath().toStdString().c_str()); |
| 40 |
+ |
| 41 |
+ /*---------------------------------------------------------*\ |
| 42 |
+@@ -64,6 +65,7 @@ void PluginManager::ScanAndLoadPlugins() |
| 43 |
+ |
| 44 |
+ AddPlugin(plugin_path); |
| 45 |
+ } |
| 46 |
++ } |
| 47 |
+ } |
| 48 |
+ |
| 49 |
+ void PluginManager::AddPlugin(std::string path) |
| 50 |
|
| 51 |
diff --git a/app-misc/openrgb/openrgb-9999.ebuild b/app-misc/openrgb/openrgb-9999.ebuild |
| 52 |
index 44c450e3c857..74083c048810 100644 |
| 53 |
--- a/app-misc/openrgb/openrgb-9999.ebuild |
| 54 |
+++ b/app-misc/openrgb/openrgb-9999.ebuild |
| 55 |
@@ -40,7 +40,7 @@ BDEPEND=" |
| 56 |
" |
| 57 |
|
| 58 |
PATCHES+=( |
| 59 |
- "${FILESDIR}"/OpenRGB-0.7-plugins.patch |
| 60 |
+ "${FILESDIR}"/OpenRGB-0.8-plugins.patch |
| 61 |
"${FILESDIR}"/OpenRGB-0.7-r1-udev.patch |
| 62 |
) |
Archives