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

Merge pull request #15634 from Rmys/master

Browse Source 
qt6 rebuild
This commit is contained in:
Rmys
2024-12-14 14:58:51 +03:00
committed by GitHub
parent 98596383f2 1a2c57d2df
commit 27cbc97712
12 changed files with 72 additions and 440 deletions
Download Patch File Download Diff File Expand all files Collapse all files
desktop/misc/packagekit-qt6/pspec.xml
+8 -1
View File
@@ -12,7 +12,7 @@
<IsA>library</IsA>
<Summary>Qt6 bindings for PackageKit</Summary>
<Description>PackageKit için Qt6 bağlamaları</Description>
<Archive sha1sum="2b81c8d01a6ea9271a33fd5b95a565d13fc152cd" type="targz">https://github.com/PackageKit/PackageKit-Qt/archive/refs/tags/v1.1.1.tar.gz</Archive>
<Archive sha1sum="21b837886a128e7000195dea7542916fdec5982c" type="targz">https://github.com/PackageKit/PackageKit-Qt/archive/refs/tags/v1.1.2.tar.gz</Archive>
<BuildDependencies>
<Dependency>cmake</Dependency>
<Dependency>packagekit-devel</Dependency>
@@ -53,6 +53,13 @@
</Package>
<History>
<Update release="4">
<Date>2024-12-14</Date>
<Version>1.1.2</Version>
<Comment>Version bump.</Comment>
<Name>Pisi Linux Community</Name>
<Email>admin@pisilinux.org</Email>
</Update>
<Update release="3">
<Date>2024-09-17</Date>
<Version>1.1.1</Version>
multimedia/sound/pulseaudio-qt6/pspec.xml
+15 -8
View File
@@ -19,14 +19,14 @@
<Dependency>glib2-devel</Dependency>
<Dependency>extra-cmake-modules-kf6</Dependency>
<Dependency>pulseaudio-libs-devel</Dependency>
<Dependency versionFrom="6.6.2">qt6-sql-mysql</Dependency>
<Dependency versionFrom="6.6.2">qt6-sql-sqlite</Dependency>
<Dependency versionFrom="6.6.2">qt6-sql-odbc</Dependency>
<Dependency versionFrom="6.6.2">qt6-sql-postgresql</Dependency>
<Dependency versionFrom="6.6.2">qt6-base-devel</Dependency>
<Dependency versionFrom="6.6.2">qt6-assistant-devel</Dependency>
<Dependency versionFrom="6.6.2">qt6-designer-devel</Dependency>
<Dependency versionFrom="6.6.2">qt6-declarative-devel</Dependency>
<Dependency versionFrom="6.8.1">qt6-sql-mysql</Dependency>
<Dependency versionFrom="6.8.1">qt6-sql-sqlite</Dependency>
<Dependency versionFrom="6.8.1">qt6-sql-odbc</Dependency>
<Dependency versionFrom="6.8.1">qt6-sql-postgresql</Dependency>
<Dependency versionFrom="6.8.1">qt6-base-devel</Dependency>
<Dependency versionFrom="6.8.1">qt6-assistant-devel</Dependency>
<Dependency versionFrom="6.8.1">qt6-designer-devel</Dependency>
<Dependency versionFrom="6.8.1">qt6-declarative-devel</Dependency>
</BuildDependencies>
</Source>
@@ -58,6 +58,13 @@
</Package>
<History>
<Update release="5">
<Date>2024-12-14</Date>
<Version>1.6.1</Version>
<Comment>Rebuild.</Comment>
<Name>Pisi Linux Community</Name>
<Email>admin@pisilinux.org</Email>
</Update>
<Update release="4">
<Date>2024-10-26</Date>
<Version>1.6.1</Version>
programming/language/python3/pyqt-builder/pspec.xml
+8 -1
View File
@@ -12,7 +12,7 @@
<IsA>library</IsA>
<Summary>PyQt build system</Summary>
<Description>PyQt build system</Description>
<Archive sha1sum="b1b68c23b64409491258a9177b7153844e93d07b" type="targz">https://files.pythonhosted.org/packages/e6/f5/daead7fd8ef3675ce55f4ef66dbe3287b0bdd74315f6b5a57718a020570b/pyqt_builder-1.16.4.tar.gz</Archive>
<Archive sha1sum="e5b414865db35311e2b2f96d329eddca1336d2f6" type="targz">https://files.pythonhosted.org/packages/04/78/ec38b8fa8f44d7437cc4b1930669d50baebb3c43c16d0a65c5b487fa2d12/pyqt_builder-1.17.0.tar.gz</Archive>
<BuildDependencies>
<Dependency>python3-devel</Dependency>
<Dependency>python3-build</Dependency>
@@ -40,6 +40,13 @@
</Package>
<History>
<Update release="9">
<Date>2024-12-14</Date>
<Version>1.17.0</Version>
<Comment>Version bump.</Comment>
<Name>Pisi Linux Community</Name>
<Email>admin@pisilinux.org</Email>
</Update>
<Update release="8">
<Date>2024-09-29</Date>
<Version>1.16.4</Version>
programming/library/libaccounts-glib/pspec.xml
+8 -1
View File
@@ -11,7 +11,7 @@
<License>LGPLv2</License>
<Summary>Accounts and SSO (Single Sign-On) framework</Summary>
<Description>Accounts and SSO (Single Sign-On) framework for Linux and POSIX based platforms.</Description>
<Archive sha1sum="a39b0ea02bbddbc67b180a509ed5af69768ccb64" type="targz">https://sourceforge.net/projects/pisilinux/files/source/libaccounts-glib-1.24.tar.gz</Archive>
<Archive sha1sum="09d86333d623fd36a103d9031a680efd6d16f83b" type="tarbz2">https://gitlab.com/accounts-sso/libaccounts-glib/-/archive/VERSION_1.27/libaccounts-glib-VERSION_1.27.tar.bz2</Archive>
<BuildDependencies>
<Dependency>meson</Dependency>
<Dependency>vala-devel</Dependency>
@@ -78,6 +78,13 @@
</Package>
<History>
<Update release="8">
<Date>2024-12-14</Date>
<Version>1.27</Version>
<Comment>Version bump.</Comment>
<Name>Pisi Linux Community</Name>
<Email>admin@pisilinux.org</Email>
</Update>
<Update release="7">
<Date>2023-10-17</Date>
<Version>1.24</Version>
programming/library/libaccounts-qt6/files/gentoo/0001-Port-away-from-deprecated-QList-toSet.patch
-92
View File
@@ -1,92 +0,0 @@
https://gitlab.com/accounts-sso/libaccounts-qt/-/merge_requests/21
From 3107822e036300684c2bdf587838a110eea8ba30 Mon Sep 17 00:00:00 2001
From: Nicolas Fella <nicolas.fella@gmx.de>
Date: Mon, 1 Aug 2022 20:35:03 +0200
Subject: [PATCH 1/5] Port away from deprecated QList::toSet
---
tests/tst_libaccounts.cpp | 44 +++++++++++++++++++++++++++++----------
1 file changed, 33 insertions(+), 11 deletions(-)
diff --git a/tests/tst_libaccounts.cpp b/tests/tst_libaccounts.cpp
index 471e3d5..efede91 100644
--- a/tests/tst_libaccounts.cpp
+++ b/tests/tst_libaccounts.cpp
@@ -326,11 +326,11 @@ void AccountsTest::testService()
QCOMPARE(service.description(), QStringLiteral("Test description"));
QCOMPARE(service.iconName(), QString("general_myservice"));
QCOMPARE(service.trCatalog(), QString("accounts"));
- QStringList tags;
+ QSet<QString> tags;
tags << "email" << "e-mail";
- QCOMPARE(service.tags(), tags.toSet());
+ QCOMPARE(service.tags(), tags);
// Called twice, because the second time it returns a cached result
- QCOMPARE(service.tags(), tags.toSet());
+ QCOMPARE(service.tags(), tags);
QVERIFY(service.hasTag("email"));
QVERIFY(!service.hasTag("chat"));
@@ -687,10 +687,15 @@ void AccountsTest::testAccountService()
spyChanged.clear();
spyEnabled.clear();
- QStringList expectedChanges;
+ QSet<QString> expectedChanges;
expectedChanges << "parameters/server";
expectedChanges << "enabled";
- QCOMPARE(m_accountServiceChangedFields.toSet(), expectedChanges.toSet());
+#if QT_VERSION >= QT_VERSION_CHECK(5, 14, 0)
+ QSet<QString> changedFields(m_accountServiceChangedFields.begin(), m_accountServiceChangedFields.end());
+#else
+ QSet<QString> changedFields = m_accountServiceChangedFields.toSet();
+#endif
+ QCOMPARE(changedFields, expectedChanges);
QCOMPARE(accountService->value("server").toString(),
UTF8("www.example.com"));
@@ -727,17 +732,34 @@ void AccountsTest::testAccountService()
/* test some more APIs */
- QStringList expectedList;
+ QSet<QString> expectedList;
expectedList << "server" << "fallback-conference-server" <<
"port" << "old-ssl";
- QCOMPARE(accountService->childKeys().toSet(), expectedList.toSet());
- QCOMPARE(accountService->childGroups().toSet(), QSet<QString>());
+#if QT_VERSION >= QT_VERSION_CHECK(5, 14, 0)
+ QStringList childKeysList = accountService->childKeys();
+ QSet<QString> childKeys(childKeysList.begin(), childKeysList.end());
+
+ QStringList childGroupsList = accountService->childGroups();
+ QSet<QString> childGroups(childGroupsList.begin(), childGroupsList.end());
+#else
+ QSet<QString> childKeys = accountService->childKeys().toSet();
+ QSet<QString> childGroups = accountService->childGroups().toSet();
+#endif
+
+ QCOMPARE(childKeys, expectedList);
+ QCOMPARE(childGroups, QSet<QString>());
QCOMPARE(accountService->contains("port"), true);
accountService->endGroup();
- expectedList.clear();
- expectedList << "parameters";
- QCOMPARE(accountService->childGroups().toSet(), expectedList.toSet());
+ QSet<QString> expectedList2;
+ expectedList2 << "parameters";
+#if QT_VERSION >= QT_VERSION_CHECK(5, 14, 0)
+ QStringList childGroupsList2 = accountService->childGroups();
+ QSet<QString> childGroups2(childGroupsList2.begin(), childGroupsList2.end());
+#else
+ QSet<QString> childGroups2 = accountService->childGroups().toSet();
+#endif
+ QCOMPARE(childGroups2, expectedList2);
/* Remove one key */
accountService->remove("parameters/port");
--
2.43.0
programming/library/libaccounts-qt6/files/gentoo/0002-Add-Qt6-CI.patch
-137
View File
@@ -1,137 +0,0 @@
https://gitlab.com/accounts-sso/libaccounts-qt/-/merge_requests/21
From d00f7346b091b885ba0ea3f6055e74a173fd0034 Mon Sep 17 00:00:00 2001
From: Nicolas Fella <nicolas.fella@gmx.de>
Date: Mon, 17 Oct 2022 23:33:16 +0200
Subject: [PATCH 2/5] Add Qt6 CI
---
.gitlab-ci.yml | 80 +++++++++++++++++++++++++++++++++++++++++---------
1 file changed, 66 insertions(+), 14 deletions(-)
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 95d5a92..f8b5bf6 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -1,5 +1,3 @@
-image: ubuntu:bionic
-
cache:
key: apt-cache
paths:
@@ -13,23 +11,19 @@ stages:
- test
- deploy
-before_script:
- - export APT_CACHE_DIR=`pwd`/apt-cache && mkdir -pv $APT_CACHE_DIR
- - PACKAGES+=" wget" # for downloading dependencies
- - PACKAGES+=" libglib2.0-dev libsqlite3-dev libxml2-dev gtk-doc-tools libgirepository1.0-dev gobject-introspection libxml2-utils python3-gi python-gi-dev valac check python3-pip" # for libaccounts-glib
- - |
- apt-get update -yq && apt-get -o dir::cache::archives="$APT_CACHE_DIR" install -y \
- qt5-qmake qttools5-dev-tools qtbase5-dev qtchooser pkg-config doxygen \
- $PACKAGES
- - apt-get -o dir::cache::archives="$APT_CACHE_DIR" install -y dbus-test-runner lcov gcovr
- - pip3 install meson ninja
-
-
build_dependencies:
+ image: ubuntu:bionic
stage: deps
artifacts:
paths:
- staging
+ before_script:
+ - export APT_CACHE_DIR=`pwd`/apt-cache && mkdir -pv $APT_CACHE_DIR
+ - PACKAGES+=" wget" # for downloading dependencies
+ - PACKAGES+=" libglib2.0-dev libsqlite3-dev libxml2-dev gtk-doc-tools libgirepository1.0-dev gobject-introspection libxml2-utils python3-gi python-gi-dev valac check python3-pip" # for libaccounts-glib
+ - apt-get update -yq && apt-get -o dir::cache::archives="$APT_CACHE_DIR" install -y $PACKAGES
+ - pip3 install meson ninja
+
script:
- STAGING="$PWD/staging"
@@ -52,7 +46,15 @@ build_dependencies:
build_amd64:
+ image: ubuntu:bionic
stage: build
+ before_script:
+ - export APT_CACHE_DIR=`pwd`/apt-cache && mkdir -pv $APT_CACHE_DIR
+ - |
+ apt-get update -yq && apt-get -o dir::cache::archives="$APT_CACHE_DIR" install -y \
+ qt5-qmake qttools5-dev-tools qtbase5-dev qtchooser pkg-config doxygen wget libglib2.0-dev libsqlite3-dev libxml2-dev gtk-doc-tools libgirepository1.0-dev gobject-introspection libxml2-utils python3-gi python-gi-dev valac check python3-pip
+ - apt-get -o dir::cache::archives="$APT_CACHE_DIR" install -y dbus-test-runner lcov gcovr
+
script:
- STAGING="$PWD/staging"
- export PKG_CONFIG_PATH="$STAGING/lib/pkgconfig:$PKG_CONFIG_PATH"
@@ -69,7 +71,16 @@ build_amd64:
- build/
test_amd64:
+ image: ubuntu:bionic
stage: test
+ before_script:
+ - export APT_CACHE_DIR=`pwd`/apt-cache && mkdir -pv $APT_CACHE_DIR
+ - PACKAGES+=" wget" # for downloading dependencies
+ - |
+ apt-get update -yq && apt-get -o dir::cache::archives="$APT_CACHE_DIR" install -y \
+ qt5-qmake qttools5-dev-tools qtbase5-dev qtchooser pkg-config doxygen \
+ $PACKAGES
+ - apt-get -o dir::cache::archives="$APT_CACHE_DIR" install -y dbus-test-runner lcov gcovr
script:
- STAGING="$PWD/staging"
- export LD_LIBRARY_PATH="$STAGING/lib:$LD_LIBRARY_PATH"
@@ -83,6 +94,47 @@ test_amd64:
paths:
- build/
+build_amd64_qt6:
+ stage: build
+ image: ubuntu:jammy
+ before_script:
+ - export APT_CACHE_DIR=`pwd`/apt-cache && mkdir -pv $APT_CACHE_DIR
+ - apt-get update -yq && apt-get -o dir::cache::archives="$APT_CACHE_DIR" install -y qmake6 qt6-base-dev pkg-config libqt6sql6-sqlite doxygen libdbus-1-dev g++ make libglib2.0-dev gtk-doc-tools libgirepository1.0-dev gobject-introspection libxml2-utils python3-gi python-gi-dev valac check python3-pip libsqlite3-dev libxml2-dev
+ script:
+ - STAGING="$PWD/staging"
+ - find $STAGING
+ - export PKG_CONFIG_PATH="$STAGING/lib/pkgconfig:$PKG_CONFIG_PATH"
+ - export LD_LIBRARY_PATH="$STAGING/lib:$LD_LIBRARY_PATH"
+ - mkdir build
+ - cd build
+ - qmake6 CONFIG+=debug CONFIG+=coverage ..
+ - make -j 4
+ dependencies:
+ - build_dependencies
+ artifacts:
+ paths:
+ - build/
+
+test_amd64_qt6:
+ stage: test
+ image: ubuntu:jammy
+ before_script:
+ - export APT_CACHE_DIR=`pwd`/apt-cache && mkdir -pv $APT_CACHE_DIR
+ - export DEBIAN_FRONTEND=noninteractive
+ - apt-get update -yq && apt-get -o dir::cache::archives="$APT_CACHE_DIR" install -y dbus-test-runner libqtdbusmock1-dev libqtdbustest1-dev lcov gcovr make qmake6 qt6-base-dev pkg-config libqt6sql6-sqlite doxygen libdbus-1-dev g++ make libsqlite3-dev libxml2-dev libglib2.0-dev
+ script:
+ - STAGING="$PWD/staging"
+ - export LD_LIBRARY_PATH="$STAGING/lib:$LD_LIBRARY_PATH"
+ - find build | xargs touch # Avoid rebuilding
+ - cd build
+ - make coverage-html
+ dependencies:
+ - build_dependencies
+ - build_amd64_qt6
+ artifacts:
+ paths:
+ - ./
+
pages:
stage: deploy
script:
--
2.43.0
programming/library/libaccounts-qt6/files/gentoo/0003-Use-undeprecated-Account-value.patch
-28
View File
@@ -1,28 +0,0 @@
https://gitlab.com/accounts-sso/libaccounts-qt/-/merge_requests/21
From 102cf562f9d143de2f93ba40f8448c1d531c2c7b Mon Sep 17 00:00:00 2001
From: Nicolas Fella <nicolas.fella@gmx.de>
Date: Tue, 18 Oct 2022 01:40:05 +0200
Subject: [PATCH 3/5] Use undeprecated Account::value
---
tests/tst_libaccounts.cpp | 3 +--
1 file changed, 1 insertion(+), 2 deletions(-)
diff --git a/tests/tst_libaccounts.cpp b/tests/tst_libaccounts.cpp
index efede91..d12091c 100644
--- a/tests/tst_libaccounts.cpp
+++ b/tests/tst_libaccounts.cpp
@@ -516,8 +516,7 @@ void AccountsTest::testAccountValue()
QTRY_COMPARE(synced.count(), 1);
/* check that the values we wrote are retrieved successfully */
- QVariant val = QVariant::String;
- account->value(QString("test"), val);
+ QVariant val = account->value(QString("test"));
QCOMPARE(val.toString(), QString("value"));
SettingSource source;
--
2.43.0
programming/library/libaccounts-qt6/files/gentoo/0004-Don-t-access-a-QString-out-of-bounds.patch
-42
View File
@@ -1,42 +0,0 @@
https://gitlab.com/accounts-sso/libaccounts-qt/-/merge_requests/21
From 3c4d5fa1f53cd66c9870b799e8518980176547b2 Mon Sep 17 00:00:00 2001
From: Nicolas Fella <nicolas.fella@gmx.de>
Date: Tue, 18 Oct 2022 02:03:59 +0200
Subject: [PATCH 4/5] Don't access a QString out-of-bounds
This asserts in Qt6
---
Accounts/account-service.cpp | 2 +-
Accounts/account.cpp | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/Accounts/account-service.cpp b/Accounts/account-service.cpp
index e6c04f2..d8d4304 100644
--- a/Accounts/account-service.cpp
+++ b/Accounts/account-service.cpp
@@ -335,7 +335,7 @@ void AccountService::endGroup()
Q_D(AccountService);
d->prefix = d->prefix.section(slash, 0, -3,
QString::SectionIncludeTrailingSep);
- if (d->prefix[0] == slash) d->prefix.remove(0, 1);
+ if (!d->prefix.isEmpty() && d->prefix[0] == slash) d->prefix.remove(0, 1);
}
/*!
diff --git a/Accounts/account.cpp b/Accounts/account.cpp
index 2e40c60..104611a 100644
--- a/Accounts/account.cpp
+++ b/Accounts/account.cpp
@@ -548,7 +548,7 @@ void Account::endGroup()
{
d->prefix = d->prefix.section(slash, 0, -3,
QString::SectionIncludeTrailingSep);
- if (d->prefix[0] == slash) d->prefix.remove(0, 1);
+ if (!d->prefix.isEmpty() && d->prefix[0] == slash) d->prefix.remove(0, 1);
}
/*!
--
2.43.0
programming/library/libaccounts-qt6/files/gentoo/0005-Adjust-buildsystem-to-include-correct-Qt-Major-versi.patch
-118
View File
@@ -1,118 +0,0 @@
https://gitlab.com/accounts-sso/libaccounts-qt/-/merge_requests/21
From 18557f7def9af8f4a9e0e93e9f575ae11e5066aa Mon Sep 17 00:00:00 2001
From: Nicolas Fella <nicolas.fella@gmx.de>
Date: Fri, 7 Apr 2023 15:49:22 +0200
Subject: [PATCH 5/5] Adjust buildsystem to include correct Qt Major version
number
---
Accounts/Accounts.pro | 4 ++--
Accounts/AccountsQt5Config.cmake.in | 2 +-
Accounts/AccountsQt6Config.cmake.in | 5 +++++
Accounts/AccountsQt6ConfigVersion.cmake.in | 10 ++++++++++
Accounts/accounts-qt6.pc.in | 15 +++++++++++++++
tests/tst_libaccounts.pro | 2 +-
6 files changed, 34 insertions(+), 4 deletions(-)
create mode 100644 Accounts/AccountsQt6Config.cmake.in
create mode 100644 Accounts/AccountsQt6ConfigVersion.cmake.in
create mode 100644 Accounts/accounts-qt6.pc.in
diff --git a/Accounts/Accounts.pro b/Accounts/Accounts.pro
index 13804ee..da62da7 100644
--- a/Accounts/Accounts.pro
+++ b/Accounts/Accounts.pro
@@ -3,7 +3,7 @@ include( ../common-project-config.pri )
include( ../common-vars.pri )
TEMPLATE = lib
-TARGET = accounts-qt5
+TARGET = accounts-qt$${QT_MAJOR_VERSION}
# Input
public_headers = \
@@ -45,7 +45,7 @@ QT -= gui
INCLUDEPATH += $${TOP_SRC_DIR}
-CMAKE_BASENAME = AccountsQt5
+CMAKE_BASENAME = AccountsQt$${QT_MAJOR_VERSION}
PKGCONFIG += \
glib-2.0 \
diff --git a/Accounts/AccountsQt5Config.cmake.in b/Accounts/AccountsQt5Config.cmake.in
index 55a8964..746f689 100644
--- a/Accounts/AccountsQt5Config.cmake.in
+++ b/Accounts/AccountsQt5Config.cmake.in
@@ -2,4 +2,4 @@
# ACCOUNTSQT_LIBRARIES - The libraries needed to use libaccounts-qt
set(ACCOUNTSQT_LIBRARIES $${INSTALL_LIBDIR}/lib$${TARGET}.so)
-set(ACCOUNTSQT_INCLUDE_DIRS $${INSTALL_PREFIX}/include/$${TARGET}/)
\ No newline at end of file
+set(ACCOUNTSQT_INCLUDE_DIRS $${INSTALL_PREFIX}/include/$${TARGET}/)
diff --git a/Accounts/AccountsQt6Config.cmake.in b/Accounts/AccountsQt6Config.cmake.in
new file mode 100644
index 0000000..55a8964
--- /dev/null
+++ b/Accounts/AccountsQt6Config.cmake.in
@@ -0,0 +1,5 @@
+# ACCOUNTSQT_INCLUDE_DIRS - The libaccounts-qt include directories
+# ACCOUNTSQT_LIBRARIES - The libraries needed to use libaccounts-qt
+
+set(ACCOUNTSQT_LIBRARIES $${INSTALL_LIBDIR}/lib$${TARGET}.so)
+set(ACCOUNTSQT_INCLUDE_DIRS $${INSTALL_PREFIX}/include/$${TARGET}/)
\ No newline at end of file
diff --git a/Accounts/AccountsQt6ConfigVersion.cmake.in b/Accounts/AccountsQt6ConfigVersion.cmake.in
new file mode 100644
index 0000000..616cd60
--- /dev/null
+++ b/Accounts/AccountsQt6ConfigVersion.cmake.in
@@ -0,0 +1,10 @@
+set(PACKAGE_VERSION $${PROJECT_VERSION})
+
+if(\"${PACKAGE_VERSION}\" VERSION_LESS \"${PACKAGE_FIND_VERSION}\" )
+ set(PACKAGE_VERSION_COMPATIBLE FALSE)
+else(\"${PACKAGE_VERSION}\" VERSION_LESS \"${PACKAGE_FIND_VERSION}\" )
+ set(PACKAGE_VERSION_COMPATIBLE TRUE)
+ if( \"${PACKAGE_FIND_VERSION}\" STREQUAL \"${PACKAGE_VERSION}\")
+ set(PACKAGE_VERSION_EXACT TRUE)
+ endif( \"${PACKAGE_FIND_VERSION}\" STREQUAL \"${PACKAGE_VERSION}\")
+endif(\"${PACKAGE_VERSION}\" VERSION_LESS \"${PACKAGE_FIND_VERSION}\" )
diff --git a/Accounts/accounts-qt6.pc.in b/Accounts/accounts-qt6.pc.in
new file mode 100644
index 0000000..c625b2e
--- /dev/null
+++ b/Accounts/accounts-qt6.pc.in
@@ -0,0 +1,15 @@
+prefix=$$INSTALL_PREFIX
+exec_prefix=${prefix}
+libdir=$$INSTALL_LIBDIR
+includedir=${prefix}/include/accounts-qt6
+servicefilesdir=${prefix}/share/accounts/services
+servicetypefilesdir=${prefix}/share/accounts/service-types
+providerfilesdir=${prefix}/share/accounts/providers
+
+Name: libaccounts-qt6
+Description: Accounts Library
+Version: $$PROJECT_VERSION
+Libs: -L${libdir} -laccounts-qt6
+Requires: Qt6Core Qt6Xml
+Cflags: -I${includedir}
+
diff --git a/tests/tst_libaccounts.pro b/tests/tst_libaccounts.pro
index a5b91fe..9992c0b 100644
--- a/tests/tst_libaccounts.pro
+++ b/tests/tst_libaccounts.pro
@@ -9,7 +9,7 @@ QT = \
testlib \
xml
-LIBS += -laccounts-qt5
+LIBS += -laccounts-qt$${QT_MAJOR_VERSION}
INCLUDEPATH += $${TOP_SRC_DIR}
QMAKE_LIBDIR += \
--
2.43.0
programming/library/libaccounts-qt6/pspec.xml
+12 -5
View File
@@ -12,7 +12,7 @@
<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>
<Archive sha1sum="4bc7c19382334880aee5a59783bddcf844dd9c83" type="targz">https://gitlab.com/accounts-sso/libaccounts-qt/-/archive/VERSION_1.17/libaccounts-qt-VERSION_1.17.tar.gz</Archive>
<BuildDependencies>
<Dependency>doxygen</Dependency>
<Dependency>qt6-base-devel</Dependency>
@@ -21,11 +21,11 @@
<Dependency>libaccounts-glib-devel</Dependency>
</BuildDependencies>
<Patches>
<Patch level="1">gentoo/0001-Port-away-from-deprecated-QList-toSet.patch</Patch>
<!-- <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/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>
@@ -87,6 +87,13 @@
</Package>
<History>
<Update release="2">
<Date>2024-12-14</Date>
<Version>1.17</Version>
<Comment>Version bump.</Comment>
<Name>Pisi Linux Community</Name>
<Email>admin@pisilinux.org</Email>
</Update>
<Update release="1">
<Date>2020-02-04</Date>
<Version>1.16</Version>
programming/library/qcoro-qt6/pspec.xml
+11 -4
View File
@@ -12,13 +12,13 @@
<IsA>library</IsA>
<Summary>C++ Coroutines for Qt</Summary>
<Description>C++ Coroutines for Qt</Description>
<Archive sha1sum="50e0ce55e699fe3c0f9337955d12418503cf1be5" type="targz">https://github.com/danvratil/qcoro/archive/refs/tags/v0.10.0.tar.gz</Archive>
<Archive sha1sum="25b8a74ae62ec12c907dae50c8dc0569bd981903" type="targz">https://github.com/danvratil/qcoro/archive/refs/tags/v0.11.0.tar.gz</Archive>
<BuildDependencies>
<Dependency>cmake</Dependency>
<Dependency>ninja</Dependency>
<Dependency>qt6-base-devel</Dependency>
<Dependency>qt6-websockets-devel</Dependency>
<Dependency>qt6-declarative-devel</Dependency>
<Dependency versionFrom="6.8.1">qt6-base-devel</Dependency>
<Dependency versionFrom="6.8.1">qt6-websockets-devel</Dependency>
<Dependency versionFrom="6.8.1">qt6-declarative-devel</Dependency>
</BuildDependencies>
<!--
<Patches>
@@ -55,6 +55,13 @@
</Package>
<History>
<Update release="3">
<Date>2024-12-14</Date>
<Version>0.11.0</Version>
<Comment>Version bump.</Comment>
<Name>Pisi Linux Community</Name>
<Email>admin@pisilinux.org</Email>
</Update>
<Update release="2">
<Date>2023-12-06</Date>
<Version>0.10.0</Version>
util/crypt/qca2-qt6/pspec.xml
+10 -3
View File
@@ -21,8 +21,8 @@
<Dependency>openssl-devel</Dependency>
<Dependency>libgcrypt-devel</Dependency>
<Dependency>cyrus-sasl-devel</Dependency>
<Dependency versionFrom="6.5.3">qt6-base-devel</Dependency>
<Dependency versionFrom="6.5.3">qt6-5compat-devel</Dependency>
<Dependency versionFrom="6.8.1">qt6-base-devel</Dependency>
<Dependency versionFrom="6.8.1">qt6-5compat-devel</Dependency>
</BuildDependencies>
<Patches>
<!--Patch level="3">qca2-sha2-digest-support-kde-svn-992617.diff</Patch>
@@ -56,7 +56,7 @@
<Summary>Development files for qca2</Summary>
<RuntimeDependencies>
<Dependency release="current">qca2-qt6</Dependency>
<Dependency versionFrom="6.6.1">qt6-base-devel</Dependency>
<Dependency versionFrom="6.8.1">qt6-base-devel</Dependency>
</RuntimeDependencies>
<Files>
<Path fileType="header">/usr/include/qt6/Qca-qt6/QtCrypto</Path>
@@ -67,6 +67,13 @@
</Package>
<History>
<Update release="5">
<Date>2024-12-14</Date>
<Version>2.3.9</Version>
<Comment>Rebuild.</Comment>
<Name>Pisi Linux Community</Name>
<Email>admin@pisilinux.org</Email>
</Update>
<Update release="4">
<Date>2024-11-17</Date>
<Version>2.3.9</Version>