gentoo auto-resync : 08:06:2023 - 15:45:39

3 files changed, 4 insertions, 59 deletions

diff --git a/net-im/tokodon/Manifest b/net-im/tokodon/Manifest
index 25a7649eee09..bdfad9f8b1fd 100644
--- a/net-im/tokodon/Manifest
+++ b/net-im/tokodon/Manifest
@@ -1,4 +1,3 @@
-AUX tokodon-23.04.0-tokodon-not-neochat.patch 1679 BLAKE2B 6a77997b7dbeeba7d7f126655fa6dde19e67bb9838544a24f504b0bdd5d46e035e5cafe174383de1c71d554e7da3649304f3c4101e3aae63f53d9a7fe6145b9e SHA512 64840ded6a91f1cf75cd2df11f3c72eacca509a171fbd3aa4184511aad71d12b0e4a2e8a373573e4835422e5681f9d75063792fb7e1ec759750eb55fe2260c2a
-DIST tokodon-23.04.1.tar.xz 233048 BLAKE2B c6e9f0652ac9920339fe70119c03eaf08143c42546338966875151b7c95e52952bfb1fdb7192befa928ec912b4f0b21481cced9f2a787de1b42b9dff1ec610aa SHA512 693783f9a27b9370fe892310680797a46c1a894a718122ae64cb479f15ed3293981adfd83255608e52ec03a25befa76b0cfbd36722d6afb97662880cdfbe3bfd
-EBUILD tokodon-23.04.1.ebuild 1425 BLAKE2B 6d464b4238277286ec5b69dadafbc8de0d355cf1b89cc1ddebfb15d8c54da9e15a83b4276f527015a48afe7a7194abc0bedee16fb078746622b48ba5a30e2d7e SHA512 e416df70e51bc146f3a7af3d487309d51636856bd32ad51bcb4979c74dd54487aa1d098a491905f4bf8c4d9f508ba56fd0b49a6f030c9316628ab9ecf8c328bf
+DIST tokodon-23.04.2.tar.xz 233084 BLAKE2B ab32b4bdc649f0175001173e715bdb5a171d078332109074eeef043d9874c244ed63cb1c6aea6d0bce5c24e85742401b66db7031a77a8a97ce43da2f760c8f86 SHA512 a867b19788a84dfd5eded1170050d944120a928156b1df1dcafeda7377c7b90efc0625cf47477d9181a697d3c1e67ea098a98dfa4f7ada8a5b2ba56b9b4747a4
+EBUILD tokodon-23.04.2.ebuild 1279 BLAKE2B 68feb5c67f55a5c83135dfec8fa613286c5800afed5a247dee897b062d875cac894a182fd11fab133c5073851e07f05ea0f732791db76b308c3233284bf6a311 SHA512 e859036247f52f96d4c50c763fc96737dcbcceaca121b691f918b545612da28bbdda474d99315eca925dac957cd27a0cd3cc06a13991595d7af3917bf41ee8b8
 MISC metadata.xml 377 BLAKE2B e70a23a324a1d14fbba036ceeeb7e5a974eca12759fee38b1869fd486f2386f4552c5a0172b4c13b937da414b6cf3bb762cea06a553447868d21911c9946b06c SHA512 914e345e6869d9d18210855bb27cc02206e62fcc4917be7968411f9b82d640ac71d40d07f3494a756971cc1412de529cf4b12a9ae47852208dfbe2920d56c3b3
diff --git a/net-im/tokodon/files/tokodon-23.04.0-tokodon-not-neochat.patch b/net-im/tokodon/files/tokodon-23.04.0-tokodon-not-neochat.patch
deleted file mode 100644
index e9ec12d64a99..000000000000
--- a/net-im/tokodon/files/tokodon-23.04.0-tokodon-not-neochat.patch
+++ /dev/null
@@ -1,47 +0,0 @@
-From bc361013894ebd1a56f3d9b64da2da730e9487ca Mon Sep 17 00:00:00 2001
-From: Andreas Sturmlechner <asturm@gentoo.org>
-Date: Thu, 20 Apr 2023 20:08:45 +0200
-Subject: [PATCH] Fix obvious copy/paste mistakes
-
-Signed-off-by: Andreas Sturmlechner <asturm@gentoo.org>
----
- src/abstractaccount.cpp   | 4 ++--
- src/networkcontroller.cpp | 2 +-
- 2 files changed, 3 insertions(+), 3 deletions(-)
-
-diff --git a/src/abstractaccount.cpp b/src/abstractaccount.cpp
-index b3f75444..5fb4d458 100644
---- a/src/abstractaccount.cpp
-+++ b/src/abstractaccount.cpp
-@@ -175,7 +175,7 @@ void AbstractAccount::setInstanceUri(const QString &instance_uri)
-     instance_url.setScheme("https"); // getting token from http is not supported
- 
-     m_instance_uri = instance_url.toString();
--    registerApplication("Tokodon", "https://app.kde.org/neochat");
-+    registerApplication("Tokodon", "https://apps.kde.org/tokodon");
- }
- 
- QString AbstractAccount::instanceUri() const
-@@ -488,4 +488,4 @@ bool AbstractAccount::isRegistered() const
- QString AbstractAccount::settingsGroupName() const
- {
-     return m_name + QLatin1Char('@') + QUrl(m_instance_uri).host();
--}
-\ No newline at end of file
-+}
-diff --git a/src/networkcontroller.cpp b/src/networkcontroller.cpp
-index 677e45c1..58a43cbb 100644
---- a/src/networkcontroller.cpp
-+++ b/src/networkcontroller.cpp
-@@ -33,7 +33,7 @@ void NetworkController::setApplicationProxy()
-     Config *cfg = Config::self();
-     QNetworkProxy proxy;
- 
--    // type match to ProxyType from neochatconfig.kcfg
-+    // type match to ProxyType from config.kcfg
-     switch (cfg->proxyType()) {
-     case 1: // HTTP
-         proxy.setType(QNetworkProxy::HttpProxy);
--- 
-GitLab
-
diff --git a/net-im/tokodon/tokodon-23.04.1.ebuild b/net-im/tokodon/tokodon-23.04.2.ebuild
index e11e41db902a..6ddac3b45100 100644
--- a/net-im/tokodon/tokodon-23.04.1.ebuild
+++ b/net-im/tokodon/tokodon-23.04.2.ebuild
@@ -4,8 +4,8 @@
 EAPI=8
 
 ECM_TEST="forceoptional"
-KFMIN=5.104.0
-QTMIN=5.15.5
+KFMIN=5.106.0
+QTMIN=5.15.9
 inherit ecm gear.kde.org
 
 DESCRIPTION="Mastodon client for Plasma and Plasma Mobile"
@@ -41,10 +41,3 @@ DEPEND="
 "
 RDEPEND="${DEPEND}"
 BDEPEND="virtual/pkgconfig"
-
-PATCHES=( "${FILESDIR}/${PN}-23.04.0-tokodon-not-neochat.patch" ) # git master
-
-src_test() {
-	local -x QT_QPA_PLATFORM=offscreen
-	ecm_src_test
-}