mirror of
https://github.com/gentoo-mirror/gentoo.git
synced 2026-08-05 12:38:09 -07:00
media-gfx/digikam: Drop 6.4.0-r1
Closes: https://bugs.gentoo.org/746596 Package-Manager: Portage-3.0.9, Repoman-3.0.2 Signed-off-by: Andreas Sturmlechner <asturm@gentoo.org>
This commit is contained in:
Andreas Sturmlechner
@@ -1,2 +1 @@
|
||||
DIST digikam-6.4.0.tar.xz 340146992 BLAKE2B ca1bc8b0d165f9774354d8489a11d46d8d7467edd3c1e90fd3a96024c4b7cd23bfd5c813251183bcca6d4beac9bffeb9d921beaa9a3752f75f1918796aacd719 SHA512 b3b5e9903538d110613aa872c9215f5e7c19f7520a2b9060c24e686f20f72075378b447239dd3e17cb8860cdd35c699399994199b848757f0497ad25a7805e42
|
||||
DIST digikam-7.1.0.tar.xz 593501044 BLAKE2B dcd124a18299a75c02b51642cc33d2a053f1fce4abd82b3f50ea93cc17e8b302b73284106ed716e815741cc38326695f1303e018998a6687f8cd92ab539faeb0 SHA512 df7138a45ff8de6c1e32cb0eea83e1cd4b67f027b149a696d8feb8008ceaae55934c1f1d9625c1ba29de850ad70aa01dc73f1b7517253ca6aa99f0f97b84a3a4
|
||||
|
||||
@@ -1,155 +0,0 @@
|
||||
# Copyright 1999-2020 Gentoo Authors
|
||||
# Distributed under the terms of the GNU General Public License v2
|
||||
|
||||
EAPI=7
|
||||
|
||||
KFMIN=5.60.0
|
||||
QTMIN=5.12.3
|
||||
inherit ecm kde.org 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"
|
||||
SLOT="5"
|
||||
IUSE="addressbook calendar dnn heif +imagemagick gphoto2 +lensfun 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="
|
||||
dev-libs/expat
|
||||
>=dev-qt/qtconcurrent-${QTMIN}:5
|
||||
>=dev-qt/qtdbus-${QTMIN}:5
|
||||
>=dev-qt/qtgui-${QTMIN}:5[-gles2-only]
|
||||
>=dev-qt/qtnetwork-${QTMIN}:5
|
||||
>=dev-qt/qtprintsupport-${QTMIN}:5
|
||||
>=dev-qt/qtsql-${QTMIN}:5[mysql?]
|
||||
>=dev-qt/qtwidgets-${QTMIN}:5
|
||||
>=dev-qt/qtxml-${QTMIN}:5
|
||||
>=dev-qt/qtxmlpatterns-${QTMIN}:5
|
||||
>=kde-frameworks/kconfig-${KFMIN}:5
|
||||
>=kde-frameworks/kconfigwidgets-${KFMIN}:5
|
||||
>=kde-frameworks/kcoreaddons-${KFMIN}:5
|
||||
>=kde-frameworks/ki18n-${KFMIN}:5
|
||||
>=kde-frameworks/kiconthemes-${KFMIN}:5
|
||||
>=kde-frameworks/kio-${KFMIN}:5
|
||||
>=kde-frameworks/knotifications-${KFMIN}:5
|
||||
>=kde-frameworks/knotifyconfig-${KFMIN}:5
|
||||
>=kde-frameworks/kservice-${KFMIN}:5
|
||||
>=kde-frameworks/kwidgetsaddons-${KFMIN}:5
|
||||
>=kde-frameworks/kwindowsystem-${KFMIN}:5
|
||||
>=kde-frameworks/kxmlgui-${KFMIN}:5
|
||||
>=kde-frameworks/solid-${KFMIN}:5
|
||||
>=media-gfx/exiv2-0.27:=
|
||||
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? (
|
||||
>=kde-apps/akonadi-contacts-19.04.3:5
|
||||
>=kde-frameworks/kcontacts-${KFMIN}:5
|
||||
)
|
||||
calendar? ( >=kde-frameworks/kcalendarcore-${KFMIN}:5 )
|
||||
dnn? ( >=media-libs/opencv-3.1.0:=[contrib,contribdnn] )
|
||||
gphoto2? ( media-libs/libgphoto2:= )
|
||||
heif? ( media-libs/x265:= )
|
||||
imagemagick? ( media-gfx/imagemagick:= )
|
||||
lensfun? ( media-libs/lensfun )
|
||||
marble? (
|
||||
>=dev-qt/qtconcurrent-${QTMIN}:5
|
||||
>=kde-apps/marble-19.04.3:5
|
||||
>=kde-frameworks/kbookmarks-${KFMIN}:5
|
||||
)
|
||||
mediaplayer? (
|
||||
media-libs/qtav[opengl]
|
||||
media-video/ffmpeg:=
|
||||
)
|
||||
opengl? (
|
||||
>=dev-qt/qtopengl-${QTMIN}:5
|
||||
virtual/opengl
|
||||
)
|
||||
panorama? ( >=kde-frameworks/threadweaver-${KFMIN}:5 )
|
||||
scanner? ( >=kde-apps/libksane-19.04.3:5 )
|
||||
semantic-desktop? ( >=kde-frameworks/kfilemetadata-${KFMIN}:5 )
|
||||
vkontakte? ( net-libs/libkvkontakte:5 )
|
||||
!webkit? ( >=dev-qt/qtwebengine-${QTMIN}:5[widgets] )
|
||||
webkit? ( >=dev-qt/qtwebkit-5.212.0_pre20180120:5 )
|
||||
X? (
|
||||
>=dev-qt/qtx11extras-${QTMIN}:5
|
||||
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}/${PN}-6.3.0-cmake.patch"
|
||||
"${FILESDIR}/${P}-qt-5.15.patch" # bug 730298
|
||||
)
|
||||
|
||||
pkg_pretend() {
|
||||
[[ ${MERGE_TYPE} != binary ]] && use openmp && tc-check-openmp
|
||||
ecm_pkg_pretend
|
||||
}
|
||||
|
||||
pkg_setup() {
|
||||
[[ ${MERGE_TYPE} != binary ]] && use openmp && tc-check-openmp
|
||||
ecm_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 heif X265)
|
||||
$(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)
|
||||
)
|
||||
|
||||
ecm_src_configure
|
||||
}
|
||||
@@ -1,66 +0,0 @@
|
||||
From beb8eb984aac519ed5dfd13615f430ec14e73f16 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 633760d194..736826d234 100644
|
||||
--- a/core/CMakeLists.txt
|
||||
+++ b/core/CMakeLists.txt
|
||||
@@ -136,16 +136,14 @@ find_package(Qt5 ${QT_MIN_VERSION} REQUIRED
|
||||
)
|
||||
|
||||
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} REQUIRED
|
||||
- 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} REQUIRED
|
||||
@@ -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.23.0
|
||||
|
||||
@@ -1,38 +0,0 @@
|
||||
Fix build with Qt 5.15
|
||||
|
||||
Authored-by: Thomas Posch <bugs.gentoo.org@online.posch.name>
|
||||
|
||||
diff -Naur a/core/dplugins/generic/view/presentation/opengl/presentationgl.cpp b/core/dplugins/generic/view/presentation/opengl/presentationgl.cpp
|
||||
--- a/core/dplugins/generic/view/presentation/opengl/presentationgl.cpp 2020-06-30 22:48:50.477149053 +0200
|
||||
+++ b/core/dplugins/generic/view/presentation/opengl/presentationgl.cpp 2020-06-30 22:49:52.217439213 +0200
|
||||
@@ -44,6 +44,8 @@
|
||||
#include <QMatrix>
|
||||
#include <QMouseEvent>
|
||||
#include <QPainter>
|
||||
+#include <QPainterPath>
|
||||
+#include <QPainterPathStroker>
|
||||
#include <QPixmap>
|
||||
#include <QTimer>
|
||||
#include <QWheelEvent>
|
||||
diff -Naur a/core/libs/dimg/filters/curves/curveswidget.cpp b/core/libs/dimg/filters/curves/curveswidget.cpp
|
||||
--- a/core/libs/dimg/filters/curves/curveswidget.cpp 2020-06-30 22:48:50.374150231 +0200
|
||||
+++ b/core/libs/dimg/filters/curves/curveswidget.cpp 2020-06-30 22:49:17.219842551 +0200
|
||||
@@ -41,6 +41,7 @@
|
||||
#include <QFont>
|
||||
#include <QFontMetrics>
|
||||
#include <QPaintEvent>
|
||||
+#include <QPainterPath>
|
||||
#include <QMouseEvent>
|
||||
|
||||
// KDE includes
|
||||
diff -Naur a/core/libs/dimg/filters/levels/histogrampainter.cpp b/core/libs/dimg/filters/levels/histogrampainter.cpp
|
||||
--- a/core/libs/dimg/filters/levels/histogrampainter.cpp 2020-06-30 22:48:50.374150231 +0200
|
||||
+++ b/core/libs/dimg/filters/levels/histogrampainter.cpp 2020-06-30 22:49:17.219842551 +0200
|
||||
@@ -30,6 +30,7 @@
|
||||
// Qt includes
|
||||
|
||||
#include <QPainter>
|
||||
+#include <QPainterPath>
|
||||
|
||||
// KDE includes
|
||||
|
||||
@@ -10,7 +10,6 @@
|
||||
</maintainer>
|
||||
<use>
|
||||
<flag name="addressbook">Enable akonadi contact integration</flag>
|
||||
<flag name="dnn">Build neural network faces engine module</flag>
|
||||
<flag name="heif">Enable support for ISO/IEC 23008-12:2017 HEIF files using <pkg>media-libs/x265</pkg></flag>
|
||||
<flag name="imagemagick">Enable support for additional image formats such as XCF, FITS, HEIC etc.</flag>
|
||||
<flag name="lensfun">Enable support for <pkg>media-libs/lensfun</pkg></flag>
|
||||
@@ -18,7 +17,5 @@
|
||||
<flag name="mediaplayer">Enable support for media player using <pkg>media-libs/qtav</pkg></flag>
|
||||
<flag name="panorama">Build the panorama plugin which requires <pkg>media-gfx/hugin</pkg></flag>
|
||||
<flag name="semantic-desktop">Enable <pkg>kde-frameworks/kfilemetadata</pkg> support</flag>
|
||||
<flag name="vkontakte">Build <pkg>net-libs/libkvkontakte</pkg> plugin for vkontakte.ru</flag>
|
||||
<flag name="webkit">Build with <pkg>dev-qt/qtwebkit</pkg> instead of <pkg>dev-qt/qtwebengine</pkg></flag>
|
||||
</use>
|
||||
</pkgmetadata>
|
||||
|
||||
Reference in New Issue
Block a user