From 6f1fae6fa57584669ac297402f28d7a1e3203605 Mon Sep 17 00:00:00 2001 From: Eric Hameleers Date: Tue, 12 Sep 2017 22:14:22 +0200 Subject: Bugfixes to KDE 5_17.09: akonadi, kile kile: recompiled against newer poppler. akonadi: patched to make it work with mariadb 10.2.8 (real bug is in qtsql, see https://bugreports.qt.io/browse/QTBUG-63108). --- kde/build/akonadi | 1 + kde/build/kile | 1 + kde/patch/akonadi.patch | 5 +++-- kde/patch/akonadi/akonadi_mariadb_qtsql.patch | 17 +++++++++++++++++ 4 files changed, 22 insertions(+), 2 deletions(-) create mode 100644 kde/build/akonadi create mode 100644 kde/build/kile create mode 100644 kde/patch/akonadi/akonadi_mariadb_qtsql.patch (limited to 'kde') diff --git a/kde/build/akonadi b/kde/build/akonadi new file mode 100644 index 0000000..0cfbf08 --- /dev/null +++ b/kde/build/akonadi @@ -0,0 +1 @@ +2 diff --git a/kde/build/kile b/kde/build/kile new file mode 100644 index 0000000..0cfbf08 --- /dev/null +++ b/kde/build/kile @@ -0,0 +1 @@ +2 diff --git a/kde/patch/akonadi.patch b/kde/patch/akonadi.patch index c5f95f6..8d4ee61 100644 --- a/kde/patch/akonadi.patch +++ b/kde/patch/akonadi.patch @@ -6,6 +6,7 @@ #cat $CWD/patch/akonadi/akonadi_revert-abs-path.patch | patch -p1 --verbose || { touch ${SLACK_KDE_BUILD_DIR}/${PKGNAME}.failed ; continue ; } #cat $CWD/patch/akonadi/akonadi_rename-header.patch | patch -p1 --verbose || { touch ${SLACK_KDE_BUILD_DIR}/${PKGNAME}.failed ; continue ; } - - +# Temporary fix for non-working Akonadi in combination with mariadb 10.2.8 +# (actually this is a bug in qtsql, not in akonadi or mariadb): +cat $CWD/patch/akonadi/akonadi_mariadb_qtsql.patch | patch -p1 --verbose || { touch ${SLACK_KDE_BUILD_DIR}/${PKGNAME}.failed ; continue ; } diff --git a/kde/patch/akonadi/akonadi_mariadb_qtsql.patch b/kde/patch/akonadi/akonadi_mariadb_qtsql.patch new file mode 100644 index 0000000..67516c1 --- /dev/null +++ b/kde/patch/akonadi/akonadi_mariadb_qtsql.patch @@ -0,0 +1,17 @@ +Patch taken from https://bugs.gentoo.org/626464 +This is a temporary fix. The real bug is in qtsql and needs to be fixed there. + +Downstream bug reports: +https://bugs.kde.org/show_bug.cgi?id=383991 +https://bugreports.qt.io/browse/QTBUG-63108 + +--- akonadi-17.04.3/src/server/storage/dbconfigmysql.cpp 2017-08-11 23:29:02.088613966 +0800 ++++ akonadi-17.04.3/src/server/storage/dbconfigmysql.cpp 2017-08-11 23:22:18.808432643 +0800 +@@ -492,7 +492,7 @@ + } + } + +- QSqlDatabase::removeDatabase(initCon); ++ //QSqlDatabase::removeDatabase(initCon); + return success; + } -- cgit v1.2.3