add net-proxy/nekoray

This commit is contained in:
2025-07-28 16:05:38 +03:00
parent baab963db3
commit a2a1d6caaf
6 changed files with 208 additions and 0 deletions

View File

@@ -0,0 +1,33 @@
From: Pavel Sobolev <contact@paveloom.dev>
Subject: [PATCH] Use system `QHotkey`.
Signed-off-by: Pavel Sobolev <contact@paveloom.dev>
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -45,7 +45,6 @@ message("[CMAKE_FIND_ROOT_PATH] ${CMAKE_FIND_ROOT_PATH}")
include("cmake/print.cmake")
include("cmake/nkr.cmake")
-include("cmake/QHotkey.cmake")
find_package(Threads)
@@ -57,6 +56,7 @@ include("cmake/myproto.cmake")
list(APPEND NKR_EXTERNAL_TARGETS myproto)
set(BUILD_SHARED_LIBS OFF)
+find_package(QHotkey CONFIG REQUIRED)
list(APPEND NKR_EXTERNAL_TARGETS qhotkey)
# Sources
--- a/src/ui/mainwindow.cpp
+++ b/src/ui/mainwindow.cpp
@@ -50,7 +50,7 @@
#endif
#include <QToolTip>
#include <random>
-#include <3rdparty/QHotkey/qhotkey.h>
+#include <QHotkey>
#include <include/api/gRPC.h>
#include <include/global/HTTPRequestHelper.hpp>

View File

@@ -0,0 +1,26 @@
From: Pavel Sobolev <contact@paveloom.dev>
Subject: [PATCH] Use system `fkYAML`.
Signed-off-by: Pavel Sobolev <contact@paveloom.dev>
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -59,6 +59,8 @@ set(BUILD_SHARED_LIBS OFF)
find_package(QHotkey CONFIG REQUIRED)
list(APPEND NKR_EXTERNAL_TARGETS qhotkey)
+find_package(fkYAML CONFIG REQUIRED)
+
# Sources
set(PROJECT_SOURCES
${PLATFORM_SOURCES}
--- a/src/configs/sub/GroupUpdater.cpp
+++ b/src/configs/sub/GroupUpdater.cpp
@@ -7,7 +7,7 @@
#include <QInputDialog>
#include <QUrlQuery>
-#include "3rdparty/fkYAML/node.hpp"
+#include <fkYAML/node.hpp>
namespace NekoGui_sub {

View File

@@ -0,0 +1,37 @@
From: Pavel Sobolev <contact@paveloom.dev>
Subject: [PATCH] Use system `quirc`.
Signed-off-by: Pavel Sobolev <contact@paveloom.dev>
--- a/3rdparty/QrDecoder.cpp
+++ b/3rdparty/QrDecoder.cpp
@@ -1,6 +1,6 @@
#include "QrDecoder.h"
-#include "quirc/quirc.h"
+#include <quirc.h>
QrDecoder::QrDecoder()
: m_qr(quirc_new())
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -83,11 +83,6 @@ set(PROJECT_SOURCES
3rdparty/qv2ray/v2/ui/widgets/speedchart/SpeedWidget.hpp
3rdparty/qv2ray/v2/proxy/QvProxyConfigurator.cpp
- 3rdparty/quirc/decode.c
- 3rdparty/quirc/identify.c
- 3rdparty/quirc/quirc.c
- 3rdparty/quirc/version_db.c
-
src/api/gRPC.cpp
src/dataStore/Database.cpp
@@ -263,6 +258,7 @@ target_link_libraries(nekoray PRIVATE
Threads::Threads
${NKR_EXTERNAL_TARGETS}
${PLATFORM_LIBRARIES}
+ quirc
)
qt_finalize_executable(nekoray)

View File

@@ -0,0 +1,11 @@
[Desktop Entry]
Version=1.0
Terminal=false
Type=Application
Name=NekoRay
Categories=Network;
Comment=Qt based cross-platform GUI proxy configuration manager (backend: sing-box)
Comment[zh_CN]=基于 Qt 的跨平台代理配置管理器 (后端 sing-box)
Keywords=Internet;VPN;Proxy;sing-box;
Exec=nekoray
Icon=nekobox