* [gentoo-commits] repo/gentoo:master commit in: net-im/choqok/, net-im/choqok/files/
@ 2016-08-20 18:28 Michael Palimaka
0 siblings, 0 replies; 2+ messages in thread
From: Michael Palimaka @ 2016-08-20 18:28 UTC (permalink / raw
To: gentoo-commits
commit: f2a7db7f8159036f2733e844c7469f00bf095daf
Author: Andreas Sturmlechner <andreas.sturmlechner <AT> gmail <DOT> com>
AuthorDate: Sat Aug 13 22:29:06 2016 +0000
Commit: Michael Palimaka <kensington <AT> gentoo <DOT> org>
CommitDate: Sat Aug 20 18:28:26 2016 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f2a7db7f
net-im/choqok: Add WEBKIT_REQUIRED, revbump with major fix
- Bump EAPI 6
- Patch to make KDEWEBKIT optional
- src_prepare -> src_configure so USE works
- Patch to fix USE=-telepathy
Package-Manager: portage-2.2.28
.../{choqok-1.5.ebuild => choqok-1.5-r1.ebuild} | 27 ++++---
net-im/choqok/choqok-1.5.ebuild | 3 +-
.../files/choqok-1.5-kdewebkit-optional.patch | 30 +++++++
.../files/choqok-1.5-telepathy-optional.patch | 93 ++++++++++++++++++++++
4 files changed, 139 insertions(+), 14 deletions(-)
diff --git a/net-im/choqok/choqok-1.5.ebuild b/net-im/choqok/choqok-1.5-r1.ebuild
similarity index 66%
copy from net-im/choqok/choqok-1.5.ebuild
copy to net-im/choqok/choqok-1.5-r1.ebuild
index 873b6ec..9eb4416 100644
--- a/net-im/choqok/choqok-1.5.ebuild
+++ b/net-im/choqok/choqok-1.5-r1.ebuild
@@ -2,24 +2,20 @@
# Distributed under the terms of the GNU General Public License v2
# $Id$
-EAPI=5
+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 for KDE"
+DESCRIPTION="Free/Open Source micro-blogging client by KDE"
HOMEPAGE="http://choqok.gnufolks.org/"
+SRC_URI="mirror://sourceforge/${PN}/${P}.tar.xz"
-if [[ ${PV} != *9999* ]]; then
- SRC_URI="mirror://sourceforge/${PN}/${P}.tar.xz"
- KEYWORDS="amd64 x86"
-else
- KEYWORDS=""
-fi
-
+KEYWORDS="~amd64 ~x86"
LICENSE="GPL-2+"
SLOT="4"
IUSE="ayatana debug telepathy"
@@ -38,11 +34,16 @@ DEPEND="${RDEPEND}
DOCS=( AUTHORS README TODO changelog )
-src_prepare(){
+PATCHES=(
+ "${FILESDIR}/${P}-kdewebkit-optional.patch"
+ "${FILESDIR}/${P}-telepathy-optional.patch"
+)
+
+src_configure(){
local mycmakeargs=(
- $(cmake-utils_use !ayatana QTINDICATE_DISABLE)
+ -DQTINDICATE_DISABLE=$(usex "!ayatana")
$(cmake-utils_use_find_package telepathy TelepathyQt4)
+ -DWITH_KDEWEBKIT=$(usex webkit)
)
-
- kde4-base_src_prepare
+ kde4-base_src_configure
}
diff --git a/net-im/choqok/choqok-1.5.ebuild b/net-im/choqok/choqok-1.5.ebuild
index 873b6ec..9e24c2e 100644
--- a/net-im/choqok/choqok-1.5.ebuild
+++ b/net-im/choqok/choqok-1.5.ebuild
@@ -8,9 +8,10 @@ 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="always"
inherit kde4-base
-DESCRIPTION="Free/Open Source micro-blogging client for KDE"
+DESCRIPTION="Free/Open Source micro-blogging client by KDE"
HOMEPAGE="http://choqok.gnufolks.org/"
if [[ ${PV} != *9999* ]]; then
diff --git a/net-im/choqok/files/choqok-1.5-kdewebkit-optional.patch b/net-im/choqok/files/choqok-1.5-kdewebkit-optional.patch
new file mode 100644
index 0000000..ee16b93
--- /dev/null
+++ b/net-im/choqok/files/choqok-1.5-kdewebkit-optional.patch
@@ -0,0 +1,30 @@
+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
new file mode 100644
index 0000000..a73a846
--- /dev/null
+++ b/net-im/choqok/files/choqok-1.5-telepathy-optional.patch
@@ -0,0 +1,93 @@
+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] 2+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: net-im/choqok/, net-im/choqok/files/
@ 2020-03-08 12:38 Andreas Sturmlechner
0 siblings, 0 replies; 2+ messages in thread
From: Andreas Sturmlechner @ 2020-03-08 12:38 UTC (permalink / raw
To: gentoo-commits
commit: 220778769634b0a09582aa4f862f09bdfc998c21
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Sun Mar 8 12:37:34 2020 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Sun Mar 8 12:38:07 2020 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=22077876
net-im/choqok: Drop 1.6.0_p20190726
Package-Manager: Portage-2.3.92, Repoman-2.3.20
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>
net-im/choqok/Manifest | 1 -
net-im/choqok/choqok-1.6.0_p20190726.ebuild | 70 ----------------
| 94 ----------------------
3 files changed, 165 deletions(-)
diff --git a/net-im/choqok/Manifest b/net-im/choqok/Manifest
index 36d4b972d64..968126781e4 100644
--- a/net-im/choqok/Manifest
+++ b/net-im/choqok/Manifest
@@ -1,2 +1 @@
-DIST choqok-1.6.0_p20190726.tar.xz 1184148 BLAKE2B c0c0459de362aa58337ab2d0c4ea03ff516de87bded48f73c47aa48ed791cfeb82c4085c4d333bff4ac1489a27e038da29d5419569aacb17366dc119e776dd67 SHA512 6471d9b37cc78fd3a14cc970512db3a8d44b21d49efb503917a57332f229c34ed735edfea6a74d6c25d8ab8d153331226effd677405d447c4a2faea3e396decf
DIST choqok-1.7.0.tar.xz 1202092 BLAKE2B 62e0c561579c36198f645bb550822d9bec583d8337b37e3336e4352199800b1807b80931f8c7c8141f74dfb91ade9f89b371723a8a3ea3e7bde97854634b82b2 SHA512 6f5998078e555f7b4a40270ad0a4defa2d15bb8440b810320fc4cfc38d78cb34bb9b2f6a38eb33eb3217b51a78a7fbc7f79224cd0ddb0fcbf8c9035d8e600e96
diff --git a/net-im/choqok/choqok-1.6.0_p20190726.ebuild b/net-im/choqok/choqok-1.6.0_p20190726.ebuild
deleted file mode 100644
index c6bfef43b41..00000000000
--- a/net-im/choqok/choqok-1.6.0_p20190726.ebuild
+++ /dev/null
@@ -1,70 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-ECM_HANDBOOK="forceoptional"
-KFMIN=5.60.0
-QTMIN=5.12.3
-inherit ecm kde.org
-
-DESCRIPTION="Free/Open Source micro-blogging client by KDE"
-HOMEPAGE="https://choqok.kde.org/
-https://kde.org/applications/internet/org.kde.choqok"
-
-if [[ ${KDE_BUILD_TYPE} != live ]]; then
- SRC_URI="https://dev.gentoo.org/~asturm/distfiles/${P}.tar.xz"
- KEYWORDS="amd64 x86"
-fi
-
-LICENSE="GPL-2+"
-SLOT="5"
-IUSE="attica konqueror telepathy"
-
-DEPEND="
- app-crypt/qca[qt5(+)]
- >=dev-qt/qtdbus-${QTMIN}:5
- >=dev-qt/qtgui-${QTMIN}:5
- >=dev-qt/qtnetworkauth-${QTMIN}:5
- >=dev-qt/qtwidgets-${QTMIN}:5
- >=dev-qt/qtxml-${QTMIN}:5
- >=kde-frameworks/kcmutils-${KFMIN}:5
- >=kde-frameworks/kconfig-${KFMIN}:5
- >=kde-frameworks/kconfigwidgets-${KFMIN}:5
- >=kde-frameworks/kcoreaddons-${KFMIN}:5
- >=kde-frameworks/kemoticons-${KFMIN}:5
- >=kde-frameworks/kglobalaccel-${KFMIN}:5
- >=kde-frameworks/kguiaddons-${KFMIN}:5
- >=kde-frameworks/ki18n-${KFMIN}:5
- >=kde-frameworks/kio-${KFMIN}:5
- >=kde-frameworks/kjobwidgets-${KFMIN}:5
- >=kde-frameworks/knotifications-${KFMIN}:5
- >=kde-frameworks/knotifyconfig-${KFMIN}:5
- >=kde-frameworks/kservice-${KFMIN}:5
- >=kde-frameworks/ktextwidgets-${KFMIN}:5
- >=kde-frameworks/kwallet-${KFMIN}:5
- >=kde-frameworks/kwidgetsaddons-${KFMIN}:5
- >=kde-frameworks/kxmlgui-${KFMIN}:5
- >=kde-frameworks/sonnet-${KFMIN}:5
- attica? ( >=kde-frameworks/attica-${KFMIN}:5 )
- konqueror? (
- >=dev-qt/qtwebkit-5.212.0_pre20180120:5
- >=kde-frameworks/kdewebkit-${KFMIN}:5
- >=kde-frameworks/kparts-${KFMIN}:5
- )
- telepathy? ( net-libs/telepathy-qt[qt5(+)] )
-"
-RDEPEND="${DEPEND}"
-
-src_configure() {
- local mycmakeargs=(
- $(cmake_use_find_package attica KF5Attica)
- $(cmake_use_find_package konqueror KF5Parts)
- $(cmake_use_find_package konqueror KF5WebKit)
- $(cmake_use_find_package telepathy TelepathyQt5)
- )
-
- ecm_src_configure
-}
-
-PATCHES=( "${FILESDIR}"/${P}-missing-header.patch )
diff --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
deleted file mode 100644
index d8b58183e2b..00000000000
--- a/net-im/choqok/files/choqok-1.6.0_p20190726-missing-header.patch
+++ /dev/null
@@ -1,94 +0,0 @@
-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] 2+ messages in thread
end of thread, other threads:[~2020-03-08 12:38 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2020-03-08 12:38 [gentoo-commits] repo/gentoo:master commit in: net-im/choqok/, net-im/choqok/files/ Andreas Sturmlechner
-- strict thread matches above, loose matches on Subject: below --
2016-08-20 18:28 Michael Palimaka
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox