| 1 |
commit: c0b9ffd1e40c1db3ad006507826b7cefcd38ecf9 |
| 2 |
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Tue Jan 29 22:01:58 2019 +0000 |
| 4 |
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Tue Jan 29 22:01:58 2019 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/proj/kde.git/commit/?id=c0b9ffd1 |
| 7 |
|
| 8 |
kde-apps/akonadi: Rebase mysql56 patch onto 18.12.2 |
| 9 |
|
| 10 |
Upstream commit a57dd124b3d231ad64f95529f24a3ad07a3c6f63 |
| 11 |
|
| 12 |
Package-Manager: Portage-2.3.59, Repoman-2.3.12 |
| 13 |
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org> |
| 14 |
|
| 15 |
kde-apps/akonadi/akonadi-18.12.49.9999.ebuild | 2 +- |
| 16 |
kde-apps/akonadi/akonadi-9999.ebuild | 2 +- |
| 17 |
.../files/akonadi-17.03.80-mysql56-crash.patch | 40 ---------------------- |
| 18 |
...h.patch => akonadi-18.12.2-mysql56-crash.patch} | 0 |
| 19 |
4 files changed, 2 insertions(+), 42 deletions(-) |
| 20 |
|
| 21 |
diff --git a/kde-apps/akonadi/akonadi-18.12.49.9999.ebuild b/kde-apps/akonadi/akonadi-18.12.49.9999.ebuild |
| 22 |
index 2b61792555..d99ac65c40 100644 |
| 23 |
--- a/kde-apps/akonadi/akonadi-18.12.49.9999.ebuild |
| 24 |
+++ b/kde-apps/akonadi/akonadi-18.12.49.9999.ebuild |
| 25 |
@@ -63,7 +63,7 @@ RDEPEND="${COMMON_DEPEND} |
| 26 |
# some akonadi tests time out, that probably needs more work as it's ~700 tests |
| 27 |
RESTRICT+=" test" |
| 28 |
|
| 29 |
-PATCHES=( "${FILESDIR}/${PN}-17.03.80-mysql56-crash.patch" ) |
| 30 |
+PATCHES=( "${FILESDIR}/${PN}-18.12.2-mysql56-crash.patch" ) |
| 31 |
|
| 32 |
pkg_setup() { |
| 33 |
# Set default storage backend in order: MySQL, PostgreSQL, SQLite |
| 34 |
|
| 35 |
diff --git a/kde-apps/akonadi/akonadi-9999.ebuild b/kde-apps/akonadi/akonadi-9999.ebuild |
| 36 |
index 169ec3761b..36490bdf17 100644 |
| 37 |
--- a/kde-apps/akonadi/akonadi-9999.ebuild |
| 38 |
+++ b/kde-apps/akonadi/akonadi-9999.ebuild |
| 39 |
@@ -63,7 +63,7 @@ RDEPEND="${COMMON_DEPEND} |
| 40 |
# some akonadi tests time out, that probably needs more work as it's ~700 tests |
| 41 |
RESTRICT+=" test" |
| 42 |
|
| 43 |
-PATCHES=( "${FILESDIR}/${PN}-19.03.80-mysql56-crash.patch" ) |
| 44 |
+PATCHES=( "${FILESDIR}/${PN}-18.12.2-mysql56-crash.patch" ) |
| 45 |
|
| 46 |
pkg_setup() { |
| 47 |
# Set default storage backend in order: MySQL, PostgreSQL, SQLite |
| 48 |
|
| 49 |
diff --git a/kde-apps/akonadi/files/akonadi-17.03.80-mysql56-crash.patch b/kde-apps/akonadi/files/akonadi-17.03.80-mysql56-crash.patch |
| 50 |
deleted file mode 100644 |
| 51 |
index 0b5e381b15..0000000000 |
| 52 |
--- a/kde-apps/akonadi/files/akonadi-17.03.80-mysql56-crash.patch |
| 53 |
+++ /dev/null |
| 54 |
@@ -1,40 +0,0 @@ |
| 55 |
-Gentoo-bug: 530012 |
| 56 |
- |
| 57 |
-diff --git a/src/server/storage/dbconfigmysql.cpp b/src/server/storage/dbconfigmysql.cpp |
| 58 |
-index 50421714d..dfae09c20 100644 |
| 59 |
---- a/src/server/storage/dbconfigmysql.cpp |
| 60 |
-+++ b/src/server/storage/dbconfigmysql.cpp |
| 61 |
-@@ -81,6 +81,7 @@ bool DbConfigMysql::init(QSettings &settings) |
| 62 |
- << QStringLiteral("/usr/local/sbin") |
| 63 |
- << QStringLiteral("/usr/local/libexec") |
| 64 |
- << QStringLiteral("/usr/libexec") |
| 65 |
-+ << QStringLiteral("/usr/share/mysql/scripts") |
| 66 |
- << QStringLiteral("/opt/mysql/libexec") |
| 67 |
- << QStringLiteral("/opt/local/lib/mysql5/bin") |
| 68 |
- << QStringLiteral("/opt/mysql/sbin"); |
| 69 |
-@@ -511,7 +512,7 @@ bool DbConfigMysql::initializeMariaDBDatabase(const QString &confFile, const QSt |
| 70 |
- return 0 == execute(mMysqlInstallDbPath, { |
| 71 |
- QStringLiteral("--defaults-file=%1").arg(confFile), |
| 72 |
- QStringLiteral("--force"), |
| 73 |
-- QStringLiteral("--basedir=%1").arg(baseDir), |
| 74 |
-+ QStringLiteral("--basedir=/usr"), |
| 75 |
- QStringLiteral("--datadir=%1/").arg(dataDir) |
| 76 |
- }); |
| 77 |
- } |
| 78 |
-@@ -525,6 +526,7 @@ bool DbConfigMysql::initializeMySQL5_7_6Database(const QString &confFile, const |
| 79 |
- return 0 == execute(mMysqldPath, { |
| 80 |
- QStringLiteral("--defaults-file=%1").arg(confFile), |
| 81 |
- QStringLiteral("--initialize"), |
| 82 |
-+ QStringLiteral("--basedir=/usr"), |
| 83 |
- QStringLiteral("--datadir=%1/").arg(dataDir) |
| 84 |
- }); |
| 85 |
- } |
| 86 |
-@@ -539,7 +541,7 @@ bool DbConfigMysql::initializeMySQLDatabase(const QString &confFile, const QStri |
| 87 |
- // Don't use --force, it has been removed in MySQL 5.7.5 |
| 88 |
- return 0 == execute(mMysqlInstallDbPath, { |
| 89 |
- QStringLiteral("--defaults-file=%1").arg(confFile), |
| 90 |
-- QStringLiteral("--basedir=%1").arg(baseDir), |
| 91 |
-+ QStringLiteral("--basedir=/usr"), |
| 92 |
- QStringLiteral("--datadir=%1/").arg(dataDir) |
| 93 |
- }); |
| 94 |
- } |
| 95 |
|
| 96 |
diff --git a/kde-apps/akonadi/files/akonadi-19.03.80-mysql56-crash.patch b/kde-apps/akonadi/files/akonadi-18.12.2-mysql56-crash.patch |
| 97 |
similarity index 100% |
| 98 |
rename from kde-apps/akonadi/files/akonadi-19.03.80-mysql56-crash.patch |
| 99 |
rename to kde-apps/akonadi/files/akonadi-18.12.2-mysql56-crash.patch |
Archives