diff options
| -rw-r--r-- | media-gfx/digikam/Manifest | 1 | ||||
| -rw-r--r-- | media-gfx/digikam/digikam-6.3.0-r1.ebuild | 157 | ||||
| -rw-r--r-- | media-gfx/digikam/files/digikam-6.3.0-googlephoto-import-crash.patch | 85 |
3 files changed, 0 insertions, 243 deletions
diff --git a/media-gfx/digikam/Manifest b/media-gfx/digikam/Manifest index 65079a279da6..06c96471be98 100644 --- a/media-gfx/digikam/Manifest +++ b/media-gfx/digikam/Manifest @@ -1,2 +1 @@ -DIST digikam-6.3.0.tar.xz 335641824 BLAKE2B 1ecddeee653d6b97570aa3616c6dd0a951210983400fe8aca19ee9e01aef29820f0ab32e3cbc2e92e833868f0f652c5bdd0809324437b6fa778dfdaf04ea3c83 SHA512 9463d7a8351acae32e2fa77c96026d1cb60e56fcc20ad2b71ac7461ff1e5e2e02ca0ef8a12e4d5ae2324aa66e185cdf5b237d6330f4741691876977e773511ce DIST digikam-6.4.0.tar.xz 340146992 BLAKE2B ca1bc8b0d165f9774354d8489a11d46d8d7467edd3c1e90fd3a96024c4b7cd23bfd5c813251183bcca6d4beac9bffeb9d921beaa9a3752f75f1918796aacd719 SHA512 b3b5e9903538d110613aa872c9215f5e7c19f7520a2b9060c24e686f20f72075378b447239dd3e17cb8860cdd35c699399994199b848757f0497ad25a7805e42 diff --git a/media-gfx/digikam/digikam-6.3.0-r1.ebuild b/media-gfx/digikam/digikam-6.3.0-r1.ebuild deleted file mode 100644 index 7a9327fbcb30..000000000000 --- a/media-gfx/digikam/digikam-6.3.0-r1.ebuild +++ /dev/null @@ -1,157 +0,0 @@ -# Copyright 1999-2019 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -inherit kde5 toolchain-funcs - -if [[ ${KDE_BUILD_TYPE} != live ]]; then - 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/${PV}/${MY_P}.tar.xz" - KEYWORDS="amd64 x86" - S="${WORKDIR}/${MY_P}" -fi - -DESCRIPTION="Digital photo management application" -HOMEPAGE="https://www.digikam.org/" - -LICENSE="GPL-2" -IUSE="addressbook calendar dnn +imagemagick gphoto2 +lensfun libav marble mediaplayer mysql opengl openmp +panorama scanner semantic-desktop vkontakte webkit X" - -BDEPEND=" - >=dev-util/cmake-3.14.3 - sys-devel/gettext - panorama? ( - sys-devel/bison - sys-devel/flex - ) -" -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 qtnetwork) - $(add_qt_dep qtprintsupport) - $(add_qt_dep qtsql 'mysql?') - $(add_qt_dep qtwidgets) - $(add_qt_dep qtxml) - $(add_qt_dep qtxmlpatterns) - dev-libs/expat - >=media-gfx/exiv2-0.26:= - media-libs/lcms:2 - media-libs/liblqr - media-libs/libpng:0= - >=media-libs/opencv-3.1.0:= - media-libs/tiff:0 - virtual/jpeg:0 - addressbook? ( - || ( - $(add_frameworks_dep kcontacts) - $(add_kdeapps_dep kcontacts) - ) - $(add_kdeapps_dep akonadi-contacts) - ) - calendar? ( || ( - $(add_frameworks_dep kcalendarcore) - $(add_kdeapps_dep kcalcore) - ) ) - dnn? ( >=media-libs/opencv-3.1.0:=[contrib,contribdnn] ) - gphoto2? ( media-libs/libgphoto2:= ) - imagemagick? ( media-gfx/imagemagick:= ) - lensfun? ( media-libs/lensfun ) - marble? ( - $(add_frameworks_dep kbookmarks) - $(add_kdeapps_dep marble) - $(add_qt_dep qtconcurrent) - ) - mediaplayer? ( - media-libs/qtav[opengl] - !libav? ( media-video/ffmpeg:= ) - libav? ( media-video/libav:= ) - ) - opengl? ( - $(add_qt_dep qtopengl) - virtual/opengl - ) - panorama? ( $(add_frameworks_dep threadweaver) ) - scanner? ( $(add_kdeapps_dep libksane) ) - semantic-desktop? ( $(add_frameworks_dep kfilemetadata) ) - vkontakte? ( net-libs/libkvkontakte:5 ) - !webkit? ( $(add_qt_dep qtwebengine 'widgets') ) - webkit? ( >=dev-qt/qtwebkit-5.212.0_pre20180120:5 ) - X? ( - $(add_qt_dep qtx11extras) - x11-libs/libX11 - ) -" -DEPEND="${COMMON_DEPEND} - dev-cpp/eigen:3 - dev-libs/boost[threads] -" -RDEPEND="${COMMON_DEPEND} - mysql? ( virtual/mysql[server] ) - panorama? ( media-gfx/hugin ) -" - -RESTRICT+=" test" -# bug 366505 - -PATCHES=( - "${FILESDIR}/${P}-cmake.patch" - "${FILESDIR}/${P}-googlephoto-import-crash.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_configure() { - local mycmakeargs=( - -DBUILD_TESTING=OFF # bug #698192 - -DENABLE_APPSTYLES=ON - -DCMAKE_DISABLE_FIND_PACKAGE_Jasper=ON - -DENABLE_AKONADICONTACTSUPPORT=$(usex addressbook) - $(cmake_use_find_package calendar KF5CalendarCore) - -DENABLE_FACESENGINE_DNN=$(usex dnn) - $(cmake_use_find_package gphoto2 Gphoto2) - $(cmake_use_find_package imagemagick ImageMagick) - $(cmake_use_find_package lensfun LensFun) - $(cmake_use_find_package marble Marble) - -DENABLE_MEDIAPLAYER=$(usex mediaplayer) - $(cmake_use_find_package mediaplayer QtAV) - -DENABLE_MYSQLSUPPORT=$(usex mysql) - -DENABLE_INTERNALMYSQL=$(usex mysql) - $(cmake_use_find_package opengl OpenGL) - $(cmake_use_find_package panorama KF5ThreadWeaver) - $(cmake_use_find_package scanner KF5Sane) - $(cmake_use_find_package semantic-desktop KF5FileMetaData) - $(cmake_use_find_package vkontakte KF5Vkontakte) - -DENABLE_QWEBENGINE=$(usex !webkit) - $(cmake_use_find_package X X11) - ) - - kde5_src_configure -} diff --git a/media-gfx/digikam/files/digikam-6.3.0-googlephoto-import-crash.patch b/media-gfx/digikam/files/digikam-6.3.0-googlephoto-import-crash.patch deleted file mode 100644 index 7a8a7e533a13..000000000000 --- a/media-gfx/digikam/files/digikam-6.3.0-googlephoto-import-crash.patch +++ /dev/null @@ -1,85 +0,0 @@ -From ea22af510d62c85224ed430611db8818f97ecc69 Mon Sep 17 00:00:00 2001 -From: Maik Qualmann <metzpinguin@gmail.com> -Date: Wed, 4 Sep 2019 20:59:20 +0200 -Subject: fix crash when close/reopen Google import window BUGS: 411587 - FIXED-IN: 6.3.0 - ---- - .../generic/webservices/google/gphoto/gptalker.cpp | 3 ++- - core/dplugins/generic/webservices/google/gswindow.cpp | 18 ++++++++++++++---- - 3 files changed, 17 insertions(+), 5 deletions(-) - -diff --git a/core/dplugins/generic/webservices/google/gphoto/gptalker.cpp b/core/dplugins/generic/webservices/google/gphoto/gptalker.cpp -index 1cddfbd..b5e68ef 100644 ---- a/core/dplugins/generic/webservices/google/gphoto/gptalker.cpp -+++ b/core/dplugins/generic/webservices/google/gphoto/gptalker.cpp -@@ -160,6 +160,7 @@ GPTalker::~GPTalker() - if (m_reply) - { - m_reply->abort(); -+ m_reply = nullptr; - } - - WSToolUtils::removeTemporaryDir("google"); -@@ -637,7 +638,7 @@ void GPTalker::slotFinished(QNetworkReply* reply) - { - emit signalAddPhotoDone(reply->error(), reply->errorString()); - } -- else -+ else if (reply->error() != QNetworkReply::OperationCanceledError) - { - QMessageBox::critical(QApplication::activeWindow(), - i18n("Error"), reply->errorString()); -diff --git a/core/dplugins/generic/webservices/google/gswindow.cpp b/core/dplugins/generic/webservices/google/gswindow.cpp -index 424aee2..d5af448 100644 ---- a/core/dplugins/generic/webservices/google/gswindow.cpp -+++ b/core/dplugins/generic/webservices/google/gswindow.cpp -@@ -266,11 +266,10 @@ GSWindow::GSWindow(DInfoInterface* const iface, - - GSWindow::~GSWindow() - { -- delete d->widget; -- delete d->albumDlg; -- delete d->gphotoAlbumDlg; -- delete d->talker; -+ d->transferQueue.clear(); -+ - delete d->gphotoTalker; -+ delete d->talker; - delete d; - } - -@@ -851,6 +850,11 @@ void GSWindow::downloadNextPhoto() - void GSWindow::slotGetPhotoDone(int errCode, const QString& errMsg, - const QByteArray& photoData, const QString& fileName) - { -+ if (d->transferQueue.isEmpty()) -+ { -+ return; -+ } -+ - GSPhoto item = d->transferQueue.first().second; - - /** -@@ -982,6 +986,11 @@ void GSWindow::slotGetPhotoDone(int errCode, const QString& errMsg, - - void GSWindow::slotAddPhotoDone(int err, const QString& msg) - { -+ if (d->transferQueue.isEmpty()) -+ { -+ return; -+ } -+ - if (err == 0) - { - d->widget->imagesList()->processed(d->transferQueue.first().first,false); -@@ -1245,6 +1254,7 @@ void GSWindow::buttonStateChange(bool state) - void GSWindow::slotFinished() - { - writeSettings(); -+ d->transferQueue.clear(); - d->widget->imagesList()->listView()->clear(); - } - --- -cgit v1.1 |