summaryrefslogtreecommitdiff
path: root/net-im/tokodon
diff options
context:
space:
mode:
authorV3n3RiX <venerix@koprulu.sector>2023-04-22 12:04:32 +0100
committerV3n3RiX <venerix@koprulu.sector>2023-04-22 12:04:32 +0100
commit5b52b99ca475070991d8e8d1dff674ffe6ffdea9 (patch)
treecf4bb45c00280387facfe6360387dbb2f8526bf3 /net-im/tokodon
parent2cf667d4c687ef89fe0fc530e2a5bc8518941728 (diff)
gentoo auto-resync : 22:04:2023 - 12:04:32
Diffstat (limited to 'net-im/tokodon')
-rw-r--r--net-im/tokodon/Manifest5
-rw-r--r--net-im/tokodon/files/tokodon-23.04.0-tokodon-not-neochat.patch47
-rw-r--r--net-im/tokodon/tokodon-23.04.0.ebuild (renamed from net-im/tokodon/tokodon-23.03.90.ebuild)2
3 files changed, 52 insertions, 2 deletions
diff --git a/net-im/tokodon/Manifest b/net-im/tokodon/Manifest
index 7796e56d77e3..4fbe0554ca62 100644
--- a/net-im/tokodon/Manifest
+++ b/net-im/tokodon/Manifest
@@ -1,3 +1,4 @@
-DIST tokodon-23.03.90.tar.xz 226728 BLAKE2B a30323b4239c6a3f61a99d25482fb6171ddd065ba69a15d100a4b02f29b526be94f8dc73c8137f48d976646c602f1ae7e57acc0784d854a47f9dabf937a70589 SHA512 237531eb46668905cc0cb797c312379cd10fc513403f028f00b1230fe4761e173f67c736a6bb4c8811925480adc0105a6fca1be61a1240b37dae655bb63fa1d8
-EBUILD tokodon-23.03.90.ebuild 1345 BLAKE2B 84c89ca008485f76cb067bbb1c45c63a5a7c0953b27d408ff9b8b8b38d6af7e82905c13040df0306b9b025a71922cd6c8785581c783870bbb0bf02af2e808dae SHA512 8ac7e8e39b66154de46fb8396c8ebb50115b35845c507d7637603f1fb1dcc103b4e14add1bf7d4490607e2bde0c436fc04ae9d5fafc16ee4a2290e44c451f131
+AUX tokodon-23.04.0-tokodon-not-neochat.patch 1679 BLAKE2B 6a77997b7dbeeba7d7f126655fa6dde19e67bb9838544a24f504b0bdd5d46e035e5cafe174383de1c71d554e7da3649304f3c4101e3aae63f53d9a7fe6145b9e SHA512 64840ded6a91f1cf75cd2df11f3c72eacca509a171fbd3aa4184511aad71d12b0e4a2e8a373573e4835422e5681f9d75063792fb7e1ec759750eb55fe2260c2a
+DIST tokodon-23.04.0.tar.xz 229524 BLAKE2B a2b17f8c93f323fd17d6b54a742a6e73fb9b87b56e952852e98438bbc30ba771b4f2c1cb771137073596e5eb8efab076fd0924fdd46f1cb095b8e75a785cdbd1 SHA512 230432ee9761ce2655313a6e4de9719c6973de5309575b0fec365d0f6e013835cdf78782566a2c61e7972f3d6c71b8f65cd06c723367cc9681103b5d69f626f5
+EBUILD tokodon-23.04.0.ebuild 1416 BLAKE2B eb0fc19f43cb3ce26bd8962a7d1a5c960f1cf46b72f0d8a02aa60f78bc744adb7d036e8d13d76f5fd7daedc4e5245119c714b0f71a15ddb9ec75d5a919575e84 SHA512 9d5b5fa93f38617a98fb0771762d060d894894d2a122a9d191447c6b915a08ab76defd2f46cf58f159c4a13cf38be3b5c3a9e5d90615240ec85696134bcc099b
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
new file mode 100644
index 000000000000..e9ec12d64a99
--- /dev/null
+++ b/net-im/tokodon/files/tokodon-23.04.0-tokodon-not-neochat.patch
@@ -0,0 +1,47 @@
+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.03.90.ebuild b/net-im/tokodon/tokodon-23.04.0.ebuild
index eb67ca3394b5..9dcc662206ec 100644
--- a/net-im/tokodon/tokodon-23.03.90.ebuild
+++ b/net-im/tokodon/tokodon-23.04.0.ebuild
@@ -42,6 +42,8 @@ DEPEND="
RDEPEND="${DEPEND}"
BDEPEND="virtual/pkgconfig"
+PATCHES=( "${FILESDIR}/${P}-tokodon-not-neochat.patch" ) # git master
+
src_test() {
local -x QT_QPA_PLATFORM=offscreen
ecm_src_test