* [gentoo-commits] proj/kde:master commit in: kde-apps/akonadi/files/, kde-apps/akonadi/
@ 2015-08-02 16:58 Johannes Huber
0 siblings, 0 replies; 8+ messages in thread
From: Johannes Huber @ 2015-08-02 16:58 UTC (permalink / raw
To: gentoo-commits
commit: 12c151c52fe8424961211771dea4ecfd119ceb7c
Author: Johannes Huber <johu <AT> gentoo <DOT> org>
AuthorDate: Sun Aug 2 17:00:22 2015 +0000
Commit: Johannes Huber <johu <AT> gentoo <DOT> org>
CommitDate: Sun Aug 2 17:00:22 2015 +0000
URL: https://gitweb.gentoo.org/proj/kde.git/commit/?id=12c151c5
[kde-apps/akonadi] Fix start with Qt 5.5
This is already fixed in stable branch.
Package-Manager: portage-2.2.20
kde-apps/akonadi/akonadi-9999.ebuild | 2 ++
kde-apps/akonadi/files/akonadi-qt55-sql.patch | 42 +++++++++++++++++++++++++++
2 files changed, 44 insertions(+)
diff --git a/kde-apps/akonadi/akonadi-9999.ebuild b/kde-apps/akonadi/akonadi-9999.ebuild
index e307fe2..7308575 100644
--- a/kde-apps/akonadi/akonadi-9999.ebuild
+++ b/kde-apps/akonadi/akonadi-9999.ebuild
@@ -36,6 +36,8 @@ RDEPEND="${CDEPEND}
!app-office/akonadi-server
"
+PATCHES=( "${FILESDIR}/${PN}-qt55-sql.patch" )
+
pkg_setup() {
# Set default storage backend in order: MySQL, SQLite PostgreSQL
# reverse driver check to keep the order
diff --git a/kde-apps/akonadi/files/akonadi-qt55-sql.patch b/kde-apps/akonadi/files/akonadi-qt55-sql.patch
new file mode 100644
index 0000000..5e0158b
--- /dev/null
+++ b/kde-apps/akonadi/files/akonadi-qt55-sql.patch
@@ -0,0 +1,42 @@
+From: Martin Koller <kollix@aon.at>
+Date: Sun, 02 Aug 2015 14:30:59 +0000
+Subject: Workaround Qt 5.5.0 bug not detecting a failed db.open()
+X-Git-Url: http://quickgit.kde.org/?p=akonadi.git&a=commitdiff&h=a0d51b01f45f7b4417455218ff91feaac3aa6bf6
+---
+Workaround Qt 5.5.0 bug not detecting a failed db.open()
+
+QTBUG-47475 leads to db.open() not detecting that the mysqld does not
+run (any connection failure still results in open() returning true)
+This patch introduces a workaround to check for the existance of
+the mysql unix socket file before we actually try to open the connection
+
+REVIEW: 124588
+---
+
+
+--- a/src/server/storage/dbconfigmysql.cpp
++++ b/src/server/storage/dbconfigmysql.cpp
+@@ -28,6 +28,7 @@
+ #include <QtCore/QDateTime>
+ #include <QtCore/QDir>
+ #include <QtCore/QProcess>
++#include <QtCore/QThread>
+ #include <QtSql/QSqlDriver>
+ #include <QtSql/QSqlError>
+ #include <QtSql/QSqlQuery>
+@@ -312,6 +313,15 @@
+ akFatal() << "process error:" << mDatabaseProcess->errorString();
+ }
+
++#ifndef Q_OS_WIN
++ // wait until mysqld has created the socket file (workaround for QTBUG-47475 in Qt5.5.0)
++ QString socketFile = QString::fromLatin1("%1/mysql.socket").arg(socketDirectory);
++ int counter = 50; // avoid an endless loop in case mysqld terminated
++ while ((counter-- > 0) && !QFileInfo::exists(socketFile)) {
++ QThread::msleep(100);
++ }
++#endif
++
+ const QLatin1String initCon("initConnection");
+ {
+ QSqlDatabase db = QSqlDatabase::addDatabase(QLatin1String("QMYSQL"), initCon);
^ permalink raw reply related [flat|nested] 8+ messages in thread
* [gentoo-commits] proj/kde:master commit in: kde-apps/akonadi/files/, kde-apps/akonadi/
@ 2015-08-03 18:34 Johannes Huber
0 siblings, 0 replies; 8+ messages in thread
From: Johannes Huber @ 2015-08-03 18:34 UTC (permalink / raw
To: gentoo-commits
commit: 270272e224fa5503b99c80d35a21c28c9c4bd1f8
Author: Johannes Huber <johu <AT> gentoo <DOT> org>
AuthorDate: Mon Aug 3 18:35:48 2015 +0000
Commit: Johannes Huber <johu <AT> gentoo <DOT> org>
CommitDate: Mon Aug 3 18:35:48 2015 +0000
URL: https://gitweb.gentoo.org/proj/kde.git/commit/?id=270272e2
[kde-apps/akonadi] Drop patch, merged to master
kde-apps/akonadi/akonadi-9999.ebuild | 2 --
kde-apps/akonadi/files/akonadi-qt55-sql.patch | 42 ---------------------------
2 files changed, 44 deletions(-)
diff --git a/kde-apps/akonadi/akonadi-9999.ebuild b/kde-apps/akonadi/akonadi-9999.ebuild
index 7308575..e307fe2 100644
--- a/kde-apps/akonadi/akonadi-9999.ebuild
+++ b/kde-apps/akonadi/akonadi-9999.ebuild
@@ -36,8 +36,6 @@ RDEPEND="${CDEPEND}
!app-office/akonadi-server
"
-PATCHES=( "${FILESDIR}/${PN}-qt55-sql.patch" )
-
pkg_setup() {
# Set default storage backend in order: MySQL, SQLite PostgreSQL
# reverse driver check to keep the order
diff --git a/kde-apps/akonadi/files/akonadi-qt55-sql.patch b/kde-apps/akonadi/files/akonadi-qt55-sql.patch
deleted file mode 100644
index 5e0158b..0000000
--- a/kde-apps/akonadi/files/akonadi-qt55-sql.patch
+++ /dev/null
@@ -1,42 +0,0 @@
-From: Martin Koller <kollix@aon.at>
-Date: Sun, 02 Aug 2015 14:30:59 +0000
-Subject: Workaround Qt 5.5.0 bug not detecting a failed db.open()
-X-Git-Url: http://quickgit.kde.org/?p=akonadi.git&a=commitdiff&h=a0d51b01f45f7b4417455218ff91feaac3aa6bf6
----
-Workaround Qt 5.5.0 bug not detecting a failed db.open()
-
-QTBUG-47475 leads to db.open() not detecting that the mysqld does not
-run (any connection failure still results in open() returning true)
-This patch introduces a workaround to check for the existance of
-the mysql unix socket file before we actually try to open the connection
-
-REVIEW: 124588
----
-
-
---- a/src/server/storage/dbconfigmysql.cpp
-+++ b/src/server/storage/dbconfigmysql.cpp
-@@ -28,6 +28,7 @@
- #include <QtCore/QDateTime>
- #include <QtCore/QDir>
- #include <QtCore/QProcess>
-+#include <QtCore/QThread>
- #include <QtSql/QSqlDriver>
- #include <QtSql/QSqlError>
- #include <QtSql/QSqlQuery>
-@@ -312,6 +313,15 @@
- akFatal() << "process error:" << mDatabaseProcess->errorString();
- }
-
-+#ifndef Q_OS_WIN
-+ // wait until mysqld has created the socket file (workaround for QTBUG-47475 in Qt5.5.0)
-+ QString socketFile = QString::fromLatin1("%1/mysql.socket").arg(socketDirectory);
-+ int counter = 50; // avoid an endless loop in case mysqld terminated
-+ while ((counter-- > 0) && !QFileInfo::exists(socketFile)) {
-+ QThread::msleep(100);
-+ }
-+#endif
-+
- const QLatin1String initCon("initConnection");
- {
- QSqlDatabase db = QSqlDatabase::addDatabase(QLatin1String("QMYSQL"), initCon);
^ permalink raw reply related [flat|nested] 8+ messages in thread
* [gentoo-commits] proj/kde:master commit in: kde-apps/akonadi/files/, kde-apps/akonadi/
@ 2016-02-09 10:53 Michael Palimaka
0 siblings, 0 replies; 8+ messages in thread
From: Michael Palimaka @ 2016-02-09 10:53 UTC (permalink / raw
To: gentoo-commits
commit: f1c4b0e2578215f90ad549a23c1a171e4bc034e4
Author: Andreas Sturmlechner <andreas.sturmlechner <AT> gmail <DOT> com>
AuthorDate: Tue Feb 2 00:26:26 2016 +0000
Commit: Michael Palimaka <kensington <AT> gentoo <DOT> org>
CommitDate: Tue Feb 9 10:53:05 2016 +0000
URL: https://gitweb.gentoo.org/proj/kde.git/commit/?id=f1c4b0e2
kde-apps/akonadi: Patches upstreamed, small fixes
Package-Manager: portage-2.2.27
kde-apps/akonadi/akonadi-15.12.1.ebuild | 5 +-
kde-apps/akonadi/akonadi-15.12.49.9999.ebuild | 7 +-
kde-apps/akonadi/akonadi-9999.ebuild | 14 ++--
.../akonadi/files/akonadi-libxml2-optional.patch | 40 -----------
.../akonadi/files/akonadi-tools-optional.patch | 77 ----------------------
5 files changed, 9 insertions(+), 134 deletions(-)
diff --git a/kde-apps/akonadi/akonadi-15.12.1.ebuild b/kde-apps/akonadi/akonadi-15.12.1.ebuild
index b5adb12..970fb70 100644
--- a/kde-apps/akonadi/akonadi-15.12.1.ebuild
+++ b/kde-apps/akonadi/akonadi-15.12.1.ebuild
@@ -4,7 +4,7 @@
EAPI=5
-KDE_TESTS=true
+KDE_TEST=true
VIRTUALDBUS_TEST=true
inherit kde5
@@ -12,7 +12,7 @@ DESCRIPTION="Storage service for PIM data"
HOMEPAGE="https://pim.kde.org/akonadi"
KEYWORDS=" ~amd64 ~x86"
LICENSE="LGPL-2.1"
-IUSE="+mysql postgres sqlite test"
+IUSE="+mysql postgres sqlite"
REQUIRED_USE="|| ( sqlite mysql postgres )"
@@ -21,7 +21,6 @@ CDEPEND="
$(add_qt_dep qtgui)
$(add_qt_dep qtnetwork)
$(add_qt_dep qtsql 'mysql?,postgres?')
- $(add_qt_dep qttest)
$(add_qt_dep qtwidgets)
$(add_qt_dep qtxml)
x11-misc/shared-mime-info
diff --git a/kde-apps/akonadi/akonadi-15.12.49.9999.ebuild b/kde-apps/akonadi/akonadi-15.12.49.9999.ebuild
index ff55ab7..13c2048 100644
--- a/kde-apps/akonadi/akonadi-15.12.49.9999.ebuild
+++ b/kde-apps/akonadi/akonadi-15.12.49.9999.ebuild
@@ -2,9 +2,9 @@
# Distributed under the terms of the GNU General Public License v2
# $Id$
-EAPI=5
+EAPI=6
-KDE_TESTS=true
+KDE_TEST=true
VIRTUALDBUS_TEST=true
inherit kde5
@@ -12,7 +12,7 @@ DESCRIPTION="Storage service for PIM data"
HOMEPAGE="https://pim.kde.org/akonadi"
KEYWORDS=""
LICENSE="LGPL-2.1"
-IUSE="+mysql postgres sqlite test"
+IUSE="+mysql postgres sqlite"
REQUIRED_USE="|| ( sqlite mysql postgres )"
@@ -21,7 +21,6 @@ CDEPEND="
$(add_qt_dep qtgui)
$(add_qt_dep qtnetwork)
$(add_qt_dep qtsql 'mysql?,postgres?')
- $(add_qt_dep qttest)
$(add_qt_dep qtwidgets)
$(add_qt_dep qtxml)
x11-misc/shared-mime-info
diff --git a/kde-apps/akonadi/akonadi-9999.ebuild b/kde-apps/akonadi/akonadi-9999.ebuild
index 622210b..6eec273 100644
--- a/kde-apps/akonadi/akonadi-9999.ebuild
+++ b/kde-apps/akonadi/akonadi-9999.ebuild
@@ -2,10 +2,10 @@
# Distributed under the terms of the GNU General Public License v2
# $Id$
-EAPI=5
+EAPI=6
KDE_DOXYGEN=true
-KDE_TESTS=true
+KDE_TEST=true
VIRTUALDBUS_TEST=true
VIRTUALX_REQUIRED=test
inherit kde5
@@ -14,7 +14,7 @@ DESCRIPTION="Storage service for PIM data and libraries for PIM apps"
HOMEPAGE="https://pim.kde.org/akonadi"
KEYWORDS=""
LICENSE="LGPL-2.1"
-IUSE="designer +mysql postgres sqlite test tools xml"
+IUSE="designer +mysql postgres sqlite tools xml"
REQUIRED_USE="|| ( sqlite mysql postgres ) test? ( tools )"
@@ -38,7 +38,6 @@ COMMON_DEPEND="
$(add_qt_dep qtgui)
$(add_qt_dep qtnetwork)
$(add_qt_dep qtsql 'mysql?,postgres?')
- $(add_qt_dep qttest)
$(add_qt_dep qtwidgets)
$(add_qt_dep qtxml)
x11-misc/shared-mime-info
@@ -62,11 +61,7 @@ RDEPEND="${COMMON_DEPEND}
# some akonadi tests time out, that probably needs more work as it's ~700 tests
RESTRICT="test"
-PATCHES=(
- "${FILESDIR}/${PN}-15.12-mysql56-crash.patch"
- "${FILESDIR}/${PN}-libxml2-optional.patch"
- "${FILESDIR}/${PN}-tools-optional.patch"
-)
+PATCHES=( "${FILESDIR}/${PN}-15.12-mysql56-crash.patch" )
pkg_setup() {
# Set default storage backend in order: MySQL, SQLite PostgreSQL
@@ -104,7 +99,6 @@ src_configure() {
$(cmake-utils_use_find_package designer Qt5Designer)
$(cmake-utils_use_find_package xml LibXml2)
-DAKONADI_BUILD_QSQLITE=$(usex sqlite)
- -DBUILD_TESTING=$(usex test)
-DBUILD_TOOLS=$(usex tools)
-DKDE_INSTALL_USE_QT_SYS_PATHS=ON
)
diff --git a/kde-apps/akonadi/files/akonadi-libxml2-optional.patch b/kde-apps/akonadi/files/akonadi-libxml2-optional.patch
deleted file mode 100644
index 2bde11a..0000000
--- a/kde-apps/akonadi/files/akonadi-libxml2-optional.patch
+++ /dev/null
@@ -1,40 +0,0 @@
-commit 75f87727dbcad2e6b6f1e97c8a6784fcf8616da9
-Author: Andreas Sturmlechner <andreas.sturmlechner@gmail.com>
-Date: Thu Jan 21 00:10:16 2016 +0100
-
- Move LibXML2 detection into xml subdir, make optional
-
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index 503ba48..b05eb4d 100644
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -66,13 +66,6 @@ set_package_properties(Boost PROPERTIES
- TYPE REQUIRED
- )
-
--find_package(LibXml2)
--set_package_properties(LibXml2 PROPERTIES
-- DESCRIPTION "The LibXML2 library"
-- URL "http://xmlsoft.org"
-- TYPE REQUIRED
--)
--
- set(AKONADI_TESTS_EXPORT AKONADICORE_EXPORT)
- configure_file(akonaditests_export.h.in "${CMAKE_CURRENT_BINARY_DIR}/akonaditests_export.h")
-
-diff --git a/src/xml/CMakeLists.txt b/src/xml/CMakeLists.txt
-index ad116d8..71e6ef4 100644
---- a/src/xml/CMakeLists.txt
-+++ b/src/xml/CMakeLists.txt
-@@ -1,4 +1,11 @@
-
-+find_package(LibXml2)
-+set_package_properties(LibXml2 PROPERTIES
-+ DESCRIPTION "Required for XML schema validation in akonadixml"
-+ URL "http://xmlsoft.org"
-+ TYPE OPTIONAL
-+)
-+
- # Turn exceptions on
- if (LIBXML2_FOUND)
- add_definitions(-DHAVE_LIBXML2)
diff --git a/kde-apps/akonadi/files/akonadi-tools-optional.patch b/kde-apps/akonadi/files/akonadi-tools-optional.patch
deleted file mode 100644
index 1c01a84..0000000
--- a/kde-apps/akonadi/files/akonadi-tools-optional.patch
+++ /dev/null
@@ -1,77 +0,0 @@
-commit 108770da124b52c089acb976f4d8f2070f73fac4
-Author: Andreas Sturmlechner <andreas.sturmlechner@gmail.com>
-Date: Thu Jan 21 00:29:49 2016 +0100
-
- Add switch to build development/testing tools optionally
-
- BUILD_TESTING=TRUE currently alters the install image, this change
- introduces BUILD_TOOLS to conditionally build akonadixml as well as
- akonadi_knut_resource, akonaditest and akonadi_test_searchplugin.
- BUILD_TESTING=TRUE however will still trigger BUILD_TOOLS=TRUE.
-
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index b05eb4d..aeabc34 100644
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -80,6 +80,11 @@ endif()
- ############### Build Options ###############
- option(AKONADI_BUILD_QSQLITE "Build the Sqlite backend." TRUE)
- option(ENABLE_ASAN "Build Akonadi with AddressSanitzer - https://code.google.com/p/address-sanitizer/" FALSE)
-+option(BUILD_TOOLS "Build and install tools for development and testing purposes." TRUE)
-+
-+if(BUILD_TESTING)
-+ set(BUILD_TOOLS TRUE)
-+endif()
-
- set(SMI_MIN_VERSION "0.20")
- find_package(SharedMimeInfo ${SMI_MIN_VERSION} REQUIRED)
-@@ -289,9 +294,17 @@ include_directories(
-
- add_subdirectory(src)
-
-+if(BUILD_TOOLS)
-+ # add testrunner (application for managing a self-contained
-+ # test environment)
-+ add_subdirectory(autotests/libs/testrunner)
-+ add_subdirectory(autotests/libs/testresource)
-+ add_subdirectory(autotests/libs/testsearchplugin)
-+endif()
-+
- if(BUILD_TESTING)
-- add_subdirectory(autotests)
-- add_subdirectory(tests)
-+ add_subdirectory(autotests)
-+ add_subdirectory(tests)
- endif()
-
-
-diff --git a/autotests/libs/CMakeLists.txt b/autotests/libs/CMakeLists.txt
-index 562454d..7e3a2b4 100644
---- a/autotests/libs/CMakeLists.txt
-+++ b/autotests/libs/CMakeLists.txt
-@@ -22,13 +22,6 @@ include_directories(
- ${Boost_INCLUDE_DIR}
- )
-
--# add testrunner (application for managing a self-contained test
--# environment)
--
--add_subdirectory(testrunner)
--add_subdirectory(testresource)
--add_subdirectory(testsearchplugin)
--
- # convenience macro to add akonadi qtestlib unit-tests
- macro(add_akonadi_test _source)
- set(_test ${_source} ${CMAKE_BINARY_DIR}/src/core/akonadicore_debug.cpp)
-diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
-index 4e79dc0..4141947 100644
---- a/src/CMakeLists.txt
-+++ b/src/CMakeLists.txt
-@@ -16,4 +16,6 @@ add_subdirectory(core)
- add_subdirectory(agentbase)
- add_subdirectory(widgets)
- add_subdirectory(selftest)
--add_subdirectory(xml)
-+if(BUILD_TOOLS)
-+ add_subdirectory(xml)
-+endif()
^ permalink raw reply related [flat|nested] 8+ messages in thread
* [gentoo-commits] proj/kde:master commit in: kde-apps/akonadi/files/, kde-apps/akonadi/
@ 2016-06-15 16:30 Michael Palimaka
0 siblings, 0 replies; 8+ messages in thread
From: Michael Palimaka @ 2016-06-15 16:30 UTC (permalink / raw
To: gentoo-commits
commit: 1589c52d73fec56308a9f55735c8a4296553dd3e
Author: Andreas Sturmlechner <andreas.sturmlechner <AT> gmail <DOT> com>
AuthorDate: Wed Jun 15 16:24:15 2016 +0000
Commit: Michael Palimaka <kensington <AT> gentoo <DOT> org>
CommitDate: Wed Jun 15 16:24:15 2016 +0000
URL: https://gitweb.gentoo.org/proj/kde.git/commit/?id=1589c52d
kde-apps/akonadi: Fix configure with updated patch
Package-Manager: portage-2.2.28
kde-apps/akonadi/akonadi-16.04.2.ebuild | 2 +-
kde-apps/akonadi/akonadi-16.04.49.9999.ebuild | 2 +-
.../files/akonadi-15.12-mysql56-crash.patch | 23 ----------------------
3 files changed, 2 insertions(+), 25 deletions(-)
diff --git a/kde-apps/akonadi/akonadi-16.04.2.ebuild b/kde-apps/akonadi/akonadi-16.04.2.ebuild
index ceb6560..b75a579 100644
--- a/kde-apps/akonadi/akonadi-16.04.2.ebuild
+++ b/kde-apps/akonadi/akonadi-16.04.2.ebuild
@@ -59,7 +59,7 @@ RDEPEND="${COMMON_DEPEND}
# some akonadi tests time out, that probably needs more work as it's ~700 tests
RESTRICT="test"
-PATCHES=( "${FILESDIR}/${PN}-15.12-mysql56-crash.patch" )
+PATCHES=( "${FILESDIR}/${PN}-16.07.80-mysql56-crash.patch" )
pkg_setup() {
# Set default storage backend in order: MySQL, SQLite PostgreSQL
diff --git a/kde-apps/akonadi/akonadi-16.04.49.9999.ebuild b/kde-apps/akonadi/akonadi-16.04.49.9999.ebuild
index 9ba8545..21fbf51 100644
--- a/kde-apps/akonadi/akonadi-16.04.49.9999.ebuild
+++ b/kde-apps/akonadi/akonadi-16.04.49.9999.ebuild
@@ -59,7 +59,7 @@ RDEPEND="${COMMON_DEPEND}
# some akonadi tests time out, that probably needs more work as it's ~700 tests
RESTRICT="test"
-PATCHES=( "${FILESDIR}/${PN}-15.12-mysql56-crash.patch" )
+PATCHES=( "${FILESDIR}/${PN}-16.07.80-mysql56-crash.patch" )
pkg_setup() {
# Set default storage backend in order: MySQL, SQLite PostgreSQL
diff --git a/kde-apps/akonadi/files/akonadi-15.12-mysql56-crash.patch b/kde-apps/akonadi/files/akonadi-15.12-mysql56-crash.patch
deleted file mode 100644
index d67c964..0000000
--- a/kde-apps/akonadi/files/akonadi-15.12-mysql56-crash.patch
+++ /dev/null
@@ -1,23 +0,0 @@
-Gentoo-bug: 530012
-
-diff --git a/src/server/storage/dbconfigmysql.cpp b/src/server/storage/dbconfigmysql.cpp
-index 517f4bc..a7a3f38 100644
---- a/src/server/storage/dbconfigmysql.cpp
-+++ b/src/server/storage/dbconfigmysql.cpp
-@@ -78,6 +78,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");
-@@ -287,7 +288,7 @@ bool DbConfigMysql::startInternalServer()
- // first run, some MySQL versions need a mysql_install_db run for that
- const QString confFile = XdgBaseDirs::findResourceFile("config", QStringLiteral("akonadi/mysql-global.conf"));
- if (QDir(dataDir).entryList(QDir::NoDotAndDotDot | QDir::AllEntries).isEmpty() && !mMysqlInstallDbPath.isEmpty()) {
-- const QStringList arguments = QStringList() << QStringLiteral("--force") << QStringLiteral("--defaults-file=%1").arg(confFile) << QStringLiteral("--datadir=%1/").arg(dataDir);
-+ const QStringList arguments = QStringList() << QStringLiteral("--force") << QStringLiteral("--defaults-file=%1").arg(confFile) << QStringLiteral("--datadir=%1/").arg(dataDir) << QString::fromLatin1( "--basedir=/usr" ) ;
- QProcess::execute(mMysqlInstallDbPath, arguments);
- }
-
^ permalink raw reply related [flat|nested] 8+ messages in thread
* [gentoo-commits] proj/kde:master commit in: kde-apps/akonadi/files/, kde-apps/akonadi/
@ 2017-01-08 11:16 Johannes Huber
0 siblings, 0 replies; 8+ messages in thread
From: Johannes Huber @ 2017-01-08 11:16 UTC (permalink / raw
To: gentoo-commits
commit: a8464c31b62cdd678b50ac0a81c0c6773f53a355
Author: Elias Probst <mail <AT> eliasprobst <DOT> eu>
AuthorDate: Sat Jan 7 21:34:30 2017 +0000
Commit: Johannes Huber <johu <AT> gentoo <DOT> org>
CommitDate: Sun Jan 8 11:15:56 2017 +0000
URL: https://gitweb.gentoo.org/proj/kde.git/commit/?id=a8464c31
kde-apps/akonadi: Update MySQL 5.6 crash patch
Upstream changed the code style in master/ddf0db43
Package-Manager: Portage-2.3.0, Repoman-2.3.1
Closes: https://github.com/gentoo/kde/pull/853
Signed-off-by: Johannes Huber <johu <AT> gentoo.org>
kde-apps/akonadi/akonadi-9999.ebuild | 2 +-
.../files/akonadi-17.03.80-mysql56-crash.patch | 40 ++++++++++++++++++++++
2 files changed, 41 insertions(+), 1 deletion(-)
diff --git a/kde-apps/akonadi/akonadi-9999.ebuild b/kde-apps/akonadi/akonadi-9999.ebuild
index 8ae3948..91792b8 100644
--- a/kde-apps/akonadi/akonadi-9999.ebuild
+++ b/kde-apps/akonadi/akonadi-9999.ebuild
@@ -58,7 +58,7 @@ RDEPEND="${COMMON_DEPEND}
# some akonadi tests time out, that probably needs more work as it's ~700 tests
RESTRICT+=" test"
-PATCHES=( "${FILESDIR}/${PN}-16.12.0-mysql56-crash.patch" )
+PATCHES=( "${FILESDIR}/${PN}-17.03.80-mysql56-crash.patch" )
pkg_setup() {
# Set default storage backend in order: MySQL, SQLite PostgreSQL
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
new file mode 100644
index 0000000..0b5e381
--- /dev/null
+++ b/kde-apps/akonadi/files/akonadi-17.03.80-mysql56-crash.patch
@@ -0,0 +1,40 @@
+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)
+ });
+ }
^ permalink raw reply related [flat|nested] 8+ messages in thread
* [gentoo-commits] proj/kde:master commit in: kde-apps/akonadi/files/, kde-apps/akonadi/
@ 2017-02-11 21:25 Andreas Sturmlechner
0 siblings, 0 replies; 8+ messages in thread
From: Andreas Sturmlechner @ 2017-02-11 21:25 UTC (permalink / raw
To: gentoo-commits
commit: 5997acdb424e5071c46b4b9fd42cb583b28fba45
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Sat Feb 11 20:48:47 2017 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Sat Feb 11 20:48:55 2017 +0000
URL: https://gitweb.gentoo.org/proj/kde.git/commit/?id=5997acdb
kde-apps/akonadi: Build akonadixml unconditionally
kde-apps/akonadiconsole depends on it.
Package-Manager: portage-2.3.3
kde-apps/akonadi/akonadi-16.12.49.9999.ebuild | 4 +++-
kde-apps/akonadi/akonadi-9999.ebuild | 3 ++-
.../akonadi/files/akonadi-16.12.3-akonadixml.patch | 22 ++++++++++++++++++++++
3 files changed, 27 insertions(+), 2 deletions(-)
diff --git a/kde-apps/akonadi/akonadi-16.12.49.9999.ebuild b/kde-apps/akonadi/akonadi-16.12.49.9999.ebuild
index 74c041d5d5..c0f6dc55b7 100644
--- a/kde-apps/akonadi/akonadi-16.12.49.9999.ebuild
+++ b/kde-apps/akonadi/akonadi-16.12.49.9999.ebuild
@@ -42,7 +42,7 @@ COMMON_DEPEND="
$(add_qt_dep qtxml)
x11-misc/shared-mime-info
sqlite? ( dev-db/sqlite:3 )
- tools? ( xml? ( dev-libs/libxml2 ) )
+ xml? ( dev-libs/libxml2 )
"
DEPEND="${COMMON_DEPEND}
dev-libs/boost
@@ -62,6 +62,7 @@ PATCHES=(
"${FILESDIR}/${PN}-16.12.0-mysql56-crash.patch"
"${FILESDIR}/${PN}-16.12.1-revert-abs-path.patch"
"${FILESDIR}/${PN}-16.12.1-rename-header.patch"
+ "${FILESDIR}/${PN}-16.12.3-akonadixml.patch"
)
pkg_setup() {
@@ -99,6 +100,7 @@ src_configure() {
local mycmakeargs=(
-DAKONADI_BUILD_QSQLITE=$(usex sqlite)
-DBUILD_TOOLS=$(usex tools)
+ $(cmake-utils_use_find_package xml LibXml2)
-DKDE_INSTALL_USE_QT_SYS_PATHS=ON
)
diff --git a/kde-apps/akonadi/akonadi-9999.ebuild b/kde-apps/akonadi/akonadi-9999.ebuild
index 91792b8665..744cc3ac40 100644
--- a/kde-apps/akonadi/akonadi-9999.ebuild
+++ b/kde-apps/akonadi/akonadi-9999.ebuild
@@ -42,7 +42,7 @@ COMMON_DEPEND="
$(add_qt_dep qtxml)
x11-misc/shared-mime-info
sqlite? ( dev-db/sqlite:3 )
- tools? ( xml? ( dev-libs/libxml2 ) )
+ xml? ( dev-libs/libxml2 )
"
DEPEND="${COMMON_DEPEND}
dev-libs/boost
@@ -95,6 +95,7 @@ src_configure() {
local mycmakeargs=(
-DAKONADI_BUILD_QSQLITE=$(usex sqlite)
-DBUILD_TOOLS=$(usex tools)
+ $(cmake-utils_use_find_package xml LibXml2)
-DKDE_INSTALL_USE_QT_SYS_PATHS=ON
)
diff --git a/kde-apps/akonadi/files/akonadi-16.12.3-akonadixml.patch b/kde-apps/akonadi/files/akonadi-16.12.3-akonadixml.patch
new file mode 100644
index 0000000000..6acd5b86dc
--- /dev/null
+++ b/kde-apps/akonadi/files/akonadi-16.12.3-akonadixml.patch
@@ -0,0 +1,22 @@
+commit 2fe8bf8b73b9f5f5d19c87099b71a71f2595e70f
+Author: Andreas Sturmlechner <andreas.sturmlechner@gmail.com>
+Date: Sat Feb 11 21:29:05 2017 +0100
+
+ Build akonadixml unconditionally
+
+ It makes more sense now that akonadiconsole depends on it.
+
+ REVIEW: 129941
+
+diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
+index 4141947..4e79dc0 100644
+--- a/src/CMakeLists.txt
++++ b/src/CMakeLists.txt
+@@ -16,6 +16,4 @@ add_subdirectory(core)
+ add_subdirectory(agentbase)
+ add_subdirectory(widgets)
+ add_subdirectory(selftest)
+-if(BUILD_TOOLS)
+- add_subdirectory(xml)
+-endif()
++add_subdirectory(xml)
^ permalink raw reply related [flat|nested] 8+ messages in thread
* [gentoo-commits] proj/kde:master commit in: kde-apps/akonadi/files/, kde-apps/akonadi/
@ 2019-01-26 20:29 Andreas Sturmlechner
0 siblings, 0 replies; 8+ messages in thread
From: Andreas Sturmlechner @ 2019-01-26 20:29 UTC (permalink / raw
To: gentoo-commits
commit: 03848542392d626356b8c6ad37cd217b29e168f1
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Sat Jan 26 20:15:54 2019 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Sat Jan 26 20:28:44 2019 +0000
URL: https://gitweb.gentoo.org/proj/kde.git/commit/?id=03848542
kde-apps/akonadi: Rebase mysql56 patch onto 19.03.80
Package-Manager: Portage-2.3.58, Repoman-2.3.12
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>
kde-apps/akonadi/akonadi-9999.ebuild | 2 +-
.../files/akonadi-19.03.80-mysql56-crash.patch | 52 ++++++++++++++++++++++
2 files changed, 53 insertions(+), 1 deletion(-)
diff --git a/kde-apps/akonadi/akonadi-9999.ebuild b/kde-apps/akonadi/akonadi-9999.ebuild
index afeedcf928..169ec3761b 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}-17.03.80-mysql56-crash.patch" )
+PATCHES=( "${FILESDIR}/${PN}-19.03.80-mysql56-crash.patch" )
pkg_setup() {
# Set default storage backend in order: MySQL, PostgreSQL, SQLite
diff --git a/kde-apps/akonadi/files/akonadi-19.03.80-mysql56-crash.patch b/kde-apps/akonadi/files/akonadi-19.03.80-mysql56-crash.patch
new file mode 100644
index 0000000000..ede8a19d84
--- /dev/null
+++ b/kde-apps/akonadi/files/akonadi-19.03.80-mysql56-crash.patch
@@ -0,0 +1,52 @@
+From b2ebd0e2d594ae71d4e1db4874f72a655f9eeb12 Mon Sep 17 00:00:00 2001
+From: Andreas Sturmlechner <andreas.sturmlechner@gmail.com>
+Date: Sat, 26 Jan 2019 21:09:14 +0100
+Subject: [PATCH] Find mysql_install_db and add required option
+
+Rebase patch onto 19.03.80
+Gentoo-bug: 530012
+---
+ src/server/storage/dbconfigmysql.cpp | 6 ++++--
+ 1 file changed, 4 insertions(+), 2 deletions(-)
+
+diff --git a/src/server/storage/dbconfigmysql.cpp b/src/server/storage/dbconfigmysql.cpp
+index dfff6fc29..80039c8ba 100644
+--- a/src/server/storage/dbconfigmysql.cpp
++++ b/src/server/storage/dbconfigmysql.cpp
+@@ -66,6 +66,7 @@ static QString findExecutable(const QString &bin)
+ 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"),
+@@ -588,7 +589,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)
+ });
+ }
+@@ -602,6 +603,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)
+ });
+ }
+@@ -622,7 +624,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)
+ });
+ }
+--
+2.20.1
+
^ permalink raw reply related [flat|nested] 8+ messages in thread
* [gentoo-commits] proj/kde:master commit in: kde-apps/akonadi/files/, kde-apps/akonadi/
@ 2021-04-04 19:51 Andreas Sturmlechner
0 siblings, 0 replies; 8+ messages in thread
From: Andreas Sturmlechner @ 2021-04-04 19:51 UTC (permalink / raw
To: gentoo-commits
commit: c64308088b7b68117d4243ee02d0cbf3adbaf432
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Tue Mar 16 23:04:33 2021 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Sun Apr 4 19:50:18 2021 +0000
URL: https://gitweb.gentoo.org/proj/kde.git/commit/?id=c6430808
kde-apps/akonadi: Update IUSE=mysql instructions using readme.gentoo
Provide detailed instructions for how to fix existing backends.
Bug: https://bugs.gentoo.org/688746
Package-Manager: Portage-3.0.17, Repoman-3.0.2
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>
kde-apps/akonadi/akonadi-9999.ebuild | 15 ++++++--------
kde-apps/akonadi/files/README.gentoo | 39 ++++++++++++++++++++++++++++++++++++
2 files changed, 45 insertions(+), 9 deletions(-)
diff --git a/kde-apps/akonadi/akonadi-9999.ebuild b/kde-apps/akonadi/akonadi-9999.ebuild
index f7739ae681..e2f976fc2c 100644
--- a/kde-apps/akonadi/akonadi-9999.ebuild
+++ b/kde-apps/akonadi/akonadi-9999.ebuild
@@ -9,7 +9,7 @@ KFMIN=5.75.0
QTMIN=5.15.2
VIRTUALDBUS_TEST="true"
VIRTUALX_REQUIRED="test"
-inherit ecm kde.org
+inherit ecm kde.org readme.gentoo-r1
DESCRIPTION="Storage service for PIM data and libraries for PIM apps"
HOMEPAGE="https://community.kde.org/KDE_PIM/akonadi"
@@ -73,15 +73,9 @@ pkg_setup() {
use postgres && DRIVER="QPSQL"
use mysql && DRIVER="QMYSQL"
- if use mysql && has_version ">=dev-db/mariadb-10.4"; then
- ewarn "If an existing Akonadi QMYSQL database is being upgraded using"
- ewarn ">=dev-db/mariadb-10.4 and KMail stops fetching and sending mail,"
- ewarn "check ~/.local/share/akonadi/akonadiserver.error for errors like:"
- ewarn " \"Cannot add or update a child row: a foreign key constraint fails\""
+ if use mysql && has_version "${CATEGORY}/${PN}[mysql]" && has_version "dev-db/mariadb"; then
ewarn
- ewarn "Manual steps are required to fix it, see also:"
- ewarn " https://bugs.gentoo.org/688746 (see Whiteboard)"
- ewarn " https://bugs.kde.org/show_bug.cgi?id=409224"
+ ewarn "Attention: Make sure to read README.gentoo after install."
ewarn
fi
@@ -116,6 +110,7 @@ EOF
doins "${T}"/akonadiserverrc
ecm_src_install
+ readme.gentoo_create_doc
}
pkg_postinst() {
@@ -126,4 +121,6 @@ pkg_postinst() {
use postgres && elog " QPSQL"
use sqlite && elog " QSQLITE3"
elog "${DRIVER} has been set as your default akonadi storage backend."
+ use mysql && elog
+ use mysql && FORCE_PRINT_ELOG=1 readme.gentoo_print_elog
}
diff --git a/kde-apps/akonadi/files/README.gentoo b/kde-apps/akonadi/files/README.gentoo
new file mode 100644
index 0000000000..c778f6d1a2
--- /dev/null
+++ b/kde-apps/akonadi/files/README.gentoo
@@ -0,0 +1,39 @@
+Akonadi QMYSQL backends that were created using <dev-db/mariadb-10.5.9-r3 may
+be in need of a manual fix. Failure to do so could result in akonadi service
+to stop fetching and sending mail for KMail or any other kind of issues in PIM
+applications depending on akonadi like KOrganizer, KAddressBook etc.
+
+Note:
+ - All commands that follow are to be run by a regular user.
+ - They will have to be repeated for any other user of KDE PIM.
+ - Use your favorite terminal.
+
+ 1) Check if "mysql" system db is present:
+ $ mysql -S /run/user/$(id -u)/akonadi/mysql.socket -e 'select schema_name \
+ from information_schema.schemata where schema_name = "mysql"'
+
+ The output obtained should look like this:
+ +-------------+
+ | schema_name |
+ +-------------+
+ | mysql |
+ +-------------+
+
+ If so, then automatic DB upgrades will succeed, no further action necessary.
+
+ 2) If, however, the above query returned empty, add the missing database:
+ $ mysql -S /run/user/$(id -u)/akonadi/mysql.socket -e 'create database mysql'
+
+ Future MariaDB releases should upgrade without manual intervention now.
+
+ 3) Optional: You may have come here with an already defunct akonadi service.
+ To manually fix the akonadi MariaDB backend:
+ $ mysql_upgrade -S /run/user/$(id -u)/akonadi/default/mysql.socket \
+ --defaults-file=~/.local/share/akonadi/mysql.conf
+
+ Don't forget to restart the akonadi service afterwards:
+ $ akonadictl restart
+
+References:
+ [1] https://bugs.gentoo.org/688746
+ [2] https://bugs.kde.org/show_bug.cgi?id=409224
^ permalink raw reply related [flat|nested] 8+ messages in thread
end of thread, other threads:[~2021-04-04 19:51 UTC | newest]
Thread overview: 8+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2017-01-08 11:16 [gentoo-commits] proj/kde:master commit in: kde-apps/akonadi/files/, kde-apps/akonadi/ Johannes Huber
-- strict thread matches above, loose matches on Subject: below --
2021-04-04 19:51 Andreas Sturmlechner
2019-01-26 20:29 Andreas Sturmlechner
2017-02-11 21:25 Andreas Sturmlechner
2016-06-15 16:30 Michael Palimaka
2016-02-09 10:53 Michael Palimaka
2015-08-03 18:34 Johannes Huber
2015-08-02 16:58 Johannes Huber
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox