diff --git a/pisi-index.xml b/pisi-index.xml index 6015d41648..820c1f3d11 100644 --- a/pisi-index.xml +++ b/pisi-index.xml @@ -121718,7 +121718,6 @@ Bu Skype SILK codec ve Xiph.Org 's Celt codec teknolojisi dahil RFC 6716 ol ffmpeg-devel taglib-devel libappimage-devel - kdegraphics-mobipocket-devel poppler-qt6-devel karchive-kf6-devel ki18n-kf6-devel @@ -121737,7 +121736,6 @@ Bu Skype SILK codec ve Xiph.Org 's Celt codec teknolojisi dahil RFC 6716 ol exiv2-libs taglib libappimage - kdegraphics-mobipocket ffmpeg poppler-qt6 karchive-kf6 @@ -122849,6 +122847,26 @@ Bu Skype SILK codec ve Xiph.Org 's Celt codec teknolojisi dahil RFC 6716 ol kcolorscheme-kf6-devel kstatusnotifieritem-kf6-devel xdg-desktop-portal-kde-kf6 + qt5-base-devel + qt5-wayland-devel + qt5-declarative-devel + qt5-x11extras-devel + qt5-quickcontrols2-devel + kcompletion-devel + ki18n-devel + kxmlgui-devel + kiconthemes-devel + kwayland-devel + kconfig-devel + kguiaddons-devel + kio-devel + kservice-devel + kwindowsystem-devel + kcoreaddons-devel + kconfigwidgets-devel + kwidgetsaddons-devel + kjobwidgets-devel + knotifications-devel desktop/kde6/plasma/plasma-integration-kf6/pspec.xml @@ -122881,26 +122899,6 @@ Bu Skype SILK codec ve Xiph.Org 's Celt codec teknolojisi dahil RFC 6716 ol kservice-kf6 kcolorscheme-kf6 kstatusnotifieritem-kf6 - qt5-base-devel - qt5-wayland-devel - qt5-declarative-devel - qt5-x11extras-devel - qt5-quickcontrols2-devel - kcompletion-devel - ki18n-devel - kxmlgui-devel - kiconthemes-devel - kwayland-devel - kconfig-devel - kguiaddons-devel - kio-devel - kservice-devel - kwindowsystem-devel - kcoreaddons-devel - kconfigwidgets-devel - kwidgetsaddons-devel - kjobwidgets-devel - knotifications-devel /usr/lib/qt6 @@ -123902,6 +123900,8 @@ Bu Skype SILK codec ve Xiph.Org 's Celt codec teknolojisi dahil RFC 6716 ol libgcc icu4c-devel + appstream-devel + kded-kf6-devel kio-kf6-devel zlib-devel baloo-kf6-devel @@ -123920,13 +123920,14 @@ Bu Skype SILK codec ve Xiph.Org 's Celt codec teknolojisi dahil RFC 6716 ol libxcb-devel prison-kf6-devel kconfig-kf6-devel - kpeople-devel + kpeople-kf6-devel krunner-kf6-devel kwallet-kf6-devel kxmlgui-kf6-devel libXtst-devel kpackage-kf6-devel kservice-kf6-devel + kunitconversion-kf6-devel kwayland-kf6-devel xcb-util-devel kirigami-kf6-devel @@ -123969,6 +123970,7 @@ Bu Skype SILK codec ve Xiph.Org 's Celt codec teknolojisi dahil RFC 6716 ol qt6-sql-odbc qt6-sql-mysql qt6-base-devel + qt6-shadertools-devel qt6-sql-sqlite libkscreen-kf6-devel qt6-sql-postgresql @@ -124027,13 +124029,16 @@ Bu Skype SILK codec ve Xiph.Org 's Celt codec teknolojisi dahil RFC 6716 ol libX11 libXau libxcb + appstream + kded-kf6 prison-kf6 kconfig-kf6 - kpeople + kpeople-kf6 krunner-kf6 kwallet-kf6 kxmlgui-kf6 libXtst + kunitconversion-kf6 kpackage-kf6 kpipewire-kf6 kservice-kf6 @@ -124078,6 +124083,7 @@ Bu Skype SILK codec ve Xiph.Org 's Celt codec teknolojisi dahil RFC 6716 ol appmenu-gtk-module oxygen-sounds-kf6 qt6-base + qt6-shadertools qt6-declarative gpsd kparts-kf6 @@ -124139,7 +124145,7 @@ Bu Skype SILK codec ve Xiph.Org 's Celt codec teknolojisi dahil RFC 6716 ol libxcb-devel prison-kf6-devel kconfig-kf6-devel - kpeople-devel + kpeople-kf6-devel krunner-kf6-devel kwallet-kf6-devel kxmlgui-kf6-devel @@ -124612,7 +124618,9 @@ Bu Skype SILK codec ve Xiph.Org 's Celt codec teknolojisi dahil RFC 6716 ol qt6-base-devel qt6-declarative-devel + qt6-5compat-devel qt6-webengine-devel + plasma5-support-devel libxcb-devel xcb-util-image-devel glib2-devel @@ -124670,7 +124678,9 @@ Bu Skype SILK codec ve Xiph.Org 's Celt codec teknolojisi dahil RFC 6716 ol kholidays-kf6 kdeclarative-kf6 qt6-webengine + qt6-5compat qt6-declarative + plasma5-support kcompletion-kf6 kcoreaddons-kf6 kwindowsystem-kf6 @@ -126044,7 +126054,6 @@ Bu Skype SILK codec ve Xiph.Org 's Celt codec teknolojisi dahil RFC 6716 ol boost-devel libX11-devel libXft-devel - signon-devel libxcb-devel breeze-style-kf6 qt6-sql-odbc @@ -126097,7 +126106,6 @@ Bu Skype SILK codec ve Xiph.Org 's Celt codec teknolojisi dahil RFC 6716 ol xorg-input-libinput-devel signon-plugin-oauth2-devel xorg-input-synaptics-devel - kaccounts-integration-devel desktop/kde6/plasma/plasma-desktop-kf6/pspec.xml @@ -126162,7 +126170,6 @@ Bu Skype SILK codec ve Xiph.Org 's Celt codec teknolojisi dahil RFC 6716 ol xcb-util-keysyms plasma-activities-stats-kf6 qqc2-desktop-style-kf6 - kaccounts-integration /etc @@ -126202,6 +126209,7 @@ Bu Skype SILK codec ve Xiph.Org 's Celt codec teknolojisi dahil RFC 6716 ol mirrors://kde/stable/plasma/6.0.0/kwin-6.0.0.tar.xz hwdata + libdisplay-info-devel kglobalacceld-devel plasma-activities-kf6-devel kauth-kf6-devel @@ -126246,6 +126254,7 @@ Bu Skype SILK codec ve Xiph.Org 's Celt codec teknolojisi dahil RFC 6716 ol xcb-util-wm-devel libplasma-kf6-devel qt6-base-devel + qt6-wayland-devel qt6-5compat-devel qt6-declarative-devel qt6-designer-devel @@ -126328,6 +126337,7 @@ Bu Skype SILK codec ve Xiph.Org 's Celt codec teknolojisi dahil RFC 6716 ol qt6-base qt6-declarative qt6-sensors + qt6-wayland wayland-cursor wayland-client xcb-util-wm @@ -126343,6 +126353,7 @@ Bu Skype SILK codec ve Xiph.Org 's Celt codec teknolojisi dahil RFC 6716 ol xcb-util-cursor wayland-server libqaccessibilityclient-qt6 + libdisplay-info /etc @@ -127136,6 +127147,7 @@ Bu Skype SILK codec ve Xiph.Org 's Celt codec teknolojisi dahil RFC 6716 ol kconfigwidgets-kf6-devel kwidgetsaddons-kf6-devel kdbusaddons-kf6-devel + kglobalaccel-kf6-devel ki18n-kf6-devel kiconthemes-kf6-devel kio-kf6-devel @@ -385833,7 +385845,7 @@ Konuk sanal makinede çalışan okuyucu. Provides a standard for creating app stores across distributions Provides a standard for creating app stores across distributions appstream-logo - https://www.freedesktop.org/software/appstream/releases/AppStream-1.0.0.tar.xz + https://www.freedesktop.org/software/appstream/releases/AppStream-1.0.2.tar.xz cmake meson @@ -385862,9 +385874,6 @@ Konuk sanal makinede çalışan okuyucu. qt6-base-devel qt6-linguist - - fix-qt5-link-target.patch - programming/library/appstream/pspec.xml @@ -385915,7 +385924,7 @@ Konuk sanal makinede çalışan okuyucu. appstream-qt5-devel Development files for appstream - appstream-qt5 + appstream-qt5 /usr/include/AppStreamQt5 @@ -385938,7 +385947,7 @@ Konuk sanal makinede çalışan okuyucu. appstream-qt6-devel Development files for appstream - appstream-qt6 + appstream-qt6 /usr/include/AppStreamQt6 @@ -385949,7 +385958,7 @@ Konuk sanal makinede çalışan okuyucu. appstream-devel Development files for appstream - appstream + appstream glib2-devel @@ -385958,6 +385967,13 @@ Konuk sanal makinede çalışan okuyucu. + + 2024-03-02 + 1.0.2 + Version bump. + Mustafa Cinasal + muscnsl@gmail.com + 2023-11-18 1.0.0 @@ -388470,6 +388486,98 @@ to create header files and sources from protocol files. + + + libaccounts-qt6 + https://gitlab.com/accounts-sso/libaccounts-qt + + Alihan Öztürk + alihan@pisilinux.org + + GPLv3 + library + programming.library + Qt5-based client library for accessing the online accounts database + Qt5-based client library for accessing the online accounts database + https://sourceforge.net/projects/pisilinux/files/source/libaccounts-qt-1.16.tar.gz + + doxygen + qt6-base-devel + qt6-assistant-devel + glib2-devel + libaccounts-glib-devel + + + gentoo/0001-Port-away-from-deprecated-QList-toSet.patch + gentoo/0003-Use-undeprecated-Account-value.patch + gentoo/0004-Don-t-access-a-QString-out-of-bounds.patch + gentoo/0005-Adjust-buildsystem-to-include-correct-Qt-Major-versi.patch + gentoo/accounts-qt-1.16-libdir.patch + + programming/library/libaccounts-qt6/pspec.xml + + + libaccounts-qt6 + + glib2 + libgcc + qt6-base + libaccounts-glib + + + /usr/lib/libaccounts-qt6.* + /usr/share/doc/libaccounts-qt6 + /usr/lib/cmake + + + + libaccounts-qt6-devel + Development files for libaccounts-qt6 + + libaccounts-qt6 + qt6-base-devel + glib2-devel + + + /usr/include + /usr/lib/pkgconfig + + + + libaccounts-qt6-docs + Help files and API documents for libaccounts-qt6 + data:doc + + libaccounts-qt6 + + + /usr/share/doc + + + + libaccounts-qt6-tools + This package contains the tools for the libaccounts-qt6 library + data:doc + + libaccounts-qt6 + libgcc + qt6-base + + + /usr/bin + /usr/share/libaccounts-qt-tests + + + + + 2020-02-04 + 1.16 + First release + Mustafa Cinasal + muscnsl@gmail.com + + + libnih diff --git a/pisi-index.xml.sha1sum b/pisi-index.xml.sha1sum index 945117e428..52919753cc 100644 --- a/pisi-index.xml.sha1sum +++ b/pisi-index.xml.sha1sum @@ -1 +1 @@ -e27570d0ff288c2e680e70dacb7e4c2f440fb430 \ No newline at end of file +d1fc6b889185db52d83749f183f2bce881513557 \ No newline at end of file diff --git a/pisi-index.xml.xz b/pisi-index.xml.xz index 2824b89919..f6218b3203 100644 Binary files a/pisi-index.xml.xz and b/pisi-index.xml.xz differ diff --git a/pisi-index.xml.xz.sha1sum b/pisi-index.xml.xz.sha1sum index c591b8f09b..9408fc6608 100644 --- a/pisi-index.xml.xz.sha1sum +++ b/pisi-index.xml.xz.sha1sum @@ -1 +1 @@ -9e39e82c4390daf4bf3d755f6c23a02ad8aaece9 \ No newline at end of file +692651ea956f2702901ee97acd177205b0ebd7f8 \ No newline at end of file diff --git a/programming/library/libaccounts-qt6/actions.py b/programming/library/libaccounts-qt6/actions.py new file mode 100644 index 0000000000..2e4f574cb1 --- /dev/null +++ b/programming/library/libaccounts-qt6/actions.py @@ -0,0 +1,23 @@ +#!/usr/bin/python +# -*- coding: utf-8 -*- +# +# Licensed under the GNU General Public License, version 3. +# See the file http://www.gnu.org/licenses/gpl.txt + +from pisi.actionsapi import autotools +from pisi.actionsapi import pisitools +from pisi.actionsapi import shelltools +from pisi.actionsapi import get + + +def setup(): + shelltools.system("sed -i 's|SUBDIRS += Accounts tests|SUBDIRS += Accounts|' accounts-qt.pro") + shelltools.system("qmake6-qt6 PREFIX=/usr LIBDIR=lib") + +def build(): + autotools.make() + +def install(): + autotools.rawInstall("INSTALL_ROOT=%s" % get.installDIR()) + + pisitools.dodoc("NOTES", "INSTALL", "COPYING", "README.*", "TODO") diff --git a/programming/library/libaccounts-qt6/files/gentoo/0001-Port-away-from-deprecated-QList-toSet.patch b/programming/library/libaccounts-qt6/files/gentoo/0001-Port-away-from-deprecated-QList-toSet.patch new file mode 100644 index 0000000000..190178cc30 --- /dev/null +++ b/programming/library/libaccounts-qt6/files/gentoo/0001-Port-away-from-deprecated-QList-toSet.patch @@ -0,0 +1,92 @@ +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/programming/library/libaccounts-qt6/files/gentoo/0002-Add-Qt6-CI.patch b/programming/library/libaccounts-qt6/files/gentoo/0002-Add-Qt6-CI.patch new file mode 100644 index 0000000000..f8383b5f8a --- /dev/null +++ b/programming/library/libaccounts-qt6/files/gentoo/0002-Add-Qt6-CI.patch @@ -0,0 +1,137 @@ +https://gitlab.com/accounts-sso/libaccounts-qt/-/merge_requests/21 + +From d00f7346b091b885ba0ea3f6055e74a173fd0034 Mon Sep 17 00:00:00 2001 +From: Nicolas Fella +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/programming/library/libaccounts-qt6/files/gentoo/0003-Use-undeprecated-Account-value.patch b/programming/library/libaccounts-qt6/files/gentoo/0003-Use-undeprecated-Account-value.patch new file mode 100644 index 0000000000..7a8cb85b00 --- /dev/null +++ b/programming/library/libaccounts-qt6/files/gentoo/0003-Use-undeprecated-Account-value.patch @@ -0,0 +1,28 @@ +https://gitlab.com/accounts-sso/libaccounts-qt/-/merge_requests/21 + +From 102cf562f9d143de2f93ba40f8448c1d531c2c7b Mon Sep 17 00:00:00 2001 +From: Nicolas Fella +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/programming/library/libaccounts-qt6/files/gentoo/0004-Don-t-access-a-QString-out-of-bounds.patch b/programming/library/libaccounts-qt6/files/gentoo/0004-Don-t-access-a-QString-out-of-bounds.patch new file mode 100644 index 0000000000..e342139cbb --- /dev/null +++ b/programming/library/libaccounts-qt6/files/gentoo/0004-Don-t-access-a-QString-out-of-bounds.patch @@ -0,0 +1,42 @@ +https://gitlab.com/accounts-sso/libaccounts-qt/-/merge_requests/21 + +From 3c4d5fa1f53cd66c9870b799e8518980176547b2 Mon Sep 17 00:00:00 2001 +From: Nicolas Fella +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/programming/library/libaccounts-qt6/files/gentoo/0005-Adjust-buildsystem-to-include-correct-Qt-Major-versi.patch b/programming/library/libaccounts-qt6/files/gentoo/0005-Adjust-buildsystem-to-include-correct-Qt-Major-versi.patch new file mode 100644 index 0000000000..904e7d5aa1 --- /dev/null +++ b/programming/library/libaccounts-qt6/files/gentoo/0005-Adjust-buildsystem-to-include-correct-Qt-Major-versi.patch @@ -0,0 +1,118 @@ +https://gitlab.com/accounts-sso/libaccounts-qt/-/merge_requests/21 + +From 18557f7def9af8f4a9e0e93e9f575ae11e5066aa Mon Sep 17 00:00:00 2001 +From: Nicolas Fella +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 + diff --git a/programming/library/libaccounts-qt6/files/gentoo/accounts-qt-1.16-libdir.patch b/programming/library/libaccounts-qt6/files/gentoo/accounts-qt-1.16-libdir.patch new file mode 100644 index 0000000000..dfcbe71938 --- /dev/null +++ b/programming/library/libaccounts-qt6/files/gentoo/accounts-qt-1.16-libdir.patch @@ -0,0 +1,116 @@ +From e3882382b2e98bce5be07baf23771856828123fc Mon Sep 17 00:00:00 2001 +From: Andreas Sturmlechner +Date: Thu, 7 Dec 2023 23:20:32 +0100 +Subject: [PATCH] Make LIBDIR configurable + +Signed-off-by: Andreas Sturmlechner +--- + Accounts/AccountsQt5Config.cmake.in | 2 +- + Accounts/AccountsQt6Config.cmake.in | 4 ++-- + Accounts/accounts-qt5.pc.in | 2 +- + Accounts/accounts-qt6.pc.in | 2 +- + common-installs-config.pri | 2 +- + common-pkgconfig.pri | 2 +- + common-project-config.pri | 6 +++--- + 7 files changed, 10 insertions(+), 10 deletions(-) + +diff --git a/Accounts/AccountsQt5Config.cmake.in b/Accounts/AccountsQt5Config.cmake.in +index 746f689..9280a7d 100644 +--- a/Accounts/AccountsQt5Config.cmake.in ++++ b/Accounts/AccountsQt5Config.cmake.in +@@ -1,5 +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_LIBRARIES $${INSTALL_PREFIX}/$${LIBDIR}/lib$${TARGET}.so) + set(ACCOUNTSQT_INCLUDE_DIRS $${INSTALL_PREFIX}/include/$${TARGET}/) +diff --git a/Accounts/AccountsQt6Config.cmake.in b/Accounts/AccountsQt6Config.cmake.in +index 55a8964..9280a7d 100644 +--- a/Accounts/AccountsQt6Config.cmake.in ++++ b/Accounts/AccountsQt6Config.cmake.in +@@ -1,5 +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 ++set(ACCOUNTSQT_LIBRARIES $${INSTALL_PREFIX}/$${LIBDIR}/lib$${TARGET}.so) ++set(ACCOUNTSQT_INCLUDE_DIRS $${INSTALL_PREFIX}/include/$${TARGET}/) +diff --git a/Accounts/accounts-qt5.pc.in b/Accounts/accounts-qt5.pc.in +index fbfcea8..faea96b 100644 +--- a/Accounts/accounts-qt5.pc.in ++++ b/Accounts/accounts-qt5.pc.in +@@ -1,6 +1,6 @@ + prefix=$$INSTALL_PREFIX + exec_prefix=${prefix} +-libdir=$$INSTALL_LIBDIR ++libdir=${prefix}/$$LIBDIR + includedir=${prefix}/include/accounts-qt5 + servicefilesdir=${prefix}/share/accounts/services + servicetypefilesdir=${prefix}/share/accounts/service-types +diff --git a/Accounts/accounts-qt6.pc.in b/Accounts/accounts-qt6.pc.in +index c625b2e..cdc0233 100644 +--- a/Accounts/accounts-qt6.pc.in ++++ b/Accounts/accounts-qt6.pc.in +@@ -1,6 +1,6 @@ + prefix=$$INSTALL_PREFIX + exec_prefix=${prefix} +-libdir=$$INSTALL_LIBDIR ++libdir=${prefix}/$$LIBDIR + includedir=${prefix}/include/accounts-qt6 + servicefilesdir=${prefix}/share/accounts/services + servicetypefilesdir=${prefix}/share/accounts/service-types +diff --git a/common-installs-config.pri b/common-installs-config.pri +index 82baf75..420accb 100644 +--- a/common-installs-config.pri ++++ b/common-installs-config.pri +@@ -17,7 +17,7 @@ contains( TEMPLATE, app ) { + #----------------------------------------------------------------------------- + contains( TEMPLATE, lib ) { + +- target.path = $${INSTALL_LIBDIR} ++ target.path = $${INSTALL_PREFIX}/$${LIBDIR} + INSTALLS += target + message("====") + message("==== INSTALLS += target") +diff --git a/common-pkgconfig.pri b/common-pkgconfig.pri +index 975068a..9f010d3 100644 +--- a/common-pkgconfig.pri ++++ b/common-pkgconfig.pri +@@ -3,7 +3,7 @@ + !isEmpty(pkgconfig.files) { + QMAKE_SUBSTITUTES += $${pkgconfig.files}.in + pkgconfig.CONFIG = no_check_exist +- pkgconfig.path = $${INSTALL_LIBDIR}/pkgconfig ++ pkgconfig.path = $${INSTALL_PREFIX}/$${LIBDIR}/pkgconfig + QMAKE_EXTRA_TARGETS += pkgconfig + + QMAKE_CLEAN += $${pkgconfig.files} +diff --git a/common-project-config.pri b/common-project-config.pri +index b856961..0484e36 100644 +--- a/common-project-config.pri ++++ b/common-project-config.pri +@@ -44,15 +44,15 @@ INSTALL_LIBDIR = $${INSTALL_PREFIX}/lib + isEmpty( LIBDIR ) { + message("====") + message("==== NOTE: To override the library installation path run: `qmake LIBDIR=/custom/path'") +- message("==== (current installation path is `$${INSTALL_LIBDIR}')") ++ message("==== (current installation path is `$${INSTALL_PREFIX}/$${LIBDIR}')") + } else { + INSTALL_LIBDIR = $${LIBDIR} + message("====") +- message("==== library install path set to `$${INSTALL_LIBDIR}'") ++ message("==== library install path set to `$${INSTALL_PREFIX}/$${LIBDIR}'") + } + + isEmpty ( CMAKE_CONFIG_PATH ) { +- CMAKE_CONFIG_PATH = $${INSTALL_LIBDIR}/cmake ++ CMAKE_CONFIG_PATH = $${INSTALL_PREFIX}/$${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}')") +-- +2.43.0 + diff --git a/programming/library/libaccounts-qt6/pspec.xml b/programming/library/libaccounts-qt6/pspec.xml new file mode 100644 index 0000000000..e87b675197 --- /dev/null +++ b/programming/library/libaccounts-qt6/pspec.xml @@ -0,0 +1,98 @@ + + + + + libaccounts-qt6 + https://gitlab.com/accounts-sso/libaccounts-qt + + Alihan Öztürk + alihan@pisilinux.org + + GPLv3 + library + Qt5-based client library for accessing the online accounts database + Qt5-based client library for accessing the online accounts database + https://sourceforge.net/projects/pisilinux/files/source/libaccounts-qt-1.16.tar.gz + + doxygen + qt6-base-devel + qt6-assistant-devel + glib2-devel + libaccounts-glib-devel + + + gentoo/0001-Port-away-from-deprecated-QList-toSet.patch + + gentoo/0003-Use-undeprecated-Account-value.patch + gentoo/0004-Don-t-access-a-QString-out-of-bounds.patch + gentoo/0005-Adjust-buildsystem-to-include-correct-Qt-Major-versi.patch + gentoo/accounts-qt-1.16-libdir.patch + + + + + libaccounts-qt6 + + glib2 + libgcc + qt6-base + libaccounts-glib + + + /usr/lib/libaccounts-qt6.* + /usr/share/doc/libaccounts-qt6 + /usr/lib/cmake + + + + + libaccounts-qt6-devel + Development files for libaccounts-qt6 + + libaccounts-qt6 + qt6-base-devel + glib2-devel + + + /usr/include + /usr/lib/pkgconfig + + + + + libaccounts-qt6-docs + data:doc + Help files and API documents for libaccounts-qt6 + + libaccounts-qt6 + + + /usr/share/doc + + + + + libaccounts-qt6-tools + data:doc + This package contains the tools for the libaccounts-qt6 library + + libaccounts-qt6 + libgcc + qt6-base + + + /usr/bin + /usr/share/libaccounts-qt-tests + + + + + + 2020-02-04 + 1.16 + First release + Mustafa Cinasal + muscnsl@gmail.com + + +