Pisilinux/main
5
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

libaccounts-qt6 new package

Browse Source
This commit is contained in:
Rmys
2024-03-03 10:06:34 +03:00
parent 6597cd4d65
commit c9d2e271c2
12 changed files with 799 additions and 37 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pisi-index.xml
+143 -35
View File
@@ -121718,7 +121718,6 @@ Bu Skype SILK codec ve Xiph.Org 's Celt codec teknolojisi dahil RFC 6716 ol
<Dependency versionFrom="3.2.4">ffmpeg-devel</Dependency>
<Dependency>taglib-devel</Dependency>
<Dependency>libappimage-devel</Dependency>
<Dependency>kdegraphics-mobipocket-devel</Dependency>
<Dependency versionFrom="21.03.0">poppler-qt6-devel</Dependency>
<Dependency versionFrom="6.0.0">karchive-kf6-devel</Dependency>
<Dependency versionFrom="6.0.0">ki18n-kf6-devel</Dependency>
@@ -121737,7 +121736,6 @@ Bu Skype SILK codec ve Xiph.Org &apos;s Celt codec teknolojisi dahil RFC 6716 ol
<Dependency versionFrom="0.25">exiv2-libs</Dependency>
<Dependency>taglib</Dependency>
<Dependency>libappimage</Dependency>
<Dependency>kdegraphics-mobipocket</Dependency>
<Dependency versionFrom="3.2.4">ffmpeg</Dependency>
<Dependency versionFrom="0.51.0">poppler-qt6</Dependency>
<Dependency versionFrom="6.0.0">karchive-kf6</Dependency>
@@ -122849,6 +122847,26 @@ Bu Skype SILK codec ve Xiph.Org &apos;s Celt codec teknolojisi dahil RFC 6716 ol
<Dependency>kcolorscheme-kf6-devel</Dependency>
<Dependency>kstatusnotifieritem-kf6-devel</Dependency>
<Dependency>xdg-desktop-portal-kde-kf6</Dependency>
<Dependency versionFrom="5.15.11">qt5-base-devel</Dependency>
<Dependency versionFrom="5.15.11">qt5-wayland-devel</Dependency>
<Dependency versionFrom="5.15.11">qt5-declarative-devel</Dependency>
<Dependency versionFrom="5.15.11">qt5-x11extras-devel</Dependency>
<Dependency versionFrom="5.15.11">qt5-quickcontrols2-devel</Dependency>
<Dependency>kcompletion-devel</Dependency>
<Dependency>ki18n-devel</Dependency>
<Dependency>kxmlgui-devel</Dependency>
<Dependency>kiconthemes-devel</Dependency>
<Dependency>kwayland-devel</Dependency>
<Dependency>kconfig-devel</Dependency>
<Dependency>kguiaddons-devel</Dependency>
<Dependency>kio-devel</Dependency>
<Dependency>kservice-devel</Dependency>
<Dependency>kwindowsystem-devel</Dependency>
<Dependency>kcoreaddons-devel</Dependency>
<Dependency>kconfigwidgets-devel</Dependency>
<Dependency>kwidgetsaddons-devel</Dependency>
<Dependency>kjobwidgets-devel</Dependency>
<Dependency>knotifications-devel</Dependency>
</BuildDependencies>
<SourceURI>desktop/kde6/plasma/plasma-integration-kf6/pspec.xml</SourceURI>
</Source>
@@ -122881,26 +122899,6 @@ Bu Skype SILK codec ve Xiph.Org &apos;s Celt codec teknolojisi dahil RFC 6716 ol
<Dependency>kservice-kf6</Dependency>
<Dependency>kcolorscheme-kf6</Dependency>
<Dependency>kstatusnotifieritem-kf6</Dependency>
<Dependency versionFrom="5.15.11">qt5-base-devel</Dependency>
<Dependency versionFrom="5.15.11">qt5-wayland-devel</Dependency>
<Dependency versionFrom="5.15.11">qt5-declarative-devel</Dependency>
<Dependency versionFrom="5.15.11">qt5-x11extras-devel</Dependency>
<Dependency versionFrom="5.15.11">qt5-quickcontrols2-devel</Dependency>
<Dependency>kcompletion-devel</Dependency>
<Dependency>ki18n-devel</Dependency>
<Dependency>kxmlgui-devel</Dependency>
<Dependency>kiconthemes-devel</Dependency>
<Dependency>kwayland-devel</Dependency>
<Dependency>kconfig-devel</Dependency>
<Dependency>kguiaddons-devel</Dependency>
<Dependency>kio-devel</Dependency>
<Dependency>kservice-devel</Dependency>
<Dependency>kwindowsystem-devel</Dependency>
<Dependency>kcoreaddons-devel</Dependency>
<Dependency>kconfigwidgets-devel</Dependency>
<Dependency>kwidgetsaddons-devel</Dependency>
<Dependency>kjobwidgets-devel</Dependency>
<Dependency>knotifications-devel</Dependency>
</RuntimeDependencies>
<Files>
<Path fileType="library">/usr/lib/qt6</Path>
@@ -123902,6 +123900,8 @@ Bu Skype SILK codec ve Xiph.Org &apos;s Celt codec teknolojisi dahil RFC 6716 ol
<BuildDependencies>
<Dependency>libgcc</Dependency>
<Dependency>icu4c-devel</Dependency>
<Dependency>appstream-devel</Dependency>
<Dependency>kded-kf6-devel</Dependency>
<Dependency>kio-kf6-devel</Dependency>
<Dependency>zlib-devel</Dependency>
<Dependency>baloo-kf6-devel</Dependency>
@@ -123920,13 +123920,14 @@ Bu Skype SILK codec ve Xiph.Org &apos;s Celt codec teknolojisi dahil RFC 6716 ol
<Dependency>libxcb-devel</Dependency>
<Dependency>prison-kf6-devel</Dependency>
<Dependency>kconfig-kf6-devel</Dependency>
<Dependency>kpeople-devel</Dependency>
<Dependency>kpeople-kf6-devel</Dependency>
<Dependency>krunner-kf6-devel</Dependency>
<Dependency>kwallet-kf6-devel</Dependency>
<Dependency>kxmlgui-kf6-devel</Dependency>
<Dependency>libXtst-devel</Dependency>
<Dependency>kpackage-kf6-devel</Dependency>
<Dependency>kservice-kf6-devel</Dependency>
<Dependency>kunitconversion-kf6-devel</Dependency>
<Dependency versionFrom="6.0.0">kwayland-kf6-devel</Dependency>
<Dependency>xcb-util-devel</Dependency>
<Dependency>kirigami-kf6-devel</Dependency>
@@ -123969,6 +123970,7 @@ Bu Skype SILK codec ve Xiph.Org &apos;s Celt codec teknolojisi dahil RFC 6716 ol
<Dependency versionFrom="6.5.3">qt6-sql-odbc</Dependency>
<Dependency versionFrom="6.5.3">qt6-sql-mysql</Dependency>
<Dependency versionFrom="5.15.5">qt6-base-devel</Dependency>
<Dependency versionFrom="5.15.5">qt6-shadertools-devel</Dependency>
<Dependency versionFrom="6.5.3">qt6-sql-sqlite</Dependency>
<Dependency versionFrom="6.0.0">libkscreen-kf6-devel</Dependency>
<Dependency versionFrom="6.5.3">qt6-sql-postgresql</Dependency>
@@ -124027,13 +124029,16 @@ Bu Skype SILK codec ve Xiph.Org &apos;s Celt codec teknolojisi dahil RFC 6716 ol
<Dependency>libX11</Dependency>
<Dependency>libXau</Dependency>
<Dependency>libxcb</Dependency>
<Dependency>appstream</Dependency>
<Dependency>kded-kf6</Dependency>
<Dependency>prison-kf6</Dependency>
<Dependency>kconfig-kf6</Dependency>
<Dependency>kpeople</Dependency>
<Dependency>kpeople-kf6</Dependency>
<Dependency>krunner-kf6</Dependency>
<Dependency>kwallet-kf6</Dependency>
<Dependency>kxmlgui-kf6</Dependency>
<Dependency>libXtst</Dependency>
<Dependency>kunitconversion-kf6</Dependency>
<Dependency>kpackage-kf6</Dependency>
<Dependency>kpipewire-kf6</Dependency>
<Dependency>kservice-kf6</Dependency>
@@ -124078,6 +124083,7 @@ Bu Skype SILK codec ve Xiph.Org &apos;s Celt codec teknolojisi dahil RFC 6716 ol
<Dependency>appmenu-gtk-module</Dependency>
<Dependency versionFrom="6.0.0">oxygen-sounds-kf6</Dependency>
<Dependency versionFrom="5.15.5">qt6-base</Dependency>
<Dependency versionFrom="5.15.5">qt6-shadertools</Dependency>
<Dependency versionFrom="6.5.3">qt6-declarative</Dependency>
<Dependency>gpsd</Dependency>
<Dependency>kparts-kf6</Dependency>
@@ -124139,7 +124145,7 @@ Bu Skype SILK codec ve Xiph.Org &apos;s Celt codec teknolojisi dahil RFC 6716 ol
<Dependency>libxcb-devel</Dependency>
<Dependency>prison-kf6-devel</Dependency>
<Dependency>kconfig-kf6-devel</Dependency>
<Dependency>kpeople-devel</Dependency>
<Dependency>kpeople-kf6-devel</Dependency>
<Dependency>krunner-kf6-devel</Dependency>
<Dependency>kwallet-kf6-devel</Dependency>
<Dependency>kxmlgui-kf6-devel</Dependency>
@@ -124612,7 +124618,9 @@ Bu Skype SILK codec ve Xiph.Org &apos;s Celt codec teknolojisi dahil RFC 6716 ol
<BuildDependencies>
<Dependency versionFrom="6.5.3">qt6-base-devel</Dependency>
<Dependency versionFrom="6.5.3">qt6-declarative-devel</Dependency>
<Dependency versionFrom="6.5.3">qt6-5compat-devel</Dependency>
<Dependency versionFrom="6.5.3">qt6-webengine-devel</Dependency>
<Dependency>plasma5-support-devel</Dependency>
<Dependency>libxcb-devel</Dependency>
<Dependency>xcb-util-image-devel</Dependency>
<Dependency>glib2-devel</Dependency>
@@ -124670,7 +124678,9 @@ Bu Skype SILK codec ve Xiph.Org &apos;s Celt codec teknolojisi dahil RFC 6716 ol
<Dependency>kholidays-kf6</Dependency>
<Dependency>kdeclarative-kf6</Dependency>
<Dependency versionFrom="6.5.3">qt6-webengine</Dependency>
<Dependency versionFrom="6.5.3">qt6-5compat</Dependency>
<Dependency versionFrom="6.5.3">qt6-declarative</Dependency>
<Dependency>plasma5-support</Dependency>
<Dependency>kcompletion-kf6</Dependency>
<Dependency>kcoreaddons-kf6</Dependency>
<Dependency>kwindowsystem-kf6</Dependency>
@@ -126044,7 +126054,6 @@ Bu Skype SILK codec ve Xiph.Org &apos;s Celt codec teknolojisi dahil RFC 6716 ol
<Dependency>boost-devel</Dependency>
<Dependency>libX11-devel</Dependency>
<Dependency>libXft-devel</Dependency>
<Dependency>signon-devel</Dependency>
<Dependency>libxcb-devel</Dependency>
<Dependency>breeze-style-kf6</Dependency>
<Dependency>qt6-sql-odbc</Dependency>
@@ -126097,7 +126106,6 @@ Bu Skype SILK codec ve Xiph.Org &apos;s Celt codec teknolojisi dahil RFC 6716 ol
<Dependency>xorg-input-libinput-devel</Dependency>
<Dependency>signon-plugin-oauth2-devel</Dependency>
<Dependency>xorg-input-synaptics-devel</Dependency>
<Dependency>kaccounts-integration-devel</Dependency>
</BuildDependencies>
<SourceURI>desktop/kde6/plasma/plasma-desktop-kf6/pspec.xml</SourceURI>
</Source>
@@ -126162,7 +126170,6 @@ Bu Skype SILK codec ve Xiph.Org &apos;s Celt codec teknolojisi dahil RFC 6716 ol
<Dependency>xcb-util-keysyms</Dependency>
<Dependency versionFrom="6.0.0">plasma-activities-stats-kf6</Dependency>
<Dependency>qqc2-desktop-style-kf6</Dependency>
<Dependency>kaccounts-integration</Dependency>
</RuntimeDependencies>
<Files>
<Path fileType="config">/etc</Path>
@@ -126202,6 +126209,7 @@ Bu Skype SILK codec ve Xiph.Org &apos;s Celt codec teknolojisi dahil RFC 6716 ol
<Archive type="tarxz" sha1sum="d439e9bae7fbf2837a185d7c389079e7a51bf9ba" name="kwin-6.0.0.tar.xz">mirrors://kde/stable/plasma/6.0.0/kwin-6.0.0.tar.xz</Archive>
<BuildDependencies>
<Dependency>hwdata</Dependency>
<Dependency>libdisplay-info-devel</Dependency>
<Dependency>kglobalacceld-devel</Dependency>
<Dependency>plasma-activities-kf6-devel</Dependency>
<Dependency>kauth-kf6-devel</Dependency>
@@ -126246,6 +126254,7 @@ Bu Skype SILK codec ve Xiph.Org &apos;s Celt codec teknolojisi dahil RFC 6716 ol
<Dependency>xcb-util-wm-devel</Dependency>
<Dependency versionFrom="6.0.0">libplasma-kf6-devel</Dependency>
<Dependency versionFrom="6.5.3">qt6-base-devel</Dependency>
<Dependency versionFrom="6.5.3">qt6-wayland-devel</Dependency>
<Dependency versionFrom="6.5.3">qt6-5compat-devel</Dependency>
<Dependency versionFrom="6.5.3">qt6-declarative-devel</Dependency>
<Dependency versionFrom="6.5.3">qt6-designer-devel</Dependency>
@@ -126328,6 +126337,7 @@ Bu Skype SILK codec ve Xiph.Org &apos;s Celt codec teknolojisi dahil RFC 6716 ol
<Dependency versionFrom="6.5.3">qt6-base</Dependency>
<Dependency versionFrom="6.5.3">qt6-declarative</Dependency>
<Dependency versionFrom="6.5.3">qt6-sensors</Dependency>
<Dependency versionFrom="6.5.3">qt6-wayland</Dependency>
<Dependency>wayland-cursor</Dependency>
<Dependency>wayland-client</Dependency>
<Dependency>xcb-util-wm</Dependency>
@@ -126343,6 +126353,7 @@ Bu Skype SILK codec ve Xiph.Org &apos;s Celt codec teknolojisi dahil RFC 6716 ol
<Dependency>xcb-util-cursor</Dependency>
<Dependency>wayland-server</Dependency>
<Dependency>libqaccessibilityclient-qt6</Dependency>
<Dependency>libdisplay-info</Dependency>
</RuntimeDependencies>
<Files>
<Path fileType="config">/etc</Path>
@@ -127136,6 +127147,7 @@ Bu Skype SILK codec ve Xiph.Org &apos;s Celt codec teknolojisi dahil RFC 6716 ol
<Dependency>kconfigwidgets-kf6-devel</Dependency>
<Dependency>kwidgetsaddons-kf6-devel</Dependency>
<Dependency>kdbusaddons-kf6-devel</Dependency>
<Dependency>kglobalaccel-kf6-devel</Dependency>
<Dependency>ki18n-kf6-devel</Dependency>
<Dependency>kiconthemes-kf6-devel</Dependency>
<Dependency>kio-kf6-devel</Dependency>
@@ -385833,7 +385845,7 @@ Konuk sanal makinede çalışan okuyucu.</Description>
<Description xml:lang="en">Provides a standard for creating app stores across distributions</Description>
<Description xml:lang="tr">Provides a standard for creating app stores across distributions</Description>
<Icon>appstream-logo</Icon>
<Archive type="tarxz" sha1sum="e319e85723996ef985b6511a1c5fdf0cce9229af" name="AppStream-1.0.0.tar.xz">https://www.freedesktop.org/software/appstream/releases/AppStream-1.0.0.tar.xz</Archive>
<Archive type="tarxz" sha1sum="5626d2b8d570fd7742fadb82460dfef9b25080be" name="AppStream-1.0.2.tar.xz">https://www.freedesktop.org/software/appstream/releases/AppStream-1.0.2.tar.xz</Archive>
<BuildDependencies>
<Dependency>cmake</Dependency>
<Dependency>meson</Dependency>
@@ -385862,9 +385874,6 @@ Konuk sanal makinede çalışan okuyucu.</Description>
<Dependency>qt6-base-devel</Dependency>
<Dependency>qt6-linguist</Dependency>
</BuildDependencies>
<Patches>
<Patch level="1">fix-qt5-link-target.patch</Patch>
</Patches>
<SourceURI>programming/library/appstream/pspec.xml</SourceURI>
</Source>
<Package>
@@ -385915,7 +385924,7 @@ Konuk sanal makinede çalışan okuyucu.</Description>
<Name>appstream-qt5-devel</Name>
<Summary xml:lang="en">Development files for appstream</Summary>
<RuntimeDependencies>
<Dependency release="16">appstream-qt5</Dependency>
<Dependency release="17">appstream-qt5</Dependency>
</RuntimeDependencies>
<Files>
<Path fileType="header">/usr/include/AppStreamQt5</Path>
@@ -385938,7 +385947,7 @@ Konuk sanal makinede çalışan okuyucu.</Description>
<Name>appstream-qt6-devel</Name>
<Summary xml:lang="en">Development files for appstream</Summary>
<RuntimeDependencies>
<Dependency release="16">appstream-qt6</Dependency>
<Dependency release="17">appstream-qt6</Dependency>
</RuntimeDependencies>
<Files>
<Path fileType="header">/usr/include/AppStreamQt6</Path>
@@ -385949,7 +385958,7 @@ Konuk sanal makinede çalışan okuyucu.</Description>
<Name>appstream-devel</Name>
<Summary xml:lang="en">Development files for appstream</Summary>
<RuntimeDependencies>
<Dependency release="16">appstream</Dependency>
<Dependency release="17">appstream</Dependency>
<Dependency>glib2-devel</Dependency>
</RuntimeDependencies>
<Files>
@@ -385958,6 +385967,13 @@ Konuk sanal makinede çalışan okuyucu.</Description>
</Files>
</Package>
<History>
<Update release="17">
<Date>2024-03-02</Date>
<Version>1.0.2</Version>
<Comment>Version bump.</Comment>
<Name>Mustafa Cinasal</Name>
<Email>muscnsl@gmail.com</Email>
</Update>
<Update release="16">
<Date>2023-11-18</Date>
<Version>1.0.0</Version>
@@ -388470,6 +388486,98 @@ to create header files and sources from protocol files.</Description>
</Update>
</History>
</SpecFile>
<SpecFile>
<Source>
<Name>libaccounts-qt6</Name>
<Homepage>https://gitlab.com/accounts-sso/libaccounts-qt</Homepage>
<Packager>
<Name>Alihan Öztürk</Name>
<Email>alihan@pisilinux.org</Email>
</Packager>
<License>GPLv3</License>
<IsA>library</IsA>
<PartOf>programming.library</PartOf>
<Summary xml:lang="en">Qt5-based client library for accessing the online accounts database</Summary>
<Description xml:lang="en">Qt5-based client library for accessing the online accounts database</Description>
<Archive type="targz" sha1sum="7922439bae4a082b7159e61d37ddb61c3c04329e" name="libaccounts-qt-1.16.tar.gz">https://sourceforge.net/projects/pisilinux/files/source/libaccounts-qt-1.16.tar.gz</Archive>
<BuildDependencies>
<Dependency>doxygen</Dependency>
<Dependency>qt6-base-devel</Dependency>
<Dependency>qt6-assistant-devel</Dependency>
<Dependency>glib2-devel</Dependency>
<Dependency>libaccounts-glib-devel</Dependency>
</BuildDependencies>
<Patches>
<Patch level="1">gentoo/0001-Port-away-from-deprecated-QList-toSet.patch</Patch>
<Patch level="1">gentoo/0003-Use-undeprecated-Account-value.patch</Patch>
<Patch level="1">gentoo/0004-Don-t-access-a-QString-out-of-bounds.patch</Patch>
<Patch level="1">gentoo/0005-Adjust-buildsystem-to-include-correct-Qt-Major-versi.patch</Patch>
<Patch level="1">gentoo/accounts-qt-1.16-libdir.patch</Patch>
</Patches>
<SourceURI>programming/library/libaccounts-qt6/pspec.xml</SourceURI>
</Source>
<Package>
<Name>libaccounts-qt6</Name>
<RuntimeDependencies>
<Dependency>glib2</Dependency>
<Dependency>libgcc</Dependency>
<Dependency>qt6-base</Dependency>
<Dependency>libaccounts-glib</Dependency>
</RuntimeDependencies>
<Files>
<Path fileType="library">/usr/lib/libaccounts-qt6.*</Path>
<Path fileType="doc">/usr/share/doc/libaccounts-qt6</Path>
<Path fileType="library">/usr/lib/cmake</Path>
</Files>
</Package>
<Package>
<Name>libaccounts-qt6-devel</Name>
<Summary xml:lang="en">Development files for libaccounts-qt6</Summary>
<RuntimeDependencies>
<Dependency release="1">libaccounts-qt6</Dependency>
<Dependency>qt6-base-devel</Dependency>
<Dependency>glib2-devel</Dependency>
</RuntimeDependencies>
<Files>
<Path fileType="header">/usr/include</Path>
<Path fileType="library">/usr/lib/pkgconfig</Path>
</Files>
</Package>
<Package>
<Name>libaccounts-qt6-docs</Name>
<Summary xml:lang="en">Help files and API documents for libaccounts-qt6</Summary>
<IsA>data:doc</IsA>
<RuntimeDependencies>
<Dependency release="1">libaccounts-qt6</Dependency>
</RuntimeDependencies>
<Files>
<Path fileType="doc">/usr/share/doc</Path>
</Files>
</Package>
<Package>
<Name>libaccounts-qt6-tools</Name>
<Summary xml:lang="en">This package contains the tools for the libaccounts-qt6 library</Summary>
<IsA>data:doc</IsA>
<RuntimeDependencies>
<Dependency release="1">libaccounts-qt6</Dependency>
<Dependency>libgcc</Dependency>
<Dependency>qt6-base</Dependency>
</RuntimeDependencies>
<Files>
<Path fileType="doc">/usr/bin</Path>
<Path fileType="data">/usr/share/libaccounts-qt-tests</Path>
</Files>
</Package>
<History>
<Update release="1">
<Date>2020-02-04</Date>
<Version>1.16</Version>
<Comment>First release</Comment>
<Name>Mustafa Cinasal</Name>
<Email>muscnsl@gmail.com</Email>
</Update>
</History>
</SpecFile>
<SpecFile>
<Source>
<Name>libnih</Name>
pisi-index.xml.sha1sum
+1 -1
View File
@@ -1 +1 @@
e27570d0ff288c2e680e70dacb7e4c2f440fb430
d1fc6b889185db52d83749f183f2bce881513557
pisi-index.xml.xz
BIN
View File
Binary file not shown.
pisi-index.xml.xz.sha1sum
+1 -1
View File
@@ -1 +1 @@
9e39e82c4390daf4bf3d755f6c23a02ad8aaece9
692651ea956f2702901ee97acd177205b0ebd7f8
programming/library/libaccounts-qt6/actions.py
+23
View File
@@ -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")
programming/library/libaccounts-qt6/files/gentoo/0001-Port-away-from-deprecated-QList-toSet.patch
+92
View File
@@ -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 <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
programming/library/libaccounts-qt6/files/gentoo/0002-Add-Qt6-CI.patch
+137
View File
@@ -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 <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
programming/library/libaccounts-qt6/files/gentoo/0003-Use-undeprecated-Account-value.patch
+28
View File
@@ -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 <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
programming/library/libaccounts-qt6/files/gentoo/0004-Don-t-access-a-QString-out-of-bounds.patch
+42
View File
@@ -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 <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
programming/library/libaccounts-qt6/files/gentoo/0005-Adjust-buildsystem-to-include-correct-Qt-Major-versi.patch
+118
View File
@@ -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 <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
programming/library/libaccounts-qt6/files/gentoo/accounts-qt-1.16-libdir.patch
+116
View File
@@ -0,0 +1,116 @@
From e3882382b2e98bce5be07baf23771856828123fc Mon Sep 17 00:00:00 2001
From: Andreas Sturmlechner <asturm@gentoo.org>
Date: Thu, 7 Dec 2023 23:20:32 +0100
Subject: [PATCH] Make LIBDIR configurable
Signed-off-by: Andreas Sturmlechner <asturm@gentoo.org>
---
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
programming/library/libaccounts-qt6/pspec.xml
+98
View File
@@ -0,0 +1,98 @@
<?xml version="1.0" ?>
<!DOCTYPE PISI SYSTEM "http://www.pisilinux.org/projeler/pisi/pisi-spec.dtd">
<PISI>
<Source>
<Name>libaccounts-qt6</Name>
<Homepage>https://gitlab.com/accounts-sso/libaccounts-qt</Homepage>
<Packager>
<Name>Alihan Öztürk</Name>
<Email>alihan@pisilinux.org</Email>
</Packager>
<License>GPLv3</License>
<IsA>library</IsA>
<Summary>Qt5-based client library for accessing the online accounts database</Summary>
<Description>Qt5-based client library for accessing the online accounts database</Description>
<Archive sha1sum="7922439bae4a082b7159e61d37ddb61c3c04329e" type="targz">https://sourceforge.net/projects/pisilinux/files/source/libaccounts-qt-1.16.tar.gz</Archive>
<BuildDependencies>
<Dependency>doxygen</Dependency>
<Dependency>qt6-base-devel</Dependency>
<Dependency>qt6-assistant-devel</Dependency>
<Dependency>glib2-devel</Dependency>
<Dependency>libaccounts-glib-devel</Dependency>
</BuildDependencies>
<Patches>
<Patch level="1">gentoo/0001-Port-away-from-deprecated-QList-toSet.patch</Patch>
<!-- <Patch level="1">gentoo/0002-Add-Qt6-CI.patch</Patch> -->
<Patch level="1">gentoo/0003-Use-undeprecated-Account-value.patch</Patch>
<Patch level="1">gentoo/0004-Don-t-access-a-QString-out-of-bounds.patch</Patch>
<Patch level="1">gentoo/0005-Adjust-buildsystem-to-include-correct-Qt-Major-versi.patch</Patch>
<Patch level="1">gentoo/accounts-qt-1.16-libdir.patch</Patch>
</Patches>
</Source>
<Package>
<Name>libaccounts-qt6</Name>
<RuntimeDependencies>
<Dependency>glib2</Dependency>
<Dependency>libgcc</Dependency>
<Dependency>qt6-base</Dependency>
<Dependency>libaccounts-glib</Dependency>
</RuntimeDependencies>
<Files>
<Path fileType="library">/usr/lib/libaccounts-qt6.*</Path>
<Path fileType="doc">/usr/share/doc/libaccounts-qt6</Path>
<Path fileType="library">/usr/lib/cmake</Path>
</Files>
</Package>
<Package>
<Name>libaccounts-qt6-devel</Name>
<Summary>Development files for libaccounts-qt6</Summary>
<RuntimeDependencies>
<Dependency release="current">libaccounts-qt6</Dependency>
<Dependency>qt6-base-devel</Dependency>
<Dependency>glib2-devel</Dependency>
</RuntimeDependencies>
<Files>
<Path fileType="header">/usr/include</Path>
<Path fileType="library">/usr/lib/pkgconfig</Path>
</Files>
</Package>
<Package>
<Name>libaccounts-qt6-docs</Name>
<IsA>data:doc</IsA>
<Summary>Help files and API documents for libaccounts-qt6</Summary>
<RuntimeDependencies>
<Dependency release="current">libaccounts-qt6</Dependency>
</RuntimeDependencies>
<Files>
<Path fileType="doc">/usr/share/doc</Path>
</Files>
</Package>
<Package>
<Name>libaccounts-qt6-tools</Name>
<IsA>data:doc</IsA>
<Summary>This package contains the tools for the libaccounts-qt6 library</Summary>
<RuntimeDependencies>
<Dependency release="current">libaccounts-qt6</Dependency>
<Dependency>libgcc</Dependency>
<Dependency>qt6-base</Dependency>
</RuntimeDependencies>
<Files>
<Path fileType="doc">/usr/bin</Path>
<Path fileType="data">/usr/share/libaccounts-qt-tests</Path>
</Files>
</Package>
<History>
<Update release="1">
<Date>2020-02-04</Date>
<Version>1.16</Version>
<Comment>First release</Comment>
<Name>Mustafa Cinasal</Name>
<Email>muscnsl@gmail.com</Email>
</Update>
</History>
</PISI>