1 |
commit: 0b335f748a7621b78e79f9ee7b1b53cea8992b4b |
2 |
Author: Anna (cybertailor) Vyalkova <cyber+gentoo <AT> sysrq <DOT> in> |
3 |
AuthorDate: Sun Oct 31 08:45:50 2021 +0000 |
4 |
Commit: Anna Vyalkova <cyber+gentoo <AT> sysrq <DOT> in> |
5 |
CommitDate: Sat Nov 6 12:43:25 2021 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=0b335f74 |
7 |
|
8 |
net-im/kaidan: fix build without knotifications |
9 |
|
10 |
Closes: https://bugs.gentoo.org/817251 |
11 |
Signed-off-by: Anna (cybertailor) Vyalkova <cyber+gentoo <AT> sysrq.in> |
12 |
|
13 |
net-im/kaidan/Manifest | 1 - |
14 |
.../files/kaidan-0.8.0-no-knotifications.patch | 15 +++++++ |
15 |
net-im/kaidan/kaidan-0.7.0.ebuild | 51 ---------------------- |
16 |
net-im/kaidan/kaidan-0.8.0.ebuild | 4 +- |
17 |
net-im/kaidan/metadata.xml | 2 +- |
18 |
5 files changed, 19 insertions(+), 54 deletions(-) |
19 |
|
20 |
diff --git a/net-im/kaidan/Manifest b/net-im/kaidan/Manifest |
21 |
index 54b0c922a..c3b586611 100644 |
22 |
--- a/net-im/kaidan/Manifest |
23 |
+++ b/net-im/kaidan/Manifest |
24 |
@@ -1,2 +1 @@ |
25 |
-DIST kaidan-0.7.0.tar.xz 516684 BLAKE2B 6ee2f6696b1fca2ec564563e13c621f63edc8696d4b14ec22157adef611d5ba9d2d522bd960d1becc16a720851263503251d5a1f850af409daf439165a23839f SHA512 89389db3dfbc6acfae252c6fad2492a997760495f9a55d6f56bbf0f49832fcbff35548ba89dc3f24e6ff05b0c4b1ee0242566ca1c7f662fc096b13b37f99af94 |
26 |
DIST kaidan-0.8.0.tar.xz 532028 BLAKE2B 75607bec35606bb87b820277c9d94af02f110c4b56d78cb7e3261555f89eecaa823b9cdbfe53a7561f145d0d94eef3fbd6acb76b4d975746706aa796e565cd3f SHA512 2084693dd2ae0f1410e6df57f77f1c2c080e9b48c771e632b4cc9bf0351e435fd9d6937209f50d0f41a7235317fe42578cc8c983163f61e0d6c541d148a202bf |
27 |
|
28 |
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 |
29 |
new file mode 100644 |
30 |
index 000000000..4ba0aa573 |
31 |
--- /dev/null |
32 |
+++ b/net-im/kaidan/files/kaidan-0.8.0-no-knotifications.patch |
33 |
@@ -0,0 +1,15 @@ |
34 |
+From: Melvin Keskin <melvo@×××××××.de> |
35 |
+https://invent.kde.org/network/kaidan/-/merge_requests/784 |
36 |
+https://bugs.gentoo.org/817251 |
37 |
+ |
38 |
+--- a/src/Notifications.cpp |
39 |
++++ b/src/Notifications.cpp |
40 |
+@@ -82,7 +82,7 @@ void Notifications::sendMessageNotification(const QString &accountJid, const QSt |
41 |
+ notification->sendEvent(); |
42 |
+ } |
43 |
+ #else |
44 |
+-void Notifications::sendMessageNotification(const QString&, const QString&, const QString&) |
45 |
++void Notifications::sendMessageNotification(const QString&, const QString&, const QString&, const QString&) |
46 |
+ { |
47 |
+ } |
48 |
+ #endif // HAVE_KNOTIFICATIONS |
49 |
|
50 |
diff --git a/net-im/kaidan/kaidan-0.7.0.ebuild b/net-im/kaidan/kaidan-0.7.0.ebuild |
51 |
deleted file mode 100644 |
52 |
index f0a7bb5b3..000000000 |
53 |
--- a/net-im/kaidan/kaidan-0.7.0.ebuild |
54 |
+++ /dev/null |
55 |
@@ -1,51 +0,0 @@ |
56 |
-# Copyright 1999-2021 Gentoo Authors |
57 |
-# Distributed under the terms of the GNU General Public License v2 |
58 |
- |
59 |
-EAPI=7 |
60 |
- |
61 |
-ECM_TEST="true" |
62 |
-KFMIN=5.67.0 |
63 |
-QTMIN=5.14.0 |
64 |
-inherit ecm |
65 |
- |
66 |
-DESCRIPTION="A simple, user-friendly Jabber/XMPP client for every device!" |
67 |
-HOMEPAGE="https://www.kaidan.im" |
68 |
-SRC_URI="mirror://kde/unstable/${PN}/${PV}/${P}.tar.xz" |
69 |
- |
70 |
-LICENSE="Apache-2.0 CC-BY-SA-4.0 GPL-3+ GPL-3-with-openssl-exception MIT" |
71 |
-SLOT="5" |
72 |
-KEYWORDS="~amd64 ~x86" |
73 |
-IUSE="kde nls" |
74 |
- |
75 |
-BDEPEND=" |
76 |
- nls? ( >=dev-qt/linguist-tools-${QTMIN}:5 ) |
77 |
-" |
78 |
-DEPEND=" |
79 |
- >=dev-qt/qtdeclarative-${QTMIN}:5 |
80 |
- >=dev-qt/qtlocation-${QTMIN}:5 |
81 |
- >=dev-qt/qtmultimedia-${QTMIN}:5[qml] |
82 |
- >=dev-qt/qtnetwork-${QTMIN}:5[ssl] |
83 |
- >=dev-qt/qtpositioning-${QTMIN}:5[qml] |
84 |
- >=dev-qt/qtquickcontrols-${QTMIN}:5 |
85 |
- >=dev-qt/qtquickcontrols2-${QTMIN}:5 |
86 |
- >=dev-qt/qtsvg-${QTMIN}:5 |
87 |
- >=dev-qt/qtsql-${QTMIN}:5 |
88 |
- >=dev-qt/qtxml-${QTMIN}:5 |
89 |
- >=kde-frameworks/kirigami-${KFMIN}:5 |
90 |
- >=kde-frameworks/qqc2-desktop-style-${KFMIN}:5 |
91 |
- >=media-libs/zxing-cpp-1.0.8 |
92 |
- >=net-libs/qxmpp-1.2.0 |
93 |
- kde? ( >=kde-frameworks/knotifications-${KFMIN}:5 ) |
94 |
-" |
95 |
-RDEPEND="${DEPEND}" |
96 |
- |
97 |
-src_configure() { |
98 |
- local mycmakeargs=( |
99 |
- -DI18N=$(usex nls) |
100 |
- -DBUILD_TESTS=$(usex test) |
101 |
- -DUSE_KNOTIFICATIONS=$(usex kde) |
102 |
- # compile QML at build time |
103 |
- -DQUICK_COMPILER=ON |
104 |
- ) |
105 |
- ecm_src_configure |
106 |
-} |
107 |
|
108 |
diff --git a/net-im/kaidan/kaidan-0.8.0.ebuild b/net-im/kaidan/kaidan-0.8.0.ebuild |
109 |
index c969fcf9e..f68df0917 100644 |
110 |
--- a/net-im/kaidan/kaidan-0.8.0.ebuild |
111 |
+++ b/net-im/kaidan/kaidan-0.8.0.ebuild |
112 |
@@ -1,7 +1,7 @@ |
113 |
# Copyright 1999-2021 Gentoo Authors |
114 |
# Distributed under the terms of the GNU General Public License v2 |
115 |
|
116 |
-EAPI=7 |
117 |
+EAPI=8 |
118 |
|
119 |
ECM_TEST="true" |
120 |
KFMIN=5.67.0 |
121 |
@@ -40,6 +40,8 @@ DEPEND=" |
122 |
" |
123 |
RDEPEND="${DEPEND}" |
124 |
|
125 |
+PATCHES=( "${FILESDIR}"/${P}-no-knotifications.patch ) |
126 |
+ |
127 |
src_configure() { |
128 |
local mycmakeargs=( |
129 |
-DI18N=$(usex nls) |
130 |
|
131 |
diff --git a/net-im/kaidan/metadata.xml b/net-im/kaidan/metadata.xml |
132 |
index d15f30d2c..5371ef105 100644 |
133 |
--- a/net-im/kaidan/metadata.xml |
134 |
+++ b/net-im/kaidan/metadata.xml |
135 |
@@ -1,5 +1,5 @@ |
136 |
<?xml version="1.0" encoding="UTF-8"?> |
137 |
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> |
138 |
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> |
139 |
<pkgmetadata> |
140 |
<upstream> |
141 |
<remote-id type="github">KDE/kaidan</remote-id> |