summaryrefslogtreecommitdiff
path: root/net-proxy
diff options
context:
space:
mode:
authorCrucible <crucible@localhost>2026-09-22 18:47:35 -0500
committerCrucible <crucible@localhost>2026-09-22 18:47:35 -0500
commitcde96c5ea0c81397fd3214d455a374f76179a7aa (patch)
tree12c86d59eb88887c244b1145411db084ae5a6c1f /net-proxy
parent47516b9667518dacb1efd6d257f7b3e6a481ec93 (diff)
downloadbaldeagleos-repo-cde96c5ea0c81397fd3214d455a374f76179a7aa.tar.gz
baldeagleos-repo-cde96c5ea0c81397fd3214d455a374f76179a7aa.tar.xz
baldeagleos-repo-cde96c5ea0c81397fd3214d455a374f76179a7aa.zip
Publish baldeagleos-repo candidate 0000000325-20260922-184323
Diffstat (limited to 'net-proxy')
-rw-r--r--net-proxy/Throne/Manifest4
-rw-r--r--net-proxy/Throne/Throne-1.3.0.ebuild (renamed from net-proxy/Throne/Throne-1.2.1.ebuild)12
-rw-r--r--net-proxy/Throne/files/Throne-1.0.0-use-system-QHotkey.patch33
-rw-r--r--net-proxy/Throne/files/Throne-1.3.0-use-system-QHotkey.patch28
-rw-r--r--net-proxy/Throne/files/Throne-1.3.0-use-system-quirc.patch41
-rw-r--r--net-proxy/tsocks/tsocks-1.8_beta5-r10.ebuild2
6 files changed, 78 insertions, 42 deletions
diff --git a/net-proxy/Throne/Manifest b/net-proxy/Throne/Manifest
index 4a6cb6d31568..a1e0c4ae51eb 100644
--- a/net-proxy/Throne/Manifest
+++ b/net-proxy/Throne/Manifest
@@ -1,4 +1,4 @@
-DIST Throne-1.2.1-deps.tar.xz 189110748 BLAKE2B 2d7bcf7f3145dabd6cc1e34dbfe325d43277a69e63f140a13c04e47e152172ff246ab15ad168dfd4fcb64a23e9f073e2472862cd475f6d09f5a62c8ebdfc0765 SHA512 a6442512cd627b1f5036df5ebe8bd60b166060cd66c73a2ee0911ec81e1adcb47fdf9ca0da20b51744a12c8342ee4cacd8bafc02787f11aa6fded358a5bbe03b
-DIST Throne-1.2.1.tar.gz 6176523 BLAKE2B d91af46155725e8a24886985a56f69e5708e145d71c1b44d2534bf46f5d949e08069103a065452e4239d9c7e020a7eae76d4f3df922ab42a63e11dddf332e19b SHA512 f8669405a5fea483cff62e8050967cfa8cefc75c6b4256698516c3bc553756cb01085933f8cff4f4475d958c131e45437e2ecbd8e291c6badf8551591192b7c5
DIST Throne-1.2.4-deps.tar.xz 189156300 BLAKE2B d9ab222eb89b6da847d4bef064d7bb77eb68001c2b42b8175cb24e7b35ae853cc3645d596e3471a9703466ca873e7ac797a892094e8c83f1d61b58b96b101863 SHA512 7182687f30ef47e1294d175861a1040ec7c19190842bc37abb5a6de69c32906f8c6b7fb28caae4e5319ad209de6e0fe2fdada782fc9c62b95005bdf3fb4ed3dc
DIST Throne-1.2.4.tar.gz 6277085 BLAKE2B 4caf600f0235e2833726f50596d18c413c003751da16bfb7bed66761ab90f6732ef05ec0e7b8933bbd57ecbf022472362575b326f148714eadfa9c525a729737 SHA512 e7c90978eebf6d44e8db99f9f7bc67add22bdfd1aeffb094ceb3cb7a50d3fed24b91ca7a316ddaf1c59e249495ca62e0861099b136c6136b008d72dd55728e66
+DIST Throne-1.3.0-deps.tar.xz 197072544 BLAKE2B 08c84dda205feb2983b0fa05efcbc53a69351d1cdb597c5557be7b77a0027a75aa0948d34ca33705ef74077f38861eff53b0c165b655334d193a31b4c41c7aaf SHA512 d877cc4d291a64b593765ffd48c6b3911984c240279666efb2e3f2ab39297ef693d514260ba8185a31402e6079b8eaf577deb6c75d699d140d4f7fc7626d7e0b
+DIST Throne-1.3.0.tar.gz 6467588 BLAKE2B 6d36d118513b7795cf85d70a617c35b95b11a369819586994d5aaefd9abf20ba0613985236fad748dbf74018cc7391f381c0336ed511ad2908c3e4b4b668a9d2 SHA512 f368770414cfe9295e4d03aac34347a7b4ac20119c777b45e024bb987c36f7c1ef76a911b74e437cbb6d37990bc421dabe2ce3c1eb67ae6b1e0db3b8c7584aa2
diff --git a/net-proxy/Throne/Throne-1.2.1.ebuild b/net-proxy/Throne/Throne-1.3.0.ebuild
index e05eef470674..f12e9b5b81b8 100644
--- a/net-proxy/Throne/Throne-1.2.1.ebuild
+++ b/net-proxy/Throne/Throne-1.3.0.ebuild
@@ -30,18 +30,18 @@ DEPEND="${RDEPEND}"
BDEPEND="
dev-go/protobuf-go
dev-go/protoc-gen-go-grpc
- >=dev-lang/go-1.26
+ >=dev-lang/go-1.26.0
dev-qt/qttools:6[linguist]
"
PATCHES=(
- "${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-use-system-quirc.patch"
+ "${FILESDIR}/${PN}-1.3.0-use-system-QHotkey.patch"
+ "${FILESDIR}/${PN}-1.3.0-use-system-quirc.patch"
)
src_unpack() {
- # The vendor tarball is unpacked to `${S}/core/server`, but `go-module_src_unpack`
+ # The vendor tarball is unpacked to `${S}/core`, but `go-module_src_unpack`
# requires the `vendor` directory to be present at `${S}/vendor`
mkdir -p "${S}/vendor" || die
@@ -68,7 +68,7 @@ src_configure() {
src_compile() {
cmake_src_compile
- cd "${S}/core/server" || die
+ cd "${S}/core" || die
pushd gen || die
protoc -I . --go_out=. --go-grpc_out=. libcore.proto
@@ -85,7 +85,7 @@ src_compile() {
src_install() {
exeinto /usr/lib/Throne
doexe "${BUILD_DIR}/Throne"
- doexe core/server/ThroneCore
+ doexe core/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
deleted file mode 100644
index e53ea769e31d..000000000000
--- a/net-proxy/Throne/files/Throne-1.0.0-use-system-QHotkey.patch
+++ /dev/null
@@ -1,33 +0,0 @@
-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
-@@ -42,7 +42,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)
-
-@@ -54,6 +53,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
-@@ -51,7 +51,7 @@
- #endif
- #include <QToolTip>
- #include <random>
--#include <3rdparty/QHotkey/qhotkey.h>
-+#include <QHotkey>
- #include <3rdparty/qv2ray/v2/proxy/QvProxyConfigurator.hpp>
- #include <include/global/HTTPRequestHelper.hpp>
diff --git a/net-proxy/Throne/files/Throne-1.3.0-use-system-QHotkey.patch b/net-proxy/Throne/files/Throne-1.3.0-use-system-QHotkey.patch
new file mode 100644
index 000000000000..50aa75d06af5
--- /dev/null
+++ b/net-proxy/Throne/files/Throne-1.3.0-use-system-QHotkey.patch
@@ -0,0 +1,28 @@
+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
+@@ -67,7 +67,7 @@ message("[CMAKE_FIND_ROOT_PATH] ${CMAKE_FIND_ROOT_PATH}")
+ set(BUILD_SHARED_LIBS OFF)
+
+ include("cmake/print.cmake")
+-include("cmake/QHotkey.cmake")
++find_package(QHotkey CONFIG REQUIRED)
+
+ find_package(Threads)
+
+--- a/src/ui/mainWindow/mainwindow_hotkeys.cpp
++++ b/src/ui/mainWindow/mainwindow_hotkeys.cpp
+@@ -7,7 +7,7 @@
+
+ #include <memory>
+
+-#include <3rdparty/QHotkey/qhotkey.h>
++#include <QHotkey>
+
+ namespace {
+ QList<std::shared_ptr<QHotkey>> RegisteredHotkey;
+
diff --git a/net-proxy/Throne/files/Throne-1.3.0-use-system-quirc.patch b/net-proxy/Throne/files/Throne-1.3.0-use-system-quirc.patch
new file mode 100644
index 000000000000..f3546e5da7b1
--- /dev/null
+++ b/net-proxy/Throne/files/Throne-1.3.0-use-system-quirc.patch
@@ -0,0 +1,41 @@
+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,10 +1,9 @@
+ #include "QrDecoder.h"
+
+-#include "quirc/quirc.h"
+ #include <cstring>
+ #include <qdebug.h>
+
+-#include "quirc/quirc_internal.h"
++#include <quirc.h>
+
+ QrDecoder::QrDecoder()
+ : m_qr(quirc_new())
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -115,11 +115,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
+-
+ 3rdparty/SQLiteCpp/src/Backup.cpp
+ 3rdparty/SQLiteCpp/src/Column.cpp
+ 3rdparty/SQLiteCpp/src/Database.cpp
+@@ -647,6 +642,7 @@ target_link_libraries(Throne PRIVATE
+ Threads::Threads
+ ${NKR_EXTERNAL_TARGETS}
+ ${PLATFORM_LIBRARIES}
++ quirc
+ )
+
+ qt_finalize_executable(Throne)
diff --git a/net-proxy/tsocks/tsocks-1.8_beta5-r10.ebuild b/net-proxy/tsocks/tsocks-1.8_beta5-r10.ebuild
index 6251dac2630f..4d8a27284f62 100644
--- a/net-proxy/tsocks/tsocks-1.8_beta5-r10.ebuild
+++ b/net-proxy/tsocks/tsocks-1.8_beta5-r10.ebuild
@@ -13,7 +13,7 @@ SRC_URI="https://downloads.sourceforge.net/tsocks/${PN}-${PV/_}.tar.gz
S="${WORKDIR}/${P%%_*}"
LICENSE="GPL-2"
SLOT="0"
-KEYWORDS="~alpha ~amd64 arm arm64 ~loong ~ppc ~ppc64 ~riscv ~sparc ~x86"
+KEYWORDS="~alpha amd64 arm arm64 ~loong ppc ppc64 ~riscv ~sparc x86"
IUSE="debug dns envconf tordns server-lookups"
REQUIRED_USE="