media-gfx/digikam: Drop 6.2.0

Package-Manager: Portage-2.3.80, Repoman-2.3.19
Signed-off-by: Andreas Sturmlechner <asturm@gentoo.org>
This commit is contained in:
Andreas Sturmlechner
2019-12-03 06:03:07 +01:00
parent 697ee44dcb
commit 9e321ebdb7
5 changed files with 0 additions and 257 deletions
-1
View File
@@ -1,2 +1 @@
DIST digikam-6.2.0.tar.xz 339472960 BLAKE2B 0db48839474d599a364fba73cad751b889fe6f37c88323d1feddce67acb0ecad306c67976e1524328e6aaf33464c9dd35b1b85cf3c41ba72be9cef664e30d520 SHA512 05667c91af290df0eabd3b18a7c6741ded3f1b01b0a9cb572d6df79f25787d0291624760d6c0fa23bd36665a94bc7ccba845c117ee381de7edff97d1d4158e56
DIST digikam-6.3.0.tar.xz 335641824 BLAKE2B 1ecddeee653d6b97570aa3616c6dd0a951210983400fe8aca19ee9e01aef29820f0ab32e3cbc2e92e833868f0f652c5bdd0809324437b6fa778dfdaf04ea3c83 SHA512 9463d7a8351acae32e2fa77c96026d1cb60e56fcc20ad2b71ac7461ff1e5e2e02ca0ef8a12e4d5ae2324aa66e185cdf5b237d6330f4741691876977e773511ce
-151
View File
@@ -1,151 +0,0 @@
# Copyright 1999-2019 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
CMAKE_MIN_VERSION=3.14.3
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="
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_kdeapps_dep akonadi-contacts)
$(add_kdeapps_dep kcontacts)
)
calendar? ( $(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}-googlephoto-upload.patch"
"${FILESDIR}/${P}-cmake.patch"
"${FILESDIR}/${P}-imagemagick-7.0.8.60.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=(
-DENABLE_APPSTYLES=ON
-DCMAKE_DISABLE_FIND_PACKAGE_Jasper=ON
-DENABLE_AKONADICONTACTSUPPORT=$(usex addressbook)
$(cmake-utils_use_find_package calendar KF5CalendarCore)
-DENABLE_FACESENGINE_DNN=$(usex dnn)
$(cmake-utils_use_find_package gphoto2 Gphoto2)
$(cmake-utils_use_find_package imagemagick ImageMagick)
$(cmake-utils_use_find_package lensfun LensFun)
$(cmake-utils_use_find_package marble Marble)
-DENABLE_MEDIAPLAYER=$(usex mediaplayer)
$(cmake-utils_use_find_package mediaplayer QtAV)
-DENABLE_MYSQLSUPPORT=$(usex mysql)
-DENABLE_INTERNALMYSQL=$(usex mysql)
$(cmake-utils_use_find_package opengl OpenGL)
$(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 vkontakte KF5Vkontakte)
-DENABLE_QWEBENGINE=$(usex !webkit)
$(cmake-utils_use_find_package X X11)
)
kde5_src_configure
}
@@ -1,66 +0,0 @@
From d915828e4db2e7b40e799abc01a6fdb683d2b921 Mon Sep 17 00:00:00 2001
From: Andreas Sturmlechner <andreas.sturmlechner@gmail.com>
Date: Sun, 17 Feb 2019 23:51:03 +0100
Subject: [PATCH] Un-break optional Qt5 detection
---
core/CMakeLists.txt | 26 ++++++++++----------------
1 file changed, 10 insertions(+), 16 deletions(-)
diff --git a/core/CMakeLists.txt b/core/CMakeLists.txt
index c04ee1a9c3..c3762437e6 100644
--- a/core/CMakeLists.txt
+++ b/core/CMakeLists.txt
@@ -136,16 +136,14 @@ find_package(Qt5 ${QT_MIN_VERSION}
)
if(ENABLE_QWEBENGINE)
- find_package(Qt5 ${QT_MIN_VERSION} NO_MODULE COMPONENTS WebEngineWidgets)
+ find_package(Qt5WebEngineWidgets ${QT_MIN_VERSION} NO_MODULE)
else()
- find_package(Qt5 ${QT_MIN_VERSION} NO_MODULE COMPONENTS WebKitWidgets)
+ find_package(Qt5WebKitWidgets ${QT_MIN_VERSION} NO_MODULE)
endif()
-find_package(Qt5 ${QT_MIN_VERSION}
- OPTIONAL_COMPONENTS
- DBus
- OpenGL
-)
+find_package(Qt5DBus ${QT_MIN_VERSION})
+
+find_package(Qt5OpenGL ${QT_MIN_VERSION})
if(ENABLE_DBUS)
if(NOT Qt5DBus_FOUND)
@@ -156,14 +154,10 @@ endif()
# Dependencies For unit tests and CLI test tools
if(BUILD_TESTING)
- find_package(Qt5 ${QT_MIN_VERSION}
- NO_MODULE COMPONENTS
- Test
- )
- find_package(Qt5 ${QT_MIN_VERSION}
- OPTIONAL_COMPONENTS
- Qml WebView # Optional, for 'sialis' O2 library test tool.
- )
+ find_package(Qt5Test ${QT_MIN_VERSION} NO_MODULE)
+ # Optional, for 'sialis' O2 library test tool.
+ find_package(Qt5Qml ${QT_MIN_VERSION} NO_MODULE)
+ find_package(Qt5WebView ${QT_MIN_VERSION} NO_MODULE)
endif()
find_package(KF5 ${KF5_MIN_VERSION}
@@ -335,7 +329,7 @@ endif()
find_package(X11)
if(X11_FOUND)
- find_package(Qt5 ${QT_MIN_VERSION} NO_MODULE COMPONENTS X11Extras)
+ find_package(Qt5X11Extras ${QT_MIN_VERSION} NO_MODULE)
set(HAVE_X11 TRUE)
else()
set(HAVE_X11 FALSE)
--
2.22.0
@@ -1,25 +0,0 @@
From 19490eb10de0444219e8b525bb75513c046d184d Mon Sep 17 00:00:00 2001
From: Maik Qualmann <metzpinguin@gmail.com>
Date: Wed, 7 Aug 2019 19:52:13 +0200
Subject: [PATCH] fix upload error to Google Photo when description contains
quotes BUGS: 410692 FIXED-IN: 6.3.0
---
core/dplugins/generic/webservices/google/gswindow.cpp | 1 +
1 files changed, 1 insertions(+)
diff --git a/core/dplugins/generic/webservices/google/gswindow.cpp b/core/dplugins/generic/webservices/google/gswindow.cpp
index a03e683e65..a80eac5cdb 100644
--- a/core/dplugins/generic/webservices/google/gswindow.cpp
+++ b/core/dplugins/generic/webservices/google/gswindow.cpp
@@ -594,6 +594,7 @@ void GSWindow::slotStartTransfer()
QStringList descriptions = QStringList() << info.title() << info.comment();
descriptions.removeAll(QLatin1String(""));
temp.description = descriptions.join(QLatin1String("\n\n"));
+ temp.description.replace(QLatin1Char('"'), QLatin1String("\\\""));
break;
}
--
2.22.0
@@ -1,14 +0,0 @@
--- a/core/tests/dimg/magickloader.cpp
+++ a/core/tests/dimg/magickloader.cpp
@@ -139,7 +139,11 @@ int main(int argc, char** argv)
if (inf->encoder) mode.append(QLatin1Char('W'));
else mode.append(QLatin1Char('-'));
+#if( (MagickLibVersion >= 0x708) && defined(magick_module) ) /* defined since 7.0.8.60 */
+ QString module = QLatin1String(inf->magick_module);
+#else
QString module = QLatin1String(inf->module);
+#endif
QString mime = QMimeDatabase().mimeTypeForFile(QFileInfo(QString::fromLatin1("foo.%1").arg(module))).name();
if (module != QLatin1String("DNG") &&