[gentoo-commits] repo/gentoo:master commit in: net-libs/accounts-qt/files/
commit: 4709c832f0e7a497e2490c70bab07b2b5ae95421
Author: Michael Mair-Keimberger levelnine at>
AuthorDate: Thu Apr 18 18:13:09 2024 +
Commit: Conrad Kostecki gentoo org>
CommitDate: Thu Apr 18 19:31:47 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4709c832
net-libs/accounts-qt: remove unused patches
Signed-off-by: Michael Mair-Keimberger levelnine.at>
Signed-off-by: Conrad Kostecki gentoo.org>
...001-Port-away-from-deprecated-QList-toSet.patch | 92 --
net-libs/accounts-qt/files/0002-Add-Qt6-CI.patch | 137 -
.../0003-Use-undeprecated-Account-value.patch | 28 -
...0004-Don-t-access-a-QString-out-of-bounds.patch | 42 ---
...dsystem-to-include-correct-Qt-Major-versi.patch | 118 --
5 files changed, 417 deletions(-)
diff --git
a/net-libs/accounts-qt/files/0001-Port-away-from-deprecated-QList-toSet.patch
b/net-libs/accounts-qt/files/0001-Port-away-from-deprecated-QList-toSet.patch
deleted file mode 100644
index 190178cc3030..
---
a/net-libs/accounts-qt/files/0001-Port-away-from-deprecated-QList-toSet.patch
+++ /dev/null
@@ -1,92 +0,0 @@
-https://gitlab.com/accounts-sso/libaccounts-qt/-/merge_requests/21
-
-From 3107822e036300684c2bdf587838a110eea8ba30 Mon Sep 17 00:00:00 2001
-From: Nicolas Fella
-Date: Mon, 1 Aug 2022 20:35:03 +0200
-Subject: [PATCH 1/5] Port away from deprecated QList::toSet
-
- tests/tst_libaccounts.cpp | 44 +--
- 1 file changed, 33 insertions(+), 11 deletions(-)
-
-diff --git a/tests/tst_libaccounts.cpp b/tests/tst_libaccounts.cpp
-index 471e3d5..efede91 100644
a/tests/tst_libaccounts.cpp
-+++ b/tests/tst_libaccounts.cpp
-@@ -326,11 +326,11 @@ void AccountsTest::testService()
- QCOMPARE(service.description(), QStringLiteral("Test description"));
- QCOMPARE(service.iconName(), QString("general_myservice"));
- QCOMPARE(service.trCatalog(), QString("accounts"));
--QStringList tags;
-+QSet tags;
- tags << "email" << "e-mail";
--QCOMPARE(service.tags(), tags.toSet());
-+QCOMPARE(service.tags(), tags);
- // Called twice, because the second time it returns a cached result
--QCOMPARE(service.tags(), tags.toSet());
-+QCOMPARE(service.tags(), tags);
- QVERIFY(service.hasTag("email"));
- QVERIFY(!service.hasTag("chat"));
-
-@@ -687,10 +687,15 @@ void AccountsTest::testAccountService()
- spyChanged.clear();
- spyEnabled.clear();
-
--QStringList expectedChanges;
-+QSet expectedChanges;
- expectedChanges << "parameters/server";
- expectedChanges << "enabled";
--QCOMPARE(m_accountServiceChangedFields.toSet(), expectedChanges.toSet());
-+#if QT_VERSION >= QT_VERSION_CHECK(5, 14, 0)
-+QSet changedFields(m_accountServiceChangedFields.begin(),
m_accountServiceChangedFields.end());
-+#else
-+QSet changedFields = m_accountServiceChangedFields.toSet();
-+#endif
-+QCOMPARE(changedFields, expectedChanges);
-
- QCOMPARE(accountService->value("server").toString(),
- UTF8("www.example.com"));
-@@ -727,17 +732,34 @@ void AccountsTest::testAccountService()
-
-
- /* test some more APIs */
--QStringList expectedList;
-+QSet expectedList;
- expectedList << "server" << "fallback-conference-server" <<
- "port" << "old-ssl";
--QCOMPARE(accountService->childKeys().toSet(), expectedList.toSet());
--QCOMPARE(accountService->childGroups().toSet(), QSet());
-+#if QT_VERSION >= QT_VERSION_CHECK(5, 14, 0)
-+QStringList childKeysList = accountService->childKeys();
-+QSet childKeys(childKeysList.begin(), childKeysList.end());
-+
-+QStringList childGroupsList = accountService->childGroups();
-+QSet childGroups(childGroupsList.begin(), childGroupsList.end());
-+#else
-+QSet childKeys = accountService->childKeys().toSet();
-+QSet childGroups = accountService->childGroups().toSet();
-+#endif
-+
-+QCOMPARE(childKeys, expectedList);
-+QCOMPARE(childGroups, QSet());
- QCOMPARE(accountService->contains("port"), true);
- accountService->endGroup();
-
--expectedList.clear();
--expectedList << "parameters";
--QCOMPARE(accountService->childGroups().toSet(), expectedList.toSet());
-+QSet expectedList2;
-+expectedList2 << "parameters";
-+#if QT_VERSION >= QT_VERSION_CHECK(5, 14, 0)
-+QStringList childGroupsList2 = accountService->childGroups();
-+QSet childGroups2(childGroupsList2.begin(),
childGroupsList2.end());
-+#else
-+QSet childGroups2 = accountService->childGroups().toSet();
-+#endif
-+QCOMPARE(childGroups2, expectedList2);
-
- /* Remove one key */
- accountService->remove("parameters/port");
---
-2.43.0
-
diff --git a/net-libs/accounts-qt/files/0002-Add-Qt6-CI.patch
b/net-libs/accounts-qt/files/0002-Add-Qt6-CI.patch
deleted file mode 100644
index f8383b5f8a43..
---
[gentoo-commits] repo/gentoo:master commit in: net-libs/accounts-qt/files/
commit: 403dec83ca3061ab002322c94666e8d698b08659
Author: Michael Mair-Keimberger (asterix) gmail
com>
AuthorDate: Tue Aug 8 16:16:45 2017 +
Commit: Andreas Sturmlechner gentoo org>
CommitDate: Tue Aug 8 17:15:26 2017 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=403dec83
net-libs/accounts-qt: remove unused patch
Closes: https://github.com/gentoo/gentoo/pull/5358
.../files/accounts-qt-1.11-to-1.13.patch | 289 -
1 file changed, 289 deletions(-)
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
deleted file mode 100644
index 28b7db12464..000
--- a/net-libs/accounts-qt/files/accounts-qt-1.11-to-1.13.patch
+++ /dev/null
@@ -1,289 +0,0 @@
-diff --git a/Accounts/Accounts.pro b/Accounts/Accounts.pro
-index b5e77fc..8b3d0d6 100644
a/Accounts/Accounts.pro
-+++ b/Accounts/Accounts.pro
-@@ -44,8 +44,10 @@ QT -= gui
-
- greaterThan(QT_MAJOR_VERSION, 4) {
- TARGET = accounts-qt5
-+CMAKE_BASENAME = AccountsQt5
- } else {
- TARGET = accounts-qt
-+CMAKE_BASENAME = AccountsQt
- }
-
- PKGCONFIG += \
-@@ -65,10 +67,12 @@ pkgconfig.files = $${TARGET}.pc
- include($${TOP_SRC_DIR}/common-pkgconfig.pri)
- INSTALLS += pkgconfig
-
--QMAKE_SUBSTITUTES += AccountsQtConfig.cmake.in \
--AccountsQtConfigVersion.cmake.in
--cmake_modules.files = AccountsQtConfig.cmake \
--AccountsQtConfigVersion.cmake
--cmake_modules.path = $${CMAKE_CONFIG_PATH}
-+QMAKE_SUBSTITUTES += \
-+$${CMAKE_BASENAME}Config.cmake.in \
-+$${CMAKE_BASENAME}ConfigVersion.cmake.in
-+cmake_modules.files = \
-+$${CMAKE_BASENAME}Config.cmake \
-+$${CMAKE_BASENAME}ConfigVersion.cmake
-+cmake_modules.path = $${CMAKE_CONFIG_PATH}/$${CMAKE_BASENAME}
-
--INSTALLS += cmake_modules
-\ No newline at end of file
-+INSTALLS += cmake_modules
-diff --git a/Accounts/AccountsQt5Config.cmake.in
b/Accounts/AccountsQt5Config.cmake.in
-new file mode 100644
-index 000..55a8964
/dev/null
-+++ b/Accounts/AccountsQt5Config.cmake.in
-@@ -0,0 +1,5 @@
-+# ACCOUNTSQT_INCLUDE_DIRS - The libaccounts-qt include directories
-+# ACCOUNTSQT_LIBRARIES - The libraries needed to use libaccounts-qt
-+
-+set(ACCOUNTSQT_LIBRARIES $${INSTALL_LIBDIR}/lib$${TARGET}.so)
-+set(ACCOUNTSQT_INCLUDE_DIRS $${INSTALL_PREFIX}/include/$${TARGET}/)
-\ No newline at end of file
-diff --git a/Accounts/AccountsQt5ConfigVersion.cmake.in
b/Accounts/AccountsQt5ConfigVersion.cmake.in
-new file mode 100644
-index 000..d086b47
/dev/null
-+++ b/Accounts/AccountsQt5ConfigVersion.cmake.in
-@@ -0,0 +1,10 @@
-+set(PACKAGE_VERSION $${PROJECT_VERSION})
-+
-+if("${PACKAGE_VERSION}" VERSION_LESS "${PACKAGE_FIND_VERSION}" )
-+ set(PACKAGE_VERSION_COMPATIBLE FALSE)
-+else("${PACKAGE_VERSION}" VERSION_LESS "${PACKAGE_FIND_VERSION}" )
-+ set(PACKAGE_VERSION_COMPATIBLE TRUE)
-+ if( "${PACKAGE_FIND_VERSION}" STREQUAL "${PACKAGE_VERSION}")
-+ set(PACKAGE_VERSION_EXACT TRUE)
-+ endif( "${PACKAGE_FIND_VERSION}" STREQUAL "${PACKAGE_VERSION}")
-+endif("${PACKAGE_VERSION}" VERSION_LESS "${PACKAGE_FIND_VERSION}" )
-\ No newline at end of file
-diff --git a/Accounts/manager.cpp b/Accounts/manager.cpp
-index fd1821a..2eb077f 100644
a/Accounts/manager.cpp
-+++ b/Accounts/manager.cpp
-@@ -187,6 +187,31 @@ Manager::Manager(const QString , QObject
*parent):
- }
-
- /*!
-+ * Constructor, allowing option flags to be specified.
-+ * Users should check for lastError() to check if manager construction
-+ * was fully succesful.
-+ */
-+Manager::Manager(Options options, QObject *parent):
-+QObject(parent),
-+d(new Private)
-+{
-+bool disableNotifications = options.testFlag(DisableNotifications);
-+
-+GError *error = NULL;
-+AgManager *manager =
-+(AgManager *)g_initable_new(AG_TYPE_MANAGER, NULL, ,
-+"use-dbus", !disableNotifications,
-+NULL);
-+if (Q_LIKELY(manager)) {
-+d->init(this, manager);
-+} else {
-+qWarning() << "Manager could not be created." << error->message;
-+d->lastError = Error(error);
-+g_error_free(error);
-+}
-+}
-+
-+/*!
- * Destructor.
- */
- Manager::~Manager()
-@@ -501,6 +526,23 @@ bool Manager::abortOnTimeout() const
- }
-
- /*!
-+ * @return Configuration options for this object.
-+ */
-+Manager::Options Manager::options() const
-+{
-+bool useDBus = true;
-+g_object_get(d->m_manager,
-+ "use-dbus", ,
-+ NULL);
-+
-+Options opts;
-+if (!useDBus) {
-+opts |= DisableNotifications;
-+}
-+return opts;
-+}
-+
-+/*!
- * Gets the last error. Not all operations set/reset the error; see the
- * individual methods' documentation to see if they set the last error or
- * not. Call this method right after an account operation
-diff --git a/Accounts/manager.h b/Accounts/manager.h
-index
