* [gentoo-commits] repo/gentoo:master commit in: net-im/choqok/files/, net-im/choqok/
@ 2017-01-10 17:35 Johannes Huber
0 siblings, 0 replies; 3+ messages in thread
From: Johannes Huber @ 2017-01-10 17:35 UTC (permalink / raw
To: gentoo-commits
commit: 43ba5a04315b0c17613297c2652e2daf93ae37e7
Author: Johannes Huber <johu <AT> gentoo <DOT> org>
AuthorDate: Tue Jan 10 17:30:38 2017 +0000
Commit: Johannes Huber <johu <AT> gentoo <DOT> org>
CommitDate: Tue Jan 10 17:35:49 2017 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=43ba5a04
net-im/choqok: Drop slot 4
Package-Manager: Portage-2.3.3, Repoman-2.3.1
net-im/choqok/Manifest | 1 -
net-im/choqok/choqok-1.5-r1.ebuild | 49 ------------
.../files/choqok-1.5-kdewebkit-optional.patch | 30 -------
.../files/choqok-1.5-telepathy-optional.patch | 93 ----------------------
4 files changed, 173 deletions(-)
diff --git a/net-im/choqok/Manifest b/net-im/choqok/Manifest
index e4cf726..64c964b 100644
--- a/net-im/choqok/Manifest
+++ b/net-im/choqok/Manifest
@@ -1,2 +1 @@
-DIST choqok-1.5.tar.xz 1068516 SHA256 5cb97ac4cdf9db4699bb7445a9411393073d213fea649ab0713f659f1308efe4 SHA512 fbb31abedd07ea1c674a7d59b4a18808ca03812ac37c60ea67d2d641668be4a9137e9f4573eda1e19425123601e9536971170e3948c1e5098b220991571a2cf3 WHIRLPOOL c4f869bab6a23a2ffa2e8e071414a6c7170816269e6e9f77df4269b94b627248fd259eb3c24217a2a838f74162ba6c198ff5549371b61f516fb142b8690cdce0
DIST choqok-1.6.0.tar.xz 1170748 SHA256 8a7527067b3694ad16faafac754cfd5f1e5f5fd1547f066d8f14fbcf8327310f SHA512 78c03689e40978213f2f9462780fe47507a2778985d4d5b940cab004f0ac52becfa76d7dbaa886df958134c65b27255e49ac68ddbb2a434131fffe9ca9280cbc WHIRLPOOL 57155eea1f9f54113bfad9d883d77c332b97c0ef4512d15db9764056704d9709b6c4e81ec630cb5b60c0b310953deabdf9cb5b2521b41ea016a421562e2d06fd
diff --git a/net-im/choqok/choqok-1.5-r1.ebuild b/net-im/choqok/choqok-1.5-r1.ebuild
deleted file mode 100644
index 62721c3..00000000
--- a/net-im/choqok/choqok-1.5-r1.ebuild
+++ /dev/null
@@ -1,49 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=6
-
-KDE_LINGUAS="bg bs ca ca@valencia cs da de el en_GB eo es et fa fi fr ga gl
-hr hu is it ja km lt mr ms nb nds nl pa pl pt pt_BR ro ru sk sl sq sv tr ug
-uk zh_CN zh_TW"
-KDE_HANDBOOK="optional"
-WEBKIT_REQUIRED="optional"
-inherit kde4-base
-
-DESCRIPTION="Free/Open Source micro-blogging client by KDE"
-HOMEPAGE="http://choqok.gnufolks.org/"
-SRC_URI="mirror://sourceforge/${PN}/${P}.tar.xz"
-
-KEYWORDS="amd64 x86"
-LICENSE="GPL-2+"
-SLOT="4"
-IUSE="ayatana debug telepathy"
-
-RDEPEND="
- dev-libs/libattica
- dev-libs/qjson
- >=dev-libs/qoauth-1.0.1:0
- ayatana? ( dev-libs/libindicate-qt )
- telepathy? ( net-libs/telepathy-qt[qt4] )
-"
-DEPEND="${RDEPEND}
- app-arch/xz-utils
- sys-devel/gettext
-"
-
-DOCS=( AUTHORS README TODO changelog )
-
-PATCHES=(
- "${FILESDIR}/${P}-kdewebkit-optional.patch"
- "${FILESDIR}/${P}-telepathy-optional.patch"
-)
-
-src_configure(){
- local mycmakeargs=(
- -DQTINDICATE_DISABLE=$(usex "!ayatana")
- $(cmake-utils_use_find_package telepathy TelepathyQt4)
- -DWITH_KDEWEBKIT=$(usex webkit)
- )
- kde4-base_src_configure
-}
diff --git a/net-im/choqok/files/choqok-1.5-kdewebkit-optional.patch b/net-im/choqok/files/choqok-1.5-kdewebkit-optional.patch
deleted file mode 100644
index ee16b93..00000000
--- a/net-im/choqok/files/choqok-1.5-kdewebkit-optional.patch
+++ /dev/null
@@ -1,30 +0,0 @@
-commit 091d6b1f0e0b473424dab7caea2e6d4964e0be46
-Author: Andreas Sturmlechner <andreas.sturmlechner@gmail.com>
-Date: Sun Aug 14 23:16:57 2016 +0200
-
- Expose HAVE_KWEBKITPART to CMake
-
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index a37bb74..20be9fa 100644
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -10,6 +10,8 @@ set(CMAKE_MODULE_PATH ${CHOQOK_SOURCE_DIR}/cmake/modules ${CMAKE_MODULE_PATH})
-
- option(QTINDICATE_DISABLE "Disable support for notifications via indicator")
-
-+option(WITH_KDEWEBKIT "Build with kdewebkit support" "ON")
-+
- find_package(QJson REQUIRED)
- find_package(QCA2 REQUIRED)
- find_package(QtOAuth REQUIRED)
-@@ -27,6 +29,10 @@ else(QTINDICATE_BUILD)
- message(STATUS "Optional dependency libindicate-qt not found: Won't support notifications via indicator")
- endif(QTINDICATE_BUILD)
-
-+if(NOT WITH_KDEWEBKIT)
-+ set(HAVE_KWEBKITPART 0)
-+endif(NOT WITH_KDEWEBKIT)
-+
- set(CHOQOK_INCLUDES
- ${KDE4_INCLUDES}
- ${QT_INCLUDES}
diff --git a/net-im/choqok/files/choqok-1.5-telepathy-optional.patch b/net-im/choqok/files/choqok-1.5-telepathy-optional.patch
deleted file mode 100644
index a73a846..00000000
--- a/net-im/choqok/files/choqok-1.5-telepathy-optional.patch
+++ /dev/null
@@ -1,93 +0,0 @@
-commit 92433189c29c425a9bfb3eb10a0ffe767f23febd
-Author: Andreas Sturmlechner <andreas.sturmlechner@gmail.com>
-Date: Sun Aug 14 23:53:08 2016 +0200
-
- Fix build with disabled TelepathyQt4
-
-diff --git a/plugins/imstatus/CMakeLists.txt b/plugins/imstatus/CMakeLists.txt
-index 19c3ef0..cb45c14 100644
---- a/plugins/imstatus/CMakeLists.txt
-+++ b/plugins/imstatus/CMakeLists.txt
-@@ -1,6 +1,8 @@
- find_package(TelepathyQt4)
-
--configure_file(config-imstatus.h.cmake ${CMAKE_CURRENT_BINARY_DIR}/config-imstatus.h )
-+if(TelepathyQt4_FOUND)
-+ add_definitions( -DTELEPATHY_FOUND )
-+endif()
-
- include_directories(
- ${TELEPATHY_QT4_INCLUDE_DIR}
-diff --git a/plugins/imstatus/imqdbus.cpp b/plugins/imstatus/imqdbus.cpp
-index 7c78b34..a968269 100644
---- a/plugins/imstatus/imqdbus.cpp
-+++ b/plugins/imstatus/imqdbus.cpp
-@@ -30,7 +30,7 @@
-
- #include <kdebug.h>
-
--#if TELEPATHY_FOUND
-+#ifdef TELEPATHY_FOUND
- #include <TelepathyQt/AccountManager>
- #include <TelepathyQt/AccountSet>
- #include <TelepathyQt/Account>
-@@ -51,7 +51,7 @@ IMQDBus::IMQDBus (QObject *parent) : QObject(parent)
- - qutIM (>0.3)
- - gajim ( doesn't want work :( )
- */
--#if TELEPATHY_FOUND
-+#ifdef TELEPATHY_FOUND
- m_accountManager = Tp::AccountManager::create(Tp::AccountFactory::create(QDBusConnection::sessionBus(), Tp::Account::FeatureCore));
- connect(m_accountManager->becomeReady(), SIGNAL(finished(Tp::PendingOperation*)), SLOT(slotFinished(Tp::PendingOperation*)));
-
-@@ -65,7 +65,7 @@ void IMQDBus::updateStatusMessage(const QString& im, const QString& statusMessag
- if ( im == IM_PSI ) usePsi(statusMessage);
- if ( im == IM_SKYPE ) useSkype(statusMessage);
- if ( im == IM_PIDGIN ) usePidgin(statusMessage);
--#if TELEPATHY_FOUND
-+#ifdef TELEPATHY_FOUND
- if ( im == IM_TELEPATHY ) useTelepathy(statusMessage);
- #endif
- }
-@@ -182,7 +182,7 @@ void IMQDBus::usePidgin(const QString &statusMessage)
- }
- }
-
--#if TELEPATHY_FOUND
-+#ifdef TELEPATHY_FOUND
- void IMQDBus::useTelepathy(const QString &statusMessage)
- {
- if (m_accountManager->isReady()) {
-@@ -224,7 +224,7 @@ QStringList IMQDBus::scanForIMs()
- ims << IM_KOPETE;
- if ( QDBusConnection::sessionBus().interface()->isServiceRegistered ( "im.pidgin.purple.PurpleService" ).value() )
- ims << IM_PIDGIN;
--#if TELEPATHY_FOUND
-+#ifdef TELEPATHY_FOUND
- if ( QDBusConnection::sessionBus().interface()->isServiceRegistered( "org.freedesktop.Telepathy.AccountManager" ).value() )
- ims << IM_TELEPATHY;
- #endif
-diff --git a/plugins/imstatus/imqdbus.h b/plugins/imstatus/imqdbus.h
-index 890184a..8b2c245 100644
---- a/plugins/imstatus/imqdbus.h
-+++ b/plugins/imstatus/imqdbus.h
-@@ -28,9 +28,7 @@
- #include <QString>
- #include <QObject>
-
--#include "config-imstatus.h"
--
--#if TELEPATHY_FOUND
-+#ifdef TELEPATHY_FOUND
-
- #include <TelepathyQt/Types>
-
-@@ -59,7 +57,7 @@ private:
- void useSkype(const QString &statusMessage);
- void usePidgin(const QString &statusMessage);
-
--#if TELEPATHY_FOUND
-+#ifdef TELEPATHY_FOUND
- private slots:
- void slotFinished(Tp::PendingOperation *po);
-
^ permalink raw reply related [flat|nested] 3+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: net-im/choqok/files/, net-im/choqok/
@ 2019-08-11 10:17 Andreas Sturmlechner
0 siblings, 0 replies; 3+ messages in thread
From: Andreas Sturmlechner @ 2019-08-11 10:17 UTC (permalink / raw
To: gentoo-commits
commit: 7bdba88ae5f2a20fac20464472b107924a4d8d88
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Sun Aug 11 10:15:32 2019 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Sun Aug 11 10:17:05 2019 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7bdba88a
net-im/choqok: Fix missing header with Frameworks 5.61
Package-Manager: Portage-2.3.71, Repoman-2.3.17
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>
net-im/choqok/choqok-1.6.0_p20190726.ebuild | 2 +
| 94 ++++++++++++++++++++++
2 files changed, 96 insertions(+)
diff --git a/net-im/choqok/choqok-1.6.0_p20190726.ebuild b/net-im/choqok/choqok-1.6.0_p20190726.ebuild
index a24edf12236..bb949cf2200 100644
--- a/net-im/choqok/choqok-1.6.0_p20190726.ebuild
+++ b/net-im/choqok/choqok-1.6.0_p20190726.ebuild
@@ -59,3 +59,5 @@ src_configure() {
kde5_src_configure
}
+
+PATCHES=( "${FILESDIR}"/${P}-missing-header.patch )
--git a/net-im/choqok/files/choqok-1.6.0_p20190726-missing-header.patch b/net-im/choqok/files/choqok-1.6.0_p20190726-missing-header.patch
new file mode 100644
index 00000000000..d8b58183e2b
--- /dev/null
+++ b/net-im/choqok/files/choqok-1.6.0_p20190726-missing-header.patch
@@ -0,0 +1,94 @@
+From 08fb06b63a78888e6703de6ac1a4fd6a0e2791eb Mon Sep 17 00:00:00 2001
+From: Albert Astals Cid <aacid@kde.org>
+Date: Sun, 28 Jul 2019 00:14:30 +0200
+Subject: Fix compile on CI
+
+plugins/uploaders/flickr/flickr.h:50:24: error: field mUrlMap has incomplete type QMap<KJob*, QUrl>
+plugins/uploaders/imageshack/imageshack.h:48:24: error: field mUrlMap has incomplete type QMap<KJob*, QUrl>
+---
+ plugins/uploaders/flickr/flickr.h | 2 ++
+ plugins/uploaders/imageshack/imageshack.h | 2 ++
+ 2 files changed, 4 insertions(+)
+
+diff --git a/plugins/uploaders/flickr/flickr.h b/plugins/uploaders/flickr/flickr.h
+index 890219a..7b26609 100644
+--- a/plugins/uploaders/flickr/flickr.h
++++ b/plugins/uploaders/flickr/flickr.h
+@@ -26,6 +26,8 @@
+
+ #include "uploader.h"
+
++#include <QMap>
++
+ /**
+ @author Andrey Esin \<gmlastik@gmail.com\>
+ */
+diff --git a/plugins/uploaders/imageshack/imageshack.h b/plugins/uploaders/imageshack/imageshack.h
+index d9ddc88..63d0e3f 100644
+--- a/plugins/uploaders/imageshack/imageshack.h
++++ b/plugins/uploaders/imageshack/imageshack.h
+@@ -26,6 +26,8 @@
+
+ #include "uploader.h"
+
++#include <QMap>
++
+ /**
+ @author Mehrdad Momeny \<mehrdad.momeny@gmail.com\>
+ */
+--
+cgit v1.1
+
+From bef6784596bf0b41287ebad81f138e1c8c2a6be2 Mon Sep 17 00:00:00 2001
+From: Albert Astals Cid <aacid@kde.org>
+Date: Sun, 28 Jul 2019 00:20:34 +0200
+Subject: Fix build on CI
+
+Even more missing QMap includes
+---
+ plugins/uploaders/mobypicture/mobypicture.h | 2 ++
+ plugins/uploaders/posterous/posterous.h | 2 ++
+ plugins/uploaders/twitgoo/twitgoo.h | 2 ++
+ 3 files changed, 6 insertions(+)
+
+diff --git a/plugins/uploaders/mobypicture/mobypicture.h b/plugins/uploaders/mobypicture/mobypicture.h
+index 098f411..86f61fd 100644
+--- a/plugins/uploaders/mobypicture/mobypicture.h
++++ b/plugins/uploaders/mobypicture/mobypicture.h
+@@ -26,6 +26,8 @@
+
+ #include "uploader.h"
+
++#include <QMap>
++
+ class KJob;
+
+ class Mobypicture : public Choqok::Uploader
+diff --git a/plugins/uploaders/posterous/posterous.h b/plugins/uploaders/posterous/posterous.h
+index c7f6fe1..5c9442d 100644
+--- a/plugins/uploaders/posterous/posterous.h
++++ b/plugins/uploaders/posterous/posterous.h
+@@ -26,6 +26,8 @@
+
+ #include "uploader.h"
+
++#include <QMap>
++
+ class KJob;
+
+ class Posterous : public Choqok::Uploader
+diff --git a/plugins/uploaders/twitgoo/twitgoo.h b/plugins/uploaders/twitgoo/twitgoo.h
+index ee3f496..020080e 100644
+--- a/plugins/uploaders/twitgoo/twitgoo.h
++++ b/plugins/uploaders/twitgoo/twitgoo.h
+@@ -26,6 +26,8 @@
+
+ #include "uploader.h"
+
++#include <QMap>
++
+ class KJob;
+
+ class Twitgoo : public Choqok::Uploader
+--
+cgit v1.1
^ permalink raw reply related [flat|nested] 3+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: net-im/choqok/files/, net-im/choqok/
@ 2022-09-22 20:59 Andreas Sturmlechner
0 siblings, 0 replies; 3+ messages in thread
From: Andreas Sturmlechner @ 2022-09-22 20:59 UTC (permalink / raw
To: gentoo-commits
commit: 205327edae93c40df284c9face7f0f848ef22c03
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Thu Sep 22 20:58:28 2022 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Thu Sep 22 20:59:17 2022 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=205327ed
net-im/choqok: Try to fix build with clang-16
Closes: https://bugs.gentoo.org/871546
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>
net-im/choqok/choqok-1.7.0-r1.ebuild | 1 +
.../files/choqok-1.7.0-fix-KCModule-warning.patch | 43 ++++++++++++++++++++++
2 files changed, 44 insertions(+)
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
+
^ permalink raw reply related [flat|nested] 3+ messages in thread
end of thread, other threads:[~2022-09-22 20:59 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2017-01-10 17:35 [gentoo-commits] repo/gentoo:master commit in: net-im/choqok/files/, net-im/choqok/ Johannes Huber
-- strict thread matches above, loose matches on Subject: below --
2019-08-11 10:17 Andreas Sturmlechner
2022-09-22 20:59 Andreas Sturmlechner
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox