From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 2EA52158012 for ; Wed, 22 Sep 2021 00:05:33 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id CEE65E07EE; Wed, 22 Sep 2021 00:05:31 +0000 (UTC) Received: from smtp.gentoo.org (woodpecker.gentoo.org [140.211.166.183]) (using TLSv1.2 with cipher ECDHE-RSA-CHACHA20-POLY1305 (256/256 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id AF124E07EE for ; Wed, 22 Sep 2021 00:05:31 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.2 with cipher ECDHE-RSA-CHACHA20-POLY1305 (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 4F52C342D69 for ; Wed, 22 Sep 2021 00:05:30 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 95624102 for ; Wed, 22 Sep 2021 00:05:28 +0000 (UTC) From: "Patrick McLean" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Patrick McLean" Message-ID: <1632269119.8236ce5cc2b9a7f00d1342da5d3e2504fa1b5101.chutzpah@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: app-misc/openrgb/files/, app-misc/openrgb/ X-VCS-Repository: repo/gentoo X-VCS-Files: app-misc/openrgb/files/OpenRGB-0.7-plugins.patch app-misc/openrgb/openrgb-9999.ebuild X-VCS-Directories: app-misc/openrgb/ app-misc/openrgb/files/ X-VCS-Committer: chutzpah X-VCS-Committer-Name: Patrick McLean X-VCS-Revision: 8236ce5cc2b9a7f00d1342da5d3e2504fa1b5101 X-VCS-Branch: master Date: Wed, 22 Sep 2021 00:05:28 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: 4936ddaa-9971-4087-98dd-a6a889ab1786 X-Archives-Hash: 59e9afe77e7270573604738273f74f4a commit: 8236ce5cc2b9a7f00d1342da5d3e2504fa1b5101 Author: Alexey Sokolov asokolov org> AuthorDate: Tue Sep 14 20:14:03 2021 +0000 Commit: Patrick McLean gentoo 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 asokolov.org> Signed-off-by: Patrick McLean 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() {