From 4fa01f1fb0978dcc978841842eab3e1128a8bf0e Mon Sep 17 00:00:00 2001 From: Rex Dieter Date: Thu, 13 Feb 2020 11:32:42 -0600 Subject: [PATCH 01/19] import --- .gitignore | 1 + Build-add-qmltypes-file-to-repository.patch | 241 ++++++++++++++++++++ Fix-compilation-with-Qt-5.13.patch | 72 ++++++ accounts-qml-module.spec | 73 ++++++ sources | 1 + 5 files changed, 388 insertions(+) create mode 100644 .gitignore create mode 100644 Build-add-qmltypes-file-to-repository.patch create mode 100644 Fix-compilation-with-Qt-5.13.patch create mode 100644 accounts-qml-module.spec create mode 100644 sources diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000..c9ebe17 --- /dev/null +++ b/.gitignore @@ -0,0 +1 @@ +/accounts-qml-module-VERSION_0.7.tar.bz2 diff --git a/Build-add-qmltypes-file-to-repository.patch b/Build-add-qmltypes-file-to-repository.patch new file mode 100644 index 0000000..d9f3784 --- /dev/null +++ b/Build-add-qmltypes-file-to-repository.patch @@ -0,0 +1,241 @@ +From 678c493a083a92d1fda2375f5d2e37c00c7b9a7e Mon Sep 17 00:00:00 2001 +From: Alberto Mardegan +Date: Tue, 9 Jan 2018 18:23:57 +0300 +Subject: [PATCH] Build: add qmltypes file to repository + +Generating the file at build time is troublesome when cross-compiling. +It's better to add the generated file to the repository and add a make +target to rebuild it. +--- + src/plugin.qmltypes | 187 ++++++++++++++++++++++++++++++++++++++++++++ + src/src.pro | 19 +---- + 2 files changed, 191 insertions(+), 15 deletions(-) + create mode 100644 src/plugin.qmltypes + +diff --git a/src/plugin.qmltypes b/src/plugin.qmltypes +new file mode 100644 +index 0000000..8481efe +--- /dev/null ++++ b/src/plugin.qmltypes +@@ -0,0 +1,187 @@ ++import QtQuick.tooling 1.2 ++ ++// This file describes the plugin-supplied types contained in the library. ++// It is used for QML tooling purposes only. ++// ++// This file was auto-generated by: ++// 'qmlplugindump -notrelocatable Ubuntu.OnlineAccounts 0.1 .' ++ ++Module { ++ dependencies: ["QtQuick 2.8"] ++ Component { ++ name: "OnlineAccounts::Account" ++ prototype: "QObject" ++ exports: ["Ubuntu.OnlineAccounts/Account 0.1"] ++ exportMetaObjectRevisions: [0] ++ Enum { ++ name: "RemovalOption" ++ values: { ++ "RemoveAccountOnly": 0, ++ "RemoveCredentials": 1 ++ } ++ } ++ Enum { ++ name: "RemovalOptions" ++ values: { ++ "RemoveAccountOnly": 0, ++ "RemoveCredentials": 1 ++ } ++ } ++ Property { name: "objectHandle"; type: "QObject"; isPointer: true } ++ Property { name: "enabled"; type: "bool"; isReadonly: true } ++ Property { name: "provider"; type: "QVariantMap"; isReadonly: true } ++ Property { name: "displayName"; type: "string"; isReadonly: true } ++ Property { name: "accountId"; type: "uint"; isReadonly: true } ++ Property { name: "accountServiceHandle"; type: "QObject"; isReadonly: true; isPointer: true } ++ Signal { name: "synced" } ++ Signal { name: "removed" } ++ Method { ++ name: "updateDisplayName" ++ Parameter { name: "displayName"; type: "string" } ++ } ++ Method { ++ name: "updateEnabled" ++ Parameter { name: "enabled"; type: "bool" } ++ } ++ Method { name: "sync" } ++ Method { ++ name: "remove" ++ Parameter { name: "options"; type: "RemovalOptions" } ++ } ++ Method { name: "remove" } ++ } ++ Component { ++ name: "OnlineAccounts::AccountService" ++ prototype: "QObject" ++ exports: ["Ubuntu.OnlineAccounts/AccountService 0.1"] ++ exportMetaObjectRevisions: [0] ++ Enum { ++ name: "ErrorCode" ++ values: { ++ "NoError": 0, ++ "NoAccountError": 1, ++ "UserCanceledError": 2, ++ "PermissionDeniedError": 3, ++ "NetworkError": 4, ++ "SslError": 5, ++ "InteractionRequiredError": 6 ++ } ++ } ++ Property { name: "objectHandle"; type: "QObject"; isPointer: true } ++ Property { name: "enabled"; type: "bool"; isReadonly: true } ++ Property { name: "serviceEnabled"; type: "bool"; isReadonly: true } ++ Property { name: "provider"; type: "QVariantMap"; isReadonly: true } ++ Property { name: "service"; type: "QVariantMap"; isReadonly: true } ++ Property { name: "displayName"; type: "string"; isReadonly: true } ++ Property { name: "accountId"; type: "uint"; isReadonly: true } ++ Property { name: "settings"; type: "QVariantMap"; isReadonly: true } ++ Property { name: "authData"; type: "QVariantMap"; isReadonly: true } ++ Property { name: "autoSync"; type: "bool" } ++ Property { name: "credentials"; type: "QObject"; isPointer: true } ++ Signal { ++ name: "authenticated" ++ Parameter { name: "reply"; type: "QVariantMap" } ++ } ++ Signal { ++ name: "authenticationError" ++ Parameter { name: "error"; type: "QVariantMap" } ++ } ++ Method { ++ name: "authenticate" ++ Parameter { name: "sessionData"; type: "QVariantMap" } ++ } ++ Method { name: "authenticate" } ++ Method { name: "cancelAuthentication" } ++ Method { ++ name: "updateServiceEnabled" ++ Parameter { name: "enabled"; type: "bool" } ++ } ++ Method { ++ name: "updateSettings" ++ Parameter { name: "settings"; type: "QVariantMap" } ++ } ++ } ++ Component { ++ name: "OnlineAccounts::AccountServiceModel" ++ prototype: "QAbstractListModel" ++ exports: ["Ubuntu.OnlineAccounts/AccountServiceModel 0.1"] ++ exportMetaObjectRevisions: [0] ++ Property { name: "count"; type: "int"; isReadonly: true } ++ Property { name: "includeDisabled"; type: "bool" } ++ Property { name: "accountId"; type: "uint" } ++ Property { name: "account"; type: "QObject"; isPointer: true } ++ Property { name: "applicationId"; type: "string" } ++ Property { name: "provider"; type: "string" } ++ Property { name: "serviceType"; type: "string" } ++ Property { name: "service"; type: "string" } ++ Method { ++ name: "get" ++ type: "QVariant" ++ Parameter { name: "row"; type: "int" } ++ Parameter { name: "roleName"; type: "string" } ++ } ++ } ++ Component { ++ name: "OnlineAccounts::ApplicationModel" ++ prototype: "QAbstractListModel" ++ exports: ["Ubuntu.OnlineAccounts/ApplicationModel 0.1"] ++ exportMetaObjectRevisions: [0] ++ Property { name: "count"; type: "int"; isReadonly: true } ++ Property { name: "service"; type: "string" } ++ Method { ++ name: "get" ++ type: "QVariant" ++ Parameter { name: "row"; type: "int" } ++ Parameter { name: "roleName"; type: "string" } ++ } ++ } ++ Component { ++ name: "OnlineAccounts::Credentials" ++ prototype: "QObject" ++ exports: ["Ubuntu.OnlineAccounts/Credentials 0.1"] ++ exportMetaObjectRevisions: [0] ++ Property { name: "credentialsId"; type: "uint" } ++ Property { name: "caption"; type: "string" } ++ Property { name: "userName"; type: "string" } ++ Property { name: "secret"; type: "string" } ++ Property { name: "storeSecret"; type: "bool" } ++ Property { name: "acl"; type: "QStringList" } ++ Property { name: "methods"; type: "QVariantMap" } ++ Signal { name: "synced" } ++ Signal { name: "removed" } ++ Method { name: "sync" } ++ Method { name: "remove" } ++ } ++ Component { ++ name: "OnlineAccounts::Manager" ++ prototype: "QObject" ++ exports: ["Ubuntu.OnlineAccounts/Manager 0.1"] ++ isCreatable: false ++ isSingleton: true ++ exportMetaObjectRevisions: [0] ++ Method { ++ name: "loadAccount" ++ type: "QObject*" ++ Parameter { name: "accountId"; type: "uint" } ++ } ++ Method { ++ name: "createAccount" ++ type: "QObject*" ++ Parameter { name: "providerName"; type: "string" } ++ } ++ } ++ Component { ++ name: "OnlineAccounts::ProviderModel" ++ prototype: "QAbstractListModel" ++ exports: ["Ubuntu.OnlineAccounts/ProviderModel 0.1"] ++ exportMetaObjectRevisions: [0] ++ Property { name: "applicationId"; type: "string" } ++ Property { name: "count"; type: "int"; isReadonly: true } ++ Method { ++ name: "get" ++ type: "QVariant" ++ Parameter { name: "row"; type: "int" } ++ Parameter { name: "roleName"; type: "string" } ++ } ++ } ++} +diff --git a/src/src.pro b/src/src.pro +index 8b26639..abfc851 100644 +--- a/src/src.pro ++++ b/src/src.pro +@@ -61,22 +61,11 @@ PLUGIN_INSTALL_BASE = $$[QT_INSTALL_QML]/$$replace(API_URI, \\., /) + target.path = $${PLUGIN_INSTALL_BASE} + INSTALLS += target + +-qmldir.files = $${DESTDIR}/qmldir ++qmldir.files = $${DESTDIR}/qmldir plugin.qmltypes + qmldir.path = $${PLUGIN_INSTALL_BASE} + INSTALLS += qmldir + +-generateQmlTypes.output = $${DESTDIR}/plugin.qmltypes +-generateQmlTypes.input = QML_PLUGINS +-generateQmlTypes.commands = export LD_PRELOAD=${QMAKE_FILE_IN}; $$[QT_INSTALL_BINS]/qmlplugindump -notrelocatable $${API_URI} 0.1 . > ${QMAKE_FILE_OUT} +-generateQmlTypes.name = Generate ${QMAKE_FILE_OUT} +-generateQmlTypes.CONFIG += no_link +-generateQmlTypes.variable_out = QML_TYPES +-QMAKE_EXTRA_COMPILERS += generateQmlTypes +- + QML_PLUGINS += $${DESTDIR}/lib$${TARGET}.so +- +-qmltypes.path = $${PLUGIN_INSTALL_BASE} +-qmltypes.files = $${DESTDIR}/plugin.qmltypes +-qmltypes.depends = $${DESTDIR}/plugin.qmltypes +-qmltypes.CONFIG += no_check_exist +-INSTALLS += qmltypes ++qmltypes.commands = export LD_PRELOAD=$${QML_PLUGINS}; $$[QT_INSTALL_BINS]/qmlplugindump -notrelocatable $${API_URI} 0.1 . > $$PWD/plugin.qmltypes ++qmltypes.depends = $${QML_PLUGINS} ++QMAKE_EXTRA_TARGETS += qmltypes +-- +2.22.2 + diff --git a/Fix-compilation-with-Qt-5.13.patch b/Fix-compilation-with-Qt-5.13.patch new file mode 100644 index 0000000..0adae29 --- /dev/null +++ b/Fix-compilation-with-Qt-5.13.patch @@ -0,0 +1,72 @@ +From 69e17dec5add40655cd9334ec7ad4eef13fed8a4 Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Jonah=20Br=C3=BCchert?= +Date: Wed, 5 Jun 2019 13:28:44 +0200 +Subject: [PATCH] Fix compilation with Qt 5.13 + +--- + src/account-service-model.cpp | 14 ++++++++------ + 1 file changed, 8 insertions(+), 6 deletions(-) + +diff --git a/src/account-service-model.cpp b/src/account-service-model.cpp +index 45795c5..deb157e 100644 +--- a/src/account-service-model.cpp ++++ b/src/account-service-model.cpp +@@ -183,7 +183,7 @@ AccountServiceModelPrivate::addServicesFromAccount(Accounts::Account *account) + newModelItems.append(accountService); + } + +- qSort(newModelItems.begin(), newModelItems.end(), sortFunction); ++ std::sort(newModelItems.begin(), newModelItems.end(), sortFunction); + addItems(newModelItems); + } + +@@ -211,7 +211,7 @@ void AccountServiceModelPrivate::addItems(const AccountServices &added) + foreach (Accounts::AccountService *accountService, added) { + // Find where the item should be inserted + AccountServices::iterator i = +- qLowerBound(modelItems.begin(), modelItems.end(), ++ std::lower_bound(modelItems.begin(), modelItems.end(), + accountService, sortFunction); + int index = i - modelItems.begin(); + addedIndexes[index]++; +@@ -253,7 +253,7 @@ AccountServiceModelPrivate::removeItems(const AccountServices &removed) + removedIndexes.append(index); + } + // sort the indexes from highest to lower, and start updating the list +- qSort(removedIndexes.begin(), removedIndexes.end(), qGreater()); ++ std::sort(removedIndexes.begin(), removedIndexes.end(), std::greater()); + int first = -1; + int last = -1; + foreach (int index, removedIndexes) { +@@ -281,7 +281,7 @@ AccountServiceModelPrivate::removeItems(const AccountServices &removed) + + void AccountServiceModelPrivate::sortItems() + { +- qSort(modelItems.begin(), modelItems.end(), sortFunction); ++ std::sort(modelItems.begin(), modelItems.end(), sortFunction); + } + + void AccountServiceModelPrivate::update() +@@ -809,7 +809,8 @@ QVariant AccountServiceModel::data(const QModelIndex &index, int role) const + ret = accountService->enabled(); + break; + case AccountServiceRole: +- qWarning("accountService role is deprecated, use accountServiceHandle"); ++ qWarning() << "accountService role is deprecated, use accountServiceHandle"; ++ /* FALLTHRU */ + case AccountServiceHandleRole: + object = accountService; + break; +@@ -817,7 +818,8 @@ QVariant AccountServiceModel::data(const QModelIndex &index, int role) const + ret = accountService->account()->id(); + break; + case AccountRole: +- qWarning("account role is deprecated, use accountHandle"); ++ qWarning() << "account role is deprecated, use accountHandle"; ++ /* FALLTHRU */ + case AccountHandleRole: + object = accountService->account(); + break; +-- +2.22.2 + diff --git a/accounts-qml-module.spec b/accounts-qml-module.spec new file mode 100644 index 0000000..a42a6fa --- /dev/null +++ b/accounts-qml-module.spec @@ -0,0 +1,73 @@ + +Name: accounts-qml-module +Summary: QML bindings for libaccounts-qt + libsignon-qt +Version: 0.7 +Release: 1%{?dist} + +License: LGPLv2 +URL: https://gitlab.com/accounts-sso/accounts-qml-module +Source: https://gitlab.com/accounts-sso/%{name}/-/archive/VERSION_%{version}/%{name}-VERSION_%{version}.tar.bz2 + +## upstream patches +# PATCH-FIX-UPSTREAM +Patch1: Fix-compilation-with-Qt-5.13.patch +# PATCH-FIX-UPSTREAM +Patch2: Build-add-qmltypes-file-to-repository.patch + +BuildRequires: qt5-doctools +BuildRequires: cmake(AccountsQt5) +BuildRequires: cmake(Qt5Qml) +BuildRequires: cmake(SignOnQt5) + +%description +This QML module provides an API to manage the user's online accounts and get +their authentication data. It's a tiny wrapper around the Qt-based APIs of +libaccounts-qt and libsignon-qt. + +%package doc +Summary: Documentation for %{name} +BuildArch: noarch +%description doc +This package contains the developer documentation for accounts-qml-module. + + +%prep +%autosetup -n %{name}-VERSION_%{version} -p1 + + +%build +mkdir %{_target_platform} +pushd %{_target_platform} +%{qmake_qt5} \ + CONFIG+=release \ + PREFIX=%{_prefix} \ + LIBDIR=%{_libdir} \ + .. +popd + +%make_build -C %{_target_platform} + + +%install +make install INSTALL_ROOT=%{buildroot} -C %{_target_platform} + +## unpackaged files +# remove tests +rm %{buildroot}%{_bindir}/tst_plugin +# avoid rpmlint warning +rm -fv %{buildroot}/%{_datadir}/%{name}/doc/html/.gitignore + + +%files +%license COPYING +%doc README.md +%{_qt5_archdatadir}/qml/Ubuntu/ + +%files doc +%doc %{_datadir}/%{name}/ + + +%changelog +* Tue Feb 11 2020 Rex Dieter - 0.7-1 +- first try, inspiration from opensuse packaging + diff --git a/sources b/sources new file mode 100644 index 0000000..d62acfc --- /dev/null +++ b/sources @@ -0,0 +1 @@ +SHA512 (accounts-qml-module-VERSION_0.7.tar.bz2) = 55b7ab3032c53aa34947d2f5acdffb1eb6b91cf38d1d9d936471253bc39851d04f5abbecec49775eda13f508d49c1be922fbb281d8166fb7c243dac229287425 From 019571027f50ee24bf88665f762f317e5c3d9f78 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Mon, 27 Jul 2020 11:41:37 +0000 Subject: [PATCH 02/19] - Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- accounts-qml-module.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/accounts-qml-module.spec b/accounts-qml-module.spec index a42a6fa..862e402 100644 --- a/accounts-qml-module.spec +++ b/accounts-qml-module.spec @@ -2,7 +2,7 @@ Name: accounts-qml-module Summary: QML bindings for libaccounts-qt + libsignon-qt Version: 0.7 -Release: 1%{?dist} +Release: 2%{?dist} License: LGPLv2 URL: https://gitlab.com/accounts-sso/accounts-qml-module @@ -68,6 +68,9 @@ rm -fv %{buildroot}/%{_datadir}/%{name}/doc/html/.gitignore %changelog +* Mon Jul 27 2020 Fedora Release Engineering - 0.7-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild + * Tue Feb 11 2020 Rex Dieter - 0.7-1 - first try, inspiration from opensuse packaging From 34dd9a1104b004cc7f48937b8612fe01fe7f2e53 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Fri, 31 Jul 2020 23:47:38 +0000 Subject: [PATCH 03/19] - Second attempt - Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- accounts-qml-module.spec | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/accounts-qml-module.spec b/accounts-qml-module.spec index 862e402..9ff8ecf 100644 --- a/accounts-qml-module.spec +++ b/accounts-qml-module.spec @@ -2,7 +2,7 @@ Name: accounts-qml-module Summary: QML bindings for libaccounts-qt + libsignon-qt Version: 0.7 -Release: 2%{?dist} +Release: 3%{?dist} License: LGPLv2 URL: https://gitlab.com/accounts-sso/accounts-qml-module @@ -68,6 +68,10 @@ rm -fv %{buildroot}/%{_datadir}/%{name}/doc/html/.gitignore %changelog +* Fri Jul 31 2020 Fedora Release Engineering - 0.7-3 +- Second attempt - Rebuilt for + https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild + * Mon Jul 27 2020 Fedora Release Engineering - 0.7-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild From b2582d6d2317c520e58b919382c70c92f0b206d2 Mon Sep 17 00:00:00 2001 From: Tom Stellard Date: Tue, 15 Dec 2020 01:43:31 +0000 Subject: [PATCH 04/19] Add BuildRequires: make https://fedoraproject.org/wiki/Changes/Remove_make_from_BuildRoot --- accounts-qml-module.spec | 1 + 1 file changed, 1 insertion(+) diff --git a/accounts-qml-module.spec b/accounts-qml-module.spec index 9ff8ecf..e19f4d4 100644 --- a/accounts-qml-module.spec +++ b/accounts-qml-module.spec @@ -18,6 +18,7 @@ BuildRequires: qt5-doctools BuildRequires: cmake(AccountsQt5) BuildRequires: cmake(Qt5Qml) BuildRequires: cmake(SignOnQt5) +BuildRequires: make %description This QML module provides an API to manage the user's online accounts and get From 43a5885b6f9271114c5cba7c66d13f873a578d08 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Mon, 25 Jan 2021 23:45:29 +0000 Subject: [PATCH 05/19] - Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- accounts-qml-module.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/accounts-qml-module.spec b/accounts-qml-module.spec index e19f4d4..a1421b3 100644 --- a/accounts-qml-module.spec +++ b/accounts-qml-module.spec @@ -2,7 +2,7 @@ Name: accounts-qml-module Summary: QML bindings for libaccounts-qt + libsignon-qt Version: 0.7 -Release: 3%{?dist} +Release: 4%{?dist} License: LGPLv2 URL: https://gitlab.com/accounts-sso/accounts-qml-module @@ -69,6 +69,9 @@ rm -fv %{buildroot}/%{_datadir}/%{name}/doc/html/.gitignore %changelog +* Mon Jan 25 2021 Fedora Release Engineering - 0.7-4 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild + * Fri Jul 31 2020 Fedora Release Engineering - 0.7-3 - Second attempt - Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild From 84f0621ed1416e229a897d28cc6b7b40f283873c Mon Sep 17 00:00:00 2001 From: Rex Dieter Date: Thu, 4 Feb 2021 09:01:17 -0600 Subject: [PATCH 06/19] build without -Werror --- accounts-qml-module-Werror.patch | 12 ++++++++++++ accounts-qml-module.spec | 9 ++++++++- 2 files changed, 20 insertions(+), 1 deletion(-) create mode 100644 accounts-qml-module-Werror.patch diff --git a/accounts-qml-module-Werror.patch b/accounts-qml-module-Werror.patch new file mode 100644 index 0000000..1dcef94 --- /dev/null +++ b/accounts-qml-module-Werror.patch @@ -0,0 +1,12 @@ +diff -up accounts-qml-module-VERSION_0.7/common-project-config.pri.Werror accounts-qml-module-VERSION_0.7/common-project-config.pri +--- accounts-qml-module-VERSION_0.7/common-project-config.pri.Werror 2016-06-08 02:26:26.000000000 -0500 ++++ accounts-qml-module-VERSION_0.7/common-project-config.pri 2021-02-04 08:59:43.179085414 -0600 +@@ -3,7 +3,7 @@ + #----------------------------------------------------------------------------- + + # we don't like warnings... +-QMAKE_CXXFLAGS += -Werror -Wno-write-strings ++QMAKE_CXXFLAGS += -Wno-write-strings + # Disable RTTI + QMAKE_CXXFLAGS += -fno-exceptions -fno-rtti + # Use C++11 diff --git a/accounts-qml-module.spec b/accounts-qml-module.spec index a1421b3..6cd40ea 100644 --- a/accounts-qml-module.spec +++ b/accounts-qml-module.spec @@ -2,7 +2,7 @@ Name: accounts-qml-module Summary: QML bindings for libaccounts-qt + libsignon-qt Version: 0.7 -Release: 4%{?dist} +Release: 5%{?dist} License: LGPLv2 URL: https://gitlab.com/accounts-sso/accounts-qml-module @@ -14,6 +14,10 @@ Patch1: Fix-compilation-with-Qt-5.13.patch # PATCH-FIX-UPSTREAM Patch2: Build-add-qmltypes-file-to-repository.patch +## upstreamable patches +# disable -Werror, only makes sense for developer builds, not release builds +Patch100: accounts-qml-module-Werror.patch + BuildRequires: qt5-doctools BuildRequires: cmake(AccountsQt5) BuildRequires: cmake(Qt5Qml) @@ -69,6 +73,9 @@ rm -fv %{buildroot}/%{_datadir}/%{name}/doc/html/.gitignore %changelog +* Thu Feb 04 2021 Rex Dieter - 0.7-5 +- build without -Werror + * Mon Jan 25 2021 Fedora Release Engineering - 0.7-4 - Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild From 300a7e77631d0115094e6f36dde16a2f07c7d908 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Wed, 21 Jul 2021 12:17:30 +0000 Subject: [PATCH 07/19] - Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild Signed-off-by: Fedora Release Engineering From 0dd4e2b7d87f8d79a95033456fa79f0002262d76 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Wed, 21 Jul 2021 17:12:36 +0000 Subject: [PATCH 08/19] - Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- accounts-qml-module.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/accounts-qml-module.spec b/accounts-qml-module.spec index 6cd40ea..3817351 100644 --- a/accounts-qml-module.spec +++ b/accounts-qml-module.spec @@ -2,7 +2,7 @@ Name: accounts-qml-module Summary: QML bindings for libaccounts-qt + libsignon-qt Version: 0.7 -Release: 5%{?dist} +Release: 6%{?dist} License: LGPLv2 URL: https://gitlab.com/accounts-sso/accounts-qml-module @@ -73,6 +73,9 @@ rm -fv %{buildroot}/%{_datadir}/%{name}/doc/html/.gitignore %changelog +* Wed Jul 21 2021 Fedora Release Engineering - 0.7-6 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild + * Thu Feb 04 2021 Rex Dieter - 0.7-5 - build without -Werror From dc24b5f62f57dd429611beb3c1463d46f1dc13da Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Wed, 19 Jan 2022 20:52:37 +0000 Subject: [PATCH 09/19] - Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- accounts-qml-module.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/accounts-qml-module.spec b/accounts-qml-module.spec index 3817351..18fe95d 100644 --- a/accounts-qml-module.spec +++ b/accounts-qml-module.spec @@ -2,7 +2,7 @@ Name: accounts-qml-module Summary: QML bindings for libaccounts-qt + libsignon-qt Version: 0.7 -Release: 6%{?dist} +Release: 7%{?dist} License: LGPLv2 URL: https://gitlab.com/accounts-sso/accounts-qml-module @@ -73,6 +73,9 @@ rm -fv %{buildroot}/%{_datadir}/%{name}/doc/html/.gitignore %changelog +* Wed Jan 19 2022 Fedora Release Engineering - 0.7-7 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild + * Wed Jul 21 2021 Fedora Release Engineering - 0.7-6 - Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild From 9441b2dd695591ca278c23b82f5a8972d707e6df Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Wed, 20 Jul 2022 20:23:19 +0000 Subject: [PATCH 10/19] Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- accounts-qml-module.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/accounts-qml-module.spec b/accounts-qml-module.spec index 18fe95d..5395789 100644 --- a/accounts-qml-module.spec +++ b/accounts-qml-module.spec @@ -2,7 +2,7 @@ Name: accounts-qml-module Summary: QML bindings for libaccounts-qt + libsignon-qt Version: 0.7 -Release: 7%{?dist} +Release: 8%{?dist} License: LGPLv2 URL: https://gitlab.com/accounts-sso/accounts-qml-module @@ -73,6 +73,9 @@ rm -fv %{buildroot}/%{_datadir}/%{name}/doc/html/.gitignore %changelog +* Wed Jul 20 2022 Fedora Release Engineering - 0.7-8 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild + * Wed Jan 19 2022 Fedora Release Engineering - 0.7-7 - Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild From fb717f5d7eea031e1415b1b8e81b0c4fdbe922af Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Wed, 18 Jan 2023 21:20:47 +0000 Subject: [PATCH 11/19] Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- accounts-qml-module.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/accounts-qml-module.spec b/accounts-qml-module.spec index 5395789..cc40b3a 100644 --- a/accounts-qml-module.spec +++ b/accounts-qml-module.spec @@ -2,7 +2,7 @@ Name: accounts-qml-module Summary: QML bindings for libaccounts-qt + libsignon-qt Version: 0.7 -Release: 8%{?dist} +Release: 9%{?dist} License: LGPLv2 URL: https://gitlab.com/accounts-sso/accounts-qml-module @@ -73,6 +73,9 @@ rm -fv %{buildroot}/%{_datadir}/%{name}/doc/html/.gitignore %changelog +* Wed Jan 18 2023 Fedora Release Engineering - 0.7-9 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild + * Wed Jul 20 2022 Fedora Release Engineering - 0.7-8 - Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild From 1203f1f6471fd60f0c033f140e9c4de5106e3ef2 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Wed, 19 Jul 2023 12:50:58 +0000 Subject: [PATCH 12/19] Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- accounts-qml-module.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/accounts-qml-module.spec b/accounts-qml-module.spec index cc40b3a..0ba8a6d 100644 --- a/accounts-qml-module.spec +++ b/accounts-qml-module.spec @@ -2,7 +2,7 @@ Name: accounts-qml-module Summary: QML bindings for libaccounts-qt + libsignon-qt Version: 0.7 -Release: 9%{?dist} +Release: 10%{?dist} License: LGPLv2 URL: https://gitlab.com/accounts-sso/accounts-qml-module @@ -73,6 +73,9 @@ rm -fv %{buildroot}/%{_datadir}/%{name}/doc/html/.gitignore %changelog +* Wed Jul 19 2023 Fedora Release Engineering - 0.7-10 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild + * Wed Jan 18 2023 Fedora Release Engineering - 0.7-9 - Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild From cf8c39b5d10ff82311f24c38c85bc68a087c7526 Mon Sep 17 00:00:00 2001 From: Alessandro Astone Date: Tue, 26 Dec 2023 18:13:47 +0100 Subject: [PATCH 13/19] Build git snapshot for both qt5 and qt6 QML module renamed to SSO.OnlineAccounts --- .gitignore | 1 + Build-add-qmltypes-file-to-repository.patch | 241 -------------------- Fix-compilation-with-Qt-5.13.patch | 72 ------ accounts-qml-module.spec | 73 ++++-- sources | 2 +- 5 files changed, 56 insertions(+), 333 deletions(-) delete mode 100644 Build-add-qmltypes-file-to-repository.patch delete mode 100644 Fix-compilation-with-Qt-5.13.patch diff --git a/.gitignore b/.gitignore index c9ebe17..a74f4f4 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1,2 @@ /accounts-qml-module-VERSION_0.7.tar.bz2 +/accounts-qml-module-05e79ebbbf3784a87f72b7be571070125c10dfe3.tar.gz diff --git a/Build-add-qmltypes-file-to-repository.patch b/Build-add-qmltypes-file-to-repository.patch deleted file mode 100644 index d9f3784..0000000 --- a/Build-add-qmltypes-file-to-repository.patch +++ /dev/null @@ -1,241 +0,0 @@ -From 678c493a083a92d1fda2375f5d2e37c00c7b9a7e Mon Sep 17 00:00:00 2001 -From: Alberto Mardegan -Date: Tue, 9 Jan 2018 18:23:57 +0300 -Subject: [PATCH] Build: add qmltypes file to repository - -Generating the file at build time is troublesome when cross-compiling. -It's better to add the generated file to the repository and add a make -target to rebuild it. ---- - src/plugin.qmltypes | 187 ++++++++++++++++++++++++++++++++++++++++++++ - src/src.pro | 19 +---- - 2 files changed, 191 insertions(+), 15 deletions(-) - create mode 100644 src/plugin.qmltypes - -diff --git a/src/plugin.qmltypes b/src/plugin.qmltypes -new file mode 100644 -index 0000000..8481efe ---- /dev/null -+++ b/src/plugin.qmltypes -@@ -0,0 +1,187 @@ -+import QtQuick.tooling 1.2 -+ -+// This file describes the plugin-supplied types contained in the library. -+// It is used for QML tooling purposes only. -+// -+// This file was auto-generated by: -+// 'qmlplugindump -notrelocatable Ubuntu.OnlineAccounts 0.1 .' -+ -+Module { -+ dependencies: ["QtQuick 2.8"] -+ Component { -+ name: "OnlineAccounts::Account" -+ prototype: "QObject" -+ exports: ["Ubuntu.OnlineAccounts/Account 0.1"] -+ exportMetaObjectRevisions: [0] -+ Enum { -+ name: "RemovalOption" -+ values: { -+ "RemoveAccountOnly": 0, -+ "RemoveCredentials": 1 -+ } -+ } -+ Enum { -+ name: "RemovalOptions" -+ values: { -+ "RemoveAccountOnly": 0, -+ "RemoveCredentials": 1 -+ } -+ } -+ Property { name: "objectHandle"; type: "QObject"; isPointer: true } -+ Property { name: "enabled"; type: "bool"; isReadonly: true } -+ Property { name: "provider"; type: "QVariantMap"; isReadonly: true } -+ Property { name: "displayName"; type: "string"; isReadonly: true } -+ Property { name: "accountId"; type: "uint"; isReadonly: true } -+ Property { name: "accountServiceHandle"; type: "QObject"; isReadonly: true; isPointer: true } -+ Signal { name: "synced" } -+ Signal { name: "removed" } -+ Method { -+ name: "updateDisplayName" -+ Parameter { name: "displayName"; type: "string" } -+ } -+ Method { -+ name: "updateEnabled" -+ Parameter { name: "enabled"; type: "bool" } -+ } -+ Method { name: "sync" } -+ Method { -+ name: "remove" -+ Parameter { name: "options"; type: "RemovalOptions" } -+ } -+ Method { name: "remove" } -+ } -+ Component { -+ name: "OnlineAccounts::AccountService" -+ prototype: "QObject" -+ exports: ["Ubuntu.OnlineAccounts/AccountService 0.1"] -+ exportMetaObjectRevisions: [0] -+ Enum { -+ name: "ErrorCode" -+ values: { -+ "NoError": 0, -+ "NoAccountError": 1, -+ "UserCanceledError": 2, -+ "PermissionDeniedError": 3, -+ "NetworkError": 4, -+ "SslError": 5, -+ "InteractionRequiredError": 6 -+ } -+ } -+ Property { name: "objectHandle"; type: "QObject"; isPointer: true } -+ Property { name: "enabled"; type: "bool"; isReadonly: true } -+ Property { name: "serviceEnabled"; type: "bool"; isReadonly: true } -+ Property { name: "provider"; type: "QVariantMap"; isReadonly: true } -+ Property { name: "service"; type: "QVariantMap"; isReadonly: true } -+ Property { name: "displayName"; type: "string"; isReadonly: true } -+ Property { name: "accountId"; type: "uint"; isReadonly: true } -+ Property { name: "settings"; type: "QVariantMap"; isReadonly: true } -+ Property { name: "authData"; type: "QVariantMap"; isReadonly: true } -+ Property { name: "autoSync"; type: "bool" } -+ Property { name: "credentials"; type: "QObject"; isPointer: true } -+ Signal { -+ name: "authenticated" -+ Parameter { name: "reply"; type: "QVariantMap" } -+ } -+ Signal { -+ name: "authenticationError" -+ Parameter { name: "error"; type: "QVariantMap" } -+ } -+ Method { -+ name: "authenticate" -+ Parameter { name: "sessionData"; type: "QVariantMap" } -+ } -+ Method { name: "authenticate" } -+ Method { name: "cancelAuthentication" } -+ Method { -+ name: "updateServiceEnabled" -+ Parameter { name: "enabled"; type: "bool" } -+ } -+ Method { -+ name: "updateSettings" -+ Parameter { name: "settings"; type: "QVariantMap" } -+ } -+ } -+ Component { -+ name: "OnlineAccounts::AccountServiceModel" -+ prototype: "QAbstractListModel" -+ exports: ["Ubuntu.OnlineAccounts/AccountServiceModel 0.1"] -+ exportMetaObjectRevisions: [0] -+ Property { name: "count"; type: "int"; isReadonly: true } -+ Property { name: "includeDisabled"; type: "bool" } -+ Property { name: "accountId"; type: "uint" } -+ Property { name: "account"; type: "QObject"; isPointer: true } -+ Property { name: "applicationId"; type: "string" } -+ Property { name: "provider"; type: "string" } -+ Property { name: "serviceType"; type: "string" } -+ Property { name: "service"; type: "string" } -+ Method { -+ name: "get" -+ type: "QVariant" -+ Parameter { name: "row"; type: "int" } -+ Parameter { name: "roleName"; type: "string" } -+ } -+ } -+ Component { -+ name: "OnlineAccounts::ApplicationModel" -+ prototype: "QAbstractListModel" -+ exports: ["Ubuntu.OnlineAccounts/ApplicationModel 0.1"] -+ exportMetaObjectRevisions: [0] -+ Property { name: "count"; type: "int"; isReadonly: true } -+ Property { name: "service"; type: "string" } -+ Method { -+ name: "get" -+ type: "QVariant" -+ Parameter { name: "row"; type: "int" } -+ Parameter { name: "roleName"; type: "string" } -+ } -+ } -+ Component { -+ name: "OnlineAccounts::Credentials" -+ prototype: "QObject" -+ exports: ["Ubuntu.OnlineAccounts/Credentials 0.1"] -+ exportMetaObjectRevisions: [0] -+ Property { name: "credentialsId"; type: "uint" } -+ Property { name: "caption"; type: "string" } -+ Property { name: "userName"; type: "string" } -+ Property { name: "secret"; type: "string" } -+ Property { name: "storeSecret"; type: "bool" } -+ Property { name: "acl"; type: "QStringList" } -+ Property { name: "methods"; type: "QVariantMap" } -+ Signal { name: "synced" } -+ Signal { name: "removed" } -+ Method { name: "sync" } -+ Method { name: "remove" } -+ } -+ Component { -+ name: "OnlineAccounts::Manager" -+ prototype: "QObject" -+ exports: ["Ubuntu.OnlineAccounts/Manager 0.1"] -+ isCreatable: false -+ isSingleton: true -+ exportMetaObjectRevisions: [0] -+ Method { -+ name: "loadAccount" -+ type: "QObject*" -+ Parameter { name: "accountId"; type: "uint" } -+ } -+ Method { -+ name: "createAccount" -+ type: "QObject*" -+ Parameter { name: "providerName"; type: "string" } -+ } -+ } -+ Component { -+ name: "OnlineAccounts::ProviderModel" -+ prototype: "QAbstractListModel" -+ exports: ["Ubuntu.OnlineAccounts/ProviderModel 0.1"] -+ exportMetaObjectRevisions: [0] -+ Property { name: "applicationId"; type: "string" } -+ Property { name: "count"; type: "int"; isReadonly: true } -+ Method { -+ name: "get" -+ type: "QVariant" -+ Parameter { name: "row"; type: "int" } -+ Parameter { name: "roleName"; type: "string" } -+ } -+ } -+} -diff --git a/src/src.pro b/src/src.pro -index 8b26639..abfc851 100644 ---- a/src/src.pro -+++ b/src/src.pro -@@ -61,22 +61,11 @@ PLUGIN_INSTALL_BASE = $$[QT_INSTALL_QML]/$$replace(API_URI, \\., /) - target.path = $${PLUGIN_INSTALL_BASE} - INSTALLS += target - --qmldir.files = $${DESTDIR}/qmldir -+qmldir.files = $${DESTDIR}/qmldir plugin.qmltypes - qmldir.path = $${PLUGIN_INSTALL_BASE} - INSTALLS += qmldir - --generateQmlTypes.output = $${DESTDIR}/plugin.qmltypes --generateQmlTypes.input = QML_PLUGINS --generateQmlTypes.commands = export LD_PRELOAD=${QMAKE_FILE_IN}; $$[QT_INSTALL_BINS]/qmlplugindump -notrelocatable $${API_URI} 0.1 . > ${QMAKE_FILE_OUT} --generateQmlTypes.name = Generate ${QMAKE_FILE_OUT} --generateQmlTypes.CONFIG += no_link --generateQmlTypes.variable_out = QML_TYPES --QMAKE_EXTRA_COMPILERS += generateQmlTypes -- - QML_PLUGINS += $${DESTDIR}/lib$${TARGET}.so -- --qmltypes.path = $${PLUGIN_INSTALL_BASE} --qmltypes.files = $${DESTDIR}/plugin.qmltypes --qmltypes.depends = $${DESTDIR}/plugin.qmltypes --qmltypes.CONFIG += no_check_exist --INSTALLS += qmltypes -+qmltypes.commands = export LD_PRELOAD=$${QML_PLUGINS}; $$[QT_INSTALL_BINS]/qmlplugindump -notrelocatable $${API_URI} 0.1 . > $$PWD/plugin.qmltypes -+qmltypes.depends = $${QML_PLUGINS} -+QMAKE_EXTRA_TARGETS += qmltypes --- -2.22.2 - diff --git a/Fix-compilation-with-Qt-5.13.patch b/Fix-compilation-with-Qt-5.13.patch deleted file mode 100644 index 0adae29..0000000 --- a/Fix-compilation-with-Qt-5.13.patch +++ /dev/null @@ -1,72 +0,0 @@ -From 69e17dec5add40655cd9334ec7ad4eef13fed8a4 Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Jonah=20Br=C3=BCchert?= -Date: Wed, 5 Jun 2019 13:28:44 +0200 -Subject: [PATCH] Fix compilation with Qt 5.13 - ---- - src/account-service-model.cpp | 14 ++++++++------ - 1 file changed, 8 insertions(+), 6 deletions(-) - -diff --git a/src/account-service-model.cpp b/src/account-service-model.cpp -index 45795c5..deb157e 100644 ---- a/src/account-service-model.cpp -+++ b/src/account-service-model.cpp -@@ -183,7 +183,7 @@ AccountServiceModelPrivate::addServicesFromAccount(Accounts::Account *account) - newModelItems.append(accountService); - } - -- qSort(newModelItems.begin(), newModelItems.end(), sortFunction); -+ std::sort(newModelItems.begin(), newModelItems.end(), sortFunction); - addItems(newModelItems); - } - -@@ -211,7 +211,7 @@ void AccountServiceModelPrivate::addItems(const AccountServices &added) - foreach (Accounts::AccountService *accountService, added) { - // Find where the item should be inserted - AccountServices::iterator i = -- qLowerBound(modelItems.begin(), modelItems.end(), -+ std::lower_bound(modelItems.begin(), modelItems.end(), - accountService, sortFunction); - int index = i - modelItems.begin(); - addedIndexes[index]++; -@@ -253,7 +253,7 @@ AccountServiceModelPrivate::removeItems(const AccountServices &removed) - removedIndexes.append(index); - } - // sort the indexes from highest to lower, and start updating the list -- qSort(removedIndexes.begin(), removedIndexes.end(), qGreater()); -+ std::sort(removedIndexes.begin(), removedIndexes.end(), std::greater()); - int first = -1; - int last = -1; - foreach (int index, removedIndexes) { -@@ -281,7 +281,7 @@ AccountServiceModelPrivate::removeItems(const AccountServices &removed) - - void AccountServiceModelPrivate::sortItems() - { -- qSort(modelItems.begin(), modelItems.end(), sortFunction); -+ std::sort(modelItems.begin(), modelItems.end(), sortFunction); - } - - void AccountServiceModelPrivate::update() -@@ -809,7 +809,8 @@ QVariant AccountServiceModel::data(const QModelIndex &index, int role) const - ret = accountService->enabled(); - break; - case AccountServiceRole: -- qWarning("accountService role is deprecated, use accountServiceHandle"); -+ qWarning() << "accountService role is deprecated, use accountServiceHandle"; -+ /* FALLTHRU */ - case AccountServiceHandleRole: - object = accountService; - break; -@@ -817,7 +818,8 @@ QVariant AccountServiceModel::data(const QModelIndex &index, int role) const - ret = accountService->account()->id(); - break; - case AccountRole: -- qWarning("account role is deprecated, use accountHandle"); -+ qWarning() << "account role is deprecated, use accountHandle"; -+ /* FALLTHRU */ - case AccountHandleRole: - object = accountService->account(); - break; --- -2.22.2 - diff --git a/accounts-qml-module.spec b/accounts-qml-module.spec index 0ba8a6d..08fe609 100644 --- a/accounts-qml-module.spec +++ b/accounts-qml-module.spec @@ -1,27 +1,32 @@ +%global gitdate 20231216 +%global commit0 05e79ebbbf3784a87f72b7be571070125c10dfe3 +%global shortcommit0 %(c=%{commit0}; echo ${c:0:7}) Name: accounts-qml-module Summary: QML bindings for libaccounts-qt + libsignon-qt -Version: 0.7 -Release: 10%{?dist} +Version: 0.7^%{gitdate}.%{shortcommit0} +Release: 1%{?dist} -License: LGPLv2 +License: LGPL-2.1-only URL: https://gitlab.com/accounts-sso/accounts-qml-module -Source: https://gitlab.com/accounts-sso/%{name}/-/archive/VERSION_%{version}/%{name}-VERSION_%{version}.tar.bz2 +Source: https://gitlab.com/accounts-sso/accounts-qml-module/-/archive/%{commit0}/%{name}-%{commit0}.tar.gz ## upstream patches -# PATCH-FIX-UPSTREAM -Patch1: Fix-compilation-with-Qt-5.13.patch -# PATCH-FIX-UPSTREAM -Patch2: Build-add-qmltypes-file-to-repository.patch ## upstreamable patches -# disable -Werror, only makes sense for developer builds, not release builds -Patch100: accounts-qml-module-Werror.patch +BuildRequires: qt5-rpm-macros BuildRequires: qt5-doctools BuildRequires: cmake(AccountsQt5) BuildRequires: cmake(Qt5Qml) BuildRequires: cmake(SignOnQt5) + +BuildRequires: qt6-rpm-macros +BuildRequires: qt6-doctools +BuildRequires: cmake(AccountsQt6) +BuildRequires: cmake(Qt6Qml) +BuildRequires: cmake(SignOnQt6) + BuildRequires: make %description @@ -29,6 +34,17 @@ This QML module provides an API to manage the user's online accounts and get their authentication data. It's a tiny wrapper around the Qt-based APIs of libaccounts-qt and libsignon-qt. +%package qt5 +Summary: Qt5 build of %{name} +%description qt5 +%{summary}. + +%package qt6 +Summary: Qt6 build of %{name} +Obsoletes: %{name} < 0.7^20231216 +%description qt6 +%{summary}. + %package doc Summary: Documentation for %{name} BuildArch: noarch @@ -37,12 +53,12 @@ This package contains the developer documentation for accounts-qml-module. %prep -%autosetup -n %{name}-VERSION_%{version} -p1 +%autosetup -n %{name}-%{commit0} -p1 %build -mkdir %{_target_platform} -pushd %{_target_platform} +mkdir %{_target_platform}_qt5 +pushd %{_target_platform}_qt5 %{qmake_qt5} \ CONFIG+=release \ PREFIX=%{_prefix} \ @@ -50,11 +66,24 @@ pushd %{_target_platform} .. popd -%make_build -C %{_target_platform} +%make_build -C %{_target_platform}_qt5 + + +mkdir %{_target_platform}_qt6 +pushd %{_target_platform}_qt6 +%{qmake_qt6} \ + CONFIG+=release \ + PREFIX=%{_prefix} \ + LIBDIR=%{_libdir} \ + .. +popd + +%make_build -C %{_target_platform}_qt6 %install -make install INSTALL_ROOT=%{buildroot} -C %{_target_platform} +%make_install INSTALL_ROOT=%{buildroot} -C %{_target_platform}_qt5 +%make_install INSTALL_ROOT=%{buildroot} -C %{_target_platform}_qt6 ## unpackaged files # remove tests @@ -62,17 +91,23 @@ rm %{buildroot}%{_bindir}/tst_plugin # avoid rpmlint warning rm -fv %{buildroot}/%{_datadir}/%{name}/doc/html/.gitignore +%files qt6 +%{_qt6_qmldir}/SSO/ -%files -%license COPYING -%doc README.md -%{_qt5_archdatadir}/qml/Ubuntu/ +%files qt5 +%{_qt5_qmldir}/SSO/ %files doc +%license COPYING +%doc README.md %doc %{_datadir}/%{name}/ %changelog +* Tue Dec 26 2023 Alessandro Astone - 0.7^20231216.05e79eb-1 +- Build git snapshot for both qt5 and qt6 +- QML module renamed to SSO.OnlineAccounts + * Wed Jul 19 2023 Fedora Release Engineering - 0.7-10 - Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild diff --git a/sources b/sources index d62acfc..944f507 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (accounts-qml-module-VERSION_0.7.tar.bz2) = 55b7ab3032c53aa34947d2f5acdffb1eb6b91cf38d1d9d936471253bc39851d04f5abbecec49775eda13f508d49c1be922fbb281d8166fb7c243dac229287425 +SHA512 (accounts-qml-module-05e79ebbbf3784a87f72b7be571070125c10dfe3.tar.gz) = 439b596d130dee81d2f7e969962c75f51413ceb5ebb7807db229e593466c22d0c87e249515a233bd18c47bf1e58f5631ab30adf8849e71fa4f3d7bd29b6974de From 5c975b5d55793b5cdf436edc7167464f09c87c5e Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Fri, 19 Jan 2024 12:04:41 +0000 Subject: [PATCH 14/19] Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild --- accounts-qml-module.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/accounts-qml-module.spec b/accounts-qml-module.spec index 08fe609..b8377a5 100644 --- a/accounts-qml-module.spec +++ b/accounts-qml-module.spec @@ -5,7 +5,7 @@ Name: accounts-qml-module Summary: QML bindings for libaccounts-qt + libsignon-qt Version: 0.7^%{gitdate}.%{shortcommit0} -Release: 1%{?dist} +Release: 2%{?dist} License: LGPL-2.1-only URL: https://gitlab.com/accounts-sso/accounts-qml-module @@ -104,6 +104,9 @@ rm -fv %{buildroot}/%{_datadir}/%{name}/doc/html/.gitignore %changelog +* Fri Jan 19 2024 Fedora Release Engineering - 0.7^20231216.05e79eb-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild + * Tue Dec 26 2023 Alessandro Astone - 0.7^20231216.05e79eb-1 - Build git snapshot for both qt5 and qt6 - QML module renamed to SSO.OnlineAccounts From 3bd57641873c8958744c195a87cf070a685cab19 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Mon, 22 Jan 2024 22:36:12 +0000 Subject: [PATCH 15/19] Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild --- accounts-qml-module.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/accounts-qml-module.spec b/accounts-qml-module.spec index b8377a5..d66c011 100644 --- a/accounts-qml-module.spec +++ b/accounts-qml-module.spec @@ -5,7 +5,7 @@ Name: accounts-qml-module Summary: QML bindings for libaccounts-qt + libsignon-qt Version: 0.7^%{gitdate}.%{shortcommit0} -Release: 2%{?dist} +Release: 3%{?dist} License: LGPL-2.1-only URL: https://gitlab.com/accounts-sso/accounts-qml-module @@ -104,6 +104,9 @@ rm -fv %{buildroot}/%{_datadir}/%{name}/doc/html/.gitignore %changelog +* Mon Jan 22 2024 Fedora Release Engineering - 0.7^20231216.05e79eb-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild + * Fri Jan 19 2024 Fedora Release Engineering - 0.7^20231216.05e79eb-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild From 6abe8cfcfc976a179efc433b164bf7e0b4a832e2 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Wed, 17 Jul 2024 16:32:30 +0000 Subject: [PATCH 16/19] Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild --- accounts-qml-module.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/accounts-qml-module.spec b/accounts-qml-module.spec index d66c011..51122fb 100644 --- a/accounts-qml-module.spec +++ b/accounts-qml-module.spec @@ -5,7 +5,7 @@ Name: accounts-qml-module Summary: QML bindings for libaccounts-qt + libsignon-qt Version: 0.7^%{gitdate}.%{shortcommit0} -Release: 3%{?dist} +Release: 4%{?dist} License: LGPL-2.1-only URL: https://gitlab.com/accounts-sso/accounts-qml-module @@ -104,6 +104,9 @@ rm -fv %{buildroot}/%{_datadir}/%{name}/doc/html/.gitignore %changelog +* Wed Jul 17 2024 Fedora Release Engineering - 0.7^20231216.05e79eb-4 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild + * Mon Jan 22 2024 Fedora Release Engineering - 0.7^20231216.05e79eb-3 - Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild From d438b0d8660f87d462b9c5063191ff1436f1ef30 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 16 Jan 2025 10:30:50 +0000 Subject: [PATCH 17/19] Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild --- accounts-qml-module.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/accounts-qml-module.spec b/accounts-qml-module.spec index 51122fb..33030f1 100644 --- a/accounts-qml-module.spec +++ b/accounts-qml-module.spec @@ -5,7 +5,7 @@ Name: accounts-qml-module Summary: QML bindings for libaccounts-qt + libsignon-qt Version: 0.7^%{gitdate}.%{shortcommit0} -Release: 4%{?dist} +Release: 5%{?dist} License: LGPL-2.1-only URL: https://gitlab.com/accounts-sso/accounts-qml-module @@ -104,6 +104,9 @@ rm -fv %{buildroot}/%{_datadir}/%{name}/doc/html/.gitignore %changelog +* Thu Jan 16 2025 Fedora Release Engineering - 0.7^20231216.05e79eb-5 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild + * Wed Jul 17 2024 Fedora Release Engineering - 0.7^20231216.05e79eb-4 - Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild From a9f4386c419bba456f326bf166bb252320ce7bbb Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Wed, 23 Jul 2025 16:43:22 +0000 Subject: [PATCH 18/19] Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild --- accounts-qml-module.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/accounts-qml-module.spec b/accounts-qml-module.spec index 33030f1..e29f3a5 100644 --- a/accounts-qml-module.spec +++ b/accounts-qml-module.spec @@ -5,7 +5,7 @@ Name: accounts-qml-module Summary: QML bindings for libaccounts-qt + libsignon-qt Version: 0.7^%{gitdate}.%{shortcommit0} -Release: 5%{?dist} +Release: 6%{?dist} License: LGPL-2.1-only URL: https://gitlab.com/accounts-sso/accounts-qml-module @@ -104,6 +104,9 @@ rm -fv %{buildroot}/%{_datadir}/%{name}/doc/html/.gitignore %changelog +* Wed Jul 23 2025 Fedora Release Engineering - 0.7^20231216.05e79eb-6 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild + * Thu Jan 16 2025 Fedora Release Engineering - 0.7^20231216.05e79eb-5 - Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild From 19c6e990eabd70e7f25560fdd79fccc4a89ad007 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Fri, 16 Jan 2026 03:24:44 +0000 Subject: [PATCH 19/19] Rebuilt for https://fedoraproject.org/wiki/Fedora_44_Mass_Rebuild --- accounts-qml-module.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/accounts-qml-module.spec b/accounts-qml-module.spec index e29f3a5..bf7257b 100644 --- a/accounts-qml-module.spec +++ b/accounts-qml-module.spec @@ -5,7 +5,7 @@ Name: accounts-qml-module Summary: QML bindings for libaccounts-qt + libsignon-qt Version: 0.7^%{gitdate}.%{shortcommit0} -Release: 6%{?dist} +Release: 7%{?dist} License: LGPL-2.1-only URL: https://gitlab.com/accounts-sso/accounts-qml-module @@ -104,6 +104,9 @@ rm -fv %{buildroot}/%{_datadir}/%{name}/doc/html/.gitignore %changelog +* Fri Jan 16 2026 Fedora Release Engineering - 0.7^20231216.05e79eb-7 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_44_Mass_Rebuild + * Wed Jul 23 2025 Fedora Release Engineering - 0.7^20231216.05e79eb-6 - Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild