commit: 82dc78caa480de605f7914ba9b81492e085b22c4
Author: Pavel Sobolev <contact <AT> paveloom <DOT> dev>
AuthorDate: Sun Mar 15 16:16:17 2026 +0000
Commit: Pavel Sobolev <contact <AT> paveloom <DOT> dev>
CommitDate: Sun Mar 15 19:26:03 2026 +0000
URL: https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=82dc78ca
net-proxy/Throne: add 1.1.1, drop 1.0.13
Signed-off-by: Pavel Sobolev <contact <AT> paveloom.dev>
net-proxy/Throne/Manifest | 4 ++--
.../{Throne-1.0.13.ebuild => Throne-1.1.1.ebuild} | 18 +++++++++------
...patch => Throne-1.0.0-use-system-QHotkey.patch} | 0
...hrone-1.1.1-dont-treat-warnings-as-errors.patch | 16 +++++++++++++
...-database-in-AppConfigLocation-by-default.patch | 26 ++++++++++++++++++++++
...c.patch => Throne-1.1.1-use-system-quirc.patch} | 10 ++++-----
6 files changed, 60 insertions(+), 14 deletions(-)
diff --git a/net-proxy/Throne/Manifest b/net-proxy/Throne/Manifest
index 4f12dd0ad1..327625312a 100644
--- a/net-proxy/Throne/Manifest
+++ b/net-proxy/Throne/Manifest
@@ -1,2 +1,2 @@
-DIST Throne-1.0.13-deps.tar.xz 7782304 BLAKE2B
60a1f4bab71dff6482c87593465a93067536558d3fec5c9c73ae83d349e4fcf312ffd1016e8f65820e92ace2857a034ec81a1a97c8cf118cdd7e0a663c3038d3
SHA512
009744228e6fee808b302310ae21d9fca73f274c93e73b185bfa73ea046c5a47a5a15f6ab0e74adb2e2db5515498f8f099cd69c7397797e0dc7f8e2c8c915eae
-DIST Throne-1.0.13.tar.gz 3216435 BLAKE2B
3a601a8b6c50e24acec06c2bd6b9e32598bf5dff928e227f76064bc65b95ed7201b20b47e17e05bdfc9816a2d4d59e3682959294608f289739b961ed39f063c3
SHA512
b1315346961a517f8b594763efcba3d81127a471c94e5ebd54e76bf6829fc89879c8b40c0a6ea3cc674c814789e3cb20fd7610f3800c48eff193bb0f5f5de8a4
+DIST Throne-1.1.1-deps.tar.xz 174869444 BLAKE2B
aa85a9a59c2cda58146ef7c52764531c6b91e0e3b0084a4cdffb75b7a64010d3c068788b775d283bd1b0c8d3f00320752cd0fa77f68eeb73e74798129f20887a
SHA512
f27be67093a71f3d40e397dc7eee18c9431d0e36de915d0c2246d8cfdb3ca82719f9f132c026a57ef5552e960e05a3afb371ab73d63bf754dce4efe7bad20992
+DIST Throne-1.1.1.tar.gz 5906588 BLAKE2B
0758f6a5c36bbbe35913c19b60ba5fff45194f8c4c2d4d577d3f072cca1c1dece5cb218dfd1fae39af14cb040df670c028e4c8fd3629c28daabcbcd48832ce44
SHA512
8d2293b3252fb0a93f35ee9dcfc8bf8425bfc48d259b1e56848948958e3f093938e59149af18e82dcdb66f409836488dafcb2fd6368e15433a59f9dafe8241df
diff --git a/net-proxy/Throne/Throne-1.0.13.ebuild
b/net-proxy/Throne/Throne-1.1.1.ebuild
similarity index 73%
rename from net-proxy/Throne/Throne-1.0.13.ebuild
rename to net-proxy/Throne/Throne-1.1.1.ebuild
index fc871182a1..44fbbf5c35 100644
--- a/net-proxy/Throne/Throne-1.0.13.ebuild
+++ b/net-proxy/Throne/Throne-1.1.1.ebuild
@@ -29,13 +29,15 @@ RDEPEND="
DEPEND="${RDEPEND}"
BDEPEND="
dev-go/protobuf-go
- dev-go/protorpc
+ dev-go/protoc-gen-go-grpc
dev-qt/qttools:6[linguist]
"
PATCHES=(
- "${FILESDIR}/${PN}-1.0.0-Use-system-QHotkey.patch"
- "${FILESDIR}/${PN}-1.0.7-Use-system-quirc.patch"
+ "${FILESDIR}/${PN}-1.0.0-use-system-QHotkey.patch"
+ "${FILESDIR}/${PN}-1.1.1-dont-treat-warnings-as-errors.patch"
+
"${FILESDIR}/${PN}-1.1.1-store-the-database-in-AppConfigLocation-by-default.patch"
+ "${FILESDIR}/${PN}-1.1.1-use-system-quirc.patch"
)
src_unpack() {
@@ -66,19 +68,21 @@ src_compile() {
cd "${S}/core/server" || die
pushd gen || die
- protoc -I . --go_out=. --protorpc_out=. libcore.proto
+ protoc -I . --go_out=. --go-grpc_out=. libcore.proto
popd || die
VERSION_SINGBOX=$(go list -m -f '{{.Version}}'
github.com/sagernet/sing-box)
ego build \
- -trimpath -ldflags "-w -s -X
'github.com/sagernet/sing-box/constant.Version=${VERSION_SINGBOX}'" \
- -tags
"with_clash_api,with_gvisor,with_quic,with_wireguard,with_utls,with_dhcp,with_tailscale"
+ -trimpath -ldflags "-w -s -checklinkname=0 \
+ -X
'github.com/sagernet/sing-box/constant.Version=${VERSION_SINGBOX}' \
+ -X 'internal/godebug.defaultGODEBUG=multipathtcp=0'" \
+ -tags
"with_clash_api,with_gvisor,with_quic,with_wireguard,with_utls,with_dhcp,with_tailscale,badlinkname,tfogo_checklinkname0"
}
src_install() {
exeinto /usr/lib/Throne
doexe "${BUILD_DIR}/Throne"
- doexe core/server/Core
+ doexe core/server/ThroneCore
dosym -r /usr/lib/Throne/Throne /usr/bin/Throne
diff --git a/net-proxy/Throne/files/Throne-1.0.0-Use-system-QHotkey.patch
b/net-proxy/Throne/files/Throne-1.0.0-use-system-QHotkey.patch
similarity index 100%
rename from net-proxy/Throne/files/Throne-1.0.0-Use-system-QHotkey.patch
rename to net-proxy/Throne/files/Throne-1.0.0-use-system-QHotkey.patch
diff --git
a/net-proxy/Throne/files/Throne-1.1.1-dont-treat-warnings-as-errors.patch
b/net-proxy/Throne/files/Throne-1.1.1-dont-treat-warnings-as-errors.patch
new file mode 100644
index 0000000000..47d51ba851
--- /dev/null
+++ b/net-proxy/Throne/files/Throne-1.1.1-dont-treat-warnings-as-errors.patch
@@ -0,0 +1,16 @@
+From: Pavel Sobolev <[email protected]>
+Subject: [PATCH] Don't treat warnings as errors.
+
+Signed-off-by: Pavel Sobolev <[email protected]>
+
+--- a/3rdparty/simple-protobuf/cmake/spb_compile_options.cmake
++++ b/3rdparty/simple-protobuf/cmake/spb_compile_options.cmake
+@@ -41,7 +41,7 @@ function(spb_enable_warnings TARGET)
+ endif()
+ target_compile_definitions(${TARGET} PRIVATE _CRT_SECURE_NO_WARNINGS)
+ else()
+- target_compile_options(${TARGET} PRIVATE -Wall -Wextra -Wpedantic -Werror
-Wno-missing-field-initializers)
++ target_compile_options(${TARGET} PRIVATE -Wall -Wextra -Wpedantic
-Wno-missing-field-initializers)
+ endif()
+ endfunction(spb_enable_warnings)
+
diff --git
a/net-proxy/Throne/files/Throne-1.1.1-store-the-database-in-AppConfigLocation-by-default.patch
b/net-proxy/Throne/files/Throne-1.1.1-store-the-database-in-AppConfigLocation-by-default.patch
new file mode 100644
index 0000000000..ec0cd714c7
--- /dev/null
+++
b/net-proxy/Throne/files/Throne-1.1.1-store-the-database-in-AppConfigLocation-by-default.patch
@@ -0,0 +1,26 @@
+From 727bf520b02d032e2dce926381841681568b1eed Mon Sep 17 00:00:00 2001
+From: Pavel Sobolev <[email protected]>
+Date: Sun, 15 Mar 2026 19:06:50 +0300
+Subject: [PATCH] Store the database in `AppConfigLocation` by default.
+
+Signed-off-by: Pavel Sobolev <[email protected]>
+---
+ src/main.cpp | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/src/main.cpp b/src/main.cpp
+index c3c63d53..2922ff4d 100644
+--- a/src/main.cpp
++++ b/src/main.cpp
+@@ -100,7 +100,7 @@ int main(int argc, char* argv[]) {
+ QStringList arguments = QApplication::arguments();
+
+ // dirs & clean
+- auto wd = QDir(QApplication::applicationDirPath());
++ auto wd =
QDir(QStandardPaths::writableLocation(QStandardPaths::AppConfigLocation));
+ if (arguments.contains("-appdata")) {
+ QString appDataDir;
+ int appdataIndex = arguments.indexOf("-appdata");
+--
+2.53.0
+
diff --git a/net-proxy/Throne/files/Throne-1.0.7-Use-system-quirc.patch
b/net-proxy/Throne/files/Throne-1.1.1-use-system-quirc.patch
similarity index 78%
rename from net-proxy/Throne/files/Throne-1.0.7-Use-system-quirc.patch
rename to net-proxy/Throne/files/Throne-1.1.1-use-system-quirc.patch
index c05ef57fcd..aaa8bb7ae3 100644
--- a/net-proxy/Throne/files/Throne-1.0.7-Use-system-quirc.patch
+++ b/net-proxy/Throne/files/Throne-1.1.1-use-system-quirc.patch
@@ -19,7 +19,7 @@ Signed-off-by: Pavel Sobolev <[email protected]>
{
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
-@@ -82,11 +82,6 @@ set(PROJECT_SOURCES
+@@ -85,11 +85,6 @@ set(PROJECT_SOURCES
3rdparty/qv2ray/v2/ui/widgets/speedchart/SpeedWidget.hpp
3rdparty/qv2ray/v2/proxy/QvProxyConfigurator.cpp
@@ -28,10 +28,10 @@ Signed-off-by: Pavel Sobolev <[email protected]>
- 3rdparty/quirc/quirc.c
- 3rdparty/quirc/version_db.c
-
- 3rdparty/protorpc/rpc_client.cc
- 3rdparty/protorpc/rpc_conn.cc
- 3rdparty/protorpc/rpc_wire.cc
-@@ -283,6 +278,7 @@ target_link_libraries(Throne PRIVATE
+ 3rdparty/SQLiteCpp/src/Backup.cpp
+ 3rdparty/SQLiteCpp/src/Column.cpp
+ 3rdparty/SQLiteCpp/src/Database.cpp
+@@ -390,6 +385,7 @@ target_link_libraries(Throne PRIVATE
Threads::Threads
${NKR_EXTERNAL_TARGETS}
${PLATFORM_LIBRARIES}