[gentoo-commits] proj/kde:master commit in: kde-apps/akonadi/, kde-apps/akonadi/files/
commit: 59a5303f2a71097271369f8a58640896e29288b7
Author: Andreas Sturmlechner gentoo org>
AuthorDate: Sat Mar 2 20:54:06 2024 +
Commit: Andreas Sturmlechner gentoo org>
CommitDate: Sat Mar 9 23:04:30 2024 +
URL:https://gitweb.gentoo.org/proj/kde.git/commit/?id=59a5303f
kde-apps/akonadi: Drop obsolete README
Signed-off-by: Andreas Sturmlechner gentoo.org>
kde-apps/akonadi/akonadi-24.02.49..ebuild | 11 +---
kde-apps/akonadi/akonadi-.ebuild | 11 +---
kde-apps/akonadi/files/README.gentoo | 39 ---
3 files changed, 2 insertions(+), 59 deletions(-)
diff --git a/kde-apps/akonadi/akonadi-24.02.49..ebuild
b/kde-apps/akonadi/akonadi-24.02.49..ebuild
index 648dfc52b8..2716368949 100644
--- a/kde-apps/akonadi/akonadi-24.02.49..ebuild
+++ b/kde-apps/akonadi/akonadi-24.02.49..ebuild
@@ -9,7 +9,7 @@ ECM_TEST="forceoptional"
KFMIN=6.0.0
QTMIN=6.6.2
VIRTUALDBUS_TEST="true"
-inherit ecm gear.kde.org readme.gentoo-r1
+inherit ecm gear.kde.org
DESCRIPTION="Storage service for PIM data and libraries for PIM apps"
HOMEPAGE="https://community.kde.org/KDE_PIM/akonadi;
@@ -61,12 +61,6 @@ pkg_setup() {
use postgres && DRIVER="QPSQL"
use mysql && DRIVER="QMYSQL"
- if use mysql && has_version "${CATEGORY}/${PN}[mysql]" && has_version
"dev-db/mariadb"; then
- ewarn
- ewarn "Attention: Make sure to read README.gentoo after
install."
- ewarn
- fi
-
ecm_pkg_setup
}
@@ -91,7 +85,6 @@ EOF
doins "${T}"/akonadiserverrc
ecm_src_install
- readme.gentoo_create_doc
}
pkg_postinst() {
@@ -102,6 +95,4 @@ pkg_postinst() {
use postgres && elog " QPSQL"
use sqlite && elog " QSQLITE"
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/akonadi-.ebuild
b/kde-apps/akonadi/akonadi-.ebuild
index 648dfc52b8..2716368949 100644
--- a/kde-apps/akonadi/akonadi-.ebuild
+++ b/kde-apps/akonadi/akonadi-.ebuild
@@ -9,7 +9,7 @@ ECM_TEST="forceoptional"
KFMIN=6.0.0
QTMIN=6.6.2
VIRTUALDBUS_TEST="true"
-inherit ecm gear.kde.org readme.gentoo-r1
+inherit ecm gear.kde.org
DESCRIPTION="Storage service for PIM data and libraries for PIM apps"
HOMEPAGE="https://community.kde.org/KDE_PIM/akonadi;
@@ -61,12 +61,6 @@ pkg_setup() {
use postgres && DRIVER="QPSQL"
use mysql && DRIVER="QMYSQL"
- if use mysql && has_version "${CATEGORY}/${PN}[mysql]" && has_version
"dev-db/mariadb"; then
- ewarn
- ewarn "Attention: Make sure to read README.gentoo after
install."
- ewarn
- fi
-
ecm_pkg_setup
}
@@ -91,7 +85,6 @@ EOF
doins "${T}"/akonadiserverrc
ecm_src_install
- readme.gentoo_create_doc
}
pkg_postinst() {
@@ -102,6 +95,4 @@ pkg_postinst() {
use postgres && elog " QPSQL"
use sqlite && elog " QSQLITE"
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
deleted file mode 100644
index 69bb68c1f0..00
--- a/kde-apps/akonadi/files/README.gentoo
+++ /dev/null
@@ -1,39 +0,0 @@
-Akonadi QMYSQL backends that were created using https://bugs.gentoo.org/688746
- [2] https://bugs.kde.org/show_bug.cgi?id=409224
[gentoo-commits] proj/kde:master commit in: kde-apps/akonadi/, kde-apps/akonadi/files/
commit: 3225f48c9c6e133d09233cd9a673a0146b18cef3
Author: Manuel Nickschas quassel-irc org>
AuthorDate: Wed Feb 10 10:43:47 2021 +
Commit: Andreas Sturmlechner gentoo org>
CommitDate: Mon Feb 15 14:12:55 2021 +
URL:https://gitweb.gentoo.org/proj/kde.git/commit/?id=3225f48c
kde-apps/akonadi: Rebase mysql crash patch for live version
Package-Manager: Portage-3.0.14, Repoman-3.0.2
Signed-off-by: Manuel Nickschas quassel-irc.org>
Closes: https://github.com/gentoo/kde/pull/896
Signed-off-by: Andreas Sturmlechner gentoo.org>
kde-apps/akonadi/akonadi-.ebuild | 2 +-
.../files/akonadi-21.03.80-mysql56-crash.patch | 51 ++
2 files changed, 52 insertions(+), 1 deletion(-)
diff --git a/kde-apps/akonadi/akonadi-.ebuild
b/kde-apps/akonadi/akonadi-.ebuild
index e7d3dad598..3320293e8a 100644
--- a/kde-apps/akonadi/akonadi-.ebuild
+++ b/kde-apps/akonadi/akonadi-.ebuild
@@ -65,7 +65,7 @@ RDEPEND="${COMMON_DEPEND}
# some akonadi tests time out, that probably needs more work as it's ~700 tests
RESTRICT+=" test"
-PATCHES=( "${FILESDIR}/${PN}-18.12.2-mysql56-crash.patch" )
+PATCHES=( "${FILESDIR}/${PN}-21.03.80-mysql56-crash.patch" )
pkg_setup() {
# Set default storage backend in order: MariaDB, PostgreSQL, SQLite
diff --git a/kde-apps/akonadi/files/akonadi-21.03.80-mysql56-crash.patch
b/kde-apps/akonadi/files/akonadi-21.03.80-mysql56-crash.patch
new file mode 100644
index 00..7cee0b0e81
--- /dev/null
+++ b/kde-apps/akonadi/files/akonadi-21.03.80-mysql56-crash.patch
@@ -0,0 +1,51 @@
+From ca023c075e5e239dd6d254722c8866b17a524a3c Mon Sep 17 00:00:00 2001
+From: Manuel Nickschas
+Date: Wed, 10 Feb 2021 09:40:44 +0100
+Subject: [PATCH] Find mysql_install_db and add required option
+
+Rebase patch onto 21.03.80
+Gentoo-bug: 530012
+---
+ src/server/storage/dbconfigmysql.cpp | 7 ---
+ 1 file changed, 4 insertions(+), 3 deletions(-)
+
+diff --git a/src/server/storage/dbconfigmysql.cpp
b/src/server/storage/dbconfigmysql.cpp
+index fd057670e..c19cff0e0 100644
+--- a/src/server/storage/dbconfigmysql.cpp
b/src/server/storage/dbconfigmysql.cpp
+@@ -53,6 +53,7 @@ static QString findExecutable(const QString )
+ 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"),
+@@ -597,7 +598,7 @@ bool DbConfigMysql::initializeMariaDBDatabase(const
QString , const QSt
+ == execute(mMysqlInstallDbPath,
+{QStringLiteral("--defaults-file=%1").arg(confFile),
+ QStringLiteral("--force"),
+-QStringLiteral("--basedir=%1").arg(baseDir),
++QStringLiteral("--basedir=/usr"),
+ QStringLiteral("--datadir=%1/").arg(dataDir)});
+ }
+
+@@ -609,7 +610,7 @@ bool DbConfigMysql::initializeMySQL5_7_6Database(const
QString , const
+ {
+ return 0
+ == execute(mMysqldPath,
+- {QStringLiteral("--defaults-file=%1").arg(confFile),
QStringLiteral("--initialize"), QStringLiteral("--datadir=%1/").arg(dataDir)});
++ {QStringLiteral("--defaults-file=%1").arg(confFile),
QStringLiteral("--initialize"), QStringLiteral("--basedir=/usr"),
QStringLiteral("--datadir=%1/").arg(dataDir)});
+ }
+
+ bool DbConfigMysql::initializeMySQLDatabase(const QString , const
QString ) const
+@@ -629,5 +630,5 @@ bool DbConfigMysql::initializeMySQLDatabase(const QString
, const QStri
+ return 0
+ == execute(
+mMysqlInstallDbPath,
+- {QStringLiteral("--defaults-file=%1").arg(confFile),
QStringLiteral("--basedir=%1").arg(baseDir),
QStringLiteral("--datadir=%1/").arg(dataDir)});
++ {QStringLiteral("--defaults-file=%1").arg(confFile),
QStringLiteral("--basedir=/usr"),
QStringLiteral("--datadir=%1/").arg(dataDir)});
+ }
+--
+2.30.0
+
[gentoo-commits] proj/kde:master commit in: kde-apps/akonadi/, kde-apps/akonadi/files/
commit: 158d589c8aa05a7f1695fa6b39c94e285ccca927
Author: Andreas Sturmlechner gentoo org>
AuthorDate: Sun Nov 17 21:54:09 2019 +
Commit: Andreas Sturmlechner gentoo org>
CommitDate: Sun Nov 17 21:54:09 2019 +
URL:https://gitweb.gentoo.org/proj/kde.git/commit/?id=158d589c
kde-apps/akonadi: Fix build with Qt 5.14
Package-Manager: Portage-2.3.79, Repoman-2.3.18
Signed-off-by: Andreas Sturmlechner gentoo.org>
kde-apps/akonadi/akonadi-19.11.80.ebuild | 6 ++-
.../akonadi/files/akonadi-19.11.80-qt-5.14.patch | 46 ++
2 files changed, 51 insertions(+), 1 deletion(-)
diff --git a/kde-apps/akonadi/akonadi-19.11.80.ebuild
b/kde-apps/akonadi/akonadi-19.11.80.ebuild
index 886147b825..41ff83a435 100644
--- a/kde-apps/akonadi/akonadi-19.11.80.ebuild
+++ b/kde-apps/akonadi/akonadi-19.11.80.ebuild
@@ -37,6 +37,7 @@ COMMON_DEPEND="
>=kde-frameworks/kwidgetsaddons-${KFMIN}:5
>=kde-frameworks/kwindowsystem-${KFMIN}:5
>=kde-frameworks/kxmlgui-${KFMIN}:5
+ >=dev-qt/qtcore-${QTMIN}:5=
>=dev-qt/qtdbus-${QTMIN}:5
>=dev-qt/qtgui-${QTMIN}:5
>=dev-qt/qtnetwork-${QTMIN}:5
@@ -69,7 +70,10 @@ RDEPEND="${COMMON_DEPEND}
# some akonadi tests time out, that probably needs more work as it's ~700 tests
RESTRICT+=" test"
-PATCHES=( "${FILESDIR}/${PN}-18.12.2-mysql56-crash.patch" )
+PATCHES=(
+ "${FILESDIR}/${PN}-18.12.2-mysql56-crash.patch"
+ "${FILESDIR}/${P}-qt-5.14.patch"
+)
pkg_setup() {
# Set default storage backend in order: MySQL, PostgreSQL, SQLite
diff --git a/kde-apps/akonadi/files/akonadi-19.11.80-qt-5.14.patch
b/kde-apps/akonadi/files/akonadi-19.11.80-qt-5.14.patch
new file mode 100644
index 00..c3165698b2
--- /dev/null
+++ b/kde-apps/akonadi/files/akonadi-19.11.80-qt-5.14.patch
@@ -0,0 +1,46 @@
+From 1d4bb01a60548ae9a5439186fbe155f9f7d492e4 Mon Sep 17 00:00:00 2001
+From: Heiko Becker
+Date: Sun, 17 Nov 2019 18:45:49 +0100
+Subject: Fix build with Qt 5.14
+
+Summary:
+std::hash is already specialized in Qt 5.14 [1], so we need
+to avoid redifining it with this version.
+
+[1] 4469e36d7203a55a4e158a50f0e9effc3f2fa3c2 in qtbase.git
+
+Test Plan: Builds fine with Qt 5.14.0-beta3
+
+Reviewers: #kde_pim
+
+Subscribers: kde-pim
+
+Tags: #kde_pim
+
+Differential Revision: https://phabricator.kde.org/D25356
+---
+ src/shared/akstd.h | 2 ++
+ 1 file changed, 2 insertions(+)
+
+diff --git a/src/shared/akstd.h b/src/shared/akstd.h
+index 4078ee4..774c432 100644
+--- a/src/shared/akstd.h
b/src/shared/akstd.h
+@@ -29,6 +29,7 @@
+
+ namespace std {
+
++#if (QT_VERSION < QT_VERSION_CHECK(5, 14, 0))
+ template<>
+ struct hash {
+ using argument_type = QString;
+@@ -39,6 +40,7 @@ struct hash {
+ return qHash(s);
+ }
+ };
++#endif
+
+ }
+
+--
+cgit v1.1
[gentoo-commits] proj/kde:master commit in: kde-apps/akonadi/, kde-apps/akonadi/files/
commit: c0b9ffd1e40c1db3ad006507826b7cefcd38ecf9
Author: Andreas Sturmlechner gentoo org>
AuthorDate: Tue Jan 29 22:01:58 2019 +
Commit: Andreas Sturmlechner gentoo org>
CommitDate: Tue Jan 29 22:01:58 2019 +
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 gentoo.org>
kde-apps/akonadi/akonadi-18.12.49..ebuild | 2 +-
kde-apps/akonadi/akonadi-.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..ebuild
b/kde-apps/akonadi/akonadi-18.12.49..ebuild
index 2b61792555..d99ac65c40 100644
--- a/kde-apps/akonadi/akonadi-18.12.49..ebuild
+++ b/kde-apps/akonadi/akonadi-18.12.49..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-.ebuild
b/kde-apps/akonadi/akonadi-.ebuild
index 169ec3761b..36490bdf17 100644
--- a/kde-apps/akonadi/akonadi-.ebuild
+++ b/kde-apps/akonadi/akonadi-.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..00
--- 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 )
- << 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 , 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 , 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
, 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
[gentoo-commits] proj/kde:master commit in: kde-apps/akonadi/, kde-apps/akonadi/files/
commit: a345b0125e742258af851925482b72336e76317c
Author: Andreas Sturmlechner gentoo org>
AuthorDate: Sat Jan 7 23:06:55 2017 +
Commit: Andreas Sturmlechner gentoo org>
CommitDate: Sat Jan 7 23:06:55 2017 +
URL:https://gitweb.gentoo.org/proj/kde.git/commit/?id=a345b012
kde-apps/akonadi: Remove hardcoded absolute path to stdlib header
This breaks on any GCC upgrade.
Package-Manager: portage-2.3.0
kde-apps/akonadi/akonadi-16.12.49..ebuild | 6 +-
.../files/akonadi-16.12.1-rename-header.patch | 77 ++
.../files/akonadi-16.12.1-revert-abs-path.patch| 70
3 files changed, 152 insertions(+), 1 deletion(-)
diff --git a/kde-apps/akonadi/akonadi-16.12.49..ebuild
b/kde-apps/akonadi/akonadi-16.12.49..ebuild
index 8ae3948..74c041d 100644
--- a/kde-apps/akonadi/akonadi-16.12.49..ebuild
+++ b/kde-apps/akonadi/akonadi-16.12.49..ebuild
@@ -58,7 +58,11 @@ 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}-16.12.0-mysql56-crash.patch"
+ "${FILESDIR}/${PN}-16.12.1-revert-abs-path.patch"
+ "${FILESDIR}/${PN}-16.12.1-rename-header.patch"
+)
pkg_setup() {
# Set default storage backend in order: MySQL, SQLite PostgreSQL
diff --git a/kde-apps/akonadi/files/akonadi-16.12.1-rename-header.patch
b/kde-apps/akonadi/files/akonadi-16.12.1-rename-header.patch
new file mode 100644
index 000..73347f0
--- /dev/null
+++ b/kde-apps/akonadi/files/akonadi-16.12.1-rename-header.patch
@@ -0,0 +1,77 @@
+commit 248671e8200ff0883877b6d0e56700ef99ff3b51
+Author: Andreas Sturmlechner
+Date: Sat Jan 7 14:38:17 2017 +0100
+
+Rename exception.h to exceptionbase.h
+
+REVIEW: 129788
+
+diff --git a/src/core/CMakeLists.txt b/src/core/CMakeLists.txt
+index 6ac851e..fa996b9 100644
+--- a/src/core/CMakeLists.txt
b/src/core/CMakeLists.txt
+@@ -95,7 +95,7 @@ ecm_generate_headers(AkonadiCore_base_HEADERS
+ EntityDeletedAttribute
+ EntityDisplayAttribute
+ EntityHiddenAttribute
+-Exception
++ExceptionBase
+ GidExtractorInterface
+ IndexPolicyAttribute
+ Item
+diff --git a/src/core/exception.cpp b/src/core/exception.cpp
+index f229c1a..14f7330 100644
+--- a/src/core/exception.cpp
b/src/core/exception.cpp
+@@ -17,7 +17,7 @@
+ 02110-1301, USA.
+ */
+
+-#include "exception.h"
++#include "exceptionbase.h"
+
+ #include
+
+diff --git a/src/core/exception.h b/src/core/exceptionbase.h
+similarity index 100%
+rename from src/core/exception.h
+rename to src/core/exceptionbase.h
+diff --git a/src/core/item.h b/src/core/item.h
+index de71cad..5ec62c8 100644
+--- a/src/core/item.h
b/src/core/item.h
+@@ -23,7 +23,7 @@
+
+ #include "akonadicore_export.h"
+ #include "attribute.h"
+-#include "exception.h"
++#include "exceptionbase.h"
+ #include "tag.h"
+ #include "collection.h"
+ #include "relation.h"
+diff --git a/src/core/itempayloadinternals_p.h
b/src/core/itempayloadinternals_p.h
+index 0a4de3c..1626f10 100644
+--- a/src/core/itempayloadinternals_p.h
b/src/core/itempayloadinternals_p.h
+@@ -32,7 +32,7 @@
+
+ #include
+
+-#include "exception.h"
++#include "exceptionbase.h"
+
+ //@cond PRIVATE Doxygen 1.7.1 hangs processing this file. so skip it.
+ //for more info, see https://bugzilla.gnome.org/show_bug.cgi?id=531637
+diff --git a/src/core/protocolhelper.cpp b/src/core/protocolhelper.cpp
+index f740e9d..c218f0c 100644
+--- a/src/core/protocolhelper.cpp
b/src/core/protocolhelper.cpp
+@@ -23,7 +23,7 @@
+ #include "collectionstatistics.h"
+ #include "item_p.h"
+ #include "collection_p.h"
+-#include "exception.h"
++#include "exceptionbase.h"
+ #include "itemserializer_p.h"
+ #include "itemserializerplugin.h"
+ #include "servermanager.h"
diff --git a/kde-apps/akonadi/files/akonadi-16.12.1-revert-abs-path.patch
b/kde-apps/akonadi/files/akonadi-16.12.1-revert-abs-path.patch
new file mode 100644
index 000..3b48253
--- /dev/null
+++ b/kde-apps/akonadi/files/akonadi-16.12.1-revert-abs-path.patch
@@ -0,0 +1,70 @@
+commit d98e29a07f4acc3bf01f06f25b3eef5522397e2e
+Author: Andreas Sturmlechner
+Date: Thu Jan 5 22:41:02 2017 +0100
+
+Revert "Workaround an include loop on case-insensitive systems"
+
+Do not hardcode absolute patchs to GCC headers.
+
+This reverts commit 59b9d6b79425c9ec1e5df059a2593580048c4adf.
+
+REVIEW: 129788
+
+diff --git a/src/core/CMakeLists.txt b/src/core/CMakeLists.txt
+index 72589cd..6ac851e 100644
+--- a/src/core/CMakeLists.txt
b/src/core/CMakeLists.txt
+@@ -257,21 +257,6 @@ ecm_generate_headers(AkonadiCore_jobs_HEADERS
+ RELATIVE jobs
+ )
+
+-# This is a workaround for conflict between our "Exception" fancy header and
+-# C++ stdlib's "exception" header
[gentoo-commits] proj/kde:master commit in: kde-apps/akonadi/, kde-apps/akonadi/files/
commit: 993776ca60a1b07b7b1cea69088fea91410b3872
Author: Michael Palimaka gentoo org>
AuthorDate: Thu Sep 15 12:44:04 2016 +
Commit: Michael Palimaka gentoo org>
CommitDate: Thu Sep 15 12:44:08 2016 +
URL:https://gitweb.gentoo.org/proj/kde.git/commit/?id=993776ca
kde-apps/akonadi: rebase patch
Upstream added basedir detection, but it still will not work for Gentoo because
mysql_install_db lives in /usr/share/mysql/scripts.
Upstream-commit: 37c639a158f78b810e84c84a9c42b6b63571c447
Package-Manager: portage-2.3.0
kde-apps/akonadi/akonadi-.ebuild | 2 +-
.../files/akonadi-16.12.0-mysql56-crash.patch | 39 ++
2 files changed, 40 insertions(+), 1 deletion(-)
diff --git a/kde-apps/akonadi/akonadi-.ebuild
b/kde-apps/akonadi/akonadi-.ebuild
index 9e1e6bb..c8e64f2 100644
--- a/kde-apps/akonadi/akonadi-.ebuild
+++ b/kde-apps/akonadi/akonadi-.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}-16.07.80-mysql56-crash.patch" )
+PATCHES=( "${FILESDIR}/${PN}-16.12.0-mysql56-crash.patch" )
pkg_setup() {
# Set default storage backend in order: MySQL, SQLite PostgreSQL
diff --git a/kde-apps/akonadi/files/akonadi-16.12.0-mysql56-crash.patch
b/kde-apps/akonadi/files/akonadi-16.12.0-mysql56-crash.patch
new file mode 100644
index 000..8f33abb
--- /dev/null
+++ b/kde-apps/akonadi/files/akonadi-16.12.0-mysql56-crash.patch
@@ -0,0 +1,39 @@
+Gentoo-bug: 530012
+
+diff --git a/src/server/storage/dbconfigmysql.cpp
b/src/server/storage/dbconfigmysql.cpp
+index 5cfaa33..1d1ea02 100644
+--- a/src/server/storage/dbconfigmysql.cpp
b/src/server/storage/dbconfigmysql.cpp
+@@ -81,6 +81,7 @@ bool DbConfigMysql::init(QSettings )
+ << 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");
+@@ -512,7 +513,7 @@ bool DbConfigMysql::initializeMariaDBDatabase(const
QString , 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 , const
+ return 0 == execute(mMysqldPath,
+ { QStringLiteral("--defaults-file=%1").arg(confFile),
+ QStringLiteral("--initialize"),
++ QStringLiteral("--basedir=/usr"),
+ QStringLiteral("--datadir=%1/").arg(dataDir) });
+ }
+
+@@ -538,6 +540,6 @@ bool DbConfigMysql::initializeMySQLDatabase(const QString
, 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) });
+ }
[gentoo-commits] proj/kde:master commit in: kde-apps/akonadi/, kde-apps/akonadi/files/
commit: 5f2526ef8d14e0d5be9fd0fc5d1a68fa7d62aa36
Author: Andreas Sturmlechner gmail com>
AuthorDate: Thu May 26 14:16:32 2016 +
Commit: Michael Palimaka gentoo org>
CommitDate: Thu May 26 14:49:52 2016 +
URL:https://gitweb.gentoo.org/proj/kde.git/commit/?id=5f2526ef
kde-apps/akonadi: Fix mysql56-crash patch for master
CMake Warning--
Package-Manager: portage-2.2.28
kde-apps/akonadi/akonadi-16.04.1.ebuild| 1 -
kde-apps/akonadi/akonadi-16.04.49..ebuild | 1 -
kde-apps/akonadi/akonadi-.ebuild | 4 +--
.../files/akonadi-16.07.80-mysql56-crash.patch | 42 ++
4 files changed, 43 insertions(+), 5 deletions(-)
diff --git a/kde-apps/akonadi/akonadi-16.04.1.ebuild
b/kde-apps/akonadi/akonadi-16.04.1.ebuild
index 54411a8..8327472 100644
--- a/kde-apps/akonadi/akonadi-16.04.1.ebuild
+++ b/kde-apps/akonadi/akonadi-16.04.1.ebuild
@@ -97,7 +97,6 @@ pkg_setup() {
src_configure() {
local mycmakeargs=(
$(cmake-utils_use_find_package designer Qt5Designer)
- $(cmake-utils_use_find_package xml LibXml2)
-DAKONADI_BUILD_QSQLITE=$(usex sqlite)
-DBUILD_TOOLS=$(usex tools)
-DKDE_INSTALL_USE_QT_SYS_PATHS=ON
diff --git a/kde-apps/akonadi/akonadi-16.04.49..ebuild
b/kde-apps/akonadi/akonadi-16.04.49..ebuild
index 6eec273..1333734 100644
--- a/kde-apps/akonadi/akonadi-16.04.49..ebuild
+++ b/kde-apps/akonadi/akonadi-16.04.49..ebuild
@@ -97,7 +97,6 @@ pkg_setup() {
src_configure() {
local mycmakeargs=(
$(cmake-utils_use_find_package designer Qt5Designer)
- $(cmake-utils_use_find_package xml LibXml2)
-DAKONADI_BUILD_QSQLITE=$(usex sqlite)
-DBUILD_TOOLS=$(usex tools)
-DKDE_INSTALL_USE_QT_SYS_PATHS=ON
diff --git a/kde-apps/akonadi/akonadi-.ebuild
b/kde-apps/akonadi/akonadi-.ebuild
index b8e27db..849a687 100644
--- a/kde-apps/akonadi/akonadi-.ebuild
+++ b/kde-apps/akonadi/akonadi-.ebuild
@@ -26,7 +26,6 @@ COMMON_DEPEND="
$(add_frameworks_dep kcoreaddons)
$(add_frameworks_dep kdbusaddons)
$(add_frameworks_dep kdesignerplugin)
- $(add_frameworks_dep kguiaddons)
$(add_frameworks_dep ki18n)
$(add_frameworks_dep kiconthemes)
$(add_frameworks_dep kio)
@@ -62,7 +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" )
+PATCHES=( "${FILESDIR}/${PN}-16.07.80-mysql56-crash.patch" )
pkg_setup() {
# Set default storage backend in order: MySQL, SQLite PostgreSQL
@@ -98,7 +97,6 @@ pkg_setup() {
src_configure() {
local mycmakeargs=(
$(cmake-utils_use_find_package designer Qt5Designer)
- $(cmake-utils_use_find_package xml LibXml2)
-DAKONADI_BUILD_QSQLITE=$(usex sqlite)
-DBUILD_TOOLS=$(usex tools)
-DKDE_INSTALL_USE_QT_SYS_PATHS=ON
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
new file mode 100644
index 000..773b523
--- /dev/null
+++ b/kde-apps/akonadi/files/akonadi-16.07.80-mysql56-crash.patch
@@ -0,0 +1,42 @@
+Gentoo-bug: 530012
+
+diff --git a/src/server/storage/dbconfigmysql.cpp
b/src/server/storage/dbconfigmysql.cpp
+index db0c100..cdd8c6b 100644
+--- a/src/server/storage/dbconfigmysql.cpp
b/src/server/storage/dbconfigmysql.cpp
+@@ -80,6 +80,7 @@ bool DbConfigMysql::init(QSettings )
+ << 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");
+@@ -500,7 +501,8 @@ bool DbConfigMysql::initializeMariaDBDatabase(const
QString , const QSt
+ return 0 == execute(mMysqlInstallDbPath,
+ { QStringLiteral("--defaults-file=%1").arg(confFile),
+ QStringLiteral("--force"),
+- QStringLiteral("--datadir=%1/").arg(dataDir) });
++ QStringLiteral("--datadir=%1/").arg(dataDir),
++ QStringLiteral("--basedir=/usr") });
+ }
+
+ /**
+@@ -512,7 +514,8 @@ bool DbConfigMysql::initializeMySQL5_7_6Database(const
QString , const
+ return 0 == execute(mMysqldPath,
+ { QStringLiteral("--defaults-file=%1").arg(confFile),
+
[gentoo-commits] proj/kde:master commit in: kde-apps/akonadi/, kde-apps/akonadi/files/
commit: cec1c4e39d55af3c9c31a3fa7647ce6a781cbcb4
Author: Andreas Sturmlechner gmail com>
AuthorDate: Wed Jan 20 23:57:08 2016 +
Commit: Michael Palimaka gentoo org>
CommitDate: Fri Jan 22 10:03:56 2016 +
URL:https://gitweb.gentoo.org/proj/kde.git/commit/?id=cec1c4e3
kde-apps/akonadi: libakonadi merged into master
Package-Manager: portage-2.2.27
kde-apps/akonadi/akonadi-.ebuild | 49 +++---
.../akonadi/files/akonadi-libxml2-optional.patch | 40 +++
.../akonadi/files/akonadi-tools-optional.patch | 77 ++
kde-apps/akonadi/metadata.xml | 4 ++
4 files changed, 162 insertions(+), 8 deletions(-)
diff --git a/kde-apps/akonadi/akonadi-.ebuild
b/kde-apps/akonadi/akonadi-.ebuild
index 4b8e68c..382cbdd 100644
--- a/kde-apps/akonadi/akonadi-.ebuild
+++ b/kde-apps/akonadi/akonadi-.ebuild
@@ -4,19 +4,36 @@
EAPI=5
+KDE_DOXYGEN=true
KDE_TESTS=true
VIRTUALDBUS_TEST=true
+VIRTUALX_REQUIRED=test
inherit kde5
-DESCRIPTION="Storage service for PIM data"
+DESCRIPTION="Storage service for PIM data and libraries for PIM apps"
HOMEPAGE="https://pim.kde.org/akonadi;
KEYWORDS=""
LICENSE="LGPL-2.1"
-IUSE="+mysql postgres sqlite test"
+IUSE="designer +mysql postgres sqlite test tools xml"
-REQUIRED_USE="|| ( sqlite mysql postgres )"
+REQUIRED_USE="|| ( sqlite mysql postgres ) test? ( tools )"
-CDEPEND="
+COMMON_DEPEND="
+ $(add_frameworks_dep kcompletion)
+ $(add_frameworks_dep kconfig)
+ $(add_frameworks_dep kconfigwidgets)
+ $(add_frameworks_dep kcoreaddons)
+ $(add_frameworks_dep kdbusaddons)
+ $(add_frameworks_dep kdesignerplugin)
+ $(add_frameworks_dep kguiaddons)
+ $(add_frameworks_dep ki18n)
+ $(add_frameworks_dep kiconthemes)
+ $(add_frameworks_dep kio)
+ $(add_frameworks_dep kitemmodels)
+ $(add_frameworks_dep kitemviews)
+ $(add_frameworks_dep kwidgetsaddons)
+ $(add_frameworks_dep kwindowsystem)
+ $(add_frameworks_dep kxmlgui)
dev-qt/qtdbus:5
dev-qt/qtgui:5
dev-qt/qtnetwork:5
@@ -25,19 +42,31 @@ CDEPEND="
dev-qt/qtwidgets:5
dev-qt/qtxml:5
x11-misc/shared-mime-info
+ designer? ( dev-qt/designer:5 )
sqlite? ( dev-db/sqlite:3 )
+ tools? ( xml? ( dev-libs/libxml2 ) )
"
-DEPEND="${CDEPEND}
+DEPEND="${COMMON_DEPEND}
+ dev-libs/boost
dev-libs/libxslt
test? ( sys-apps/dbus )
"
-RDEPEND="${CDEPEND}
+RDEPEND="${COMMON_DEPEND}
mysql? ( virtual/mysql )
postgres? ( dev-db/postgresql )
!app-office/akonadi-server
+ !kde-apps/kdepimlibs
+ !kde-apps/libakonadi
"
-PATCHES=( "${FILESDIR}/${PN}-15.12-mysql56-crash.patch" )
+# 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"
+)
pkg_setup() {
# Set default storage backend in order: MySQL, SQLite PostgreSQL
@@ -72,8 +101,12 @@ pkg_setup() {
src_configure() {
local mycmakeargs=(
- -DKDE_INSTALL_USE_QT_SYS_PATHS=ON
+ $(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
)
kde5_src_configure
diff --git a/kde-apps/akonadi/files/akonadi-libxml2-optional.patch
b/kde-apps/akonadi/files/akonadi-libxml2-optional.patch
new file mode 100644
index 000..2bde11a
--- /dev/null
+++ b/kde-apps/akonadi/files/akonadi-libxml2-optional.patch
@@ -0,0 +1,40 @@
+commit 75f87727dbcad2e6b6f1e97c8a6784fcf8616da9
+Author: Andreas Sturmlechner
+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;
++
[gentoo-commits] proj/kde:master commit in: kde-apps/akonadi/, kde-apps/akonadi/files/
commit: 2afeb25b979328971b69742c9986ad5b029d6fc4
Author: Michael Palimaka gentoo org>
AuthorDate: Fri Oct 2 19:13:28 2015 +
Commit: Michael Palimaka gentoo org>
CommitDate: Fri Oct 2 19:13:28 2015 +
URL:https://gitweb.gentoo.org/proj/kde.git/commit/?id=2afeb25b
kde-apps/akonadi: add patch from app-office/akonadi-server:4
Package-Manager: portage-2.2.20.1
kde-apps/akonadi/akonadi-15.08.1.ebuild| 2 ++
kde-apps/akonadi/akonadi-15.08.49..ebuild | 2 ++
kde-apps/akonadi/akonadi-.ebuild | 2 ++
.../files/akonadi-15.08-mysql56-crash.patch| 23 ++
.../files/akonadi-15.12-mysql56-crash.patch| 23 ++
5 files changed, 52 insertions(+)
diff --git a/kde-apps/akonadi/akonadi-15.08.1.ebuild
b/kde-apps/akonadi/akonadi-15.08.1.ebuild
index 8d7f7a9..44204d1 100644
--- a/kde-apps/akonadi/akonadi-15.08.1.ebuild
+++ b/kde-apps/akonadi/akonadi-15.08.1.ebuild
@@ -36,6 +36,8 @@ RDEPEND="${CDEPEND}
!app-office/akonadi-server
"
+PATCHES=( "${FILESDIR}/${PN}-15.08-mysql56-crash.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/akonadi-15.08.49..ebuild
b/kde-apps/akonadi/akonadi-15.08.49..ebuild
index 718b4f0..f5a3052 100644
--- a/kde-apps/akonadi/akonadi-15.08.49..ebuild
+++ b/kde-apps/akonadi/akonadi-15.08.49..ebuild
@@ -36,6 +36,8 @@ RDEPEND="${CDEPEND}
!app-office/akonadi-server
"
+PATCHES=( "${FILESDIR}/${PN}-15.08-mysql56-crash.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/akonadi-.ebuild
b/kde-apps/akonadi/akonadi-.ebuild
index 718b4f0..2af4002 100644
--- a/kde-apps/akonadi/akonadi-.ebuild
+++ b/kde-apps/akonadi/akonadi-.ebuild
@@ -36,6 +36,8 @@ RDEPEND="${CDEPEND}
!app-office/akonadi-server
"
+PATCHES=( "${FILESDIR}/${PN}-15.12-mysql56-crash.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-15.08-mysql56-crash.patch
b/kde-apps/akonadi/files/akonadi-15.08-mysql56-crash.patch
new file mode 100644
index 000..933b60b
--- /dev/null
+++ b/kde-apps/akonadi/files/akonadi-15.08-mysql56-crash.patch
@@ -0,0 +1,23 @@
+Gentoo-bug: 530012
+
+diff --git a/src/server/storage/dbconfigmysql.cpp
b/src/server/storage/dbconfigmysql.cpp
+index a18144d..68b0ecd 100644
+--- a/src/server/storage/dbconfigmysql.cpp
b/src/server/storage/dbconfigmysql.cpp
+@@ -77,6 +77,7 @@ bool DbConfigMysql::init(QSettings )
+ << QLatin1String("/usr/sbin")
+ << QLatin1String("/usr/local/sbin")
+ <<
QLatin1String("/usr/local/libexec")
++ <<
QLatin1String("/usr/share/mysql/scripts")
+ << QLatin1String("/usr/libexec")
+ <<
QLatin1String("/opt/mysql/libexec")
+ <<
QLatin1String("/opt/local/lib/mysql5/bin")
+@@ -280,7 +281,7 @@ void DbConfigMysql::startInternalServer()
+ // first run, some MySQL versions need a mysql_install_db run for that
+ const QString confFile = XdgBaseDirs::findResourceFile("config",
QLatin1String("akonadi/mysql-global.conf"));
+ if (QDir(dataDir).entryList(QDir::NoDotAndDotDot |
QDir::AllEntries).isEmpty() && !mMysqlInstallDbPath.isEmpty()) {
+-const QStringList arguments = QStringList() <<
QString::fromLatin1("--force") <<
QString::fromLatin1("--defaults-file=%1").arg(confFile) <<
QString::fromLatin1("--datadir=%1/").arg(dataDir);
++const QStringList arguments = QStringList() <<
QString::fromLatin1("--force") <<
QString::fromLatin1("--defaults-file=%1").arg(confFile) <<
QString::fromLatin1("--datadir=%1/").arg(dataDir) << QString::fromLatin1(
"--basedir=/usr" ) ;
+ QProcess::execute(mMysqlInstallDbPath, arguments);
+ }
+
diff --git a/kde-apps/akonadi/files/akonadi-15.12-mysql56-crash.patch
b/kde-apps/akonadi/files/akonadi-15.12-mysql56-crash.patch
new file mode 100644
index 000..d67c964
--- /dev/null
+++ b/kde-apps/akonadi/files/akonadi-15.12-mysql56-crash.patch
@@ -0,0 +1,23 @@
+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 )
+ << QStringLiteral("/usr/local/sbin")
+ <<
