commit: c7dbe2c56bcbbcb7478f9407057df292b8e86d15 Author: Andreas Sturmlechner <andreas.sturmlechner <AT> gmail <DOT> com> AuthorDate: Sun Feb 21 17:38:30 2016 +0000 Commit: Michael Palimaka <kensington <AT> gentoo <DOT> org> CommitDate: Tue Feb 23 14:20:36 2016 +0000 URL: https://gitweb.gentoo.org/proj/kde.git/commit/?id=c7dbe2c5
app-office/akonadi-server: Fix mysql.conf before it breaks Backport from git master for mysql versions >=5.7 Package-Manager: portage-2.2.27 ...=> akonadi-server-1.13.1_pre20160203-r1.ebuild} | 13 +++++--- .../files/akonadi-server-1.13.1-mysql.conf.patch | 38 ++++++++++++++++++++++ 2 files changed, 46 insertions(+), 5 deletions(-) diff --git a/app-office/akonadi-server/akonadi-server-1.13.1_pre20160203.ebuild b/app-office/akonadi-server/akonadi-server-1.13.1_pre20160203-r1.ebuild similarity index 92% rename from app-office/akonadi-server/akonadi-server-1.13.1_pre20160203.ebuild rename to app-office/akonadi-server/akonadi-server-1.13.1_pre20160203-r1.ebuild index 3a7685a..e94e994 100644 --- a/app-office/akonadi-server/akonadi-server-1.13.1_pre20160203.ebuild +++ b/app-office/akonadi-server/akonadi-server-1.13.1_pre20160203-r1.ebuild @@ -34,12 +34,12 @@ REQUIRED_USE="|| ( sqlite mysql postgres )" CDEPEND=" dev-libs/boost:= - x11-misc/shared-mime-info >=dev-qt/qtcore-4.8.5:4 >=dev-qt/qtdbus-4.8.5:4 >=dev-qt/qtgui-4.8.5:4 >=dev-qt/qtsql-4.8.5:4[mysql?,postgres?] >=dev-qt/qttest-4.8.5:4 + x11-misc/shared-mime-info sqlite? ( dev-db/sqlite:3 ) " DEPEND="${CDEPEND} @@ -54,7 +54,10 @@ RDEPEND="${CDEPEND} RESTRICT="test" -PATCHES=( "${FILESDIR}/${PN}-1.13.0-mysql56-crash.patch" ) +PATCHES=( + "${FILESDIR}/${PN}-1.13.0-mysql56-crash.patch" + "${FILESDIR}/${PN}-1.13.1-mysql.conf.patch" +) pkg_pretend() { if [[ ${MERGE_TYPE} != binary ]]; then @@ -86,9 +89,9 @@ pkg_setup() { if use sqlite || has_version "<${CATEGORY}/${P}[sqlite]"; then ewarn ewarn "We strongly recommend you change your Akonadi database backend to MySQL in your" - ewarn "user configuration. This is the backend recommended by KDE upstream." - ewarn "In particular, kde-apps/kmail-4.10 does not work properly with the sqlite" - ewarn "backend anymore." + ewarn "user configuration. This is the backend recommended by KDE upstream. PostgreSQL" + ewarn "is also known to work very well but requires manual dump and import on major" + ewarn "upgrades of the DB." ewarn "You can select the backend in your ~/.config/akonadi/akonadiserverrc." ewarn "Available drivers are:${AVAILABLE}" ewarn diff --git a/app-office/akonadi-server/files/akonadi-server-1.13.1-mysql.conf.patch b/app-office/akonadi-server/files/akonadi-server-1.13.1-mysql.conf.patch new file mode 100644 index 0000000..a090636 --- /dev/null +++ b/app-office/akonadi-server/files/akonadi-server-1.13.1-mysql.conf.patch @@ -0,0 +1,38 @@ +From: Daniel Vrátil <dvra...@kde.org> +Date: Tue, 16 Feb 2016 17:26:22 +0000 +Subject: Drop mysql.conf option removed in MySQL 5.7 +X-Git-Url: http://quickgit.kde.org/?p=akonadi.git&a=commitdiff&h=9a9f7eaa38023f70c6fa85a87359a487ccf7a48c +--- +Drop mysql.conf option removed in MySQL 5.7 + +innodb_additional_mem_pool_size option has been deprecated in MySQL 5.6 +and removed in 5.7 so MySQL will no longer start it the option is present +in mysql.conf. + +The option still seems to be supported by MariaDB, but the default value +we had in the mysql.conf was below the minimum allowed value, so the harm +in removing the option for MariaDB should be minimal. + +If options supported by MySQL and MariaDB begin to diverge more in the future +we might consider having separate config files for each database. + +* 2016-02-21: Adjusted path for 1.13 branch +--- + + +--- a/server/src/storage/mysql-global.conf ++++ b/server/src/storage/mysql-global.conf +@@ -37,9 +37,9 @@ + # use InnoDB for transactions and better crash recovery + default_storage_engine=innodb + +-# memory pool InnoDB uses to store data dictionary information and other internal data structures (default:1M) +-# Deprecated in MySQL >= 5.6.3 +-innodb_additional_mem_pool_size=1M ++# memory pool InnoDB uses to store data dictionary information and other internal data structures (default:8M) ++# Deprecated in MySQL >= 5.6.3, removed in 5.7 (works in MariaDB) ++# innodb_additional_mem_pool_size=8M + + # memory buffer InnoDB uses to cache data and indexes of its tables (default:128M) + # Larger values means less I/O +