diff options
Diffstat (limited to 'kde-apps')
-rw-r--r-- | kde-apps/Manifest.gz | bin | 38198 -> 38192 bytes | |||
-rw-r--r-- | kde-apps/akonadi-search/Manifest | 2 | ||||
-rw-r--r-- | kde-apps/akonadi-search/akonadi-search-20.12.2-r1.ebuild (renamed from kde-apps/akonadi-search/akonadi-search-20.12.2.ebuild) | 2 | ||||
-rw-r--r-- | kde-apps/akonadi/Manifest | 5 | ||||
-rw-r--r-- | kde-apps/akonadi/akonadi-20.12.2-r1.ebuild (renamed from kde-apps/akonadi/akonadi-20.12.2.ebuild) | 42 | ||||
-rw-r--r-- | kde-apps/akonadi/files/akonadi-20.12.2-mysql8-conf.patch | 75 | ||||
-rw-r--r-- | kde-apps/akonadi/metadata.xml | 1 |
7 files changed, 98 insertions, 29 deletions
diff --git a/kde-apps/Manifest.gz b/kde-apps/Manifest.gz Binary files differindex c29908fe521c..6b606610f422 100644 --- a/kde-apps/Manifest.gz +++ b/kde-apps/Manifest.gz diff --git a/kde-apps/akonadi-search/Manifest b/kde-apps/akonadi-search/Manifest index f4bb88df4946..22432844a88b 100644 --- a/kde-apps/akonadi-search/Manifest +++ b/kde-apps/akonadi-search/Manifest @@ -1,5 +1,5 @@ DIST akonadi-search-20.08.3.tar.xz 94772 BLAKE2B a1ab156b0306dc543eff92711a7c3e3d94fde423a16fead67559b4b01b937178e549421d41dd486e3f68e4743c13a3667d7f432b656d990f02cac6edb0968a1c SHA512 db6246e428bfbe77239089e1bc4036b99dd8c070a70a995c698785ab202e5f975e30a7e0f36ac3fa41c859b928821f626f545c2be21479ffe5809e83068dbee8 DIST akonadi-search-20.12.2.tar.xz 93988 BLAKE2B 42b62605b4dbe27dae073761ccb78e6063b65fc9ad934aa77065baa380e4dba38b38062f30ac800ec9546697d1b10b275f1bc0ca21426ebe16f5d8e399560720 SHA512 cbb9bb579b0545198ebc145d41ca3ffdc84a5cdab00941ef133c5d2fba2e720eefdb4ea52edfa065bcd2baffe5a612c15058fd5d7a2106c8728ad4ff6e531de0 EBUILD akonadi-search-20.08.3.ebuild 1301 BLAKE2B 00c6815e3aac88e7483b8a0ebb485207a1e048ee35b0a6999327f0a1f631b7746fa85d92aa6523b6f88d5a957ed244f327640c4fdac65a46ba366d4e39ad5ac2 SHA512 ad76831ebbd2eaac684fb83f353a6223c2447c396dd514b69e8447c47ae93f389a62f9946fbdde54e5c9a1aacfa74662e9bfaa857e1dac67b66da66a3fd37a76 -EBUILD akonadi-search-20.12.2.ebuild 1306 BLAKE2B 0360c0db2d332ede2613ab2ebdcd9769f6c8e0fb6d720ea4586c2028f15a7e479478696289c6a6f25be445d9cb12056e49ae45aee0cdae0242bc9872a7c234df SHA512 7aceb1878584de96546b100375ec0cb7e3c7ab9a1fe5efa7db429d9a902ab41a9735057341ac2cef7a556e9aecd43016804f9bb01e05cbce70e75c605511c07a +EBUILD akonadi-search-20.12.2-r1.ebuild 1304 BLAKE2B 62f40c6accd6e1743935f8657adf7d3c7e12fbef17b7cce360c4aa979b00bbf28555cc19352ca24327f355be795effdc262cd47ceff1d4f0b8bb1bc869417965 SHA512 de7cd43541b59a7f7233c521ea718e3ec58d86f8e6d3f9e2371ec61d4e47dba7682469a513ca6c1251ba8407e9885bb18ee4927c9116fdbb5c22797419badf3a MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3 diff --git a/kde-apps/akonadi-search/akonadi-search-20.12.2.ebuild b/kde-apps/akonadi-search/akonadi-search-20.12.2-r1.ebuild index 2d08a7e07333..e8429904b4bf 100644 --- a/kde-apps/akonadi-search/akonadi-search-20.12.2.ebuild +++ b/kde-apps/akonadi-search/akonadi-search-20.12.2-r1.ebuild @@ -45,5 +45,5 @@ RDEPEND=" " DEPEND="${RDEPEND} dev-libs/boost - test? ( >=kde-apps/akonadi-${PVCUT}:5[mariadb,postgres,sqlite] ) + test? ( >=kde-apps/akonadi-${PVCUT}:5[mysql,postgres,sqlite] ) " diff --git a/kde-apps/akonadi/Manifest b/kde-apps/akonadi/Manifest index 138b985a9749..55495b05ece2 100644 --- a/kde-apps/akonadi/Manifest +++ b/kde-apps/akonadi/Manifest @@ -1,6 +1,7 @@ AUX akonadi-18.12.2-mysql56-crash.patch 2196 BLAKE2B d12643c870da557f540f199f78462f97fc569ffe160415f56f166d89b7e94e0f6682fa68ed84c9629e66639ddac61b5c54376c309a8921d84a1d52ba351a9aab SHA512 093a0b4243668344db59b0419809500e411f7399137ba3d9c439b4d5300a2f867fb231f7d5a8bc5d95ad2d1ccb6921804caff8200ddddba74a62ddcdfa9ac623 +AUX akonadi-20.12.2-mysql8-conf.patch 2392 BLAKE2B 10d34a17d0af283d273186c32770af4dd3ea86893ac96d600203872dde8a0b1f62463315f1b3f46a91be86e44f7d49f88fdfbc1ff3ce56c51057cfa40cf6c51f SHA512 04fed8d69129ea410938edfa73af302f4aafa26894061480f4ef25b7b38b16df71ce813e404c78cc55d70af62b8bd2c4ed940f22b8030444bea66cef3adc5871 DIST akonadi-20.08.3.tar.xz 1591360 BLAKE2B e237fc3307ae3cd785e29da9c2177832f1cff523ab3dc46279813c9ae152ac3a030649e6b73e8d566332f478992d6441457301355c2f6abd180c4db8c8d48011 SHA512 2d278a6189732e7c68a89321356915413771f1b4b1e3fb5a491b02f0000095163cce61278cc4f7f8b17759c1d71b3e3c08dbed0c89f3fe26be21da14adbbf720 DIST akonadi-20.12.2.tar.xz 1593452 BLAKE2B e3d058a43685a8b8bf92ffbb169f1c17b8e831712567a4ef8eba6ef1eee6321ae45f82a72a4c44a71835b65c18075497d26c8802b7a2f0a10c9baa21efefa65e SHA512 2c21db5d6ab6b8d9cedabad2f726fd518ba8219db3cb6f8f72820edc71ed72efa31efcb2c4cd8ff36e52e4c0a38a97dd890789bf6816ab524f0568892254523c EBUILD akonadi-20.08.3.ebuild 3694 BLAKE2B 5c829b9c1ed6ffe603d7eb24b6d5b24affde82fb174c053e238ec79d57400fee1ce27c027ea6e02ff873215598de6bd62c18496f8b39e141510dd9ace430fd63 SHA512 c8903c0eff409708558e65eafd22a7348c95ecdd06e190ffe6fbedd48a22fc1ee7fc2a10894bf42d70e3066732b374d90ccdbf412e974612622c1f1bda943866 -EBUILD akonadi-20.12.2.ebuild 4086 BLAKE2B 5860b009ef9518689183afc45c1e97213ef782300ebde34a9a212a2a1526f25e2ccad5d4478fe08dc3df7469b0aa51e19402193f79d96b9fa2f805e87b1e6dee SHA512 c29a608b17dabe69d7943e8bb1b15ab858cec9f6de72baa7fb4aafaa5eb721193f808f3a9ab3ad24cab58e89c5889149a97e4b707a11cd8d37bfa0b560abd7f8 -MISC metadata.xml 588 BLAKE2B b0162943e19c7770ada2c773296d983b49904b9724dad1b10f78468c62deec785c116a5ab641214b6ea96dc2814d9d3ebf8e3972d6e38340dfba10db0cfdef81 SHA512 7f407851ce4b50e137cc6802d5a18c7ca96287044209bdc1689cce6f898ed46b0f57704111a359176004b16a3287a4cb143a266e5e707040d75e771115a576c8 +EBUILD akonadi-20.12.2-r1.ebuild 3754 BLAKE2B 5dfdb255d2e419ce749cd0376c60789d3b21f50392bbb76f1892ca3ec7ded8126a8e88ad3fe13ff71e263d14eb15956c728379386c80452c100796850487aeaa SHA512 156e410a4bd58a4175bcada4232d25db5130f74d80bf130c01958b8f689f8f3f8307d61464cb0d5187713bc09cd9fafda722e198e253c82bce563106c2d415eb +MISC metadata.xml 491 BLAKE2B f4d942600308e7fbc604467130f087b7dc9c22f92a21aa89224cdabe9b822b1b8f0986e14efa5e1d5206718f3dc837b00c926b559ee32b21b71cff09fe0ee0d0 SHA512 fbb184c959335ec38a98faa983f67eed457c7eaa7c401261c5b7c0401d813d7a9a4521001376c6d70d76b98286446346ae1592dfbf3771b8112591bc3fe2472e diff --git a/kde-apps/akonadi/akonadi-20.12.2.ebuild b/kde-apps/akonadi/akonadi-20.12.2-r1.ebuild index ec7b1bb392c9..3c234d906ee2 100644 --- a/kde-apps/akonadi/akonadi-20.12.2.ebuild +++ b/kde-apps/akonadi/akonadi-20.12.2-r1.ebuild @@ -5,7 +5,6 @@ EAPI=7 ECM_DESIGNERPLUGIN="true" ECM_TEST="forceoptional" -PVCUT=$(ver_cut 1-3) KFMIN=5.75.0 QTMIN=5.15.2 VIRTUALDBUS_TEST="true" @@ -18,16 +17,19 @@ HOMEPAGE="https://community.kde.org/KDE_PIM/akonadi" LICENSE="LGPL-2.1+" SLOT="5" KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86" -IUSE="+kaccounts +mariadb postgres sqlite tools xml" +IUSE="+kaccounts +mysql postgres sqlite tools xml" -REQUIRED_USE="|| ( mariadb postgres sqlite ) test? ( tools )" +REQUIRED_USE="|| ( mysql postgres sqlite ) test? ( tools )" + +# some akonadi tests time out, that probably needs more work as it's ~700 tests +RESTRICT+=" test" COMMON_DEPEND=" app-arch/xz-utils >=dev-qt/qtdbus-${QTMIN}:5 >=dev-qt/qtgui-${QTMIN}:5 >=dev-qt/qtnetwork-${QTMIN}:5 - >=dev-qt/qtsql-${QTMIN}:5[postgres?] + >=dev-qt/qtsql-${QTMIN}:5[mysql?,postgres?] >=dev-qt/qtwidgets-${QTMIN}:5 >=dev-qt/qtxml-${QTMIN}:5 >=kde-frameworks/kconfig-${KFMIN}:5 @@ -43,10 +45,9 @@ COMMON_DEPEND=" >=kde-frameworks/kwindowsystem-${KFMIN}:5 >=kde-frameworks/kxmlgui-${KFMIN}:5 kaccounts? ( - >=kde-apps/kaccounts-integration-${PVCUT}:5 + >=kde-apps/kaccounts-integration-20.08.3:5 net-libs/accounts-qt ) - mariadb? ( >=dev-qt/qtsql-${QTMIN}:5[mysql] ) sqlite? ( dev-db/sqlite:3 >=dev-qt/qtsql-${QTMIN}:5=[sqlite] @@ -59,24 +60,24 @@ DEPEND="${COMMON_DEPEND} test? ( sys-apps/dbus ) " RDEPEND="${COMMON_DEPEND} - mariadb? ( >=dev-db/mariadb-10.4:* ) + mysql? ( virtual/mysql ) postgres? ( dev-db/postgresql ) " -# some akonadi tests time out, that probably needs more work as it's ~700 tests -RESTRICT+=" test" - -PATCHES=( "${FILESDIR}/${PN}-18.12.2-mysql56-crash.patch" ) +PATCHES=( + "${FILESDIR}/${PN}-18.12.2-mysql56-crash.patch" + "${FILESDIR}/${P}-mysql8-conf.patch" # bug 709812 +) pkg_setup() { - # Set default storage backend in order: MariaDB, PostgreSQL, SQLite + # Set default storage backend in order: MySQL, PostgreSQL, SQLite # reverse driver check to keep the order use sqlite && DRIVER="QSQLITE3" use postgres && DRIVER="QPSQL" - use mariadb && DRIVER="QMYSQL" + use mysql && DRIVER="QMYSQL" - if use mariadb && has_version ">=dev-db/mariadb-10.4"; then - ewarn "If an existing Akonadi MariaDB database is being upgraded using" + if use mysql && has_version ">=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\"" @@ -89,17 +90,10 @@ pkg_setup() { if use sqlite || has_version "<${CATEGORY}/${P}[sqlite]"; then ewarn "We strongly recommend you change your Akonadi database backend to" - ewarn "either MariaDB or PostgreSQL in your user configuration." + 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 - if has_version "kde-apps/akonadi[mysql]"; then - ewarn "Due to configuration incompatibilities we are unable to provide" - ewarn "the option to use dev-db/mysql. You must switch to dev-db/mariadb." - ewarn " https://bugs.gentoo.org/709812" - ewarn " https://bugs.kde.org/show_bug.cgi?id=421922" - fi - ecm_pkg_setup } @@ -131,7 +125,7 @@ pkg_postinst() { ecm_pkg_postinst elog "You can select the storage backend in ~/.config/akonadi/akonadiserverrc." elog "Available drivers are:" - use mariadb && elog " QMYSQL" + 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-20.12.2-mysql8-conf.patch b/kde-apps/akonadi/files/akonadi-20.12.2-mysql8-conf.patch new file mode 100644 index 000000000000..8edf9d605dde --- /dev/null +++ b/kde-apps/akonadi/files/akonadi-20.12.2-mysql8-conf.patch @@ -0,0 +1,75 @@ +From 9c666d0d6039a87f6286014c7d9c7281a5bd9dd1 Mon Sep 17 00:00:00 2001 +From: Andreas Sturmlechner <asturm@gentoo.org> +Date: Tue, 16 Feb 2021 21:38:14 +0100 +Subject: [PATCH] MySQL server settings: Make use of 'loose_' option prefix + +Idea by one of the Gentoo MySQL maintainers. This makes MySQL skip over +unsupported options rather than fail, which is important with >=MySQL-8. + +See also: +https://dev.mysql.com/doc/refman/8.0/en/option-files.html#option-file-syntax +https://mariadb.com/kb/en/configuring-mariadb-with-option-files/#option-prefixes + +BUG: 421922 + +Thanks-to: Thomas Deutschmann <whissi@gentoo.org> +--- + src/server/storage/mysql-global-mobile.conf | 6 +++--- + src/server/storage/mysql-global.conf | 6 +++--- + 2 files changed, 6 insertions(+), 6 deletions(-) + +diff --git a/src/server/storage/mysql-global-mobile.conf b/src/server/storage/mysql-global-mobile.conf +index 19649d347..48e150af7 100644 +--- a/src/server/storage/mysql-global-mobile.conf ++++ b/src/server/storage/mysql-global-mobile.conf +@@ -65,7 +65,7 @@ innodb_large_prefix=1 + log_error=mysql.err + + # print warnings and connection errors (default:1) +-log_warnings=2 ++loose_log_warnings=2 + + # Convert table named to lowercase + lower_case_table_names=1 +@@ -80,10 +80,10 @@ max_connections=256 + # (make sense when having the same query multiple times) + + # Memory allocated for caching query results (default:0 (disabled)) +-query_cache_size=0 ++loose_query_cache_size=0 + + # Do not cache results (default:1) +-query_cache_type=0 ++loose_query_cache_type=0 + + # Do not use the privileges mechanisms + skip_grant_tables +diff --git a/src/server/storage/mysql-global.conf b/src/server/storage/mysql-global.conf +index ab4a4a1e3..b67a4ec1e 100644 +--- a/src/server/storage/mysql-global.conf ++++ b/src/server/storage/mysql-global.conf +@@ -62,7 +62,7 @@ innodb_log_file_size=64M + log_error=mysql.err + + # print warnings and connection errors (default:1) +-log_warnings=2 ++loose_log_warnings=2 + + # Convert table named to lowercase + lower_case_table_names=1 +@@ -77,10 +77,10 @@ max_connections=256 + # (make sense when having the same query multiple times) + + # Memory allocated for caching query results (default:0 (disabled)) +-query_cache_size=0 ++loose_query_cache_size=0 + + # Do not cache results (default:1) +-query_cache_type=0 ++loose_query_cache_type=0 + + # Do not use the privileges mechanisms + skip_grant_tables +-- +2.30.1 + diff --git a/kde-apps/akonadi/metadata.xml b/kde-apps/akonadi/metadata.xml index c6b73ba5cfce..8acbee94c7a6 100644 --- a/kde-apps/akonadi/metadata.xml +++ b/kde-apps/akonadi/metadata.xml @@ -8,7 +8,6 @@ <use> <flag name="designer">Install plugin for <pkg>dev-qt/designer</pkg></flag> <flag name="kaccounts">Enable support for system-wide defined KAccounts</flag> - <flag name="mariadb">Enable support for using <pkg>dev-db/mariadb</pkg> storage backend</flag> <flag name="tools">Install tools for developers and testing</flag> </use> </pkgmetadata> |