| 1 |
commit: 205327edae93c40df284c9face7f0f848ef22c03 |
| 2 |
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Thu Sep 22 20:58:28 2022 +0000 |
| 4 |
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Thu Sep 22 20:59:17 2022 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=205327ed |
| 7 |
|
| 8 |
net-im/choqok: Try to fix build with clang-16 |
| 9 |
|
| 10 |
Closes: https://bugs.gentoo.org/871546 |
| 11 |
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org> |
| 12 |
|
| 13 |
net-im/choqok/choqok-1.7.0-r1.ebuild | 1 + |
| 14 |
.../files/choqok-1.7.0-fix-KCModule-warning.patch | 43 ++++++++++++++++++++++ |
| 15 |
2 files changed, 44 insertions(+) |
| 16 |
|
| 17 |
diff --git a/net-im/choqok/choqok-1.7.0-r1.ebuild b/net-im/choqok/choqok-1.7.0-r1.ebuild |
| 18 |
index 347ae3c26c3d..665a4a472330 100644 |
| 19 |
--- a/net-im/choqok/choqok-1.7.0-r1.ebuild |
| 20 |
+++ b/net-im/choqok/choqok-1.7.0-r1.ebuild |
| 21 |
@@ -60,6 +60,7 @@ PATCHES=( |
| 22 |
"${WORKDIR}/${P}-choqokplugin.patch" |
| 23 |
"${WORKDIR}/${P}-fix-layout-of-tweets.patch" # KDE-bug 424938 |
| 24 |
"${WORKDIR}/${P}-fix-partially-static-signatures.patch" # KDE-bug 417297 |
| 25 |
+ "${FILESDIR}/${P}-fix-KCModule-warning.patch" # bug 871546, git master |
| 26 |
) |
| 27 |
|
| 28 |
src_configure() { |
| 29 |
|
| 30 |
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 |
| 31 |
new file mode 100644 |
| 32 |
index 000000000000..26721514ca04 |
| 33 |
--- /dev/null |
| 34 |
+++ b/net-im/choqok/files/choqok-1.7.0-fix-KCModule-warning.patch |
| 35 |
@@ -0,0 +1,43 @@ |
| 36 |
+From 9c488d8f776b5e7462e8e57dc2b15db5fe28815a Mon Sep 17 00:00:00 2001 |
| 37 |
+From: Andrea Scarpino <scarpino@×××.org> |
| 38 |
+Date: Sat, 8 Feb 2020 16:06:18 +0100 |
| 39 |
+Subject: [PATCH] Fix warning about KCModule::changed |
| 40 |
+ |
| 41 |
+--- |
| 42 |
+ choqok/config/behavior/behaviorconfig.cpp | 4 ++-- |
| 43 |
+ choqok/config/plugins/choqokpluginconfig.cpp | 3 +-- |
| 44 |
+ 2 files changed, 3 insertions(+), 4 deletions(-) |
| 45 |
+ |
| 46 |
+diff --git a/choqok/config/behavior/behaviorconfig.cpp b/choqok/config/behavior/behaviorconfig.cpp |
| 47 |
+index a25b0196..fb1d16b3 100644 |
| 48 |
+--- a/choqok/config/behavior/behaviorconfig.cpp |
| 49 |
++++ b/choqok/config/behavior/behaviorconfig.cpp |
| 50 |
+@@ -95,9 +95,9 @@ BehaviorConfig::BehaviorConfig(QWidget *parent, const QVariantList &args) |
| 51 |
+ d->mBehaviorTabCtl->addTab(d->proxyModule, proxyInfo.moduleName()); |
| 52 |
+ |
| 53 |
+ connect(d->mPrfsShorten, (void (BehaviorConfig_Shorten::*)(bool))&BehaviorConfig_Shorten::changed, |
| 54 |
+- this, (void (KCModule::*)())&KCModule::changed); |
| 55 |
++ this, &BehaviorConfig::markAsChanged); |
| 56 |
+ connect(d->proxyModule, (void (KCModuleProxy::*)(KCModuleProxy*))&KCModuleProxy::changed, |
| 57 |
+- this, (void (KCModule::*)())&KCModule::changed); |
| 58 |
++ this, &BehaviorConfig::markAsChanged); |
| 59 |
+ |
| 60 |
+ load(); |
| 61 |
+ |
| 62 |
+diff --git a/choqok/config/plugins/choqokpluginconfig.cpp b/choqok/config/plugins/choqokpluginconfig.cpp |
| 63 |
+index 1a5f4fc2..4f36d608 100644 |
| 64 |
+--- a/choqok/config/plugins/choqokpluginconfig.cpp |
| 65 |
++++ b/choqok/config/plugins/choqokpluginconfig.cpp |
| 66 |
+@@ -46,8 +46,7 @@ ChoqokPluginConfig::ChoqokPluginConfig(QWidget *parent, const QVariantList &args |
| 67 |
+ mainLayout->setMargin(0); |
| 68 |
+ mainLayout->addWidget(m_pluginSelector); |
| 69 |
+ |
| 70 |
+- connect(m_pluginSelector, &KPluginSelector::changed, this, |
| 71 |
+- (void (KCModule::*)())&KCModule::changed); |
| 72 |
++ connect(m_pluginSelector, &KPluginSelector::changed, this, &ChoqokPluginConfig::markAsChanged); |
| 73 |
+ connect(m_pluginSelector, &KPluginSelector::configCommitted, |
| 74 |
+ this, &ChoqokPluginConfig::reparseConfiguration); |
| 75 |
+ |
| 76 |
+-- |
| 77 |
+GitLab |
| 78 |
+ |
Archives