From 7c9c6c0c8add01ce8f51e0be69891eefb86188d2 Mon Sep 17 00:00:00 2001 From: Pavel Sobolev Date: Sat, 13 Dec 2025 13:49:36 +0300 Subject: [PATCH] net-proxy/Throne: add 1.0.12, drop 1.0.11 Signed-off-by: Pavel Sobolev --- net-proxy/Throne/Manifest | 5 ++-- ...one-1.0.11.ebuild => Throne-1.0.12.ebuild} | 12 ++++----- .../nekoray-4.3.7-Use-system-fkYAML.patch | 26 ------------------- 3 files changed, 8 insertions(+), 35 deletions(-) rename net-proxy/Throne/{Throne-1.0.11.ebuild => Throne-1.0.12.ebuild} (88%) delete mode 100644 net-proxy/Throne/files/nekoray-4.3.7-Use-system-fkYAML.patch diff --git a/net-proxy/Throne/Manifest b/net-proxy/Throne/Manifest index 35d9debc7a..5ce94892fa 100644 --- a/net-proxy/Throne/Manifest +++ b/net-proxy/Throne/Manifest @@ -1,2 +1,3 @@ -DIST Throne-1.0.11-deps.tar.xz 7048032 BLAKE2B 6d1e36981ade4d0a13827f422638ded9f3b3fb19c65452217283476c7d1e58a3ecf6e7660229ccfa6d6490c05b2ea9cc38e4a4dd71b8126e12daa55597c6f749 SHA512 32c64364fded78c95822f53ff8a2d660bd7ea3480864287a47b7bef3639aede36653a6414e8a55cd76defa14f9a853cfdefdadc113086595385d6d5af867fc35 -DIST Throne-1.0.11.tar.gz 3292965 BLAKE2B 6b2ddc4d8efaf327ec821911d704cfc06f76e281a369300e69f304d3080b4984dfbec506144cb0c0d8261b35bb2a7ad297ca75062a80c475efbd9df30e5e78ec SHA512 3ae6cd53124ef95675ab4f20138b944915398082e8d87b9bbbe6febedfb244385585d454bceb8f2dca05ea06613f3f3938cf6d6db6e172ecda842c5c8dd8963b +DIST Throne-1.0.12-deps.tar.xz 7762876 BLAKE2B 19067bd08d20a4dbc3d666f5a9e6e0f1fddd539eef0289693350f88f797d7442db7ff9a26a7217c2f747a60af0e3b683c2752db09c6eed1cc7be4103881c514c SHA512 77bfb654591947bed2db579b1d998982e546c7f66369afb358527860f05c9ff74bc29f8b556dcb622f5c75b858d19bd8b7f15fde5618a378cbbf29cfda6fa34f +DIST Throne-1.0.12-fix-quic-go-issues.patch 32232 BLAKE2B 58bfe64855a6f34033f88b98cc03e248f6cfdd7ffe826805d866c052d8b5ef7c8795ceefd962933a5c18b09767d456d9025aeab87eb5c813c88e7f9322e4bb54 SHA512 2d307076d69c9eb83c734843a7f0f16e6a548eefd2ba39d1f287caf9e0b5cecb7a47c5cd1c9d24bb445ee1abc3478d7cfcf2dacb98e0990bc1fb0f3bf97f05fe +DIST Throne-1.0.12.tar.gz 3207926 BLAKE2B 2f5b875c673b962dc0993935d497a9e6c6cef5e0aaa13b04cd44a1fd5306b13152faa4a4ad1c14ccd4e6c209fc6a311889bf1d1ce7d6cbe0404e75f6f8cd9131 SHA512 5e729f469cef091566556176db7c7d51bcdcfff9a18b37476a339397e1ba1d918ecfb589930458819c1052b439baa3ae187b8ba703850097631dce4e04598913 diff --git a/net-proxy/Throne/Throne-1.0.11.ebuild b/net-proxy/Throne/Throne-1.0.12.ebuild similarity index 88% rename from net-proxy/Throne/Throne-1.0.11.ebuild rename to net-proxy/Throne/Throne-1.0.12.ebuild index 9463b2c011..5b7148ce15 100644 --- a/net-proxy/Throne/Throne-1.0.11.ebuild +++ b/net-proxy/Throne/Throne-1.0.12.ebuild @@ -10,6 +10,8 @@ HOMEPAGE="https://github.com/throneproj/Throne" SRC_URI=" https://github.com/throneproj/Throne/archive/refs/tags/${PV}.tar.gz -> ${P}.tar.gz https://gitlab.com/api/v4/projects/69517529/packages/generic/${PN}/${PV}/${P}-deps.tar.xz + https://github.com/throneproj/Throne/commit/f03ad7d16555324fc7308dbadde1ade1f0011d6d.patch -> + ${PN}-1.0.12-fix-quic-go-issues.patch " # The first line is for the C++ code, the second line is for the Go module @@ -21,16 +23,12 @@ SLOT="0" KEYWORDS="~amd64" RDEPEND=" - dev-cpp/abseil-cpp:= dev-libs/protobuf:= dev-libs/qhotkey dev-qt/qtbase:6[dbus,network,widgets] media-libs/quirc:= " -DEPEND=" - ${RDEPEND} - dev-cpp/fkYAML -" +DEPEND="${RDEPEND}" BDEPEND=" dev-go/protobuf-go dev-go/protorpc @@ -38,9 +36,9 @@ BDEPEND=" " PATCHES=( + "${DISTDIR}/${PN}-1.0.12-fix-quic-go-issues.patch" "${FILESDIR}/${PN}-1.0.0-Use-system-QHotkey.patch" "${FILESDIR}/${PN}-1.0.7-Use-system-quirc.patch" - "${FILESDIR}/nekoray-4.3.7-Use-system-fkYAML.patch" ) src_unpack() { @@ -52,7 +50,7 @@ src_unpack() { } src_prepare() { - rm -r 3rdparty/{fkYAML,QHotkey,quirc} || die + rm -r 3rdparty/{QHotkey,quirc} || die cmake_src_prepare } diff --git a/net-proxy/Throne/files/nekoray-4.3.7-Use-system-fkYAML.patch b/net-proxy/Throne/files/nekoray-4.3.7-Use-system-fkYAML.patch deleted file mode 100644 index c1799832bb..0000000000 --- a/net-proxy/Throne/files/nekoray-4.3.7-Use-system-fkYAML.patch +++ /dev/null @@ -1,26 +0,0 @@ -From: Pavel Sobolev -Subject: [PATCH] Use system `fkYAML`. - -Signed-off-by: Pavel Sobolev - ---- 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 - #include - --#include "3rdparty/fkYAML/node.hpp" -+#include - - namespace NekoGui_sub {