Get Gentoo!
gentoo.org sites
gentoo.org Wiki Bugs Forums Packages
Planet Archives Sources
Infra Status

Gentoo Archives: gentoo-commits

From: Maciej Mrozowski <reavertm@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: net-im/kadu/files/, profiles/, net-im/kadu/
Date: Tue, 03 May 2016 05:15:45
Message-Id: 1462252505.505fb17c5aec39716a2f19d27b25857e587ece5a.reavertm@gentoo
1 commit: 505fb17c5aec39716a2f19d27b25857e587ece5a
2 Author: Maciej Mrozowski <reavertm <AT> gentoo <DOT> org>
3 AuthorDate: Tue May 3 05:13:20 2016 +0000
4 Commit: Maciej Mrozowski <reavertm <AT> gentoo <DOT> org>
5 CommitDate: Tue May 3 05:15:05 2016 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=505fb17c
7
8 net-im/kadu: (masked) version bump 3.0, remove now spurious inherit 'base', revbump 2.1 with upstream patch to port to QtQuick2.3
9
10 net-im/kadu/Manifest | 1 +
11 .../kadu/files/kadu-2.1-port-to-QtQuick-2.3.patch | 150 +++++++++++++++++++++
12 net-im/kadu/kadu-0.12.3.ebuild | 2 +-
13 .../kadu/{kadu-2.1.ebuild => kadu-2.1-r1.ebuild} | 15 ++-
14 net-im/kadu/kadu-2.1.ebuild | 4 +-
15 net-im/kadu/{kadu-2.1.ebuild => kadu-3.0.ebuild} | 16 +--
16 profiles/package.mask | 4 +
17 7 files changed, 173 insertions(+), 19 deletions(-)
18
19 diff --git a/net-im/kadu/Manifest b/net-im/kadu/Manifest
20 index a50a33d..45211ec 100644
21 --- a/net-im/kadu/Manifest
22 +++ b/net-im/kadu/Manifest
23 @@ -1,2 +1,3 @@
24 DIST kadu-0.12.3.tar.bz2 5106482 SHA256 d607bbd0d00b01bfb70dd15f15c8be4076896a935041651e67a3887ad12ab8a8 SHA512 0aeaec9ac3ce5a1860571721e307a8d5e6657a30780125e21d153901ce5f2870ba3ea6ebc272bbb6f35a56ed9a24127abfc8f25b9eb88d01ecf9c931fa5c851c WHIRLPOOL 0a2b1b9684577d95027b9107fc51e8a8f290b7ed38a18bf282f9589eb3dd5ca7a9fa61b088e2fb2be8d4d16e6d4e72d766476e36f7d65cc55a2d5efae53bb8ca
25 DIST kadu-2.1.tar.bz2 6013519 SHA256 9f8092756d4a870c1ecb016c0cba2c833e1697b3eb7e9bf51813b1f0a541ffb8 SHA512 3f0e38aefbaf15f357ae8232b1364deb5954a2464895fafa0a324ad99c7d14c6ba7495bed51d628e04c30bbaaf8e49412c70bbbbf01a40f360406c1afba2384a WHIRLPOOL 10b214ca8d1964054918dc0e1b85bf1157d2496e3ad340958302083a0374ac4fb7b6ac96741637f3847ac06dd9c322b0e529f9c204b9ebc6658157f7b7c2b8a2
26 +DIST kadu-3.0.tar.bz2 8002501 SHA256 3f5c0a66a33d1244acd981aef5c268d94185956754ca62e0c4295f7b50700366 SHA512 bc01a2355a53827a9139e460316fcb7ef4bca598964caa11868fe2634140ab8499f7845f0dd64aff0fdc0ba52ee27349f32793a8e2ad9d97b17e6f9a36eddb83 WHIRLPOOL bd743cc4d99d5ebae95e7230dc132e0f246a0b94dd02caa4f5fa92bd8ef3ec40905812c3711c009f56b9e61779fbbb0ec47e5f9b278e90c3665c363e7f865326
27
28 diff --git a/net-im/kadu/files/kadu-2.1-port-to-QtQuick-2.3.patch b/net-im/kadu/files/kadu-2.1-port-to-QtQuick-2.3.patch
29 new file mode 100644
30 index 0000000..cdfd549
31 --- /dev/null
32 +++ b/net-im/kadu/files/kadu-2.1-port-to-QtQuick-2.3.patch
33 @@ -0,0 +1,150 @@
34 +From 6912d8fc02b5ff4d6675656d6c00506c48fdd940 Mon Sep 17 00:00:00 2001
35 +From: Rafał Przemysław Malinowski <rafal.przemyslaw.malinowski@×××××.com>
36 +Date: Sat, 21 Mar 2015 01:32:11 +0100
37 +Subject: [PATCH] gui: ported open chat with from qml to quick 2.3
38 +
39 +Signed-off-by: Rafał Przemysław Malinowski <rafal.przemyslaw.malinowski@×××××.com>
40 +---
41 + cmake/KaduMacros.cmake | 2 +-
42 + kadu-core/CMakeLists.txt | 2 +-
43 + kadu-core/gui/windows/open-chat-with/open-chat-with.cpp | 11 ++++++-----
44 + kadu-core/gui/windows/open-chat-with/open-chat-with.h | 4 ++--
45 + tests/CMakeLists.txt | 2 +-
46 + varia/qml/Contact.qml | 2 +-
47 + varia/qml/ContactsGridView.qml | 2 +-
48 + varia/qml/openChatWith.qml | 2 +-
49 + 8 files changed, 14 insertions(+), 13 deletions(-)
50 +
51 +diff --git a/cmake/KaduMacros.cmake b/cmake/KaduMacros.cmake
52 +index ac9e94e..0a7712a 100644
53 +--- a/cmake/KaduMacros.cmake
54 ++++ b/cmake/KaduMacros.cmake
55 +@@ -183,7 +183,7 @@ function (kadu_plugin KADU_PLUGIN_NAME)
56 + endforeach ()
57 + endif ()
58 +
59 +- qt5_use_modules (${KADU_PLUGIN_NAME} LINK_PRIVATE Core Gui Widgets Network Xml WebKit WebKitWidgets Declarative)
60 ++ qt5_use_modules (${KADU_PLUGIN_NAME} LINK_PRIVATE Core Gui Network Qml Quick QuickWidgets WebKit WebKitWidgets Widgets Xml)
61 + if (UNIX AND NOT APPLE)
62 + qt5_use_modules (${KADU_PLUGIN_NAME} LINK_PRIVATE DBus)
63 + endif ()
64 +diff --git a/kadu-core/CMakeLists.txt b/kadu-core/CMakeLists.txt
65 +index be52339..46317d1 100644
66 +--- a/kadu-core/CMakeLists.txt
67 ++++ b/kadu-core/CMakeLists.txt
68 +@@ -205,7 +205,7 @@ if (FAST_LINKING)
69 + endif ()
70 + endif ()
71 +
72 +-qt5_use_modules (libkadu LINK_PRIVATE Core Gui Widgets Xml Network WebKit WebKitWidgets Declarative)
73 ++qt5_use_modules (libkadu LINK_PRIVATE Core Gui Network Qml Quick QuickWidgets WebKit WebKitWidgets Widgets Xml)
74 + if (UNIX AND NOT APPLE)
75 + qt5_use_modules (libkadu LINK_PRIVATE DBus X11Extras)
76 + endif ()
77 +diff --git a/kadu-core/gui/windows/open-chat-with/open-chat-with.cpp b/kadu-core/gui/windows/open-chat-with/open-chat-with.cpp
78 +index 2c14c3f..9ff00d1 100644
79 +--- a/kadu-core/gui/windows/open-chat-with/open-chat-with.cpp
80 ++++ b/kadu-core/gui/windows/open-chat-with/open-chat-with.cpp
81 +@@ -21,8 +21,9 @@
82 + * along with this program. If not, see <http://www.gnu.org/licenses/>.
83 + */
84 +
85 +-#include <QtDeclarative/QDeclarativeContext>
86 +-#include <QtDeclarative/QDeclarativeView>
87 ++#include <QtQml/QQmlContext>
88 ++#include <QtQuick/QQuickItem>
89 ++#include <QtQuickWidgets/QQuickWidget>
90 + #include <QtGui/QKeyEvent>
91 + #include <QtWidgets/QApplication>
92 + #include <QtWidgets/QDesktopWidget>
93 +@@ -97,18 +98,18 @@ OpenChatWith::OpenChatWith() :
94 +
95 + MainLayout->addWidget(idWidget);
96 +
97 +- BuddiesView = new QDeclarativeView();
98 ++ BuddiesView = new QQuickWidget();
99 +
100 + Chain = new ModelChain(this);
101 + ListModel = new BuddyListModel(Chain);
102 + Chain->setBaseModel(ListModel);
103 + Chain->addProxyModel(new TalkableProxyModel(Chain));
104 +
105 +- QDeclarativeContext *declarativeContext = BuddiesView->rootContext();
106 ++ QQmlContext *declarativeContext = BuddiesView->rootContext();
107 + declarativeContext->setContextProperty("buddies", Chain->lastModel());
108 +
109 + BuddiesView->setSizePolicy(QSizePolicy::Expanding, QSizePolicy::Expanding);
110 +- BuddiesView->setResizeMode(QDeclarativeView::SizeRootObjectToView);
111 ++ BuddiesView->setResizeMode(QQuickWidget::SizeRootObjectToView);
112 + BuddiesView->setSource(QUrl("file:///" + Application::instance()->pathsProvider()->dataPath() + "qml/openChatWith.qml"));
113 +
114 + if (BuddiesView->rootObject())
115 +diff --git a/kadu-core/gui/windows/open-chat-with/open-chat-with.h b/kadu-core/gui/windows/open-chat-with/open-chat-with.h
116 +index b079b25..8268d8e 100644
117 +--- a/kadu-core/gui/windows/open-chat-with/open-chat-with.h
118 ++++ b/kadu-core/gui/windows/open-chat-with/open-chat-with.h
119 +@@ -29,9 +29,9 @@
120 +
121 + #include "open-chat-with-runner.h"
122 +
123 +-class QDeclarativeView;
124 + class QLabel;
125 + class QPushButton;
126 ++class QQuickWidget;
127 + class QVBoxLayout;
128 +
129 + class BuddyListModel;
130 +@@ -46,7 +46,7 @@ class KADUAPI OpenChatWith : public QWidget, DesktopAwareObject
131 +
132 + explicit OpenChatWith();
133 +
134 +- QDeclarativeView *BuddiesView;
135 ++ QQuickWidget *BuddiesView;
136 + LineEditWithClearButton *ContactID;
137 + QVBoxLayout *MainLayout;
138 + OpenChatWithRunner *OpenChatRunner;
139 +diff --git a/tests/CMakeLists.txt b/tests/CMakeLists.txt
140 +index 0dc1dcf..db7c42d 100644
141 +--- a/tests/CMakeLists.txt
142 ++++ b/tests/CMakeLists.txt
143 +@@ -31,7 +31,7 @@ function (kadu_add_test name_)
144 + endif ()
145 + add_test ("${sourcePath}/${name_}" ${name_})
146 +
147 +- qt5_use_modules (${name_} LINK_PRIVATE Core Gui Widgets Xml Network WebKit WebKitWidgets Declarative Test)
148 ++ qt5_use_modules (${name_} LINK_PRIVATE Core Gui Network Qml Quick QuickWidgets Test WebKit WebKitWidgets Widgets Xml)
149 +
150 + # Add libkadu after the plugin so that --as-needed won't drop anything
151 + # needed by the plugin.
152 +diff --git a/varia/qml/Contact.qml b/varia/qml/Contact.qml
153 +index 54a551e..2257348 100644
154 +--- a/varia/qml/Contact.qml
155 ++++ b/varia/qml/Contact.qml
156 +@@ -1,4 +1,4 @@
157 +-import QtQuick 1.1
158 ++import QtQuick 2.3
159 +
160 + Rectangle
161 + {
162 +diff --git a/varia/qml/ContactsGridView.qml b/varia/qml/ContactsGridView.qml
163 +index 769a419..141931e 100644
164 +--- a/varia/qml/ContactsGridView.qml
165 ++++ b/varia/qml/ContactsGridView.qml
166 +@@ -1,4 +1,4 @@
167 +-import QtQuick 1.1
168 ++import QtQuick 2.3
169 +
170 + Item
171 + {
172 +diff --git a/varia/qml/openChatWith.qml b/varia/qml/openChatWith.qml
173 +index 317133e..cce65b5 100644
174 +--- a/varia/qml/openChatWith.qml
175 ++++ b/varia/qml/openChatWith.qml
176 +@@ -1,4 +1,4 @@
177 +-import QtQuick 1.1
178 ++import QtQuick 2.3
179 +
180 + Item
181 + {
182 +--
183 +libgit2 0.24.0
184
185 diff --git a/net-im/kadu/kadu-0.12.3.ebuild b/net-im/kadu/kadu-0.12.3.ebuild
186 index 5eb83a8..62625bd 100644
187 --- a/net-im/kadu/kadu-0.12.3.ebuild
188 +++ b/net-im/kadu/kadu-0.12.3.ebuild
189 @@ -4,7 +4,7 @@
190
191 EAPI="4"
192
193 -inherit base cmake-utils flag-o-matic
194 +inherit cmake-utils flag-o-matic
195
196 MY_P="${P/_/-}"
197
198
199 diff --git a/net-im/kadu/kadu-2.1.ebuild b/net-im/kadu/kadu-2.1-r1.ebuild
200 similarity index 91%
201 copy from net-im/kadu/kadu-2.1.ebuild
202 copy to net-im/kadu/kadu-2.1-r1.ebuild
203 index 4f9bb7b..d8d0125 100644
204 --- a/net-im/kadu/kadu-2.1.ebuild
205 +++ b/net-im/kadu/kadu-2.1-r1.ebuild
206 @@ -1,10 +1,10 @@
207 -# Copyright 1999-2015 Gentoo Foundation
208 +# Copyright 1999-2016 Gentoo Foundation
209 # Distributed under the terms of the GNU General Public License v2
210 # $Id$
211
212 -EAPI="5"
213 +EAPI="6"
214
215 -inherit base cmake-utils flag-o-matic
216 +inherit cmake-utils flag-o-matic
217
218 MY_P="${P/_/-}"
219
220 @@ -13,7 +13,7 @@ HOMEPAGE="http://www.kadu.net"
221 SRC_URI="http://download.kadu.im/stable/${P}.tar.bz2"
222
223 LICENSE="GPL-2"
224 -KEYWORDS="amd64 ~x86"
225 +KEYWORDS="~amd64 ~x86"
226 SLOT="0"
227 IUSE="+gadu mpd otr phonon sdk speech spell xmpp"
228 REQUIRED_USE="
229 @@ -27,10 +27,10 @@ COMMON_DEPEND="
230 >=dev-libs/injeqt-1.0.0
231 >=dev-qt/qtcore-5.2.0:5
232 >=dev-qt/qtdbus-5.2.0:5
233 + >=dev-qt/qtdeclarative-5.2.0:5
234 >=dev-qt/qtgui-5.2.0:5
235 >=dev-qt/qtmultimedia-5.2.0:5
236 >=dev-qt/qtnetwork-5.2.0:5
237 - >=dev-qt/qtquick1-5.2.0:5
238 >=dev-qt/qtscript-5.2.0:5
239 >=dev-qt/qtsql-5.2.0:5
240 >=dev-qt/qtsvg-5.2.0:5
241 @@ -73,6 +73,7 @@ RDEPEND="${COMMON_DEPEND}
242
243 PATCHES=(
244 "${FILESDIR}/${P}-qt5-compilation.patch"
245 + "${FILESDIR}/${P}-port-to-QtQuick-2.3.patch"
246 )
247
248 PLUGINS='
249 @@ -136,8 +137,8 @@ src_configure() {
250 -DBUILD_DESCRIPTION='Gentoo Linux'
251 -DCOMPILE_PLUGINS="${PLUGINS}"
252 -DNETWORK_IMPLEMENTATION="Qt"
253 - $(cmake-utils_use sdk INSTALL_SDK)
254 - $(cmake-utils_use_with spell ENCHANT)
255 + -DINSTALL_SDK=$(usex sdk)
256 + -DWITH_ENCHANT=$(usex spell)
257 )
258 unset PLUGINS
259
260
261 diff --git a/net-im/kadu/kadu-2.1.ebuild b/net-im/kadu/kadu-2.1.ebuild
262 index 4f9bb7b..8e0dc71 100644
263 --- a/net-im/kadu/kadu-2.1.ebuild
264 +++ b/net-im/kadu/kadu-2.1.ebuild
265 @@ -1,10 +1,10 @@
266 -# Copyright 1999-2015 Gentoo Foundation
267 +# Copyright 1999-2016 Gentoo Foundation
268 # Distributed under the terms of the GNU General Public License v2
269 # $Id$
270
271 EAPI="5"
272
273 -inherit base cmake-utils flag-o-matic
274 +inherit cmake-utils flag-o-matic
275
276 MY_P="${P/_/-}"
277
278
279 diff --git a/net-im/kadu/kadu-2.1.ebuild b/net-im/kadu/kadu-3.0.ebuild
280 similarity index 92%
281 copy from net-im/kadu/kadu-2.1.ebuild
282 copy to net-im/kadu/kadu-3.0.ebuild
283 index 4f9bb7b..f706548 100644
284 --- a/net-im/kadu/kadu-2.1.ebuild
285 +++ b/net-im/kadu/kadu-3.0.ebuild
286 @@ -2,9 +2,9 @@
287 # Distributed under the terms of the GNU General Public License v2
288 # $Id$
289
290 -EAPI="5"
291 +EAPI="6"
292
293 -inherit base cmake-utils flag-o-matic
294 +inherit cmake-utils flag-o-matic
295
296 MY_P="${P/_/-}"
297
298 @@ -13,7 +13,7 @@ HOMEPAGE="http://www.kadu.net"
299 SRC_URI="http://download.kadu.im/stable/${P}.tar.bz2"
300
301 LICENSE="GPL-2"
302 -KEYWORDS="amd64 ~x86"
303 +KEYWORDS="~amd64 ~x86"
304 SLOT="0"
305 IUSE="+gadu mpd otr phonon sdk speech spell xmpp"
306 REQUIRED_USE="
307 @@ -30,7 +30,6 @@ COMMON_DEPEND="
308 >=dev-qt/qtgui-5.2.0:5
309 >=dev-qt/qtmultimedia-5.2.0:5
310 >=dev-qt/qtnetwork-5.2.0:5
311 - >=dev-qt/qtquick1-5.2.0:5
312 >=dev-qt/qtscript-5.2.0:5
313 >=dev-qt/qtsql-5.2.0:5
314 >=dev-qt/qtsvg-5.2.0:5
315 @@ -58,6 +57,7 @@ COMMON_DEPEND="
316 spell? ( app-text/enchant )
317 xmpp? (
318 net-dns/libidn
319 + >=net-libs/qxmpp-0.8.3[qt5]
320 sys-libs/zlib
321 )
322 "
323 @@ -84,8 +84,8 @@ autostatus
324 cenzor
325 chat_notify
326 config_wizard
327 -desktop_docking
328 docking
329 +docking_notify
330 emoticons
331 encryption_ng
332 encryption_ng_simlite
333 @@ -103,8 +103,6 @@ last_seen
334 mediaplayer
335 mprisplayer_mediaplayer
336 pcspeaker
337 -qt4_docking
338 -qt4_docking_notify
339 screenshot simpleview
340 single_window
341 sms
342 @@ -136,8 +134,8 @@ src_configure() {
343 -DBUILD_DESCRIPTION='Gentoo Linux'
344 -DCOMPILE_PLUGINS="${PLUGINS}"
345 -DNETWORK_IMPLEMENTATION="Qt"
346 - $(cmake-utils_use sdk INSTALL_SDK)
347 - $(cmake-utils_use_with spell ENCHANT)
348 + -DINSTALL_SDK=$(usex sdk)
349 + -DWITH_ENCHANT=$(usex spell)
350 )
351 unset PLUGINS
352
353
354 diff --git a/profiles/package.mask b/profiles/package.mask
355 index 497e0dc..38961f7 100644
356 --- a/profiles/package.mask
357 +++ b/profiles/package.mask
358 @@ -30,6 +30,10 @@
359
360 #--- END OF EXAMPLES ---
361
362 +# Maciej Mrozowski <reavertm@g.o> (3 May 2016)
363 +# Mask until >=net-libs/qxmpp-0.8.3 is provided with qt5 support.
364 +=net-im/kadu-3.0
365 +
366 # Lars Wendler <polynomial-c@g.o> (2 May 2016)
367 # Broken reverse deps. At least one header file has been moved around.
368 >=media-gfx/imagemagick-7.0.1.0
Report Message
Find on MARC Find on Google Groups