[neon/3rdparty/libaccounts-qt/Neon/release] debian/patches: remove commits now in tar

Jonathan Esk-Riddell null at kde.org
Thu Feb 22 15:05:36 GMT 2024


Git commit b515ca79051ed71ab791ebc2d29ff00c5d0a5e3c by Jonathan Esk-Riddell.
Committed on 22/02/2024 at 15:05.
Pushed by jriddell into branch 'Neon/release'.

remove commits now in tar

D  +0    -175  debian/patches/commit-ca0447d
D  +0    -76   debian/patches/commit-f877232
M  +0    -2    debian/patches/series

https://invent.kde.org/neon/3rdparty/libaccounts-qt/-/commit/b515ca79051ed71ab791ebc2d29ff00c5d0a5e3c

diff --git a/debian/patches/commit-ca0447d b/debian/patches/commit-ca0447d
deleted file mode 100644
index 3415579..0000000
--- a/debian/patches/commit-ca0447d
+++ /dev/null
@@ -1,175 +0,0 @@
-From a4844062ade8e67c8cf60db9b670099244130efd Mon Sep 17 00:00:00 2001
-From: Scarlett Moore <sgmoore at kde.org>
-Date: Tue, 19 Sep 2023 10:29:27 -0700
-Subject: Fix tests as class QList<QString>’ {aka ‘class QList<QString>’} has
- no member named ‘toSet’ and the function was already updated to qset, just
- not the test
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-
-diff --git a/Accounts/Accounts.pro b/Accounts/Accounts.pro
-index 5ade19c..13804ee 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-qt6
-+TARGET = accounts-qt5
- 
- # Input
- public_headers = \
-@@ -45,7 +45,7 @@ QT -= gui
- 
- INCLUDEPATH += $${TOP_SRC_DIR}
- 
--CMAKE_BASENAME = AccountsQt6
-+CMAKE_BASENAME = AccountsQt5
- 
- PKGCONFIG += \
- 	glib-2.0 \
-diff --git a/Accounts/Accounts6.pro b/Accounts/Accounts6.pro
-new file mode 100644
-index 0000000..5ade19c
---- /dev/null
-+++ b/Accounts/Accounts6.pro
-@@ -0,0 +1,75 @@
-+
-+include( ../common-project-config.pri )
-+include( ../common-vars.pri )
-+
-+TEMPLATE = lib
-+TARGET = accounts-qt6
-+
-+# Input
-+public_headers = \
-+    accountscommon.h \
-+    Manager manager.h \
-+    Account account.h \
-+    AccountService account-service.h \
-+    Application application.h \
-+    AuthData auth-data.h \
-+    Error error.h \
-+    Provider provider.h \
-+    Service service.h \
-+    ServiceType service-type.h
-+
-+private_headers = \
-+    manager_p.h \
-+    utils.h
-+
-+HEADERS += \
-+    $$public_headers \
-+    $$private_headers
-+
-+SOURCES += manager.cpp \
-+    account.cpp \
-+    account-service.cpp \
-+    application.cpp \
-+    auth-data.cpp \
-+    error.cpp \
-+    provider.cpp \
-+    service.cpp \
-+    service-type.cpp \
-+    utils.cpp
-+
-+CONFIG += link_pkgconfig
-+
-+DEFINES += QT_NO_CAST_TO_ASCII QT_NO_CAST_FROM_ASCII QT_NO_KEYWORDS
-+QT += core xml
-+QT -= gui
-+
-+INCLUDEPATH += $${TOP_SRC_DIR}
-+
-+CMAKE_BASENAME = AccountsQt6
-+
-+PKGCONFIG += \
-+	glib-2.0 \
-+	gobject-2.0 \
-+	libaccounts-glib
-+
-+QMAKE_CXXFLAGS += \
-+    -fno-exceptions \
-+    -fvisibility=hidden
-+
-+headers.files = $$HEADERS
-+
-+include( ../common-installs-config.pri )
-+
-+pkgconfig.files = $${TARGET}.pc
-+include($${TOP_SRC_DIR}/common-pkgconfig.pri)
-+INSTALLS += pkgconfig
-+
-+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
-diff --git a/tests/tst_libaccounts.cpp b/tests/tst_libaccounts.cpp
-index 471e3d5..54b5509 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,10 @@ void AccountsTest::testAccountService()
-     spyChanged.clear();
-     spyEnabled.clear();
- 
--    QStringList expectedChanges;
-+    QSet<QString> expectedChanges;
-     expectedChanges << "parameters/server";
-     expectedChanges << "enabled";
--    QCOMPARE(m_accountServiceChangedFields.toSet(), expectedChanges.toSet());
-+    QCOMPARE(m_accountServiceChangedFields, expectedChanges);
- 
-     QCOMPARE(accountService->value("server").toString(),
-              UTF8("www.example.com"));
-@@ -727,23 +727,23 @@ 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>());
-+    QCOMPARE(accountService->childKeys(), expectedList);
-+    QCOMPARE(accountService->childGroups(), QSet<QString>());
-     QCOMPARE(accountService->contains("port"), true);
-     accountService->endGroup();
- 
-     expectedList.clear();
-     expectedList << "parameters";
--    QCOMPARE(accountService->childGroups().toSet(), expectedList.toSet());
-+    QCOMPARE(accountService->childGroups(), expectedList);
- 
-     /* Remove one key */
-     accountService->remove("parameters/port");
-     account->sync();
-     QCOMPARE(spyChanged.count(), 1);
--    QCOMPARE(m_accountServiceChangedFields, QStringList("parameters/port"));
-+    QCOMPARE(m_accountServiceChangedFields, QSet<QString>("parameters/port"));
-     spyChanged.clear();
- 
-     /* remove all keys */
diff --git a/debian/patches/commit-f877232 b/debian/patches/commit-f877232
deleted file mode 100644
index 081a9e1..0000000
--- a/debian/patches/commit-f877232
+++ /dev/null
@@ -1,76 +0,0 @@
-From f87723208fe72c5bd0cac219c2ca6f72c6577ff4 Mon Sep 17 00:00:00 2001
-From: Scarlett Moore <sgmoore at kde.org>
-Date: Tue, 19 Sep 2023 09:52:53 -0700
-Subject: Patch for qt6
-
-
-diff --git a/Accounts/Accounts.pro b/Accounts/Accounts.pro
-index 13804ee..5ade19c 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-qt6
- 
- # Input
- public_headers = \
-@@ -45,7 +45,7 @@ QT -= gui
- 
- INCLUDEPATH += $${TOP_SRC_DIR}
- 
--CMAKE_BASENAME = AccountsQt5
-+CMAKE_BASENAME = AccountsQt6
- 
- PKGCONFIG += \
- 	glib-2.0 \
-diff --git a/Accounts/AccountsQt6Config.cmake.in b/Accounts/AccountsQt6Config.cmake.in
-new file mode 100644
-index 0000000..746f689
---- /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}/)
-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/debian/patches/series b/debian/patches/series
index f33eee3..a6fc60b 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,4 +1,2 @@
 Install-the-doc-FILES.patch
 Build-docs-if-doxygen-is-available.patch
-commit-f877232
-commit-ca0447d


More information about the Neon-commits mailing list