* [gentoo-commits] repo/gentoo:master commit in: net-libs/accounts-qt/files/
@ 2017-08-08 17:15 Andreas Sturmlechner
0 siblings, 0 replies; 2+ messages in thread
From: Andreas Sturmlechner @ 2017-08-08 17:15 UTC (permalink / raw
To: gentoo-commits
commit: 403dec83ca3061ab002322c94666e8d698b08659
Author: Michael Mair-Keimberger (asterix) <m.mairkeimberger <AT> gmail <DOT> com>
AuthorDate: Tue Aug 8 16:16:45 2017 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Tue Aug 8 17:15:26 2017 +0000
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..00000000000
--- 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 0000000..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 0000000..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 &serviceType, 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, &error,
-+ "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", &useDBus,
-+ 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 d32c514..c88be2b 100644
---- a/Accounts/manager.h
-+++ b/Accounts/manager.h
-@@ -53,8 +53,18 @@ class ACCOUNTS_EXPORT Manager: public QObject
- Q_OBJECT
-
- public:
-+ /*!
-+ * @enum Option
-+ * @brief Specifies options for the object.
-+ */
-+ enum Option {
-+ DisableNotifications = 0x1, /**< Disable all inter-process notifications */
-+ };
-+ Q_DECLARE_FLAGS(Options, Option)
-+
- Manager(QObject *parent = 0);
- Manager(const QString &serviceType, QObject *parent = 0);
-+ Manager(Options options, QObject *parent = 0);
- ~Manager();
-
- Account *account(const AccountId &id) const;
-@@ -83,6 +93,8 @@ public:
- void setAbortOnTimeout(bool abort);
- bool abortOnTimeout() const;
-
-+ Options options() const;
-+
- Error lastError() const;
-
- Q_SIGNALS:
-@@ -105,4 +117,6 @@ private:
-
- } //namespace Accounts
-
-+Q_DECLARE_OPERATORS_FOR_FLAGS(Accounts::Manager::Options)
-+
- #endif // ACCOUNTS_MANAGER_H
-diff --git a/Accounts/provider.cpp b/Accounts/provider.cpp
-index 7e2941d..93a24c5 100644
---- a/Accounts/provider.cpp
-+++ b/Accounts/provider.cpp
-@@ -3,7 +3,7 @@
- * This file is part of libaccounts-qt
- *
- * Copyright (C) 2009-2011 Nokia Corporation.
-- * Copyright (C) 2012 Canonical Ltd.
-+ * Copyright (C) 2012-2014 Canonical Ltd.
- *
- * Contact: Alberto Mardegan <alberto.mardegan@canonical.com>
- *
-@@ -82,8 +82,10 @@ Provider &Provider::operator=(const Provider &other)
-
- Provider::~Provider()
- {
-- ag_provider_unref(m_provider);
-- m_provider = 0;
-+ if (m_provider != 0) {
-+ ag_provider_unref(m_provider);
-+ m_provider = 0;
-+ }
- }
-
- /*!
-@@ -153,6 +155,15 @@ QString Provider::iconName() const
- }
-
- /*!
-+ * @return A regular expression pattern which matches all the internet domains
-+ * in which this type of account can be used.
-+ */
-+QString Provider::domainsRegExp() const
-+{
-+ return UTF8(ag_provider_get_domains_regex(m_provider));
-+}
-+
-+/*!
- * @return Whether the provider supports creating one account at most.
- */
- bool Provider::isSingleAccount() const
-diff --git a/Accounts/provider.h b/Accounts/provider.h
-index 27d923d..7c04c3f 100644
---- a/Accounts/provider.h
-+++ b/Accounts/provider.h
-@@ -3,7 +3,7 @@
- * This file is part of libaccounts-qt
- *
- * Copyright (C) 2009-2011 Nokia Corporation.
-- * Copyright (C) 2012 Canonical Ltd.
-+ * Copyright (C) 2012-2014 Canonical Ltd.
- *
- * Contact: Alberto Mardegan <alberto.mardegan@canonical.com>
- *
-@@ -61,6 +61,7 @@ public:
- QString pluginName() const;
- QString trCatalog() const;
- QString iconName() const;
-+ QString domainsRegExp() const;
- bool isSingleAccount() const;
- const QDomDocument domDocument() const;
-
-diff --git a/common-project-config.pri b/common-project-config.pri
-index c252e81..de6f0ae 100644
---- a/common-project-config.pri
-+++ b/common-project-config.pri
-@@ -62,7 +62,7 @@ isEmpty( LIBDIR ) {
- }
-
- isEmpty ( CMAKE_CONFIG_PATH ) {
-- CMAKE_CONFIG_PATH = $${INSTALL_LIBDIR}/cmake/AccountsQt/
-+ CMAKE_CONFIG_PATH = $${INSTALL_LIBDIR}/cmake
- message("====")
- message("==== NOTE: To override the cmake module installation path run: `qmake CMAKE_CONFIG_PATH=/custom/path'")
- message("==== (current installation path is `$${CMAKE_CONFIG_PATH}')")
-diff --git a/common-vars.pri b/common-vars.pri
-index 8b2d740..07ffb59 100644
---- a/common-vars.pri
-+++ b/common-vars.pri
-@@ -13,7 +13,7 @@ PROJECT_NAME = accounts-qt
- #-----------------------------------------------------------------------------
- # Project version
- #-----------------------------------------------------------------------------
--PROJECT_VERSION = 1.11
-+PROJECT_VERSION = 1.13
-
- #-----------------------------------------------------------------------------
- # Library version
-diff --git a/tests/MyProvider.provider b/tests/MyProvider.provider
-index 1f1dd5c..3ffbbb5 100644
---- a/tests/MyProvider.provider
-+++ b/tests/MyProvider.provider
-@@ -5,6 +5,7 @@
- <description>fast & furious</description>
- <translations>accounts</translations>
- <plugin>generic-oauth</plugin>
-+ <domains>.*example.net</domains>
- <single-account>true</single-account>
-
- <template>
-diff --git a/tests/accountstest.cpp b/tests/accountstest.cpp
-index b51bcab..beaa006 100644
---- a/tests/accountstest.cpp
-+++ b/tests/accountstest.cpp
-@@ -72,6 +72,12 @@ void AccountsTest::managerTestCase()
- mgr->setTimeout(123);
- QCOMPARE(mgr->timeout(), quint32(123));
-
-+ QCOMPARE(mgr->options().testFlag(Manager::DisableNotifications), false);
-+
-+ delete mgr;
-+
-+ mgr = new Manager(Manager::DisableNotifications);
-+ QCOMPARE(mgr->options().testFlag(Manager::DisableNotifications), true);
- delete mgr;
- }
-
-@@ -210,6 +216,7 @@ void AccountsTest::providerTestCase()
- QCOMPARE(provider.description(), QString("fast & furious"));
- QCOMPARE(provider.trCatalog(), QString("accounts"));
- QCOMPARE(provider.pluginName(), QString("generic-oauth"));
-+ QCOMPARE(provider.domainsRegExp(), QString(".*example.net"));
- QCOMPARE(provider.isSingleAccount(), true);
-
- QDomDocument dom = provider.domDocument();
^ permalink raw reply related [flat|nested] 2+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: net-libs/accounts-qt/files/
@ 2024-04-18 19:32 Conrad Kostecki
0 siblings, 0 replies; 2+ messages in thread
From: Conrad Kostecki @ 2024-04-18 19:32 UTC (permalink / raw
To: gentoo-commits
commit: 4709c832f0e7a497e2490c70bab07b2b5ae95421
Author: Michael Mair-Keimberger <mmk <AT> levelnine <DOT> at>
AuthorDate: Thu Apr 18 18:13:09 2024 +0000
Commit: Conrad Kostecki <conikost <AT> gentoo <DOT> org>
CommitDate: Thu Apr 18 19:31:47 2024 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4709c832
net-libs/accounts-qt: remove unused patches
Signed-off-by: Michael Mair-Keimberger <mmk <AT> levelnine.at>
Signed-off-by: Conrad Kostecki <conikost <AT> 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..000000000000
--- 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 <nicolas.fella@gmx.de>
-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<QString> 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<QString> expectedChanges;
- expectedChanges << "parameters/server";
- expectedChanges << "enabled";
-- QCOMPARE(m_accountServiceChangedFields.toSet(), expectedChanges.toSet());
-+#if QT_VERSION >= QT_VERSION_CHECK(5, 14, 0)
-+ QSet<QString> changedFields(m_accountServiceChangedFields.begin(), m_accountServiceChangedFields.end());
-+#else
-+ QSet<QString> 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<QString> expectedList;
- expectedList << "server" << "fallback-conference-server" <<
- "port" << "old-ssl";
-- QCOMPARE(accountService->childKeys().toSet(), expectedList.toSet());
-- QCOMPARE(accountService->childGroups().toSet(), QSet<QString>());
-+#if QT_VERSION >= QT_VERSION_CHECK(5, 14, 0)
-+ QStringList childKeysList = accountService->childKeys();
-+ QSet<QString> childKeys(childKeysList.begin(), childKeysList.end());
-+
-+ QStringList childGroupsList = accountService->childGroups();
-+ QSet<QString> childGroups(childGroupsList.begin(), childGroupsList.end());
-+#else
-+ QSet<QString> childKeys = accountService->childKeys().toSet();
-+ QSet<QString> childGroups = accountService->childGroups().toSet();
-+#endif
-+
-+ QCOMPARE(childKeys, expectedList);
-+ QCOMPARE(childGroups, QSet<QString>());
- QCOMPARE(accountService->contains("port"), true);
- accountService->endGroup();
-
-- expectedList.clear();
-- expectedList << "parameters";
-- QCOMPARE(accountService->childGroups().toSet(), expectedList.toSet());
-+ QSet<QString> expectedList2;
-+ expectedList2 << "parameters";
-+#if QT_VERSION >= QT_VERSION_CHECK(5, 14, 0)
-+ QStringList childGroupsList2 = accountService->childGroups();
-+ QSet<QString> childGroups2(childGroupsList2.begin(), childGroupsList2.end());
-+#else
-+ QSet<QString> 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..000000000000
--- a/net-libs/accounts-qt/files/0002-Add-Qt6-CI.patch
+++ /dev/null
@@ -1,137 +0,0 @@
-https://gitlab.com/accounts-sso/libaccounts-qt/-/merge_requests/21
-
-From d00f7346b091b885ba0ea3f6055e74a173fd0034 Mon Sep 17 00:00:00 2001
-From: Nicolas Fella <nicolas.fella@gmx.de>
-Date: Mon, 17 Oct 2022 23:33:16 +0200
-Subject: [PATCH 2/5] Add Qt6 CI
-
----
- .gitlab-ci.yml | 80 +++++++++++++++++++++++++++++++++++++++++---------
- 1 file changed, 66 insertions(+), 14 deletions(-)
-
-diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
-index 95d5a92..f8b5bf6 100644
---- a/.gitlab-ci.yml
-+++ b/.gitlab-ci.yml
-@@ -1,5 +1,3 @@
--image: ubuntu:bionic
--
- cache:
- key: apt-cache
- paths:
-@@ -13,23 +11,19 @@ stages:
- - test
- - deploy
-
--before_script:
-- - export APT_CACHE_DIR=`pwd`/apt-cache && mkdir -pv $APT_CACHE_DIR
-- - PACKAGES+=" wget" # for downloading dependencies
-- - PACKAGES+=" libglib2.0-dev libsqlite3-dev libxml2-dev gtk-doc-tools libgirepository1.0-dev gobject-introspection libxml2-utils python3-gi python-gi-dev valac check python3-pip" # for libaccounts-glib
-- - |
-- apt-get update -yq && apt-get -o dir::cache::archives="$APT_CACHE_DIR" install -y \
-- qt5-qmake qttools5-dev-tools qtbase5-dev qtchooser pkg-config doxygen \
-- $PACKAGES
-- - apt-get -o dir::cache::archives="$APT_CACHE_DIR" install -y dbus-test-runner lcov gcovr
-- - pip3 install meson ninja
--
--
- build_dependencies:
-+ image: ubuntu:bionic
- stage: deps
- artifacts:
- paths:
- - staging
-+ before_script:
-+ - export APT_CACHE_DIR=`pwd`/apt-cache && mkdir -pv $APT_CACHE_DIR
-+ - PACKAGES+=" wget" # for downloading dependencies
-+ - PACKAGES+=" libglib2.0-dev libsqlite3-dev libxml2-dev gtk-doc-tools libgirepository1.0-dev gobject-introspection libxml2-utils python3-gi python-gi-dev valac check python3-pip" # for libaccounts-glib
-+ - apt-get update -yq && apt-get -o dir::cache::archives="$APT_CACHE_DIR" install -y $PACKAGES
-+ - pip3 install meson ninja
-+
- script:
- - STAGING="$PWD/staging"
-
-@@ -52,7 +46,15 @@ build_dependencies:
-
-
- build_amd64:
-+ image: ubuntu:bionic
- stage: build
-+ before_script:
-+ - export APT_CACHE_DIR=`pwd`/apt-cache && mkdir -pv $APT_CACHE_DIR
-+ - |
-+ apt-get update -yq && apt-get -o dir::cache::archives="$APT_CACHE_DIR" install -y \
-+ qt5-qmake qttools5-dev-tools qtbase5-dev qtchooser pkg-config doxygen wget libglib2.0-dev libsqlite3-dev libxml2-dev gtk-doc-tools libgirepository1.0-dev gobject-introspection libxml2-utils python3-gi python-gi-dev valac check python3-pip
-+ - apt-get -o dir::cache::archives="$APT_CACHE_DIR" install -y dbus-test-runner lcov gcovr
-+
- script:
- - STAGING="$PWD/staging"
- - export PKG_CONFIG_PATH="$STAGING/lib/pkgconfig:$PKG_CONFIG_PATH"
-@@ -69,7 +71,16 @@ build_amd64:
- - build/
-
- test_amd64:
-+ image: ubuntu:bionic
- stage: test
-+ before_script:
-+ - export APT_CACHE_DIR=`pwd`/apt-cache && mkdir -pv $APT_CACHE_DIR
-+ - PACKAGES+=" wget" # for downloading dependencies
-+ - |
-+ apt-get update -yq && apt-get -o dir::cache::archives="$APT_CACHE_DIR" install -y \
-+ qt5-qmake qttools5-dev-tools qtbase5-dev qtchooser pkg-config doxygen \
-+ $PACKAGES
-+ - apt-get -o dir::cache::archives="$APT_CACHE_DIR" install -y dbus-test-runner lcov gcovr
- script:
- - STAGING="$PWD/staging"
- - export LD_LIBRARY_PATH="$STAGING/lib:$LD_LIBRARY_PATH"
-@@ -83,6 +94,47 @@ test_amd64:
- paths:
- - build/
-
-+build_amd64_qt6:
-+ stage: build
-+ image: ubuntu:jammy
-+ before_script:
-+ - export APT_CACHE_DIR=`pwd`/apt-cache && mkdir -pv $APT_CACHE_DIR
-+ - apt-get update -yq && apt-get -o dir::cache::archives="$APT_CACHE_DIR" install -y qmake6 qt6-base-dev pkg-config libqt6sql6-sqlite doxygen libdbus-1-dev g++ make libglib2.0-dev gtk-doc-tools libgirepository1.0-dev gobject-introspection libxml2-utils python3-gi python-gi-dev valac check python3-pip libsqlite3-dev libxml2-dev
-+ script:
-+ - STAGING="$PWD/staging"
-+ - find $STAGING
-+ - export PKG_CONFIG_PATH="$STAGING/lib/pkgconfig:$PKG_CONFIG_PATH"
-+ - export LD_LIBRARY_PATH="$STAGING/lib:$LD_LIBRARY_PATH"
-+ - mkdir build
-+ - cd build
-+ - qmake6 CONFIG+=debug CONFIG+=coverage ..
-+ - make -j 4
-+ dependencies:
-+ - build_dependencies
-+ artifacts:
-+ paths:
-+ - build/
-+
-+test_amd64_qt6:
-+ stage: test
-+ image: ubuntu:jammy
-+ before_script:
-+ - export APT_CACHE_DIR=`pwd`/apt-cache && mkdir -pv $APT_CACHE_DIR
-+ - export DEBIAN_FRONTEND=noninteractive
-+ - apt-get update -yq && apt-get -o dir::cache::archives="$APT_CACHE_DIR" install -y dbus-test-runner libqtdbusmock1-dev libqtdbustest1-dev lcov gcovr make qmake6 qt6-base-dev pkg-config libqt6sql6-sqlite doxygen libdbus-1-dev g++ make libsqlite3-dev libxml2-dev libglib2.0-dev
-+ script:
-+ - STAGING="$PWD/staging"
-+ - export LD_LIBRARY_PATH="$STAGING/lib:$LD_LIBRARY_PATH"
-+ - find build | xargs touch # Avoid rebuilding
-+ - cd build
-+ - make coverage-html
-+ dependencies:
-+ - build_dependencies
-+ - build_amd64_qt6
-+ artifacts:
-+ paths:
-+ - ./
-+
- pages:
- stage: deploy
- script:
---
-2.43.0
-
diff --git a/net-libs/accounts-qt/files/0003-Use-undeprecated-Account-value.patch b/net-libs/accounts-qt/files/0003-Use-undeprecated-Account-value.patch
deleted file mode 100644
index 7a8cb85b009e..000000000000
--- a/net-libs/accounts-qt/files/0003-Use-undeprecated-Account-value.patch
+++ /dev/null
@@ -1,28 +0,0 @@
-https://gitlab.com/accounts-sso/libaccounts-qt/-/merge_requests/21
-
-From 102cf562f9d143de2f93ba40f8448c1d531c2c7b Mon Sep 17 00:00:00 2001
-From: Nicolas Fella <nicolas.fella@gmx.de>
-Date: Tue, 18 Oct 2022 01:40:05 +0200
-Subject: [PATCH 3/5] Use undeprecated Account::value
-
----
- tests/tst_libaccounts.cpp | 3 +--
- 1 file changed, 1 insertion(+), 2 deletions(-)
-
-diff --git a/tests/tst_libaccounts.cpp b/tests/tst_libaccounts.cpp
-index efede91..d12091c 100644
---- a/tests/tst_libaccounts.cpp
-+++ b/tests/tst_libaccounts.cpp
-@@ -516,8 +516,7 @@ void AccountsTest::testAccountValue()
- QTRY_COMPARE(synced.count(), 1);
-
- /* check that the values we wrote are retrieved successfully */
-- QVariant val = QVariant::String;
-- account->value(QString("test"), val);
-+ QVariant val = account->value(QString("test"));
- QCOMPARE(val.toString(), QString("value"));
-
- SettingSource source;
---
-2.43.0
-
diff --git a/net-libs/accounts-qt/files/0004-Don-t-access-a-QString-out-of-bounds.patch b/net-libs/accounts-qt/files/0004-Don-t-access-a-QString-out-of-bounds.patch
deleted file mode 100644
index e342139cbb5d..000000000000
--- a/net-libs/accounts-qt/files/0004-Don-t-access-a-QString-out-of-bounds.patch
+++ /dev/null
@@ -1,42 +0,0 @@
-https://gitlab.com/accounts-sso/libaccounts-qt/-/merge_requests/21
-
-From 3c4d5fa1f53cd66c9870b799e8518980176547b2 Mon Sep 17 00:00:00 2001
-From: Nicolas Fella <nicolas.fella@gmx.de>
-Date: Tue, 18 Oct 2022 02:03:59 +0200
-Subject: [PATCH 4/5] Don't access a QString out-of-bounds
-
-This asserts in Qt6
----
- Accounts/account-service.cpp | 2 +-
- Accounts/account.cpp | 2 +-
- 2 files changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/Accounts/account-service.cpp b/Accounts/account-service.cpp
-index e6c04f2..d8d4304 100644
---- a/Accounts/account-service.cpp
-+++ b/Accounts/account-service.cpp
-@@ -335,7 +335,7 @@ void AccountService::endGroup()
- Q_D(AccountService);
- d->prefix = d->prefix.section(slash, 0, -3,
- QString::SectionIncludeTrailingSep);
-- if (d->prefix[0] == slash) d->prefix.remove(0, 1);
-+ if (!d->prefix.isEmpty() && d->prefix[0] == slash) d->prefix.remove(0, 1);
- }
-
- /*!
-diff --git a/Accounts/account.cpp b/Accounts/account.cpp
-index 2e40c60..104611a 100644
---- a/Accounts/account.cpp
-+++ b/Accounts/account.cpp
-@@ -548,7 +548,7 @@ void Account::endGroup()
- {
- d->prefix = d->prefix.section(slash, 0, -3,
- QString::SectionIncludeTrailingSep);
-- if (d->prefix[0] == slash) d->prefix.remove(0, 1);
-+ if (!d->prefix.isEmpty() && d->prefix[0] == slash) d->prefix.remove(0, 1);
- }
-
- /*!
---
-2.43.0
-
diff --git a/net-libs/accounts-qt/files/0005-Adjust-buildsystem-to-include-correct-Qt-Major-versi.patch b/net-libs/accounts-qt/files/0005-Adjust-buildsystem-to-include-correct-Qt-Major-versi.patch
deleted file mode 100644
index 904e7d5aa1ad..000000000000
--- a/net-libs/accounts-qt/files/0005-Adjust-buildsystem-to-include-correct-Qt-Major-versi.patch
+++ /dev/null
@@ -1,118 +0,0 @@
-https://gitlab.com/accounts-sso/libaccounts-qt/-/merge_requests/21
-
-From 18557f7def9af8f4a9e0e93e9f575ae11e5066aa Mon Sep 17 00:00:00 2001
-From: Nicolas Fella <nicolas.fella@gmx.de>
-Date: Fri, 7 Apr 2023 15:49:22 +0200
-Subject: [PATCH 5/5] Adjust buildsystem to include correct Qt Major version
- number
-
----
- Accounts/Accounts.pro | 4 ++--
- Accounts/AccountsQt5Config.cmake.in | 2 +-
- Accounts/AccountsQt6Config.cmake.in | 5 +++++
- Accounts/AccountsQt6ConfigVersion.cmake.in | 10 ++++++++++
- Accounts/accounts-qt6.pc.in | 15 +++++++++++++++
- tests/tst_libaccounts.pro | 2 +-
- 6 files changed, 34 insertions(+), 4 deletions(-)
- create mode 100644 Accounts/AccountsQt6Config.cmake.in
- create mode 100644 Accounts/AccountsQt6ConfigVersion.cmake.in
- create mode 100644 Accounts/accounts-qt6.pc.in
-
-diff --git a/Accounts/Accounts.pro b/Accounts/Accounts.pro
-index 13804ee..da62da7 100644
---- a/Accounts/Accounts.pro
-+++ b/Accounts/Accounts.pro
-@@ -3,7 +3,7 @@ include( ../common-project-config.pri )
- include( ../common-vars.pri )
-
- TEMPLATE = lib
--TARGET = accounts-qt5
-+TARGET = accounts-qt$${QT_MAJOR_VERSION}
-
- # Input
- public_headers = \
-@@ -45,7 +45,7 @@ QT -= gui
-
- INCLUDEPATH += $${TOP_SRC_DIR}
-
--CMAKE_BASENAME = AccountsQt5
-+CMAKE_BASENAME = AccountsQt$${QT_MAJOR_VERSION}
-
- PKGCONFIG += \
- glib-2.0 \
-diff --git a/Accounts/AccountsQt5Config.cmake.in b/Accounts/AccountsQt5Config.cmake.in
-index 55a8964..746f689 100644
---- a/Accounts/AccountsQt5Config.cmake.in
-+++ b/Accounts/AccountsQt5Config.cmake.in
-@@ -2,4 +2,4 @@
- # 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
-+set(ACCOUNTSQT_INCLUDE_DIRS $${INSTALL_PREFIX}/include/$${TARGET}/)
-diff --git a/Accounts/AccountsQt6Config.cmake.in b/Accounts/AccountsQt6Config.cmake.in
-new file mode 100644
-index 0000000..55a8964
---- /dev/null
-+++ b/Accounts/AccountsQt6Config.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/AccountsQt6ConfigVersion.cmake.in b/Accounts/AccountsQt6ConfigVersion.cmake.in
-new file mode 100644
-index 0000000..616cd60
---- /dev/null
-+++ b/Accounts/AccountsQt6ConfigVersion.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}\" )
-diff --git a/Accounts/accounts-qt6.pc.in b/Accounts/accounts-qt6.pc.in
-new file mode 100644
-index 0000000..c625b2e
---- /dev/null
-+++ b/Accounts/accounts-qt6.pc.in
-@@ -0,0 +1,15 @@
-+prefix=$$INSTALL_PREFIX
-+exec_prefix=${prefix}
-+libdir=$$INSTALL_LIBDIR
-+includedir=${prefix}/include/accounts-qt6
-+servicefilesdir=${prefix}/share/accounts/services
-+servicetypefilesdir=${prefix}/share/accounts/service-types
-+providerfilesdir=${prefix}/share/accounts/providers
-+
-+Name: libaccounts-qt6
-+Description: Accounts Library
-+Version: $$PROJECT_VERSION
-+Libs: -L${libdir} -laccounts-qt6
-+Requires: Qt6Core Qt6Xml
-+Cflags: -I${includedir}
-+
-diff --git a/tests/tst_libaccounts.pro b/tests/tst_libaccounts.pro
-index a5b91fe..9992c0b 100644
---- a/tests/tst_libaccounts.pro
-+++ b/tests/tst_libaccounts.pro
-@@ -9,7 +9,7 @@ QT = \
- testlib \
- xml
-
--LIBS += -laccounts-qt5
-+LIBS += -laccounts-qt$${QT_MAJOR_VERSION}
-
- INCLUDEPATH += $${TOP_SRC_DIR}
- QMAKE_LIBDIR += \
---
-2.43.0
-
^ permalink raw reply related [flat|nested] 2+ messages in thread
end of thread, other threads:[~2024-04-18 19:32 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2017-08-08 17:15 [gentoo-commits] repo/gentoo:master commit in: net-libs/accounts-qt/files/ Andreas Sturmlechner
-- strict thread matches above, loose matches on Subject: below --
2024-04-18 19:32 Conrad Kostecki
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox