mirrors/guru
1
0
Fork 0
mirror of https://github.com/gentoo-mirror/guru.git synced 2026-07-19 03:53:22 -04:00
Code Issues Packages Projects Releases Wiki Activity

net-proxy/nekoray: add 4.3.7, drop 4.3.5-r1

Browse Source 
Signed-off-by: Pavel Sobolev <contact@paveloom.dev>
This commit is contained in:
Pavel Sobolev
2025-07-13 11:11:13 +03:00
parent 34564c9194
commit e753188cb0
6 changed files with 112 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
net-proxy/nekoray/Manifest
View File

@@ -1,2 +1,2 @@
DIST nekoray-4.3.5-deps.tar.xz 5031332 BLAKE2B 4975beab9ee4f644579e38349e9961319bea356766bb2b71c1867359384c86ec0fe2de2237321f1eefadb0b62bc0965b59c8e1a16902a793a6315a7aacd0d23a SHA512 eaa49199066f9d6d0dc60a8404597ff862253bba21c63e9f68ba61a5ecb1930156772fa5f1d0c556541ce1e24db262f893aecc1895dc684945d36b58e4719984
DIST nekoray-4.3.5.tar.gz 1142930 BLAKE2B c07653f0fe6a74a5881233125659fea7a844aea7275ace496b320cb6f8d323e7875598ebe3be0124c1607307acaa8390cc16a66e72f942230e4fcfdec3eb760b SHA512 d22dbd19860d325cb1e1108905840c1e0adf28fb5e30a7d86b0e9c0cb416af0b3035f07f398684017f69de5b6ac4d74f7c4bcc87fab942128195e45b77cf2539
DIST nekoray-4.3.7-deps.tar.xz 5024296 BLAKE2B 98921ea6843db450f46f323476a6c2300b52d22097a907ef05afb26ac110a5dd23d1190c9d9e9a04d9b3e77ac77fd2ee9e4ef4378386f470c46d45c3012ec0c4 SHA512 f08025bbc92325adaf0aa3b47056eb8e76747d2ccb89a8e99632fedeaf4a6bba59e3cc2df9d367286e5a379b37a40f8f0b39cdee4b9198bf7932161bd1aedce2
DIST nekoray-4.3.7.tar.gz 1272114 BLAKE2B b2253df4db3327608823b50281e6834877964c0b076e6cfd3f1eef555cf4c23a896df31fd94b6cf2b652902d8d6acf9bae7e7e2b1ea3048afe48f34dfdc5eec5 SHA512 d9a4d87d0dd3d5c10626c44664349b8eb3e76498a9efe2bc1e97005fee7d9556594a2653acba3609135eda175c3a38398fc8cdf0c2f56007dc5de1c8df76bea6

21
net-proxy/nekoray/files/nekoray-4.3.5-use-system-qhotkey.patch
View File

@@ -1,21 +0,0 @@
From: Pavel Sobolev <contact@paveloom.dev>
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -48,7 +48,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)
@@ -65,7 +64,7 @@ list(APPEND NKR_EXTERNAL_TARGETS yaml-cpp)
find_package(ZXing CONFIG REQUIRED)
list(APPEND NKR_EXTERNAL_TARGETS ZXing::ZXing)
-set(BUILD_SHARED_LIBS OFF)
+find_package(QHotkey CONFIG REQUIRED)
list(APPEND NKR_EXTERNAL_TARGETS qhotkey)
# Sources

33
net-proxy/nekoray/files/nekoray-4.3.7-Use-system-QHotkey.patch Normal file
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>

26
net-proxy/nekoray/files/nekoray-4.3.7-Use-system-fkYAML.patch Normal file
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 {

37
net-proxy/nekoray/files/nekoray-4.3.7-Use-system-quirc.patch Normal file
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)

18
net-proxy/nekoray/nekoray-4.3.5-r1.ebuild → net-proxy/nekoray/nekoray-4.3.7.ebuild
View File

@@ -22,19 +22,23 @@ KEYWORDS="~amd64"
RDEPEND="
dev-cpp/abseil-cpp:=
dev-cpp/yaml-cpp
dev-libs/protobuf:=
dev-libs/qhotkey
dev-qt/qtbase:6[dbus,network,widgets]
media-libs/zxing-cpp
media-libs/quirc:=
"
DEPEND="
${RDEPEND}
dev-cpp/fkYAML
"
DEPEND="${RDEPEND}"
BDEPEND="
dev-qt/qttools:6[linguist]
"
PATCHES=(
"${FILESDIR}"/${PN}-4.3.5-use-system-qhotkey.patch
"${FILESDIR}/${PN}-4.3.7-Use-system-fkYAML.patch"
"${FILESDIR}/${PN}-4.3.7-Use-system-QHotkey.patch"
"${FILESDIR}/${PN}-4.3.7-Use-system-quirc.patch"
)
src_unpack() {
@@ -45,6 +49,12 @@ src_unpack() {
go-module_src_unpack
}
src_prepare() {
rm -r 3rdparty/{fkYAML,QHotkey,quirc} || die
cmake_src_prepare
}
src_configure() {
local mycmakeargs=(
-DNKR_PACKAGE=true