aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndreas Sturmlechner <asturm@gentoo.org>2023-08-06 19:43:40 +0200
committerAndreas Sturmlechner <asturm@gentoo.org>2023-08-06 19:48:11 +0200
commitc322b60f4811cf3892eeb9ef81ccb1460e5af8a8 (patch)
treea59bb2ef5454942227db6aa4fc593c29f08e1574
parentwww-client/falkon: Update dependencies, cmake args, rebase py3 patch (diff)
downloadkde-c322b60f.tar.gz
kde-c322b60f.tar.bz2
kde-c322b60f.zip
kde-apps/akonadi: Drop obsolete QSQLITE3 deps, args, ewarn
tl;dr: Upstream QSQLITE driver is considered stable, more up to date, old (and by now outdated) QSQLITE3 fork was removed. See also: https://invent.kde.org/pim/akonadi/-/merge_requests/143 Upstream commit e70a7a5521b4d8fe0bb36a5b3392c547851507b0 Signed-off-by: Andreas Sturmlechner <asturm@gentoo.org>
-rw-r--r--kde-apps/akonadi/akonadi-9999.ebuild17
1 files changed, 3 insertions, 14 deletions
diff --git a/kde-apps/akonadi/akonadi-9999.ebuild b/kde-apps/akonadi/akonadi-9999.ebuild
index 92f8881503..13fb6fa5e9 100644
--- a/kde-apps/akonadi/akonadi-9999.ebuild
+++ b/kde-apps/akonadi/akonadi-9999.ebuild
@@ -29,7 +29,7 @@ COMMON_DEPEND="
>=dev-qt/qtdbus-${QTMIN}:5
>=dev-qt/qtgui-${QTMIN}:5
>=dev-qt/qtnetwork-${QTMIN}:5
- >=dev-qt/qtsql-${QTMIN}:5[mysql?,postgres?]
+ >=dev-qt/qtsql-${QTMIN}:5[mysql?,postgres?,sqlite?]
>=dev-qt/qtwidgets-${QTMIN}:5
>=dev-qt/qtxml-${QTMIN}:5
>=kde-frameworks/kconfig-${KFMIN}:5
@@ -46,10 +46,6 @@ COMMON_DEPEND="
>=kde-apps/kaccounts-integration-20.08.3:5
>=net-libs/accounts-qt-1.16
)
- sqlite? (
- dev-db/sqlite:3
- >=dev-qt/qtsql-${QTMIN}:5=[sqlite]
- )
xml? ( dev-libs/libxml2 )
"
DEPEND="${COMMON_DEPEND}
@@ -66,7 +62,7 @@ PATCHES=( "${FILESDIR}/${PN}-21.03.80-mysql56-crash.patch" )
pkg_setup() {
# Set default storage backend in order: MySQL, PostgreSQL, SQLite
# reverse driver check to keep the order
- use sqlite && DRIVER="QSQLITE3"
+ use sqlite && DRIVER="QSQLITE"
use postgres && DRIVER="QPSQL"
use mysql && DRIVER="QMYSQL"
@@ -76,12 +72,6 @@ pkg_setup() {
ewarn
fi
- if use sqlite || has_version "<${CATEGORY}/${P}[sqlite]"; then
- ewarn "We strongly recommend you change your Akonadi database backend to"
- ewarn "either MariaDB/MySQL or PostgreSQL in your user configuration."
- ewarn "In particular, kde-apps/kmail does not work properly with the sqlite backend."
- fi
-
ecm_pkg_setup
}
@@ -89,7 +79,6 @@ src_configure() {
local mycmakeargs=(
$(cmake_use_find_package kaccounts AccountsQt5)
$(cmake_use_find_package kaccounts KAccounts)
- -DAKONADI_BUILD_QSQLITE=$(usex sqlite)
-DBUILD_TOOLS=$(usex tools)
$(cmake_use_find_package xml LibXml2)
)
@@ -116,7 +105,7 @@ pkg_postinst() {
elog "Available drivers are:"
use mysql && elog " QMYSQL"
use postgres && elog " QPSQL"
- use sqlite && elog " QSQLITE3"
+ use sqlite && elog " QSQLITE"
elog "${DRIVER} has been set as your default akonadi storage backend."
use mysql && elog
use mysql && FORCE_PRINT_ELOG=1 readme.gentoo_print_elog