summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJohannes Huber <johu@gentoo.org>2018-05-02 21:10:22 +0200
committerJohannes Huber <johu@gentoo.org>2018-05-02 21:12:18 +0200
commit19b939a52a4462ec8e7e7650e341ef83d0ea1a16 (patch)
tree818ef811db3fb235e36527028b4f4444746558a9 /media-gfx
parentnet-analyzer/wireshark: Drop -DDUMPCAP_INSTALL_OPTION=. (diff)
downloadgentoo-19b939a52a4462ec8e7e7650e341ef83d0ea1a16.tar.gz
gentoo-19b939a52a4462ec8e7e7650e341ef83d0ea1a16.tar.bz2
gentoo-19b939a52a4462ec8e7e7650e341ef83d0ea1a16.zip
media-gfx/digikam: Remove 5.7.0-r3
Package-Manager: Portage-2.3.33, Repoman-2.3.9
Diffstat (limited to 'media-gfx')
-rw-r--r--media-gfx/digikam/Manifest1
-rw-r--r--media-gfx/digikam/digikam-5.7.0-r3.ebuild174
-rw-r--r--media-gfx/digikam/files/digikam-5.7.0-kcalcore-1.patch44
-rw-r--r--media-gfx/digikam/files/digikam-5.7.0-kcalcore-2.patch79
-rw-r--r--media-gfx/digikam/files/digikam-5.7.0-kreadconfig5.patch28
-rw-r--r--media-gfx/digikam/files/digikam-5.7.0-mariadb-10.2-1.patch58
-rw-r--r--media-gfx/digikam/files/digikam-5.7.0-mariadb-10.2-2.patch117
-rw-r--r--media-gfx/digikam/files/digikam-5.7.0-qt-5.9.3.patch32
8 files changed, 0 insertions, 533 deletions
diff --git a/media-gfx/digikam/Manifest b/media-gfx/digikam/Manifest
index d23807cfbbd..0cb547b5865 100644
--- a/media-gfx/digikam/Manifest
+++ b/media-gfx/digikam/Manifest
@@ -1,2 +1 @@
-DIST digikam-5.7.0.tar.xz 123315064 BLAKE2B 0879b25e674e39d204038ab629dec36757ae034e3dd7e9a0a3700f9703272c4a972a21c1db5a42c6c294247a1226b1cb9a8b980bb90cdcc12e0cd752459273ef SHA512 626c9854311c637b994325237f171adce3dba39159fb336dfe95f1de287e2d08a3aaddd611eea87e8018047d331aff252b555c382cfbe1d8e14413c51a3849f4
DIST digikam-5.9.0.tar.xz 132931184 BLAKE2B cfbcbae8471c9c00bdf846d13bbc1ce3fbbd2ee4cc86500d011f9e15c1a21d7799638f94708794e8bc36a200df455667f9df8fcefdc38aaa00060630807d11cb SHA512 f6134a957dcd11343e34f0bc90f5560a28ed205c47d2ffd76a5418a4c63f76706045e9179c47f1448304b59081051b524f7a6847c3c1dcee4673047ce5d90e63
diff --git a/media-gfx/digikam/digikam-5.7.0-r3.ebuild b/media-gfx/digikam/digikam-5.7.0-r3.ebuild
deleted file mode 100644
index fb65507f36b..00000000000
--- a/media-gfx/digikam/digikam-5.7.0-r3.ebuild
+++ /dev/null
@@ -1,174 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-if [[ ${KDE_BUILD_TYPE} != live ]]; then
- KDE_HANDBOOK="true"
- KDE_TEST="true"
-fi
-CMAKE_MAKEFILE_GENERATOR="emake"
-KDE_APPS_MINIMAL="17.12.0"
-inherit kde5 toolchain-funcs
-
-DESCRIPTION="Digital photo management application"
-HOMEPAGE="https://www.digikam.org/"
-
-LICENSE="GPL-2"
-IUSE="addressbook calendar gphoto2 jpeg2k +kipi +lensfun marble mediaplayer semantic-desktop mysql opengl openmp +panorama scanner X"
-
-if [[ ${KDE_BUILD_TYPE} != live ]]; then
- KEYWORDS="amd64 x86"
- MY_PV=${PV/_/-}
- MY_P=${PN}-${MY_PV}
- SRC_BRANCH=stable
- [[ ${PV} =~ beta[0-9]$ ]] && SRC_BRANCH=unstable
- SRC_URI="mirror://kde/${SRC_BRANCH}/digikam/${MY_P}.tar.xz"
- S="${WORKDIR}/${MY_P}/core"
-fi
-
-COMMON_DEPEND="
- $(add_frameworks_dep kconfig)
- $(add_frameworks_dep kconfigwidgets)
- $(add_frameworks_dep kcoreaddons)
- $(add_frameworks_dep ki18n)
- $(add_frameworks_dep kiconthemes)
- $(add_frameworks_dep kio)
- $(add_frameworks_dep knotifications)
- $(add_frameworks_dep knotifyconfig)
- $(add_frameworks_dep kservice)
- $(add_frameworks_dep kwidgetsaddons)
- $(add_frameworks_dep kwindowsystem)
- $(add_frameworks_dep kxmlgui)
- $(add_frameworks_dep solid)
- $(add_qt_dep qtconcurrent)
- $(add_qt_dep qtdbus)
- $(add_qt_dep qtgui '-gles2')
- $(add_qt_dep qtprintsupport)
- $(add_qt_dep qtsql 'mysql?')
- $(add_qt_dep qtwebkit)
- $(add_qt_dep qtwidgets)
- $(add_qt_dep qtxml)
- dev-libs/expat
- >=media-gfx/exiv2-0.26:=
- media-libs/lcms:2
- media-libs/liblqr
- media-libs/libpng:0=
- media-libs/opencv:=[-qt4(-)]
- || ( <media-libs/opencv-3.0.0 >=media-libs/opencv-3.1.0 )
- media-libs/tiff:0
- virtual/jpeg:0
- addressbook? (
- $(add_kdeapps_dep akonadi-contacts)
- $(add_kdeapps_dep kcontacts)
- )
- calendar? ( $(add_kdeapps_dep kcalcore) )
- gphoto2? ( media-libs/libgphoto2:= )
- jpeg2k? ( media-libs/jasper:= )
- kipi? ( $(add_kdeapps_dep libkipi '' '16.03.80') )
- lensfun? ( media-libs/lensfun )
- marble? (
- $(add_frameworks_dep kbookmarks)
- $(add_kdeapps_dep marble)
- $(add_qt_dep qtconcurrent)
- $(add_qt_dep qtnetwork)
- )
- mediaplayer? ( media-libs/qtav[opengl] )
- mysql? ( virtual/mysql[server] )
- opengl? (
- $(add_qt_dep qtopengl)
- virtual/opengl
- )
- panorama? ( $(add_frameworks_dep threadweaver) )
- scanner? ( $(add_kdeapps_dep libksane) )
- semantic-desktop? ( $(add_frameworks_dep kfilemetadata) )
- X? (
- $(add_qt_dep qtx11extras)
- x11-libs/libX11
- )
-"
-DEPEND="${COMMON_DEPEND}
- dev-cpp/eigen:3
- dev-libs/boost[threads]
- sys-devel/gettext
- panorama? (
- sys-devel/bison
- sys-devel/flex
- )
-"
-RDEPEND="${COMMON_DEPEND}
- media-plugins/kipi-plugins:5
- panorama? ( media-gfx/hugin )
- !media-gfx/digikam:4
-"
-
-RESTRICT=test
-# bug 366505
-
-PATCHES=(
- "${FILESDIR}"/${P}-qt-5.9.3.patch
- "${FILESDIR}"/${P}-mariadb-10.2-{1,2}.patch
- "${FILESDIR}"/${P}-kreadconfig5.patch
- "${FILESDIR}"/${P}-kcalcore-{1,2}.patch
-)
-
-pkg_pretend() {
- [[ ${MERGE_TYPE} != binary ]] && use openmp && tc-check-openmp
- kde5_pkg_pretend
-}
-
-pkg_setup() {
- [[ ${MERGE_TYPE} != binary ]] && use openmp && tc-check-openmp
- kde5_pkg_setup
-}
-
-# FIXME: Unbundle libraw (libs/rawengine/libraw)
-src_prepare() {
- if [[ ${KDE_BUILD_TYPE} != live ]]; then
- # prepare the translations
- mv "${WORKDIR}/${MY_P}/po" po || die
- find po -name "*.po" -and -not -name "digikam.po" -delete || die
- echo "set_property(GLOBAL PROPERTY ALLOW_DUPLICATE_CUSTOM_TARGETS 1)" >> CMakeLists.txt || die
- echo "find_package(Gettext REQUIRED)" >> CMakeLists.txt || die
- echo "add_subdirectory( po )" >> CMakeLists.txt || die
-
- if use handbook; then
- # subdirs need to be preserved b/c relative paths...
- # doc-translated is, in fact, broken, and ignored
- mv "${WORKDIR}/${MY_P}/doc/${PN}" doc-default || die
- echo "find_package(KF5DocTools REQUIRED)" >> CMakeLists.txt || die
- echo "add_subdirectory( doc-default )" >> CMakeLists.txt || die
- fi
- fi
-
- if ! use marble; then
- punt_bogus_dep Qt5 Network
- fi
-
- kde5_src_prepare
-}
-
-src_configure() {
- local mycmakeargs=(
- -DENABLE_APPSTYLES=ON
- -DENABLE_AKONADICONTACTSUPPORT=$(usex addressbook)
- -DENABLE_MEDIAPLAYER=$(usex mediaplayer)
- -DENABLE_MYSQLSUPPORT=$(usex mysql)
- -DENABLE_OPENCV3=$(has_version ">=media-libs/opencv-3" && echo yes || echo no)
- $(cmake-utils_use_find_package calendar KF5CalendarCore)
- $(cmake-utils_use_find_package gphoto2 Gphoto2)
- $(cmake-utils_use_find_package jpeg2k Jasper)
- $(cmake-utils_use_find_package kipi KF5Kipi)
- $(cmake-utils_use_find_package lensfun LensFun)
- $(cmake-utils_use_find_package marble Marble)
- $(cmake-utils_use_find_package mediaplayer QtAV)
- $(cmake-utils_use_find_package opengl OpenGL)
- $(cmake-utils_use_find_package openmp OpenMP)
- $(cmake-utils_use_find_package panorama KF5ThreadWeaver)
- $(cmake-utils_use_find_package scanner KF5Sane)
- $(cmake-utils_use_find_package semantic-desktop KF5FileMetaData)
- $(cmake-utils_use_find_package X X11)
- )
-
- kde5_src_configure
-}
diff --git a/media-gfx/digikam/files/digikam-5.7.0-kcalcore-1.patch b/media-gfx/digikam/files/digikam-5.7.0-kcalcore-1.patch
deleted file mode 100644
index 9a9574fc982..00000000000
--- a/media-gfx/digikam/files/digikam-5.7.0-kcalcore-1.patch
+++ /dev/null
@@ -1,44 +0,0 @@
-From 12ab7af4618f10d39d4a977e00a0e68a3aac9bd2 Mon Sep 17 00:00:00 2001
-From: Simon Frei <freisim93@gmail.com>
-Date: Wed, 13 Sep 2017 15:43:49 +0200
-Subject: calendar: Adjust to new KCalCore API (fixes CI)
-
----
- utilities/assistants/calendar/print/calsettings.cpp | 9 +++++++--
- 1 file changed, 7 insertions(+), 2 deletions(-)
-
-diff --git a/utilities/assistants/calendar/print/calsettings.cpp b/utilities/assistants/calendar/print/calsettings.cpp
-index b0bed5a..46e995d 100644
---- a/utilities/assistants/calendar/print/calsettings.cpp
-+++ b/utilities/assistants/calendar/print/calsettings.cpp
-@@ -31,12 +31,17 @@
- #include "digikam_debug.h"
- #include "calsystem.h"
-
--// KCalCore includes
-
- #ifdef HAVE_KCALENDAR
-+ // KCalCore includes
-+
- # include <kcalcore/icalformat.h>
- # include <kcalcore/filestorage.h>
- # include <kcalcore/memorycalendar.h>
-+
-+ // Qt includes
-+
-+# include <QTimeZone>
- #endif // HAVE_KCALENDAR
-
- namespace Digikam
-@@ -290,7 +295,7 @@ void CalSettings::loadSpecial(const QUrl& url, const QColor& color)
- return;
- }
-
-- KCalCore::MemoryCalendar::Ptr memCal(new KCalCore::MemoryCalendar(QString::fromLatin1("UTC")));
-+ KCalCore::MemoryCalendar::Ptr memCal(new KCalCore::MemoryCalendar(QTimeZone(0)));
- KCalCore::FileStorage::Ptr fileStorage(new KCalCore::FileStorage(memCal, url.toLocalFile(), new KCalCore::ICalFormat));
-
- qCDebug(DIGIKAM_GENERAL_LOG) << "Loading calendar from file " << url.toLocalFile();
---
-cgit v0.11.2
-
diff --git a/media-gfx/digikam/files/digikam-5.7.0-kcalcore-2.patch b/media-gfx/digikam/files/digikam-5.7.0-kcalcore-2.patch
deleted file mode 100644
index 7237b74a285..00000000000
--- a/media-gfx/digikam/files/digikam-5.7.0-kcalcore-2.patch
+++ /dev/null
@@ -1,79 +0,0 @@
-From dad750fadc926b62603cc9d64009ee5072a46d97 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Daniel=20Vr=C3=A1til?= <dvratil@kde.org>
-Date: Wed, 13 Sep 2017 16:51:14 +0200
-Subject: Adapt to KCalCore API changes
-
-This change supports both old (pre-QDateTime) and new version.
-
-Differential Revision: https://phabricator.kde.org/D7802
-
-* asturm: Incorporated fix from d204022e191d9377874689bfe4c89f7b83998188
----
- CMakeLists.txt | 3 +++
- app/utils/digikam_config.h.cmake.in | 3 +++
- utilities/assistants/calendar/print/calsettings.cpp | 14 ++++++++++----
- 3 files changed, 16 insertions(+), 4 deletions(-)
-
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index 3ad686d..e2f28a7 100644
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -174,6 +174,9 @@ find_package(KF5 ${CALENDAR_MIN_VERSION} QUIET
- OPTIONAL_COMPONENTS
- CalendarCore # For Calendar tool.
- )
-+if ("${KF5CalendarCore_VERSION}" VERSION_GREATER 5.6.40)
-+ set(HAVE_KCALENDAR_QDATETIME TRUE)
-+endif()
-
- if(ENABLE_AKONADICONTACTSUPPORT AND NOT KF5AkonadiContact_FOUND)
- set(ENABLE_KFILEMETADATASUPPORT OFF)
-diff --git a/app/utils/digikam_config.h.cmake.in b/app/utils/digikam_config.h.cmake.in
-index 8a2e8e5..ffd3a22 100644
---- a/app/utils/digikam_config.h.cmake.in
-+++ b/app/utils/digikam_config.h.cmake.in
-@@ -75,6 +75,9 @@
- /* Define to 1 if you have KCalendar core shared libraries installed */
- #cmakedefine HAVE_KCALENDAR 1
-
-+/* Define to 1 if you have KCalendar core shared libraries with QDateTime support installed */
-+#cmakedefine HAVE_KCALENDAR_QDATETIME 1
-+
- /* Define to 1 if Panorama tool is supported */
- #cmakedefine HAVE_PANORAMA 1
-
-diff --git a/utilities/assistants/calendar/print/calsettings.cpp b/utilities/assistants/calendar/print/calsettings.cpp
-index 46e995d..c6554ef 100644
---- a/utilities/assistants/calendar/print/calsettings.cpp
-+++ b/utilities/assistants/calendar/print/calsettings.cpp
-@@ -295,7 +295,13 @@ void CalSettings::loadSpecial(const QUrl& url, const QColor& color)
- return;
- }
-
-- KCalCore::MemoryCalendar::Ptr memCal(new KCalCore::MemoryCalendar(QTimeZone(0)));
-+#ifdef HAVE_KCALENDAR_QDATETIME
-+ KCalCore::MemoryCalendar::Ptr memCal(new KCalCore::MemoryCalendar(QTimeZone::utc()));
-+ using DateTime = QDateTime;
-+#else
-+ KCalCore::MemoryCalendar::Ptr memCal(new KCalCore::MemoryCalendar(QString::fromLatin1("UTC")));
-+ using DateTime = KDateTime;
-+#endif
- KCalCore::FileStorage::Ptr fileStorage(new KCalCore::FileStorage(memCal, url.toLocalFile(), new KCalCore::ICalFormat));
-
- qCDebug(DIGIKAM_GENERAL_LOG) << "Loading calendar from file " << url.toLocalFile();
-@@ -313,9 +319,9 @@ void CalSettings::loadSpecial(const QUrl& url, const QColor& color)
- qLast = calSys.date(params.year + 1, 1, 1);
- qLast = qLast.addDays(-1);
-
-- KDateTime dtFirst(qFirst);
-- KDateTime dtLast(qLast);
-- KDateTime dtCurrent;
-+ DateTime dtFirst(qFirst, QTime(0, 0));
-+ DateTime dtLast(qLast, QTime(0, 0));
-+ DateTime dtCurrent;
-
- int counter = 0;
- KCalCore::Event::List list = memCal->rawEvents(qFirst, qLast);
---
-cgit v0.11.2
-
diff --git a/media-gfx/digikam/files/digikam-5.7.0-kreadconfig5.patch b/media-gfx/digikam/files/digikam-5.7.0-kreadconfig5.patch
deleted file mode 100644
index 7305f64aa3f..00000000000
--- a/media-gfx/digikam/files/digikam-5.7.0-kreadconfig5.patch
+++ /dev/null
@@ -1,28 +0,0 @@
-From bbf087645d426e20ce96fa2accd70ff4198d30ec Mon Sep 17 00:00:00 2001
-From: Andreas Sturmlechner <andreas.sturmlechner@gmail.com>
-Date: Wed, 6 Dec 2017 22:31:29 +0100
-Subject: [PATCH] cleanup_digikamdb: Don't depend on kde-runtime
-
-Summary: This needs to use kreadconfig5 in a Frameworks world.
-
-Differential Revision: https://phabricator.kde.org/D9235
----
- data/scripts/cleanup_digikamdb/cleanup_digikamdb | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/data/scripts/cleanup_digikamdb/cleanup_digikamdb b/data/scripts/cleanup_digikamdb/cleanup_digikamdb
-index 3a68d3d040..9cfcd6ac8d 100644
---- a/data/scripts/cleanup_digikamdb/cleanup_digikamdb
-+++ b/data/scripts/cleanup_digikamdb/cleanup_digikamdb
-@@ -58,7 +58,7 @@ readConfigValue()
- {
- local config_file="digikamrc"
- local config_group="Database Settings"
-- local db_dir=$(kreadconfig --file "${config_file}" --group "${config_group}" --key "$1")
-+ local db_dir=$(kreadconfig5 --file "${config_file}" --group "${config_group}" --key "$1")
- echo "${db_dir}"
- }
-
---
-2.15.1
-
diff --git a/media-gfx/digikam/files/digikam-5.7.0-mariadb-10.2-1.patch b/media-gfx/digikam/files/digikam-5.7.0-mariadb-10.2-1.patch
deleted file mode 100644
index e3e968fbaac..00000000000
--- a/media-gfx/digikam/files/digikam-5.7.0-mariadb-10.2-1.patch
+++ /dev/null
@@ -1,58 +0,0 @@
-From 395ab5b02ed7d02736a08e370217c0c96b391bb9 Mon Sep 17 00:00:00 2001
-From: Maik Qualmann <metzpinguin@gmail.com>
-Date: Wed, 6 Dec 2017 08:09:44 +0100
-Subject: Workaround for the problem mariaDB >= 10.2 and QTBUG-63108
-
----
- libs/album/albummanager.cpp | 14 ++++++++++++++
- 1 file changed, 14 insertions(+)
-
-diff --git a/libs/album/albummanager.cpp b/libs/album/albummanager.cpp
-index a72acc3..2ea40e9 100644
---- a/libs/album/albummanager.cpp
-+++ b/libs/album/albummanager.cpp
-@@ -162,6 +162,7 @@ public:
- hasPriorizedDbPath(false),
- dbPort(0),
- dbInternalServer(false),
-+ dbFakeConnection(false),
- showOnlyAvailableAlbums(false),
- albumListJob(0),
- dateListJob(0),
-@@ -192,6 +193,7 @@ public:
- QString dbHostName;
- int dbPort;
- bool dbInternalServer;
-+ bool dbFakeConnection;
-
- bool showOnlyAvailableAlbums;
-
-@@ -391,6 +393,11 @@ void AlbumManager::cleanUp()
- d->personListJob->cancel();
- d->personListJob = 0;
- }
-+
-+ if (d->dbFakeConnection)
-+ {
-+ QSqlDatabase::removeDatabase(QLatin1String("FakeConnection"));
-+ }
- }
-
- bool AlbumManager::databaseEqual(const DbEngineParameters& parameters) const
-@@ -727,6 +734,13 @@ bool AlbumManager::setDatabase(const DbEngineParameters& params, bool priority,
- // ensure, embedded database is loaded
- qCDebug(DIGIKAM_GENERAL_LOG) << params;
-
-+ // workaround for the problem mariaDB >= 10.2 and QTBUG-63108.
-+ if (params.isMySQL() && !d->dbFakeConnection)
-+ {
-+ QSqlDatabase::addDatabase(QLatin1String("QMYSQL"), QLatin1String("FakeConnection"));
-+ d->dbFakeConnection = true;
-+ }
-+
- if (params.internalServer)
- {
- DatabaseServerError result = DatabaseServerStarter::instance()->startServerManagerProcess(params);
---
-cgit v0.11.2
-
diff --git a/media-gfx/digikam/files/digikam-5.7.0-mariadb-10.2-2.patch b/media-gfx/digikam/files/digikam-5.7.0-mariadb-10.2-2.patch
deleted file mode 100644
index eed213c3bc9..00000000000
--- a/media-gfx/digikam/files/digikam-5.7.0-mariadb-10.2-2.patch
+++ /dev/null
@@ -1,117 +0,0 @@
-From ba1ceda1448895009ba6524398ca42441695cc3e Mon Sep 17 00:00:00 2001
-From: Maik Qualmann <metzpinguin@gmail.com>
-Date: Wed, 6 Dec 2017 18:28:32 +0100
-Subject: workaround for QTBUG-63108 now works in all cases
-
----
- app/main/digikamapp.cpp | 2 ++
- libs/album/albummanager.cpp | 30 +++++++++++++++++++++---------
- libs/album/albummanager.h | 3 +++
- libs/database/utils/dbsettingswidget.cpp | 3 +++
- 4 files changed, 29 insertions(+), 9 deletions(-)
-
-diff --git a/app/main/digikamapp.cpp b/app/main/digikamapp.cpp
-index 4349271..935b786 100644
---- a/app/main/digikamapp.cpp
-+++ b/app/main/digikamapp.cpp
-@@ -383,6 +383,8 @@ DigikamApp::~DigikamApp()
- DatabaseServerStarter::instance()->stopServerManagerProcess();
- }
-
-+ AlbumManager::instance()->removeFakeConnection();
-+
- m_instance = 0;
-
- delete d->modelCollection;
-diff --git a/libs/album/albummanager.cpp b/libs/album/albummanager.cpp
-index 2ea40e9..92a8b37 100644
---- a/libs/album/albummanager.cpp
-+++ b/libs/album/albummanager.cpp
-@@ -393,11 +393,6 @@ void AlbumManager::cleanUp()
- d->personListJob->cancel();
- d->personListJob = 0;
- }
--
-- if (d->dbFakeConnection)
-- {
-- QSqlDatabase::removeDatabase(QLatin1String("FakeConnection"));
-- }
- }
-
- bool AlbumManager::databaseEqual(const DbEngineParameters& parameters) const
-@@ -734,11 +729,10 @@ bool AlbumManager::setDatabase(const DbEngineParameters& params, bool priority,
- // ensure, embedded database is loaded
- qCDebug(DIGIKAM_GENERAL_LOG) << params;
-
-- // workaround for the problem mariaDB >= 10.2 and QTBUG-63108.
-- if (params.isMySQL() && !d->dbFakeConnection)
-+ // workaround for the problem mariaDB >= 10.2 and QTBUG-63108
-+ if (params.isMySQL())
- {
-- QSqlDatabase::addDatabase(QLatin1String("QMYSQL"), QLatin1String("FakeConnection"));
-- d->dbFakeConnection = true;
-+ addFakeConnection();
- }
-
- if (params.internalServer)
-@@ -3558,4 +3552,22 @@ void AlbumManager::removeWatchedPAlbums(const PAlbum* const album)
- d->albumWatch->removeWatchedPAlbums(album);
- }
-
-+void AlbumManager::addFakeConnection()
-+{
-+ if (!d->dbFakeConnection)
-+ {
-+ // workaround for the problem mariaDB >= 10.2 and QTBUG-63108
-+ QSqlDatabase::addDatabase(QLatin1String("QMYSQL"), QLatin1String("FakeConnection"));
-+ d->dbFakeConnection = true;
-+ }
-+}
-+
-+void AlbumManager::removeFakeConnection()
-+{
-+ if (d->dbFakeConnection)
-+ {
-+ QSqlDatabase::removeDatabase(QLatin1String("FakeConnection"));
-+ }
-+}
-+
- } // namespace Digikam
-diff --git a/libs/album/albummanager.h b/libs/album/albummanager.h
-index bee58c4..5b24c8d 100644
---- a/libs/album/albummanager.h
-+++ b/libs/album/albummanager.h
-@@ -625,6 +625,9 @@ public:
-
- void removeWatchedPAlbums(const PAlbum* const album);
-
-+ void addFakeConnection();
-+ void removeFakeConnection();
-+
- //@}
-
- Q_SIGNALS:
-diff --git a/libs/database/utils/dbsettingswidget.cpp b/libs/database/utils/dbsettingswidget.cpp
-index ca95646..4f1e1a4 100644
---- a/libs/database/utils/dbsettingswidget.cpp
-+++ b/libs/database/utils/dbsettingswidget.cpp
-@@ -65,6 +65,7 @@
- #include "dlayoutbox.h"
- #include "mysqlinitbinary.h"
- #include "mysqlservbinary.h"
-+#include "albummanager.h"
-
- namespace Digikam
- {
-@@ -669,6 +670,8 @@ bool DatabaseSettingsWidget::checkMysqlServerConnection(QString& error)
-
- qApp->setOverrideCursor(Qt::WaitCursor);
-
-+ AlbumManager::instance()->addFakeConnection();
-+
- QString databaseID(QLatin1String("ConnectionTest"));
- QSqlDatabase testDatabase = QSqlDatabase::addDatabase(databaseBackend(), databaseID);
-
---
-cgit v0.11.2
-
diff --git a/media-gfx/digikam/files/digikam-5.7.0-qt-5.9.3.patch b/media-gfx/digikam/files/digikam-5.7.0-qt-5.9.3.patch
deleted file mode 100644
index 7001850cd9c..00000000000
--- a/media-gfx/digikam/files/digikam-5.7.0-qt-5.9.3.patch
+++ /dev/null
@@ -1,32 +0,0 @@
-From 855ba5b7d4bc6337234720a72ea824ddd3b32e5b Mon Sep 17 00:00:00 2001
-From: Maik Qualmann <metzpinguin@gmail.com>
-Date: Tue, 28 Nov 2017 21:29:00 +0100
-Subject: try to fix the Qt-5.9.3 empty album problem CCBUGS: 387373
-
-* asturm: Fix build w/ Qt-5.7
----
- libs/database/coredb/coredburl.cpp | 7 ++++++-
- 1 file changed, 6 insertions(+), 1 deletion(-)
-
-diff --git a/libs/database/coredb/coredburl.cpp b/libs/database/coredb/coredburl.cpp
-index 2c0d0eb..b1bdf71 100644
---- a/libs/database/coredb/coredburl.cpp
-+++ b/libs/database/coredb/coredburl.cpp
-@@ -88,8 +88,13 @@ CoreDbUrl CoreDbUrl::fromAlbumAndName(const QString& name,
- const DbEngineParameters& parameters)
- {
- CoreDbUrl url;
-+ QString path(album);
- url.setScheme(QLatin1String("digikamalbums"));
-- url.setPath(QLatin1Char('/') + album + QLatin1Char('/') + name);
-+
-+ if (path != QLatin1String("/"))
-+ path += QLatin1Char('/');
-+
-+ url.setPath(path + name);
-
- QUrlQuery q(url);
- q.addQueryItem(QLatin1String("albumRoot"), albumRoot.adjusted(QUrl::StripTrailingSlash).toLocalFile());
---
-cgit v0.11.2
-