From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id EE819158086 for ; Mon, 8 Nov 2021 13:02:36 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id F2C2A2BC0FC; Mon, 8 Nov 2021 13:02:34 +0000 (UTC) Received: from smtp.gentoo.org (woodpecker.gentoo.org [140.211.166.183]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id AEF3C2BC0FC for ; Mon, 8 Nov 2021 13:02:34 +0000 (UTC) Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 1CDCE342F2B for ; Mon, 8 Nov 2021 13:02:32 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 9EE911B3 for ; Mon, 8 Nov 2021 13:02:30 +0000 (UTC) From: "Andrew Ammerlaan" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Andrew Ammerlaan" Message-ID: <1636202605.0b335f748a7621b78e79f9ee7b1b53cea8992b4b.andrewammerlaan@gentoo> Subject: [gentoo-commits] repo/proj/guru:master commit in: net-im/kaidan/, net-im/kaidan/files/ X-VCS-Repository: repo/proj/guru X-VCS-Files: net-im/kaidan/Manifest net-im/kaidan/files/kaidan-0.8.0-no-knotifications.patch net-im/kaidan/kaidan-0.7.0.ebuild net-im/kaidan/kaidan-0.8.0.ebuild net-im/kaidan/metadata.xml X-VCS-Directories: net-im/kaidan/files/ net-im/kaidan/ X-VCS-Committer: andrewammerlaan X-VCS-Committer-Name: Andrew Ammerlaan X-VCS-Revision: 0b335f748a7621b78e79f9ee7b1b53cea8992b4b X-VCS-Branch: master Date: Mon, 8 Nov 2021 13:02:30 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: 6b6f535a-58d9-4aea-b38a-72e1333af5c2 X-Archives-Hash: e276d6ec6cb41ad227a2d37234c59a49 commit: 0b335f748a7621b78e79f9ee7b1b53cea8992b4b Author: Anna (cybertailor) Vyalkova sysrq in> AuthorDate: Sun Oct 31 08:45:50 2021 +0000 Commit: Andrew Ammerlaan gentoo org> CommitDate: Sat Nov 6 12:43:25 2021 +0000 URL: https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=0b335f74 net-im/kaidan: fix build without knotifications Closes: https://bugs.gentoo.org/817251 Signed-off-by: Anna (cybertailor) Vyalkova sysrq.in> net-im/kaidan/Manifest | 1 - .../files/kaidan-0.8.0-no-knotifications.patch | 15 +++++++ net-im/kaidan/kaidan-0.7.0.ebuild | 51 ---------------------- net-im/kaidan/kaidan-0.8.0.ebuild | 4 +- net-im/kaidan/metadata.xml | 2 +- 5 files changed, 19 insertions(+), 54 deletions(-) diff --git a/net-im/kaidan/Manifest b/net-im/kaidan/Manifest index 54b0c922a..c3b586611 100644 --- a/net-im/kaidan/Manifest +++ b/net-im/kaidan/Manifest @@ -1,2 +1 @@ -DIST kaidan-0.7.0.tar.xz 516684 BLAKE2B 6ee2f6696b1fca2ec564563e13c621f63edc8696d4b14ec22157adef611d5ba9d2d522bd960d1becc16a720851263503251d5a1f850af409daf439165a23839f SHA512 89389db3dfbc6acfae252c6fad2492a997760495f9a55d6f56bbf0f49832fcbff35548ba89dc3f24e6ff05b0c4b1ee0242566ca1c7f662fc096b13b37f99af94 DIST kaidan-0.8.0.tar.xz 532028 BLAKE2B 75607bec35606bb87b820277c9d94af02f110c4b56d78cb7e3261555f89eecaa823b9cdbfe53a7561f145d0d94eef3fbd6acb76b4d975746706aa796e565cd3f SHA512 2084693dd2ae0f1410e6df57f77f1c2c080e9b48c771e632b4cc9bf0351e435fd9d6937209f50d0f41a7235317fe42578cc8c983163f61e0d6c541d148a202bf diff --git a/net-im/kaidan/files/kaidan-0.8.0-no-knotifications.patch b/net-im/kaidan/files/kaidan-0.8.0-no-knotifications.patch new file mode 100644 index 000000000..4ba0aa573 --- /dev/null +++ b/net-im/kaidan/files/kaidan-0.8.0-no-knotifications.patch @@ -0,0 +1,15 @@ +From: Melvin Keskin +https://invent.kde.org/network/kaidan/-/merge_requests/784 +https://bugs.gentoo.org/817251 + +--- a/src/Notifications.cpp ++++ b/src/Notifications.cpp +@@ -82,7 +82,7 @@ void Notifications::sendMessageNotification(const QString &accountJid, const QSt + notification->sendEvent(); + } + #else +-void Notifications::sendMessageNotification(const QString&, const QString&, const QString&) ++void Notifications::sendMessageNotification(const QString&, const QString&, const QString&, const QString&) + { + } + #endif // HAVE_KNOTIFICATIONS diff --git a/net-im/kaidan/kaidan-0.7.0.ebuild b/net-im/kaidan/kaidan-0.7.0.ebuild deleted file mode 100644 index f0a7bb5b3..000000000 --- a/net-im/kaidan/kaidan-0.7.0.ebuild +++ /dev/null @@ -1,51 +0,0 @@ -# Copyright 1999-2021 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -ECM_TEST="true" -KFMIN=5.67.0 -QTMIN=5.14.0 -inherit ecm - -DESCRIPTION="A simple, user-friendly Jabber/XMPP client for every device!" -HOMEPAGE="https://www.kaidan.im" -SRC_URI="mirror://kde/unstable/${PN}/${PV}/${P}.tar.xz" - -LICENSE="Apache-2.0 CC-BY-SA-4.0 GPL-3+ GPL-3-with-openssl-exception MIT" -SLOT="5" -KEYWORDS="~amd64 ~x86" -IUSE="kde nls" - -BDEPEND=" - nls? ( >=dev-qt/linguist-tools-${QTMIN}:5 ) -" -DEPEND=" - >=dev-qt/qtdeclarative-${QTMIN}:5 - >=dev-qt/qtlocation-${QTMIN}:5 - >=dev-qt/qtmultimedia-${QTMIN}:5[qml] - >=dev-qt/qtnetwork-${QTMIN}:5[ssl] - >=dev-qt/qtpositioning-${QTMIN}:5[qml] - >=dev-qt/qtquickcontrols-${QTMIN}:5 - >=dev-qt/qtquickcontrols2-${QTMIN}:5 - >=dev-qt/qtsvg-${QTMIN}:5 - >=dev-qt/qtsql-${QTMIN}:5 - >=dev-qt/qtxml-${QTMIN}:5 - >=kde-frameworks/kirigami-${KFMIN}:5 - >=kde-frameworks/qqc2-desktop-style-${KFMIN}:5 - >=media-libs/zxing-cpp-1.0.8 - >=net-libs/qxmpp-1.2.0 - kde? ( >=kde-frameworks/knotifications-${KFMIN}:5 ) -" -RDEPEND="${DEPEND}" - -src_configure() { - local mycmakeargs=( - -DI18N=$(usex nls) - -DBUILD_TESTS=$(usex test) - -DUSE_KNOTIFICATIONS=$(usex kde) - # compile QML at build time - -DQUICK_COMPILER=ON - ) - ecm_src_configure -} diff --git a/net-im/kaidan/kaidan-0.8.0.ebuild b/net-im/kaidan/kaidan-0.8.0.ebuild index c969fcf9e..f68df0917 100644 --- a/net-im/kaidan/kaidan-0.8.0.ebuild +++ b/net-im/kaidan/kaidan-0.8.0.ebuild @@ -1,7 +1,7 @@ # Copyright 1999-2021 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=7 +EAPI=8 ECM_TEST="true" KFMIN=5.67.0 @@ -40,6 +40,8 @@ DEPEND=" " RDEPEND="${DEPEND}" +PATCHES=( "${FILESDIR}"/${P}-no-knotifications.patch ) + src_configure() { local mycmakeargs=( -DI18N=$(usex nls) diff --git a/net-im/kaidan/metadata.xml b/net-im/kaidan/metadata.xml index d15f30d2c..5371ef105 100644 --- a/net-im/kaidan/metadata.xml +++ b/net-im/kaidan/metadata.xml @@ -1,5 +1,5 @@ - + KDE/kaidan