* [gentoo-commits] repo/gentoo:master commit in: app-misc/openrgb/files/
@ 2023-03-03 21:21 Maciej Barć
0 siblings, 0 replies; 2+ messages in thread
From: Maciej Barć @ 2023-03-03 21:21 UTC (permalink / raw
To: gentoo-commits
commit: be5d2ed93a38d1208916f3f8a8aad476ead53c1b
Author: Michael Mair-Keimberger <mmk <AT> levelnine <DOT> at>
AuthorDate: Wed Mar 1 16:20:06 2023 +0000
Commit: Maciej Barć <xgqt <AT> gentoo <DOT> org>
CommitDate: Fri Mar 3 21:21:04 2023 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=be5d2ed9
app-misc/openrgb: remove unused patches
Signed-off-by: Michael Mair-Keimberger <mmk <AT> levelnine.at>
Signed-off-by: Maciej Barć <xgqt <AT> gentoo.org>
app-misc/openrgb/files/OpenRGB-0.7-json.patch | 24 ------------------------
app-misc/openrgb/files/OpenRGB-0.7-plugins.patch | 24 ------------------------
app-misc/openrgb/files/OpenRGB-0.7-udev.patch | 16 ----------------
3 files changed, 64 deletions(-)
diff --git a/app-misc/openrgb/files/OpenRGB-0.7-json.patch b/app-misc/openrgb/files/OpenRGB-0.7-json.patch
deleted file mode 100644
index 32474f545dd0..000000000000
--- a/app-misc/openrgb/files/OpenRGB-0.7-json.patch
+++ /dev/null
@@ -1,24 +0,0 @@
-Fix build with dev-cpp/nlohmann_json-3.11.2
-
-https://bugs.gentoo.org/865133
-https://gitlab.com/CalcProgrammer1/OpenRGB/-/merge_requests/1376
---- a/Controllers/GigabyteRGBFusion2USBController/RGBController_GigabyteRGBFusion2USB.cpp
-+++ b/Controllers/GigabyteRGBFusion2USBController/RGBController_GigabyteRGBFusion2USB.cpp
-@@ -329,7 +329,7 @@ void RGBController_RGBFusion2USB::Load_Device_Config()
- }
- else
- {
-- for(nlohmann::detail::iteration_proxy_value<nlohmann::detail::iter_impl<nlohmann::json>>& it : device_settings[SectionLayout].items())
-+ for(const nlohmann::detail::iteration_proxy_value<nlohmann::detail::iter_impl<nlohmann::json>>& it : device_settings[SectionLayout].items())
- {
- MBName2Layout.insert( std::pair<std::string, std::string>(it.key(), it.value() ));
- }
-@@ -380,7 +380,7 @@ void RGBController_RGBFusion2USB::Load_Device_Config()
- json json_HCL = device_settings[SectionCustom]["Data"];
- layout.clear();
-
-- for(nlohmann::detail::iteration_proxy_value<nlohmann::detail::iter_impl<nlohmann::json>>& json_layout_it : json_HCL.items())
-+ for(const nlohmann::detail::iteration_proxy_value<nlohmann::detail::iter_impl<nlohmann::json>>& json_layout_it : json_HCL.items())
- {
- json json_zl = json_layout_it.value();
- std::vector<LedPort> v_lp;
diff --git a/app-misc/openrgb/files/OpenRGB-0.7-plugins.patch b/app-misc/openrgb/files/OpenRGB-0.7-plugins.patch
deleted file mode 100644
index b9a6fb2cd16a..000000000000
--- a/app-misc/openrgb/files/OpenRGB-0.7-plugins.patch
+++ /dev/null
@@ -1,24 +0,0 @@
-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/files/OpenRGB-0.7-udev.patch b/app-misc/openrgb/files/OpenRGB-0.7-udev.patch
deleted file mode 100644
index a2feaf1c9378..000000000000
--- a/app-misc/openrgb/files/OpenRGB-0.7-udev.patch
+++ /dev/null
@@ -1,16 +0,0 @@
-Install udev rules to correct dir
-
-Revert https://gitlab.com/CalcProgrammer1/OpenRGB/-/commit/ccbe83919a70be346eea948fb2c4122ef9f34214
-
---- a/OpenRGB.pro
-+++ b/OpenRGB.pro
-@@ -1246,7 +1246,7 @@ unix:!macx {
- icon.files+=qt/OpenRGB.png
- metainfo.path=$$PREFIX/share/metainfo/
- metainfo.files+=qt/org.openrgb.OpenRGB.metainfo.xml
-+ rules.path=/lib/udev/rules.d/
-- rules.path=$$PREFIX/lib/udev/rules.d/
- rules.files+=60-openrgb.rules
- INSTALLS += target desktop icon metainfo rules
- }
-GitLab
^ permalink raw reply related [flat|nested] 2+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: app-misc/openrgb/files/
@ 2023-12-19 18:59 Maciej Barć
0 siblings, 0 replies; 2+ messages in thread
From: Maciej Barć @ 2023-12-19 18:59 UTC (permalink / raw
To: gentoo-commits
commit: 85e1498847f987029ed9a4a4fd0d32b2e0a499a3
Author: Michael Mair-Keimberger <mmk <AT> levelnine <DOT> at>
AuthorDate: Tue Dec 19 18:49:34 2023 +0000
Commit: Maciej Barć <xgqt <AT> gentoo <DOT> org>
CommitDate: Tue Dec 19 18:59:49 2023 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=85e14988
app-misc/openrgb: remove unused patches
Signed-off-by: Michael Mair-Keimberger <mmk <AT> levelnine.at>
Closes: https://github.com/gentoo/gentoo/pull/34374
Signed-off-by: Maciej Barć <xgqt <AT> gentoo.org>
.../openrgb/files/OpenRGB-0.5-build-system.patch | 13 --------
app-misc/openrgb/files/OpenRGB-0.8-includes.patch | 24 ---------------
app-misc/openrgb/files/openrgb-0.8-gcc-13.patch | 36 ----------------------
3 files changed, 73 deletions(-)
diff --git a/app-misc/openrgb/files/OpenRGB-0.5-build-system.patch b/app-misc/openrgb/files/OpenRGB-0.5-build-system.patch
deleted file mode 100644
index fe805988af5d..000000000000
--- a/app-misc/openrgb/files/OpenRGB-0.5-build-system.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-diff --git a/OpenRGB.pro b/OpenRGB.pro
-index 91e0079..7f279dd 100644
---- a/OpenRGB.pro
-+++ b/OpenRGB.pro
-@@ -26,8 +26,5 @@ TEMPLATE = app
- win32:BUILDDATE = $$system(date /t)
- unix:BUILDDATE = $$system(date -R -d "@${SOURCE_DATE_EPOCH:-$(date +%s)}")
--GIT_COMMIT_ID = $$system(git --git-dir $$_PRO_FILE_PWD_/.git --work-tree $$_PRO_FILE_PWD_ rev-parse HEAD)
--GIT_COMMIT_DATE = $$system(git --git-dir $$_PRO_FILE_PWD_/.git --work-tree $$_PRO_FILE_PWD_ show -s --format=%ci HEAD)
--GIT_BRANCH = $$system(git --git-dir $$_PRO_FILE_PWD_/.git --work-tree $$_PRO_FILE_PWD_ rev-parse --abbrev-ref HEAD)
-
- DEFINES += \
- VERSION_STRING=\\"\"\"$$VERSION\\"\"\" \
diff --git a/app-misc/openrgb/files/OpenRGB-0.8-includes.patch b/app-misc/openrgb/files/OpenRGB-0.8-includes.patch
deleted file mode 100644
index 8ed341b06029..000000000000
--- a/app-misc/openrgb/files/OpenRGB-0.8-includes.patch
+++ /dev/null
@@ -1,24 +0,0 @@
-From 8c893fba4fcec17e6221f2d754def4aa71b020b8 Mon Sep 17 00:00:00 2001
-From: Sirn Thanabulpong <sirn@ogsite.net>
-Date: Wed, 28 Dec 2022 00:49:47 +0900
-Subject: [PATCH] Fix build on musl in Nanoleaf settings
-
----
- qt/OpenRGBNanoleafSettingsPage/OpenRGBNanoleafScanningThread.cpp | 1 +
- 1 file changed, 1 insertion(+)
-
-diff --git a/qt/OpenRGBNanoleafSettingsPage/OpenRGBNanoleafScanningThread.cpp b/qt/OpenRGBNanoleafSettingsPage/OpenRGBNanoleafScanningThread.cpp
-index 1e3c926b3..55ed5fcaa 100644
---- a/qt/OpenRGBNanoleafSettingsPage/OpenRGBNanoleafScanningThread.cpp
-+++ b/qt/OpenRGBNanoleafSettingsPage/OpenRGBNanoleafScanningThread.cpp
-@@ -8,6 +8,7 @@
- #else
- #include <netdb.h>
- #include <ifaddrs.h>
-+#include <sys/select.h>
- #endif
-
- #include "mdns.h"
---
-GitLab
-
diff --git a/app-misc/openrgb/files/openrgb-0.8-gcc-13.patch b/app-misc/openrgb/files/openrgb-0.8-gcc-13.patch
deleted file mode 100644
index 2a78d8f4ab5c..000000000000
--- a/app-misc/openrgb/files/openrgb-0.8-gcc-13.patch
+++ /dev/null
@@ -1,36 +0,0 @@
-diff --git a/Controllers/ENESMBusController/ENESMBusInterface/ENESMBusInterface_SpectrixS40G.cpp b/Controllers/ENESMBusController/ENESMBusInterface/ENESMBusInterface_SpectrixS40G.cpp
-index 2bdc37ad695dfdc870cb912f17fffd54bda2b89b..17080edb896f74c9393049041c25347d38a8a6f5 100644
---- a/Controllers/ENESMBusController/ENESMBusInterface/ENESMBusInterface_SpectrixS40G.cpp
-+++ b/Controllers/ENESMBusController/ENESMBusInterface/ENESMBusInterface_SpectrixS40G.cpp
-@@ -10,6 +10,7 @@
- #include "ENESMBusInterface_SpectrixS40G.h"
- #include <sys/ioctl.h>
- #include <cstring>
-+#include <cstdint>
-
- /*---------------------------------------------------------------------*\
- | Functions for submitting NVME admin passthrough command taken from |
-diff --git a/Controllers/SteelSeriesController/SteelSeriesMouseController.h b/Controllers/SteelSeriesController/SteelSeriesMouseController.h
-index 64df7a1cc0351ccb8f306984c8b554f8eb3dcc6e..a4e561a3504c1def8acdd1921dc3955df7f68271 100644
---- a/Controllers/SteelSeriesController/SteelSeriesMouseController.h
-+++ b/Controllers/SteelSeriesController/SteelSeriesMouseController.h
-@@ -10,6 +10,7 @@
- #include <hidapi/hidapi.h>
- #include <vector>
- #include "SteelSeriesGeneric.h"
-+#include <cstdint>
-
- #pragma once
-
-diff --git a/Controllers/SteelSeriesController/SteelSeriesRivalController.cpp b/Controllers/SteelSeriesController/SteelSeriesRivalController.cpp
-index 8f0cd4cdb637ea5f474b1caf587dc3c98c5dba89..367e9175b07548845696616aef86920ca2536bb4 100644
---- a/Controllers/SteelSeriesController/SteelSeriesRivalController.cpp
-+++ b/Controllers/SteelSeriesController/SteelSeriesRivalController.cpp
-@@ -11,6 +11,7 @@
- #include <cstring>
- #include <stdio.h>
- #include <stdlib.h>
-+#include <cstdint>
-
- static void send_usb_msg(hid_device* dev, char * data_pkt, unsigned int size)
- {
^ permalink raw reply related [flat|nested] 2+ messages in thread
end of thread, other threads:[~2023-12-19 18:59 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2023-03-03 21:21 [gentoo-commits] repo/gentoo:master commit in: app-misc/openrgb/files/ Maciej Barć
-- strict thread matches above, loose matches on Subject: below --
2023-12-19 18:59 Maciej Barć
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox