diff --git a/net-proxy/Throne/Manifest b/net-proxy/Throne/Manifest index 7a483ab08d..a6dac1686e 100644 --- a/net-proxy/Throne/Manifest +++ b/net-proxy/Throne/Manifest @@ -1,2 +1,2 @@ -DIST Throne-1.0.6-deps.tar.xz 7042224 BLAKE2B 3162f9a920c1d430ef178c8dc471872ca80827f36d3d3ab3c43c47c950305c225a6625601f12a5a7d562b63f6cbb998cc464650666407bafafdb03cc72514208 SHA512 7bfa5dee29a5abb4ec988ee932f89d8063f09c86860dc710acce076685b11c53c9a20092ca43ba43c3c187710dc7cbe6041831c70f3987df3ce52d483eba96ac -DIST Throne-1.0.6.tar.gz 1399542 BLAKE2B 6a51bc99f73fffae419071f3fbc774376d5528cac3cd4c79121593e16e50bc1c2307febb2b2077325c13824950361469e25499ea4a3cbc8937d04b47bc1ece17 SHA512 6ac667f43d24cdb60b3584d97a78c6166c53268beb7c66e9cc8926dbb74de04efd9dd9a57ec8460dbe919dd8469faab09023561e1752f1378f78477e54d60a35 +DIST Throne-1.0.7-deps.tar.xz 7055508 BLAKE2B 571acebcad4fc76c47dbbf64ef32151daf763f67ada05b945fa2e4a4389a93de323b4e42b38f2d317e36db76c0bcf4bc449bd669ee6734f6bdef69628e32f7dc SHA512 8b8f05fd3d8424c7a3cb7c0250138d748262b5fd28953685559d560a973b6e60cd9a5bc073c09a9728fd0690a0fdc5fbb5b2935d733eeabd62b43e3232719c9d +DIST Throne-1.0.7.tar.gz 3269831 BLAKE2B b9c90c4563d5638c9feee6cd35ff12147232cb6d60abc4325807c2f9b448d209ad927d934e6d3c40e57ccee7993c69a16e300fdf151ba156b3cda913e2598fd5 SHA512 9fccda2bf636c9a258f50c9a8caf84413e91f7e7aa9d579b5bf6e8b490795daa541f078c19a5f74c895a5e9f25dd0c6cbc37d632655fe76111edcd5d64ebca68 diff --git a/net-proxy/Throne/Throne-1.0.6.ebuild b/net-proxy/Throne/Throne-1.0.7.ebuild similarity index 97% rename from net-proxy/Throne/Throne-1.0.6.ebuild rename to net-proxy/Throne/Throne-1.0.7.ebuild index ecdcf3534e..9463b2c011 100644 --- a/net-proxy/Throne/Throne-1.0.6.ebuild +++ b/net-proxy/Throne/Throne-1.0.7.ebuild @@ -39,7 +39,7 @@ BDEPEND=" PATCHES=( "${FILESDIR}/${PN}-1.0.0-Use-system-QHotkey.patch" - "${FILESDIR}/${PN}-1.0.0-Use-system-quirc.patch" + "${FILESDIR}/${PN}-1.0.7-Use-system-quirc.patch" "${FILESDIR}/nekoray-4.3.7-Use-system-fkYAML.patch" ) diff --git a/net-proxy/Throne/files/Throne-1.0.0-Use-system-quirc.patch b/net-proxy/Throne/files/Throne-1.0.7-Use-system-quirc.patch similarity index 83% rename from net-proxy/Throne/files/Throne-1.0.0-Use-system-quirc.patch rename to net-proxy/Throne/files/Throne-1.0.7-Use-system-quirc.patch index 7acb0e9f63..c05ef57fcd 100644 --- a/net-proxy/Throne/files/Throne-1.0.0-Use-system-quirc.patch +++ b/net-proxy/Throne/files/Throne-1.0.7-Use-system-quirc.patch @@ -5,17 +5,21 @@ Signed-off-by: Pavel Sobolev --- a/3rdparty/QrDecoder.cpp +++ b/3rdparty/QrDecoder.cpp -@@ -1,6 +1,6 @@ +@@ -1,10 +1,8 @@ #include "QrDecoder.h" -#include "quirc/quirc.h" +#include + #include +-#include "quirc/quirc_internal.h" +- QrDecoder::QrDecoder() : m_qr(quirc_new()) + { --- a/CMakeLists.txt +++ b/CMakeLists.txt -@@ -80,11 +80,6 @@ set(PROJECT_SOURCES +@@ -82,11 +82,6 @@ set(PROJECT_SOURCES 3rdparty/qv2ray/v2/ui/widgets/speedchart/SpeedWidget.hpp 3rdparty/qv2ray/v2/proxy/QvProxyConfigurator.cpp @@ -27,7 +31,7 @@ Signed-off-by: Pavel Sobolev 3rdparty/protorpc/rpc_client.cc 3rdparty/protorpc/rpc_conn.cc 3rdparty/protorpc/rpc_wire.cc -@@ -267,6 +262,7 @@ target_link_libraries(Throne PRIVATE +@@ -283,6 +278,7 @@ target_link_libraries(Throne PRIVATE Threads::Threads ${NKR_EXTERNAL_TARGETS} ${PLATFORM_LIBRARIES}