1 |
commit: 56efce0ab4bc8d710e1abe8aca25689c7667a765 |
2 |
Author: Andrew Ammerlaan <andrewammerlaan <AT> gentoo <DOT> org> |
3 |
AuthorDate: Sun Nov 27 21:57:50 2022 +0000 |
4 |
Commit: Andrew Ammerlaan <andrewammerlaan <AT> gentoo <DOT> org> |
5 |
CommitDate: Sun Nov 27 21:58:31 2022 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=56efce0a |
7 |
|
8 |
app-misc/openrgb: update 9999 again, patch merged upstream |
9 |
|
10 |
Signed-off-by: Andrew Ammerlaan <andrewammerlaan <AT> gentoo.org> |
11 |
|
12 |
app-misc/openrgb/files/OpenRGB-0.8-plugins.patch | 26 ------------------------ |
13 |
app-misc/openrgb/openrgb-9999.ebuild | 3 +-- |
14 |
2 files changed, 1 insertion(+), 28 deletions(-) |
15 |
|
16 |
diff --git a/app-misc/openrgb/files/OpenRGB-0.8-plugins.patch b/app-misc/openrgb/files/OpenRGB-0.8-plugins.patch |
17 |
deleted file mode 100644 |
18 |
index a2d02cde3c7f..000000000000 |
19 |
--- a/app-misc/openrgb/files/OpenRGB-0.8-plugins.patch |
20 |
+++ /dev/null |
21 |
@@ -1,26 +0,0 @@ |
22 |
-Allow installation of plugins not only in ~/.config |
23 |
- |
24 |
-Used by app-misc/openrgb-plugin-* packages |
25 |
- |
26 |
-diff --git a/PluginManager.cpp b/PluginManager.cpp |
27 |
-index 6ccad72c..7b12f32e 100644 |
28 |
---- a/PluginManager.cpp |
29 |
-+++ b/PluginManager.cpp |
30 |
-@@ -41,7 +41,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(ResourceManager::get()->GetConfigurationDirectory().c_str()).append(plugins_path); |
35 |
-+ for (const QDir plugins_dir : {QString(ResourceManager::get()->GetConfigurationDirectory().c_str()).append(plugins_path), |
36 |
-+ QString().fromStdString(GENTOO_PLUGINS_DIR)}) { |
37 |
- LOG_INFO("[PluginManager] Scanning plugin directory: %s", plugins_dir.absolutePath().toStdString().c_str()); |
38 |
- |
39 |
- /*---------------------------------------------------------*\ |
40 |
-@@ -64,6 +65,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 74083c048810..343c012dd241 100644 |
51 |
--- a/app-misc/openrgb/openrgb-9999.ebuild |
52 |
+++ b/app-misc/openrgb/openrgb-9999.ebuild |
53 |
@@ -40,7 +40,6 @@ BDEPEND=" |
54 |
" |
55 |
|
56 |
PATCHES+=( |
57 |
- "${FILESDIR}"/OpenRGB-0.8-plugins.patch |
58 |
"${FILESDIR}"/OpenRGB-0.7-r1-udev.patch |
59 |
) |
60 |
|
61 |
@@ -57,7 +56,7 @@ src_configure() { |
62 |
|
63 |
eqmake5 \ |
64 |
INCLUDEPATH+="${ESYSROOT}/usr/include/nlohmann" \ |
65 |
- DEFINES+="GENTOO_PLUGINS_DIR=\\\\\"\\\"${EPREFIX}/usr/$(get_libdir)/OpenRGB/plugins\\\\\"\\\"" |
66 |
+ DEFINES+="OPENRGB_EXTRA_PLUGIN_DIRECTORY=\\\\\"\\\"${EPREFIX}/usr/$(get_libdir)/OpenRGB/plugins\\\\\"\\\"" |
67 |
} |
68 |
|
69 |
src_install() { |