public inbox for gentoo-commits@lists.gentoo.org
 help / color / mirror / Atom feed
From: "Andreas Sturmlechner" <asturm@gentoo.org>
To: gentoo-commits@lists.gentoo.org
Subject: [gentoo-commits] proj/kde:master commit in: kde-apps/akonadi/, kde-apps/akonadi/files/
Date: Tue, 29 Jan 2019 22:03:44 +0000 (UTC)	[thread overview]
Message-ID: <1548799318.c0b9ffd1e40c1db3ad006507826b7cefcd38ecf9.asturm@gentoo> (raw)

commit:     c0b9ffd1e40c1db3ad006507826b7cefcd38ecf9
Author:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Tue Jan 29 22:01:58 2019 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Tue Jan 29 22:01:58 2019 +0000
URL:        https://gitweb.gentoo.org/proj/kde.git/commit/?id=c0b9ffd1

kde-apps/akonadi: Rebase mysql56 patch onto 18.12.2

Upstream commit a57dd124b3d231ad64f95529f24a3ad07a3c6f63

Package-Manager: Portage-2.3.59, Repoman-2.3.12
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>

 kde-apps/akonadi/akonadi-18.12.49.9999.ebuild      |  2 +-
 kde-apps/akonadi/akonadi-9999.ebuild               |  2 +-
 .../files/akonadi-17.03.80-mysql56-crash.patch     | 40 ----------------------
 ...h.patch => akonadi-18.12.2-mysql56-crash.patch} |  0
 4 files changed, 2 insertions(+), 42 deletions(-)

diff --git a/kde-apps/akonadi/akonadi-18.12.49.9999.ebuild b/kde-apps/akonadi/akonadi-18.12.49.9999.ebuild
index 2b61792555..d99ac65c40 100644
--- a/kde-apps/akonadi/akonadi-18.12.49.9999.ebuild
+++ b/kde-apps/akonadi/akonadi-18.12.49.9999.ebuild
@@ -63,7 +63,7 @@ RDEPEND="${COMMON_DEPEND}
 # some akonadi tests time out, that probably needs more work as it's ~700 tests
 RESTRICT+=" test"
 
-PATCHES=( "${FILESDIR}/${PN}-17.03.80-mysql56-crash.patch" )
+PATCHES=( "${FILESDIR}/${PN}-18.12.2-mysql56-crash.patch" )
 
 pkg_setup() {
 	# Set default storage backend in order: MySQL, PostgreSQL, SQLite

diff --git a/kde-apps/akonadi/akonadi-9999.ebuild b/kde-apps/akonadi/akonadi-9999.ebuild
index 169ec3761b..36490bdf17 100644
--- a/kde-apps/akonadi/akonadi-9999.ebuild
+++ b/kde-apps/akonadi/akonadi-9999.ebuild
@@ -63,7 +63,7 @@ RDEPEND="${COMMON_DEPEND}
 # some akonadi tests time out, that probably needs more work as it's ~700 tests
 RESTRICT+=" test"
 
-PATCHES=( "${FILESDIR}/${PN}-19.03.80-mysql56-crash.patch" )
+PATCHES=( "${FILESDIR}/${PN}-18.12.2-mysql56-crash.patch" )
 
 pkg_setup() {
 	# Set default storage backend in order: MySQL, PostgreSQL, SQLite

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
deleted file mode 100644
index 0b5e381b15..0000000000
--- a/kde-apps/akonadi/files/akonadi-17.03.80-mysql56-crash.patch
+++ /dev/null
@@ -1,40 +0,0 @@
-Gentoo-bug: 530012
-
-diff --git a/src/server/storage/dbconfigmysql.cpp b/src/server/storage/dbconfigmysql.cpp
-index 50421714d..dfae09c20 100644
---- a/src/server/storage/dbconfigmysql.cpp
-+++ b/src/server/storage/dbconfigmysql.cpp
-@@ -81,6 +81,7 @@ bool DbConfigMysql::init(QSettings &settings)
-                                          << QStringLiteral("/usr/local/sbin")
-                                          << QStringLiteral("/usr/local/libexec")
-                                          << QStringLiteral("/usr/libexec")
-+                                         << QStringLiteral("/usr/share/mysql/scripts")
-                                          << QStringLiteral("/opt/mysql/libexec")
-                                          << QStringLiteral("/opt/local/lib/mysql5/bin")
-                                          << QStringLiteral("/opt/mysql/sbin");
-@@ -511,7 +512,7 @@ bool DbConfigMysql::initializeMariaDBDatabase(const QString &confFile, const QSt
-     return 0 == execute(mMysqlInstallDbPath, {
-         QStringLiteral("--defaults-file=%1").arg(confFile),
-         QStringLiteral("--force"),
--        QStringLiteral("--basedir=%1").arg(baseDir),
-+        QStringLiteral("--basedir=/usr"),
-         QStringLiteral("--datadir=%1/").arg(dataDir)
-     });
- }
-@@ -525,6 +526,7 @@ bool DbConfigMysql::initializeMySQL5_7_6Database(const QString &confFile, const
-     return 0 == execute(mMysqldPath, {
-         QStringLiteral("--defaults-file=%1").arg(confFile),
-         QStringLiteral("--initialize"),
-+        QStringLiteral("--basedir=/usr"),
-         QStringLiteral("--datadir=%1/").arg(dataDir)
-     });
- }
-@@ -539,7 +541,7 @@ bool DbConfigMysql::initializeMySQLDatabase(const QString &confFile, const QStri
-     // Don't use --force, it has been removed in MySQL 5.7.5
-     return 0 == execute(mMysqlInstallDbPath, {
-         QStringLiteral("--defaults-file=%1").arg(confFile),
--        QStringLiteral("--basedir=%1").arg(baseDir),
-+        QStringLiteral("--basedir=/usr"),
-         QStringLiteral("--datadir=%1/").arg(dataDir)
-     });
- }

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
similarity index 100%
rename from kde-apps/akonadi/files/akonadi-19.03.80-mysql56-crash.patch
rename to kde-apps/akonadi/files/akonadi-18.12.2-mysql56-crash.patch


             reply	other threads:[~2019-01-29 22:03 UTC|newest]

Thread overview: 9+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2019-01-29 22:03 Andreas Sturmlechner [this message]
  -- strict thread matches above, loose matches on Subject: below --
2024-03-09 23:04 [gentoo-commits] proj/kde:master commit in: kde-apps/akonadi/, kde-apps/akonadi/files/ Andreas Sturmlechner
2021-02-15 14:39 Andreas Sturmlechner
2019-11-17 21:54 Andreas Sturmlechner
2017-01-08 10:59 Andreas Sturmlechner
2016-09-15 12:44 Michael Palimaka
2016-05-26 15:08 Michael Palimaka
2016-01-22 10:04 Michael Palimaka
2015-10-02 19:13 Michael Palimaka

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=1548799318.c0b9ffd1e40c1db3ad006507826b7cefcd38ecf9.asturm@gentoo \
    --to=asturm@gentoo.org \
    --cc=gentoo-commits@lists.gentoo.org \
    --cc=gentoo-dev@lists.gentoo.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox