1 |
commit: 5abb45a29171dc8ad15e174acd5e0ab2c8c111bf |
2 |
Author: Johannes Huber <johu <AT> gentoo <DOT> org> |
3 |
AuthorDate: Thu Aug 27 12:47:44 2015 +0000 |
4 |
Commit: Johannes Huber <johu <AT> gentoo <DOT> org> |
5 |
CommitDate: Thu Aug 27 12:47:44 2015 +0000 |
6 |
URL: https://gitweb.gentoo.org/proj/kde.git/commit/?id=5abb45a2 |
7 |
|
8 |
net-libs/accounts-qt: Remove package |
9 |
|
10 |
Moved to gentoo main repo. |
11 |
|
12 |
net-libs/accounts-qt/accounts-qt-1.13.ebuild | 44 ---- |
13 |
.../files/accounts-qt-1.11-to-1.13.patch | 289 --------------------- |
14 |
net-libs/accounts-qt/metadata.xml | 5 - |
15 |
3 files changed, 338 deletions(-) |
16 |
|
17 |
diff --git a/net-libs/accounts-qt/accounts-qt-1.13.ebuild b/net-libs/accounts-qt/accounts-qt-1.13.ebuild |
18 |
deleted file mode 100644 |
19 |
index f5bfac9..0000000 |
20 |
--- a/net-libs/accounts-qt/accounts-qt-1.13.ebuild |
21 |
+++ /dev/null |
22 |
@@ -1,44 +0,0 @@ |
23 |
-# Copyright 1999-2015 Gentoo Foundation |
24 |
-# Distributed under the terms of the GNU General Public License v2 |
25 |
-# $Id$ |
26 |
- |
27 |
-EAPI=5 |
28 |
- |
29 |
-inherit qmake-utils |
30 |
- |
31 |
-DESCRIPTION="Qt5 bindings for libaccounts-glib" |
32 |
-HOMEPAGE="https://01.org/gsso/" |
33 |
-SRC_URI="http://dev.gentoo.org/~kensington/distfiles/${P}.tar.bz2" |
34 |
- |
35 |
-LICENSE="LGPL-2.1" |
36 |
-SLOT="0" |
37 |
-KEYWORDS="~amd64 ~x86" |
38 |
-IUSE="doc test" |
39 |
- |
40 |
-# killed by stack smashing detector |
41 |
-RESTRICT="test" |
42 |
- |
43 |
-RDEPEND=" |
44 |
- net-libs/libaccounts-glib |
45 |
- dev-libs/glib:2 |
46 |
- dev-qt/qtcore:5 |
47 |
- dev-qt/qtxml:5 |
48 |
-" |
49 |
-DEPEND="${RDEPEND} |
50 |
- doc? ( app-doc/doxygen ) |
51 |
- test? ( dev-qt/qttest:5 ) |
52 |
-" |
53 |
- |
54 |
-src_prepare() { |
55 |
- sed -e "s|share/doc/\$\${PROJECT_NAME}|share/doc/${PF}|" -i doc/doc.pri || die |
56 |
- use doc || sed -e "/include( doc\/doc.pri )/d" -i ${PN}.pro || die |
57 |
- use test || sed -i -e '/^SUBDIRS/s/tests//' accounts-qt.pro || die "couldn't disable tests" |
58 |
-} |
59 |
- |
60 |
-src_configure() { |
61 |
- eqmake5 |
62 |
-} |
63 |
- |
64 |
-src_install() { |
65 |
- emake INSTALL_ROOT="${D}" install |
66 |
-} |
67 |
|
68 |
diff --git a/net-libs/accounts-qt/files/accounts-qt-1.11-to-1.13.patch b/net-libs/accounts-qt/files/accounts-qt-1.11-to-1.13.patch |
69 |
deleted file mode 100644 |
70 |
index 28b7db1..0000000 |
71 |
--- a/net-libs/accounts-qt/files/accounts-qt-1.11-to-1.13.patch |
72 |
+++ /dev/null |
73 |
@@ -1,289 +0,0 @@ |
74 |
-diff --git a/Accounts/Accounts.pro b/Accounts/Accounts.pro |
75 |
-index b5e77fc..8b3d0d6 100644 |
76 |
---- a/Accounts/Accounts.pro |
77 |
-+++ b/Accounts/Accounts.pro |
78 |
-@@ -44,8 +44,10 @@ QT -= gui |
79 |
- |
80 |
- greaterThan(QT_MAJOR_VERSION, 4) { |
81 |
- TARGET = accounts-qt5 |
82 |
-+ CMAKE_BASENAME = AccountsQt5 |
83 |
- } else { |
84 |
- TARGET = accounts-qt |
85 |
-+ CMAKE_BASENAME = AccountsQt |
86 |
- } |
87 |
- |
88 |
- PKGCONFIG += \ |
89 |
-@@ -65,10 +67,12 @@ pkgconfig.files = $${TARGET}.pc |
90 |
- include($${TOP_SRC_DIR}/common-pkgconfig.pri) |
91 |
- INSTALLS += pkgconfig |
92 |
- |
93 |
--QMAKE_SUBSTITUTES += AccountsQtConfig.cmake.in \ |
94 |
-- AccountsQtConfigVersion.cmake.in |
95 |
--cmake_modules.files = AccountsQtConfig.cmake \ |
96 |
-- AccountsQtConfigVersion.cmake |
97 |
--cmake_modules.path = $${CMAKE_CONFIG_PATH} |
98 |
-+QMAKE_SUBSTITUTES += \ |
99 |
-+ $${CMAKE_BASENAME}Config.cmake.in \ |
100 |
-+ $${CMAKE_BASENAME}ConfigVersion.cmake.in |
101 |
-+cmake_modules.files = \ |
102 |
-+ $${CMAKE_BASENAME}Config.cmake \ |
103 |
-+ $${CMAKE_BASENAME}ConfigVersion.cmake |
104 |
-+cmake_modules.path = $${CMAKE_CONFIG_PATH}/$${CMAKE_BASENAME} |
105 |
- |
106 |
--INSTALLS += cmake_modules |
107 |
-\ No newline at end of file |
108 |
-+INSTALLS += cmake_modules |
109 |
-diff --git a/Accounts/AccountsQt5Config.cmake.in b/Accounts/AccountsQt5Config.cmake.in |
110 |
-new file mode 100644 |
111 |
-index 0000000..55a8964 |
112 |
---- /dev/null |
113 |
-+++ b/Accounts/AccountsQt5Config.cmake.in |
114 |
-@@ -0,0 +1,5 @@ |
115 |
-+# ACCOUNTSQT_INCLUDE_DIRS - The libaccounts-qt include directories |
116 |
-+# ACCOUNTSQT_LIBRARIES - The libraries needed to use libaccounts-qt |
117 |
-+ |
118 |
-+set(ACCOUNTSQT_LIBRARIES $${INSTALL_LIBDIR}/lib$${TARGET}.so) |
119 |
-+set(ACCOUNTSQT_INCLUDE_DIRS $${INSTALL_PREFIX}/include/$${TARGET}/) |
120 |
-\ No newline at end of file |
121 |
-diff --git a/Accounts/AccountsQt5ConfigVersion.cmake.in b/Accounts/AccountsQt5ConfigVersion.cmake.in |
122 |
-new file mode 100644 |
123 |
-index 0000000..d086b47 |
124 |
---- /dev/null |
125 |
-+++ b/Accounts/AccountsQt5ConfigVersion.cmake.in |
126 |
-@@ -0,0 +1,10 @@ |
127 |
-+set(PACKAGE_VERSION $${PROJECT_VERSION}) |
128 |
-+ |
129 |
-+if("${PACKAGE_VERSION}" VERSION_LESS "${PACKAGE_FIND_VERSION}" ) |
130 |
-+ set(PACKAGE_VERSION_COMPATIBLE FALSE) |
131 |
-+else("${PACKAGE_VERSION}" VERSION_LESS "${PACKAGE_FIND_VERSION}" ) |
132 |
-+ set(PACKAGE_VERSION_COMPATIBLE TRUE) |
133 |
-+ if( "${PACKAGE_FIND_VERSION}" STREQUAL "${PACKAGE_VERSION}") |
134 |
-+ set(PACKAGE_VERSION_EXACT TRUE) |
135 |
-+ endif( "${PACKAGE_FIND_VERSION}" STREQUAL "${PACKAGE_VERSION}") |
136 |
-+endif("${PACKAGE_VERSION}" VERSION_LESS "${PACKAGE_FIND_VERSION}" ) |
137 |
-\ No newline at end of file |
138 |
-diff --git a/Accounts/manager.cpp b/Accounts/manager.cpp |
139 |
-index fd1821a..2eb077f 100644 |
140 |
---- a/Accounts/manager.cpp |
141 |
-+++ b/Accounts/manager.cpp |
142 |
-@@ -187,6 +187,31 @@ Manager::Manager(const QString &serviceType, QObject *parent): |
143 |
- } |
144 |
- |
145 |
- /*! |
146 |
-+ * Constructor, allowing option flags to be specified. |
147 |
-+ * Users should check for lastError() to check if manager construction |
148 |
-+ * was fully succesful. |
149 |
-+ */ |
150 |
-+Manager::Manager(Options options, QObject *parent): |
151 |
-+ QObject(parent), |
152 |
-+ d(new Private) |
153 |
-+{ |
154 |
-+ bool disableNotifications = options.testFlag(DisableNotifications); |
155 |
-+ |
156 |
-+ GError *error = NULL; |
157 |
-+ AgManager *manager = |
158 |
-+ (AgManager *)g_initable_new(AG_TYPE_MANAGER, NULL, &error, |
159 |
-+ "use-dbus", !disableNotifications, |
160 |
-+ NULL); |
161 |
-+ if (Q_LIKELY(manager)) { |
162 |
-+ d->init(this, manager); |
163 |
-+ } else { |
164 |
-+ qWarning() << "Manager could not be created." << error->message; |
165 |
-+ d->lastError = Error(error); |
166 |
-+ g_error_free(error); |
167 |
-+ } |
168 |
-+} |
169 |
-+ |
170 |
-+/*! |
171 |
- * Destructor. |
172 |
- */ |
173 |
- Manager::~Manager() |
174 |
-@@ -501,6 +526,23 @@ bool Manager::abortOnTimeout() const |
175 |
- } |
176 |
- |
177 |
- /*! |
178 |
-+ * @return Configuration options for this object. |
179 |
-+ */ |
180 |
-+Manager::Options Manager::options() const |
181 |
-+{ |
182 |
-+ bool useDBus = true; |
183 |
-+ g_object_get(d->m_manager, |
184 |
-+ "use-dbus", &useDBus, |
185 |
-+ NULL); |
186 |
-+ |
187 |
-+ Options opts; |
188 |
-+ if (!useDBus) { |
189 |
-+ opts |= DisableNotifications; |
190 |
-+ } |
191 |
-+ return opts; |
192 |
-+} |
193 |
-+ |
194 |
-+/*! |
195 |
- * Gets the last error. Not all operations set/reset the error; see the |
196 |
- * individual methods' documentation to see if they set the last error or |
197 |
- * not. Call this method right after an account operation |
198 |
-diff --git a/Accounts/manager.h b/Accounts/manager.h |
199 |
-index d32c514..c88be2b 100644 |
200 |
---- a/Accounts/manager.h |
201 |
-+++ b/Accounts/manager.h |
202 |
-@@ -53,8 +53,18 @@ class ACCOUNTS_EXPORT Manager: public QObject |
203 |
- Q_OBJECT |
204 |
- |
205 |
- public: |
206 |
-+ /*! |
207 |
-+ * @enum Option |
208 |
-+ * @brief Specifies options for the object. |
209 |
-+ */ |
210 |
-+ enum Option { |
211 |
-+ DisableNotifications = 0x1, /**< Disable all inter-process notifications */ |
212 |
-+ }; |
213 |
-+ Q_DECLARE_FLAGS(Options, Option) |
214 |
-+ |
215 |
- Manager(QObject *parent = 0); |
216 |
- Manager(const QString &serviceType, QObject *parent = 0); |
217 |
-+ Manager(Options options, QObject *parent = 0); |
218 |
- ~Manager(); |
219 |
- |
220 |
- Account *account(const AccountId &id) const; |
221 |
-@@ -83,6 +93,8 @@ public: |
222 |
- void setAbortOnTimeout(bool abort); |
223 |
- bool abortOnTimeout() const; |
224 |
- |
225 |
-+ Options options() const; |
226 |
-+ |
227 |
- Error lastError() const; |
228 |
- |
229 |
- Q_SIGNALS: |
230 |
-@@ -105,4 +117,6 @@ private: |
231 |
- |
232 |
- } //namespace Accounts |
233 |
- |
234 |
-+Q_DECLARE_OPERATORS_FOR_FLAGS(Accounts::Manager::Options) |
235 |
-+ |
236 |
- #endif // ACCOUNTS_MANAGER_H |
237 |
-diff --git a/Accounts/provider.cpp b/Accounts/provider.cpp |
238 |
-index 7e2941d..93a24c5 100644 |
239 |
---- a/Accounts/provider.cpp |
240 |
-+++ b/Accounts/provider.cpp |
241 |
-@@ -3,7 +3,7 @@ |
242 |
- * This file is part of libaccounts-qt |
243 |
- * |
244 |
- * Copyright (C) 2009-2011 Nokia Corporation. |
245 |
-- * Copyright (C) 2012 Canonical Ltd. |
246 |
-+ * Copyright (C) 2012-2014 Canonical Ltd. |
247 |
- * |
248 |
- * Contact: Alberto Mardegan <alberto.mardegan@×××××××××.com> |
249 |
- * |
250 |
-@@ -82,8 +82,10 @@ Provider &Provider::operator=(const Provider &other) |
251 |
- |
252 |
- Provider::~Provider() |
253 |
- { |
254 |
-- ag_provider_unref(m_provider); |
255 |
-- m_provider = 0; |
256 |
-+ if (m_provider != 0) { |
257 |
-+ ag_provider_unref(m_provider); |
258 |
-+ m_provider = 0; |
259 |
-+ } |
260 |
- } |
261 |
- |
262 |
- /*! |
263 |
-@@ -153,6 +155,15 @@ QString Provider::iconName() const |
264 |
- } |
265 |
- |
266 |
- /*! |
267 |
-+ * @return A regular expression pattern which matches all the internet domains |
268 |
-+ * in which this type of account can be used. |
269 |
-+ */ |
270 |
-+QString Provider::domainsRegExp() const |
271 |
-+{ |
272 |
-+ return UTF8(ag_provider_get_domains_regex(m_provider)); |
273 |
-+} |
274 |
-+ |
275 |
-+/*! |
276 |
- * @return Whether the provider supports creating one account at most. |
277 |
- */ |
278 |
- bool Provider::isSingleAccount() const |
279 |
-diff --git a/Accounts/provider.h b/Accounts/provider.h |
280 |
-index 27d923d..7c04c3f 100644 |
281 |
---- a/Accounts/provider.h |
282 |
-+++ b/Accounts/provider.h |
283 |
-@@ -3,7 +3,7 @@ |
284 |
- * This file is part of libaccounts-qt |
285 |
- * |
286 |
- * Copyright (C) 2009-2011 Nokia Corporation. |
287 |
-- * Copyright (C) 2012 Canonical Ltd. |
288 |
-+ * Copyright (C) 2012-2014 Canonical Ltd. |
289 |
- * |
290 |
- * Contact: Alberto Mardegan <alberto.mardegan@×××××××××.com> |
291 |
- * |
292 |
-@@ -61,6 +61,7 @@ public: |
293 |
- QString pluginName() const; |
294 |
- QString trCatalog() const; |
295 |
- QString iconName() const; |
296 |
-+ QString domainsRegExp() const; |
297 |
- bool isSingleAccount() const; |
298 |
- const QDomDocument domDocument() const; |
299 |
- |
300 |
-diff --git a/common-project-config.pri b/common-project-config.pri |
301 |
-index c252e81..de6f0ae 100644 |
302 |
---- a/common-project-config.pri |
303 |
-+++ b/common-project-config.pri |
304 |
-@@ -62,7 +62,7 @@ isEmpty( LIBDIR ) { |
305 |
- } |
306 |
- |
307 |
- isEmpty ( CMAKE_CONFIG_PATH ) { |
308 |
-- CMAKE_CONFIG_PATH = $${INSTALL_LIBDIR}/cmake/AccountsQt/ |
309 |
-+ CMAKE_CONFIG_PATH = $${INSTALL_LIBDIR}/cmake |
310 |
- message("====") |
311 |
- message("==== NOTE: To override the cmake module installation path run: `qmake CMAKE_CONFIG_PATH=/custom/path'") |
312 |
- message("==== (current installation path is `$${CMAKE_CONFIG_PATH}')") |
313 |
-diff --git a/common-vars.pri b/common-vars.pri |
314 |
-index 8b2d740..07ffb59 100644 |
315 |
---- a/common-vars.pri |
316 |
-+++ b/common-vars.pri |
317 |
-@@ -13,7 +13,7 @@ PROJECT_NAME = accounts-qt |
318 |
- #----------------------------------------------------------------------------- |
319 |
- # Project version |
320 |
- #----------------------------------------------------------------------------- |
321 |
--PROJECT_VERSION = 1.11 |
322 |
-+PROJECT_VERSION = 1.13 |
323 |
- |
324 |
- #----------------------------------------------------------------------------- |
325 |
- # Library version |
326 |
-diff --git a/tests/MyProvider.provider b/tests/MyProvider.provider |
327 |
-index 1f1dd5c..3ffbbb5 100644 |
328 |
---- a/tests/MyProvider.provider |
329 |
-+++ b/tests/MyProvider.provider |
330 |
-@@ -5,6 +5,7 @@ |
331 |
- <description>fast & furious</description> |
332 |
- <translations>accounts</translations> |
333 |
- <plugin>generic-oauth</plugin> |
334 |
-+ <domains>.*example.net</domains> |
335 |
- <single-account>true</single-account> |
336 |
- |
337 |
- <template> |
338 |
-diff --git a/tests/accountstest.cpp b/tests/accountstest.cpp |
339 |
-index b51bcab..beaa006 100644 |
340 |
---- a/tests/accountstest.cpp |
341 |
-+++ b/tests/accountstest.cpp |
342 |
-@@ -72,6 +72,12 @@ void AccountsTest::managerTestCase() |
343 |
- mgr->setTimeout(123); |
344 |
- QCOMPARE(mgr->timeout(), quint32(123)); |
345 |
- |
346 |
-+ QCOMPARE(mgr->options().testFlag(Manager::DisableNotifications), false); |
347 |
-+ |
348 |
-+ delete mgr; |
349 |
-+ |
350 |
-+ mgr = new Manager(Manager::DisableNotifications); |
351 |
-+ QCOMPARE(mgr->options().testFlag(Manager::DisableNotifications), true); |
352 |
- delete mgr; |
353 |
- } |
354 |
- |
355 |
-@@ -210,6 +216,7 @@ void AccountsTest::providerTestCase() |
356 |
- QCOMPARE(provider.description(), QString("fast & furious")); |
357 |
- QCOMPARE(provider.trCatalog(), QString("accounts")); |
358 |
- QCOMPARE(provider.pluginName(), QString("generic-oauth")); |
359 |
-+ QCOMPARE(provider.domainsRegExp(), QString(".*example.net")); |
360 |
- QCOMPARE(provider.isSingleAccount(), true); |
361 |
- |
362 |
- QDomDocument dom = provider.domDocument(); |
363 |
|
364 |
diff --git a/net-libs/accounts-qt/metadata.xml b/net-libs/accounts-qt/metadata.xml |
365 |
deleted file mode 100644 |
366 |
index a23f444..0000000 |
367 |
--- a/net-libs/accounts-qt/metadata.xml |
368 |
+++ /dev/null |
369 |
@@ -1,5 +0,0 @@ |
370 |
-<?xml version="1.0" encoding="UTF-8"?> |
371 |
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> |
372 |
-<pkgmetadata> |
373 |
- <herd>kde</herd> |
374 |
-</pkgmetadata> |