From 7bc9c63c9da678a7e6fceb095d56c634afd22c56 Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Sun, 15 Dec 2019 18:09:03 +0000 Subject: gentoo resync : 15.12.2019 --- kde-apps/akonadi/Manifest | 9 +- kde-apps/akonadi/akonadi-19.04.3-r1.ebuild | 127 ------------------- kde-apps/akonadi/akonadi-19.08.3.ebuild | 2 +- kde-apps/akonadi/akonadi-19.12.0.ebuild | 134 +++++++++++++++++++++ .../akonadi/files/akonadi-19.04.3-qmysql-fix.patch | 44 ------- kde-apps/akonadi/metadata.xml | 1 + 6 files changed, 140 insertions(+), 177 deletions(-) delete mode 100644 kde-apps/akonadi/akonadi-19.04.3-r1.ebuild create mode 100644 kde-apps/akonadi/akonadi-19.12.0.ebuild delete mode 100644 kde-apps/akonadi/files/akonadi-19.04.3-qmysql-fix.patch (limited to 'kde-apps/akonadi') diff --git a/kde-apps/akonadi/Manifest b/kde-apps/akonadi/Manifest index dfe86bcc2862..f9f0c1060433 100644 --- a/kde-apps/akonadi/Manifest +++ b/kde-apps/akonadi/Manifest @@ -1,7 +1,6 @@ AUX akonadi-18.12.2-mysql56-crash.patch 2196 BLAKE2B d12643c870da557f540f199f78462f97fc569ffe160415f56f166d89b7e94e0f6682fa68ed84c9629e66639ddac61b5c54376c309a8921d84a1d52ba351a9aab SHA512 093a0b4243668344db59b0419809500e411f7399137ba3d9c439b4d5300a2f867fb231f7d5a8bc5d95ad2d1ccb6921804caff8200ddddba74a62ddcdfa9ac623 -AUX akonadi-19.04.3-qmysql-fix.patch 1642 BLAKE2B 5ca247ec787d6f4182fdb13e8990909548473adfc2ef95a1bdfa29f85c76a6747f1c9135f5220e290c64397cc0d2c3c6b7c060f76d89147394b2d7d71b7cba13 SHA512 6678df405c290989667a2d58317517378c365862650f851a1ae3d919e3370dbe216f42db52c0cb5f7b7faaad252ae08aa55f6c8aa0570927546af73892056e1d -DIST akonadi-19.04.3.tar.xz 1574868 BLAKE2B f520f5e8f8fc6480b6e44d6f91c561317b2d3460072c5473baccdf149c0e9eca5587cfeefaeacee0e504349624418a0ba5de7042866c0f5806de0b677f8f38a1 SHA512 62d7367ef87cd6fd7e26ae87dcc15df427f3b647618334a5ae67e722ca16dc2c7882152bd6172ab6a0982979f45271f6d65cc15b18f86e8a0ebf144b1bbe576a DIST akonadi-19.08.3.tar.xz 1579468 BLAKE2B c7df5162768a00d395d598a098a25aa789c2e9694958cef47a014a744b4e7322471b3855963fb1ec63708608a59c29f5cdbf7049848d8a44ad7e88366316c18f SHA512 612cf8860476c32462dfa565c392a94f7fdb60953dc3afe7ea87ffdd9e78ec5f01e44aaf2ba0c6b018fa0f4cc75d1c56da1211daa13eb9589f270c2761da1e6e -EBUILD akonadi-19.04.3-r1.ebuild 3526 BLAKE2B 7f30ab98cee979d02dff8b402084894d4b2da241466e41639488a872acbdf8232ca958ce7dcd4d675ecb634b0567813f9554448d6f7ad9cb3c6a9ffaf53095bd SHA512 3f55230c10f5513130a6044108b41819cdfa820a652dd7f675d6ce5ccb21ef7211514c09a51ed95e59fbfc0a3a86f04b8a7b44a6249dec458815d41b2f65cf95 -EBUILD akonadi-19.08.3.ebuild 3646 BLAKE2B 0dfe9f6d15fbda8515f7950e83f6094658de32bc498eea187c4b78f2f72e1603f6ab8d7dd0a1f62ca2df6fe2271cb9dd3b4d7db5ad5843a22b87f7821bd4c820 SHA512 837e21b1def7e896ba032e0e737c0e5e3cc49590d8a29dbc578fe52226f2b3d71195422637ddca41922251ef3df8e0182782fc575ccb52543c41fc51a9dff7ee -MISC metadata.xml 410 BLAKE2B 259694dd8c348fbd80f1ef1dd2b2c6e5aa876cfcd2d4b781dd51f3882b22f8899bea347c6c993be3912c5acc3d996bdf88b63f8455bb822490f3d33cc45ce8bd SHA512 28d1be9310a2e9b91f2b93089bd2588da14b0aded9a057f9885782153df3222cd62c885d03374dd59216e408c1e0717074c03445e38b3dfdc7b3ed0b3dd739fa +DIST akonadi-19.12.0.tar.xz 1582164 BLAKE2B b08e5442b4c6a5a67a23fe197ea322655c2f686384ed708dc443de76484a28fc7e6ef35fba8b0c3056c060e51a0a52a5664a3d2239163dc245b76ac5decb493a SHA512 1c3d770dfccae7b596dd45af65aa05652a96f2c81fbd6094a089d7fa610b55b30339eb2b2cecb798ed8a40f389f896fcbd381ea8a8bb6f05951a7f8b7dc5fed3 +EBUILD akonadi-19.08.3.ebuild 3643 BLAKE2B 9571095fa215e6730e2fb07c23b452a90fef3094e25ddb52a6564e41695e8d45fb6f87299ab9242bcb48b0e8cc4d4f0f0d96d1fe6eeef6982d1b279ff1d8ec43 SHA512 b4700fd72867ad805d6d2defa15679a0aaafa0bc1617f64220426727453475499b81b32b9c4e4c1ec5bf433d9f63ed2bd1e68370eb1348dd86209f0443961b48 +EBUILD akonadi-19.12.0.ebuild 3856 BLAKE2B 891108562474aff1218605e0d26baccf6b26831295d30821d5e033dad882a31c11cf00c708b5b58c81657e51cc55aed4852ae1e46b8b97948d4e521da2fa324e SHA512 f47a742412df517123de8b15603a9f9719f2ecf276338a4f8e4b1e8730d63cdee98ce40c81d116fb27b11c791a1445e3e43fc244d4fd9c1bc2b80f435d2da5ad +MISC metadata.xml 491 BLAKE2B f4d942600308e7fbc604467130f087b7dc9c22f92a21aa89224cdabe9b822b1b8f0986e14efa5e1d5206718f3dc837b00c926b559ee32b21b71cff09fe0ee0d0 SHA512 fbb184c959335ec38a98faa983f67eed457c7eaa7c401261c5b7c0401d813d7a9a4521001376c6d70d76b98286446346ae1592dfbf3771b8112591bc3fe2472e diff --git a/kde-apps/akonadi/akonadi-19.04.3-r1.ebuild b/kde-apps/akonadi/akonadi-19.04.3-r1.ebuild deleted file mode 100644 index e0b34bf8f256..000000000000 --- a/kde-apps/akonadi/akonadi-19.04.3-r1.ebuild +++ /dev/null @@ -1,127 +0,0 @@ -# Copyright 1999-2019 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -KDE_DESIGNERPLUGIN="true" -KDE_TEST="forceoptional" -VIRTUALDBUS_TEST="true" -VIRTUALX_REQUIRED="test" -inherit kde5 - -DESCRIPTION="Storage service for PIM data and libraries for PIM apps" -HOMEPAGE="https://community.kde.org/KDE_PIM/akonadi" - -KEYWORDS="amd64 ~arm arm64 x86" -LICENSE="LGPL-2.1+" -IUSE="+mysql postgres sqlite tools xml" - -REQUIRED_USE="|| ( mysql postgres sqlite ) test? ( tools )" - -COMMON_DEPEND=" - $(add_frameworks_dep kcompletion) - $(add_frameworks_dep kconfig) - $(add_frameworks_dep kconfigwidgets) - $(add_frameworks_dep kcoreaddons) - $(add_frameworks_dep kcrash) - $(add_frameworks_dep kdbusaddons) - $(add_frameworks_dep ki18n) - $(add_frameworks_dep kiconthemes) - $(add_frameworks_dep kio) - $(add_frameworks_dep kitemmodels) - $(add_frameworks_dep kitemviews) - $(add_frameworks_dep kwidgetsaddons) - $(add_frameworks_dep kwindowsystem) - $(add_frameworks_dep kxmlgui) - $(add_qt_dep qtdbus) - $(add_qt_dep qtgui) - $(add_qt_dep qtnetwork) - $(add_qt_dep qtsql 'mysql?,postgres?') - $(add_qt_dep qtwidgets) - $(add_qt_dep qtxml) - sqlite? ( - $(add_qt_dep qtsql 'sqlite' '' '5=') - dev-db/sqlite:3 - ) - xml? ( dev-libs/libxml2 ) -" -DEPEND="${COMMON_DEPEND} - dev-libs/boost - dev-libs/libxslt - test? ( sys-apps/dbus ) -" -RDEPEND="${COMMON_DEPEND} - !=dev-db/mariadb-10.4"; then - ewarn "If an existing Akonadi QMYSQL database is being upgraded using" - ewarn ">=dev-db/mariadb-10.4 and KMail stops fetching and sending mail," - ewarn "check ~/.local/share/akonadi/akonadiserver.error for errors like:" - ewarn " \"Cannot add or update a child row: a foreign key constraint fails\"" - ewarn - ewarn "Manual steps are required to fix it, see also:" - ewarn " https://bugs.gentoo.org/688746 (see Whiteboard)" - ewarn " https://bugs.kde.org/show_bug.cgi?id=409224" - ewarn - fi - - if use sqlite || has_version "<${CATEGORY}/${P}[sqlite]"; then - ewarn "We strongly recommend you change your Akonadi database backend to either MySQL" - ewarn "or PostgreSQL in your user configuration." - ewarn "In particular, kde-apps/kmail does not work properly with the sqlite backend." - fi - - kde5_pkg_setup -} - -src_configure() { - local mycmakeargs=( - -DAKONADI_BUILD_QSQLITE=$(usex sqlite) - -DBUILD_TOOLS=$(usex tools) - $(cmake-utils_use_find_package xml LibXml2) - ) - - kde5_src_configure -} - -src_install() { - # Who knows, maybe it accidentally fixes our permission issues - cat <<-EOF > "${T}"/akonadiserverrc -[%General] -Driver=${DRIVER} -EOF - insinto /usr/share/config/akonadi - doins "${T}"/akonadiserverrc - - kde5_src_install -} - -pkg_postinst() { - kde5_pkg_postinst - elog "You can select the storage backend in ~/.config/akonadi/akonadiserverrc." - elog "Available drivers are:" - use mysql && elog " QMYSQL" - use postgres && elog " QPSQL" - use sqlite && elog " QSQLITE3" - elog "${DRIVER} has been set as your default akonadi storage backend." -} diff --git a/kde-apps/akonadi/akonadi-19.08.3.ebuild b/kde-apps/akonadi/akonadi-19.08.3.ebuild index 29ed0f40384d..0c1c41e1a9b5 100644 --- a/kde-apps/akonadi/akonadi-19.08.3.ebuild +++ b/kde-apps/akonadi/akonadi-19.08.3.ebuild @@ -15,7 +15,7 @@ DESCRIPTION="Storage service for PIM data and libraries for PIM apps" HOMEPAGE="https://community.kde.org/KDE_PIM/akonadi" SLOT="5" -KEYWORDS="~amd64 ~arm ~arm64 ~x86" +KEYWORDS="amd64 ~arm arm64 x86" LICENSE="LGPL-2.1+" IUSE="+mysql postgres sqlite tools xml" diff --git a/kde-apps/akonadi/akonadi-19.12.0.ebuild b/kde-apps/akonadi/akonadi-19.12.0.ebuild new file mode 100644 index 000000000000..c8ddf505aaef --- /dev/null +++ b/kde-apps/akonadi/akonadi-19.12.0.ebuild @@ -0,0 +1,134 @@ +# Copyright 1999-2019 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +ECM_DESIGNERPLUGIN="true" +ECM_TEST="forceoptional" +PVCUT=$(ver_cut 1-3) +KFMIN=5.63.0 +QTMIN=5.12.3 +VIRTUALDBUS_TEST="true" +VIRTUALX_REQUIRED="test" +inherit ecm kde.org + +DESCRIPTION="Storage service for PIM data and libraries for PIM apps" +HOMEPAGE="https://community.kde.org/KDE_PIM/akonadi" + +SLOT="5" +KEYWORDS="~amd64 ~arm ~arm64 ~x86" +LICENSE="LGPL-2.1+" +IUSE="+kaccounts +mysql postgres sqlite tools xml" + +REQUIRED_USE="|| ( mysql postgres sqlite ) test? ( tools )" + +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/qtwidgets-${QTMIN}:5 + >=dev-qt/qtxml-${QTMIN}:5 + >=kde-frameworks/kcompletion-${KFMIN}:5 + >=kde-frameworks/kconfig-${KFMIN}:5 + >=kde-frameworks/kconfigwidgets-${KFMIN}:5 + >=kde-frameworks/kcoreaddons-${KFMIN}:5 + >=kde-frameworks/kcrash-${KFMIN}:5 + >=kde-frameworks/kdbusaddons-${KFMIN}:5 + >=kde-frameworks/ki18n-${KFMIN}:5 + >=kde-frameworks/kiconthemes-${KFMIN}:5 + >=kde-frameworks/kio-${KFMIN}:5 + >=kde-frameworks/kitemmodels-${KFMIN}:5 + >=kde-frameworks/kitemviews-${KFMIN}:5 + >=kde-frameworks/kwidgetsaddons-${KFMIN}:5 + >=kde-frameworks/kwindowsystem-${KFMIN}:5 + >=kde-frameworks/kxmlgui-${KFMIN}:5 + kaccounts? ( + >=kde-apps/kaccounts-integration-${PVCUT}:5 + net-libs/accounts-qt + ) + sqlite? ( + >=dev-qt/qtsql-${QTMIN}:5=[sqlite] + dev-db/sqlite:3 + ) + xml? ( dev-libs/libxml2 ) +" +DEPEND="${COMMON_DEPEND} + dev-libs/boost + dev-libs/libxslt + test? ( sys-apps/dbus ) +" +RDEPEND="${COMMON_DEPEND} + !=dev-db/mariadb-10.4"; then + ewarn "If an existing Akonadi QMYSQL database is being upgraded using" + ewarn ">=dev-db/mariadb-10.4 and KMail stops fetching and sending mail," + ewarn "check ~/.local/share/akonadi/akonadiserver.error for errors like:" + ewarn " \"Cannot add or update a child row: a foreign key constraint fails\"" + ewarn + ewarn "Manual steps are required to fix it, see also:" + ewarn " https://bugs.gentoo.org/688746 (see Whiteboard)" + ewarn " https://bugs.kde.org/show_bug.cgi?id=409224" + ewarn + fi + + if use sqlite || has_version "<${CATEGORY}/${P}[sqlite]"; then + ewarn "We strongly recommend you change your Akonadi database backend to either MySQL" + ewarn "or PostgreSQL in your user configuration." + ewarn "In particular, kde-apps/kmail does not work properly with the sqlite backend." + fi + + ecm_pkg_setup +} + +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) + ) + + ecm_src_configure +} + +src_install() { + # Who knows, maybe it accidentally fixes our permission issues + cat <<-EOF > "${T}"/akonadiserverrc +[%General] +Driver=${DRIVER} +EOF + insinto /usr/share/config/akonadi + doins "${T}"/akonadiserverrc + + ecm_src_install +} + +pkg_postinst() { + ecm_pkg_postinst + elog "You can select the storage backend in ~/.config/akonadi/akonadiserverrc." + elog "Available drivers are:" + use mysql && elog " QMYSQL" + use postgres && elog " QPSQL" + use sqlite && elog " QSQLITE3" + elog "${DRIVER} has been set as your default akonadi storage backend." +} diff --git a/kde-apps/akonadi/files/akonadi-19.04.3-qmysql-fix.patch b/kde-apps/akonadi/files/akonadi-19.04.3-qmysql-fix.patch deleted file mode 100644 index c26d3d993b2b..000000000000 --- a/kde-apps/akonadi/files/akonadi-19.04.3-qmysql-fix.patch +++ /dev/null @@ -1,44 +0,0 @@ -From 8b8db29d10b2ef92deb2d87ff613f3d7f39af34e Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Daniel=20Vr=C3=A1til?= -Date: Fri, 26 Jul 2019 13:31:58 +0200 -Subject: Fix compatibility with QMYSQL driver after 74aed95 - -Summary: -QPSQL requires the table name passed to QSqlDatabase::record() to be lowercase -since Qt 5.13, but doing that breaks QMYSQL, so only adjust the name when -using QPSQL. - -CCBUG: 409234 - -Reviewers: #kde_pim, vkrause - -Reviewed By: #kde_pim, vkrause - -Subscribers: kde-pim - -Tags: #kde_pim - -Differential Revision: https://phabricator.kde.org/D22677 ---- - src/server/storage/dbintrospector.cpp | 5 ++++- - 1 file changed, 4 insertions(+), 1 deletion(-) - -diff --git a/src/server/storage/dbintrospector.cpp b/src/server/storage/dbintrospector.cpp -index 70d952a..932444c 100644 ---- a/src/server/storage/dbintrospector.cpp -+++ b/src/server/storage/dbintrospector.cpp -@@ -76,7 +76,10 @@ bool DbIntrospector::hasColumn(const QString &tableName, const QString &columnNa - QStringList columns = m_columnCache.value(tableName); - - if (columns.isEmpty()) { -- const QSqlRecord table = m_database.record(tableName.toLower()); -+ // QPSQL requires the name to be lower case, but it breaks compatibility with existing -+ // tables with other drivers (see BKO#409234). Yay for abstraction... -+ const auto name = (DbType::type(m_database) == DbType::PostgreSQL) ? tableName.toLower() : tableName; -+ const QSqlRecord table = m_database.record(name); - const int numTables = table.count(); - columns.reserve(numTables); - for (int i = 0; i < numTables; ++i) { --- -cgit v1.1 - diff --git a/kde-apps/akonadi/metadata.xml b/kde-apps/akonadi/metadata.xml index 58d880b38b44..8acbee94c7a6 100644 --- a/kde-apps/akonadi/metadata.xml +++ b/kde-apps/akonadi/metadata.xml @@ -7,6 +7,7 @@ Install plugin for dev-qt/designer + Enable support for system-wide defined KAccounts Install tools for developers and testing -- cgit v1.2.3