1 |
commit: c7dbe2c56bcbbcb7478f9407057df292b8e86d15 |
2 |
Author: Andreas Sturmlechner <andreas.sturmlechner <AT> gmail <DOT> com> |
3 |
AuthorDate: Sun Feb 21 17:38:30 2016 +0000 |
4 |
Commit: Michael Palimaka <kensington <AT> gentoo <DOT> org> |
5 |
CommitDate: Tue Feb 23 14:20:36 2016 +0000 |
6 |
URL: https://gitweb.gentoo.org/proj/kde.git/commit/?id=c7dbe2c5 |
7 |
|
8 |
app-office/akonadi-server: Fix mysql.conf before it breaks |
9 |
|
10 |
Backport from git master for mysql versions >=5.7 |
11 |
|
12 |
Package-Manager: portage-2.2.27 |
13 |
|
14 |
...=> akonadi-server-1.13.1_pre20160203-r1.ebuild} | 13 +++++--- |
15 |
.../files/akonadi-server-1.13.1-mysql.conf.patch | 38 ++++++++++++++++++++++ |
16 |
2 files changed, 46 insertions(+), 5 deletions(-) |
17 |
|
18 |
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 |
19 |
similarity index 92% |
20 |
rename from app-office/akonadi-server/akonadi-server-1.13.1_pre20160203.ebuild |
21 |
rename to app-office/akonadi-server/akonadi-server-1.13.1_pre20160203-r1.ebuild |
22 |
index 3a7685a..e94e994 100644 |
23 |
--- a/app-office/akonadi-server/akonadi-server-1.13.1_pre20160203.ebuild |
24 |
+++ b/app-office/akonadi-server/akonadi-server-1.13.1_pre20160203-r1.ebuild |
25 |
@@ -34,12 +34,12 @@ REQUIRED_USE="|| ( sqlite mysql postgres )" |
26 |
|
27 |
CDEPEND=" |
28 |
dev-libs/boost:= |
29 |
- x11-misc/shared-mime-info |
30 |
>=dev-qt/qtcore-4.8.5:4 |
31 |
>=dev-qt/qtdbus-4.8.5:4 |
32 |
>=dev-qt/qtgui-4.8.5:4 |
33 |
>=dev-qt/qtsql-4.8.5:4[mysql?,postgres?] |
34 |
>=dev-qt/qttest-4.8.5:4 |
35 |
+ x11-misc/shared-mime-info |
36 |
sqlite? ( dev-db/sqlite:3 ) |
37 |
" |
38 |
DEPEND="${CDEPEND} |
39 |
@@ -54,7 +54,10 @@ RDEPEND="${CDEPEND} |
40 |
|
41 |
RESTRICT="test" |
42 |
|
43 |
-PATCHES=( "${FILESDIR}/${PN}-1.13.0-mysql56-crash.patch" ) |
44 |
+PATCHES=( |
45 |
+ "${FILESDIR}/${PN}-1.13.0-mysql56-crash.patch" |
46 |
+ "${FILESDIR}/${PN}-1.13.1-mysql.conf.patch" |
47 |
+) |
48 |
|
49 |
pkg_pretend() { |
50 |
if [[ ${MERGE_TYPE} != binary ]]; then |
51 |
@@ -86,9 +89,9 @@ pkg_setup() { |
52 |
if use sqlite || has_version "<${CATEGORY}/${P}[sqlite]"; then |
53 |
ewarn |
54 |
ewarn "We strongly recommend you change your Akonadi database backend to MySQL in your" |
55 |
- ewarn "user configuration. This is the backend recommended by KDE upstream." |
56 |
- ewarn "In particular, kde-apps/kmail-4.10 does not work properly with the sqlite" |
57 |
- ewarn "backend anymore." |
58 |
+ ewarn "user configuration. This is the backend recommended by KDE upstream. PostgreSQL" |
59 |
+ ewarn "is also known to work very well but requires manual dump and import on major" |
60 |
+ ewarn "upgrades of the DB." |
61 |
ewarn "You can select the backend in your ~/.config/akonadi/akonadiserverrc." |
62 |
ewarn "Available drivers are:${AVAILABLE}" |
63 |
ewarn |
64 |
|
65 |
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 |
66 |
new file mode 100644 |
67 |
index 0000000..a090636 |
68 |
--- /dev/null |
69 |
+++ b/app-office/akonadi-server/files/akonadi-server-1.13.1-mysql.conf.patch |
70 |
@@ -0,0 +1,38 @@ |
71 |
+From: Daniel Vrátil <dvratil@×××.org> |
72 |
+Date: Tue, 16 Feb 2016 17:26:22 +0000 |
73 |
+Subject: Drop mysql.conf option removed in MySQL 5.7 |
74 |
+X-Git-Url: http://quickgit.kde.org/?p=akonadi.git&a=commitdiff&h=9a9f7eaa38023f70c6fa85a87359a487ccf7a48c |
75 |
+--- |
76 |
+Drop mysql.conf option removed in MySQL 5.7 |
77 |
+ |
78 |
+innodb_additional_mem_pool_size option has been deprecated in MySQL 5.6 |
79 |
+and removed in 5.7 so MySQL will no longer start it the option is present |
80 |
+in mysql.conf. |
81 |
+ |
82 |
+The option still seems to be supported by MariaDB, but the default value |
83 |
+we had in the mysql.conf was below the minimum allowed value, so the harm |
84 |
+in removing the option for MariaDB should be minimal. |
85 |
+ |
86 |
+If options supported by MySQL and MariaDB begin to diverge more in the future |
87 |
+we might consider having separate config files for each database. |
88 |
+ |
89 |
+* 2016-02-21: Adjusted path for 1.13 branch |
90 |
+--- |
91 |
+ |
92 |
+ |
93 |
+--- a/server/src/storage/mysql-global.conf |
94 |
++++ b/server/src/storage/mysql-global.conf |
95 |
+@@ -37,9 +37,9 @@ |
96 |
+ # use InnoDB for transactions and better crash recovery |
97 |
+ default_storage_engine=innodb |
98 |
+ |
99 |
+-# memory pool InnoDB uses to store data dictionary information and other internal data structures (default:1M) |
100 |
+-# Deprecated in MySQL >= 5.6.3 |
101 |
+-innodb_additional_mem_pool_size=1M |
102 |
++# memory pool InnoDB uses to store data dictionary information and other internal data structures (default:8M) |
103 |
++# Deprecated in MySQL >= 5.6.3, removed in 5.7 (works in MariaDB) |
104 |
++# innodb_additional_mem_pool_size=8M |
105 |
+ |
106 |
+ # memory buffer InnoDB uses to cache data and indexes of its tables (default:128M) |
107 |
+ # Larger values means less I/O |
108 |
+ |