summaryrefslogtreecommitdiff
path: root/net-im
diff options
context:
space:
mode:
Diffstat (limited to 'net-im')
-rw-r--r--net-im/Manifest.gzbin10422 -> 10413 bytes
-rw-r--r--net-im/choqok/Manifest3
-rw-r--r--net-im/choqok/choqok-1.7.0-r1.ebuild1
-rw-r--r--net-im/choqok/files/choqok-1.7.0-fix-KCModule-warning.patch43
4 files changed, 46 insertions, 1 deletions
diff --git a/net-im/Manifest.gz b/net-im/Manifest.gz
index 7d28d3dc97d5..fba869b939cf 100644
--- a/net-im/Manifest.gz
+++ b/net-im/Manifest.gz
Binary files differ
diff --git a/net-im/choqok/Manifest b/net-im/choqok/Manifest
index bd9631c7212a..078c32fea18e 100644
--- a/net-im/choqok/Manifest
+++ b/net-im/choqok/Manifest
@@ -1,4 +1,5 @@
+AUX choqok-1.7.0-fix-KCModule-warning.patch 1986 BLAKE2B bbc95d0ce9f3514e80c4ccd4831149fdaf1931a138238f5022905bb2769f789c234ad002dde4d177b72f4c0db454146959059e830c867fad9a75625b08c7c913 SHA512 42daf1c5bdceb571e8565d8963c9fc443a4461c60c8a00bba5d12658b3324269036999542f7ca75a64bed9d2cd30a5c79a32c7f5b9b56e8913eb8cba267dc098
DIST choqok-1.7.0-patchset-1.tar.xz 3260 BLAKE2B 48612da4e92c9ed4a877858940f73075df4142d68da3854c42892bcfb13a59ab5dd45b06597c404badfb55ebaeddf7485bc0970e65ae29898a742742353d6caa SHA512 78e31f4d8de9d5294c8439959d8966b5b966bf6bc8f26d1b9cb1ffd12bf182d167269b26deb2dfa7d7dd8cf09bcaa0c77a560418075105f40a74fa50c96d48d0
DIST choqok-1.7.0.tar.xz 1202092 BLAKE2B 62e0c561579c36198f645bb550822d9bec583d8337b37e3336e4352199800b1807b80931f8c7c8141f74dfb91ade9f89b371723a8a3ea3e7bde97854634b82b2 SHA512 6f5998078e555f7b4a40270ad0a4defa2d15bb8440b810320fc4cfc38d78cb34bb9b2f6a38eb33eb3217b51a78a7fbc7f79224cd0ddb0fcbf8c9035d8e600e96
-EBUILD choqok-1.7.0-r1.ebuild 2231 BLAKE2B d0d15434881d0158f249ce6de0c4b2e7532b05c47c9a81a078ba396d6487a72c5a146c939c6f463cc5d4af01fef4b7d8014c3dde0c525dcf09a372739d71ea0b SHA512 9e78c285b7ea213a02bfc31fde6a1d49619104cb8052fcb4e5629242e7bec821b79cc32a68aed264fa3c65c74eb2f35b59a57eb1307a63321ada074fff04d925
+EBUILD choqok-1.7.0-r1.ebuild 2303 BLAKE2B b7f50e7e10081b5252ed46268ac0f5e8a5fe5e7b6875414b256dad03a074857b83ad130f753d1064c5108520214c88cad362c647e703f51dffc5e68c7d2c0e6d SHA512 c1238d0c93157ab9f9d9eaeb3669fd474ef0f25bce7f1c2d138fb28d21058eb55810feb847b160be168c03ff494151da537ac83106ec35c8886d89a38a79db76
MISC metadata.xml 641 BLAKE2B 025e44ef86eda8b0733f1f3a9ddb4c854f8601f32bb840a7b41ca55114c6a3596ca95d3274552a259a948da30d5cf3eafc395200114a5e3d3957b0667d00b031 SHA512 36ec911abe6a1e4e2b916dee27c2fc6484f4b42c6f45462d9117221344ef4aa8fcae15b058945251563d173417c0b34ef402dd2912eb62e0f112061ac367233a
diff --git a/net-im/choqok/choqok-1.7.0-r1.ebuild b/net-im/choqok/choqok-1.7.0-r1.ebuild
index 347ae3c26c3d..665a4a472330 100644
--- a/net-im/choqok/choqok-1.7.0-r1.ebuild
+++ b/net-im/choqok/choqok-1.7.0-r1.ebuild
@@ -60,6 +60,7 @@ PATCHES=(
"${WORKDIR}/${P}-choqokplugin.patch"
"${WORKDIR}/${P}-fix-layout-of-tweets.patch" # KDE-bug 424938
"${WORKDIR}/${P}-fix-partially-static-signatures.patch" # KDE-bug 417297
+ "${FILESDIR}/${P}-fix-KCModule-warning.patch" # bug 871546, git master
)
src_configure() {
diff --git a/net-im/choqok/files/choqok-1.7.0-fix-KCModule-warning.patch b/net-im/choqok/files/choqok-1.7.0-fix-KCModule-warning.patch
new file mode 100644
index 000000000000..26721514ca04
--- /dev/null
+++ b/net-im/choqok/files/choqok-1.7.0-fix-KCModule-warning.patch
@@ -0,0 +1,43 @@
+From 9c488d8f776b5e7462e8e57dc2b15db5fe28815a Mon Sep 17 00:00:00 2001
+From: Andrea Scarpino <scarpino@kde.org>
+Date: Sat, 8 Feb 2020 16:06:18 +0100
+Subject: [PATCH] Fix warning about KCModule::changed
+
+---
+ choqok/config/behavior/behaviorconfig.cpp | 4 ++--
+ choqok/config/plugins/choqokpluginconfig.cpp | 3 +--
+ 2 files changed, 3 insertions(+), 4 deletions(-)
+
+diff --git a/choqok/config/behavior/behaviorconfig.cpp b/choqok/config/behavior/behaviorconfig.cpp
+index a25b0196..fb1d16b3 100644
+--- a/choqok/config/behavior/behaviorconfig.cpp
++++ b/choqok/config/behavior/behaviorconfig.cpp
+@@ -95,9 +95,9 @@ BehaviorConfig::BehaviorConfig(QWidget *parent, const QVariantList &args)
+ d->mBehaviorTabCtl->addTab(d->proxyModule, proxyInfo.moduleName());
+
+ connect(d->mPrfsShorten, (void (BehaviorConfig_Shorten::*)(bool))&BehaviorConfig_Shorten::changed,
+- this, (void (KCModule::*)())&KCModule::changed);
++ this, &BehaviorConfig::markAsChanged);
+ connect(d->proxyModule, (void (KCModuleProxy::*)(KCModuleProxy*))&KCModuleProxy::changed,
+- this, (void (KCModule::*)())&KCModule::changed);
++ this, &BehaviorConfig::markAsChanged);
+
+ load();
+
+diff --git a/choqok/config/plugins/choqokpluginconfig.cpp b/choqok/config/plugins/choqokpluginconfig.cpp
+index 1a5f4fc2..4f36d608 100644
+--- a/choqok/config/plugins/choqokpluginconfig.cpp
++++ b/choqok/config/plugins/choqokpluginconfig.cpp
+@@ -46,8 +46,7 @@ ChoqokPluginConfig::ChoqokPluginConfig(QWidget *parent, const QVariantList &args
+ mainLayout->setMargin(0);
+ mainLayout->addWidget(m_pluginSelector);
+
+- connect(m_pluginSelector, &KPluginSelector::changed, this,
+- (void (KCModule::*)())&KCModule::changed);
++ connect(m_pluginSelector, &KPluginSelector::changed, this, &ChoqokPluginConfig::markAsChanged);
+ connect(m_pluginSelector, &KPluginSelector::configCommitted,
+ this, &ChoqokPluginConfig::reparseConfiguration);
+
+--
+GitLab
+