| 1 |
commit: 5f2526ef8d14e0d5be9fd0fc5d1a68fa7d62aa36 |
| 2 |
Author: Andreas Sturmlechner <andreas.sturmlechner <AT> gmail <DOT> com> |
| 3 |
AuthorDate: Thu May 26 14:16:32 2016 +0000 |
| 4 |
Commit: Michael Palimaka <kensington <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Thu May 26 14:49:52 2016 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/proj/kde.git/commit/?id=5f2526ef |
| 7 |
|
| 8 |
kde-apps/akonadi: Fix mysql56-crash patch for master |
| 9 |
|
| 10 |
CMake Warning-- |
| 11 |
|
| 12 |
Package-Manager: portage-2.2.28 |
| 13 |
|
| 14 |
kde-apps/akonadi/akonadi-16.04.1.ebuild | 1 - |
| 15 |
kde-apps/akonadi/akonadi-16.04.49.9999.ebuild | 1 - |
| 16 |
kde-apps/akonadi/akonadi-9999.ebuild | 4 +-- |
| 17 |
.../files/akonadi-16.07.80-mysql56-crash.patch | 42 ++++++++++++++++++++++ |
| 18 |
4 files changed, 43 insertions(+), 5 deletions(-) |
| 19 |
|
| 20 |
diff --git a/kde-apps/akonadi/akonadi-16.04.1.ebuild b/kde-apps/akonadi/akonadi-16.04.1.ebuild |
| 21 |
index 54411a8..8327472 100644 |
| 22 |
--- a/kde-apps/akonadi/akonadi-16.04.1.ebuild |
| 23 |
+++ b/kde-apps/akonadi/akonadi-16.04.1.ebuild |
| 24 |
@@ -97,7 +97,6 @@ pkg_setup() { |
| 25 |
src_configure() { |
| 26 |
local mycmakeargs=( |
| 27 |
$(cmake-utils_use_find_package designer Qt5Designer) |
| 28 |
- $(cmake-utils_use_find_package xml LibXml2) |
| 29 |
-DAKONADI_BUILD_QSQLITE=$(usex sqlite) |
| 30 |
-DBUILD_TOOLS=$(usex tools) |
| 31 |
-DKDE_INSTALL_USE_QT_SYS_PATHS=ON |
| 32 |
|
| 33 |
diff --git a/kde-apps/akonadi/akonadi-16.04.49.9999.ebuild b/kde-apps/akonadi/akonadi-16.04.49.9999.ebuild |
| 34 |
index 6eec273..1333734 100644 |
| 35 |
--- a/kde-apps/akonadi/akonadi-16.04.49.9999.ebuild |
| 36 |
+++ b/kde-apps/akonadi/akonadi-16.04.49.9999.ebuild |
| 37 |
@@ -97,7 +97,6 @@ pkg_setup() { |
| 38 |
src_configure() { |
| 39 |
local mycmakeargs=( |
| 40 |
$(cmake-utils_use_find_package designer Qt5Designer) |
| 41 |
- $(cmake-utils_use_find_package xml LibXml2) |
| 42 |
-DAKONADI_BUILD_QSQLITE=$(usex sqlite) |
| 43 |
-DBUILD_TOOLS=$(usex tools) |
| 44 |
-DKDE_INSTALL_USE_QT_SYS_PATHS=ON |
| 45 |
|
| 46 |
diff --git a/kde-apps/akonadi/akonadi-9999.ebuild b/kde-apps/akonadi/akonadi-9999.ebuild |
| 47 |
index b8e27db..849a687 100644 |
| 48 |
--- a/kde-apps/akonadi/akonadi-9999.ebuild |
| 49 |
+++ b/kde-apps/akonadi/akonadi-9999.ebuild |
| 50 |
@@ -26,7 +26,6 @@ COMMON_DEPEND=" |
| 51 |
$(add_frameworks_dep kcoreaddons) |
| 52 |
$(add_frameworks_dep kdbusaddons) |
| 53 |
$(add_frameworks_dep kdesignerplugin) |
| 54 |
- $(add_frameworks_dep kguiaddons) |
| 55 |
$(add_frameworks_dep ki18n) |
| 56 |
$(add_frameworks_dep kiconthemes) |
| 57 |
$(add_frameworks_dep kio) |
| 58 |
@@ -62,7 +61,7 @@ RDEPEND="${COMMON_DEPEND} |
| 59 |
# some akonadi tests time out, that probably needs more work as it's ~700 tests |
| 60 |
RESTRICT="test" |
| 61 |
|
| 62 |
-PATCHES=( "${FILESDIR}/${PN}-15.12-mysql56-crash.patch" ) |
| 63 |
+PATCHES=( "${FILESDIR}/${PN}-16.07.80-mysql56-crash.patch" ) |
| 64 |
|
| 65 |
pkg_setup() { |
| 66 |
# Set default storage backend in order: MySQL, SQLite PostgreSQL |
| 67 |
@@ -98,7 +97,6 @@ pkg_setup() { |
| 68 |
src_configure() { |
| 69 |
local mycmakeargs=( |
| 70 |
$(cmake-utils_use_find_package designer Qt5Designer) |
| 71 |
- $(cmake-utils_use_find_package xml LibXml2) |
| 72 |
-DAKONADI_BUILD_QSQLITE=$(usex sqlite) |
| 73 |
-DBUILD_TOOLS=$(usex tools) |
| 74 |
-DKDE_INSTALL_USE_QT_SYS_PATHS=ON |
| 75 |
|
| 76 |
diff --git a/kde-apps/akonadi/files/akonadi-16.07.80-mysql56-crash.patch b/kde-apps/akonadi/files/akonadi-16.07.80-mysql56-crash.patch |
| 77 |
new file mode 100644 |
| 78 |
index 0000000..773b523 |
| 79 |
--- /dev/null |
| 80 |
+++ b/kde-apps/akonadi/files/akonadi-16.07.80-mysql56-crash.patch |
| 81 |
@@ -0,0 +1,42 @@ |
| 82 |
+Gentoo-bug: 530012 |
| 83 |
+ |
| 84 |
+diff --git a/src/server/storage/dbconfigmysql.cpp b/src/server/storage/dbconfigmysql.cpp |
| 85 |
+index db0c100..cdd8c6b 100644 |
| 86 |
+--- a/src/server/storage/dbconfigmysql.cpp |
| 87 |
++++ b/src/server/storage/dbconfigmysql.cpp |
| 88 |
+@@ -80,6 +80,7 @@ bool DbConfigMysql::init(QSettings &settings) |
| 89 |
+ << QStringLiteral("/usr/local/sbin") |
| 90 |
+ << QStringLiteral("/usr/local/libexec") |
| 91 |
+ << QStringLiteral("/usr/libexec") |
| 92 |
++ << QStringLiteral("/usr/share/mysql/scripts") |
| 93 |
+ << QStringLiteral("/opt/mysql/libexec") |
| 94 |
+ << QStringLiteral("/opt/local/lib/mysql5/bin") |
| 95 |
+ << QStringLiteral("/opt/mysql/sbin"); |
| 96 |
+@@ -500,7 +501,8 @@ bool DbConfigMysql::initializeMariaDBDatabase(const QString &confFile, const QSt |
| 97 |
+ return 0 == execute(mMysqlInstallDbPath, |
| 98 |
+ { QStringLiteral("--defaults-file=%1").arg(confFile), |
| 99 |
+ QStringLiteral("--force"), |
| 100 |
+- QStringLiteral("--datadir=%1/").arg(dataDir) }); |
| 101 |
++ QStringLiteral("--datadir=%1/").arg(dataDir), |
| 102 |
++ QStringLiteral("--basedir=/usr") }); |
| 103 |
+ } |
| 104 |
+ |
| 105 |
+ /** |
| 106 |
+@@ -512,7 +514,8 @@ bool DbConfigMysql::initializeMySQL5_7_6Database(const QString &confFile, const |
| 107 |
+ return 0 == execute(mMysqldPath, |
| 108 |
+ { QStringLiteral("--defaults-file=%1").arg(confFile), |
| 109 |
+ QStringLiteral("--initialize"), |
| 110 |
+- QStringLiteral("--datadir=%1/").arg(dataDir) }); |
| 111 |
++ QStringLiteral("--datadir=%1/").arg(dataDir), |
| 112 |
++ QStringLiteral("--basedir=/usr") }); |
| 113 |
+ } |
| 114 |
+ |
| 115 |
+ bool DbConfigMysql::initializeMySQLDatabase(const QString &confFile, const QString &dataDir) const |
| 116 |
+@@ -520,5 +523,6 @@ bool DbConfigMysql::initializeMySQLDatabase(const QString &confFile, const QStri |
| 117 |
+ // Don't use --force, it has been removed in MySQL 5.7.5 |
| 118 |
+ return 0 == execute(mMysqlInstallDbPath, |
| 119 |
+ { QStringLiteral("--defaults-file=%1").arg(confFile), |
| 120 |
+- QStringLiteral("--datadir=%1/").arg(dataDir) }); |
| 121 |
++ QStringLiteral("--datadir=%1/").arg(dataDir), |
| 122 |
++ QStringLiteral("--basedir=/usr") }); |
| 123 |
+ } |
Archives