forked from gentoo/gentoo
-
Notifications
You must be signed in to change notification settings - Fork 0
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Closes: https://bugs.gentoo.org/861341 Signed-off-by: Andreas Sturmlechner <[email protected]>
- Loading branch information
Showing
3 changed files
with
270 additions
and
0 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1 +1,2 @@ | ||
DIST digiKam-7.5.0.tar.xz 339573688 BLAKE2B 26014564e9f9d44db65d4588924da2c85897fb514df0a963f51b9fddb1f26ce3ddf18856b2d4b0eb140581ee7948f048986cf79687a31730e29017b5a811a3d6 SHA512 a2f5005b8f8b8cd9ef58a6bd563481a95004fbad7110d13f1ec4d8550311f1765410dda54f5b04c91bde7ec089e145656961c7c70b27242931e78abd698763e9 | ||
DIST digiKam-7.8.0.tar.xz 345431764 BLAKE2B 43fff59b51b98a04ca852cadedafc2792aafa5cf9e90f1ce0ad6174533844c7164e72b623a253d42fc4ea695fa7e4bd6cc954287ac72a35211f9fa564a13cb92 SHA512 d2ec96239760cc06808a73bcbf1a2131653764719d1e23afa8cea8eda449e221b177f2a96ca2a997d1c82a6a4977c4227165c932bdd006d5305cdb4c63f454fc |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,150 @@ | ||
# Copyright 1999-2022 Gentoo Authors | ||
# Distributed under the terms of the GNU General Public License v2 | ||
|
||
EAPI=8 | ||
|
||
KFMIN=5.88.0 | ||
QTMIN=5.15.5 | ||
inherit ecm kde.org toolchain-funcs | ||
|
||
if [[ ${KDE_BUILD_TYPE} != live ]]; then | ||
if [[ ${PV} =~ beta[0-9]$ ]]; then | ||
SRC_URI="mirror://kde/unstable/${PN}/" | ||
else | ||
SRC_URI="mirror://kde/stable/${PN}/${PV}/" | ||
fi | ||
SRC_URI+="digiKam-${PV/_/-}.tar.xz" | ||
KEYWORDS="~amd64 ~x86" | ||
S="${WORKDIR}/${PN}-${PV/_/-}" | ||
fi | ||
|
||
DESCRIPTION="Digital photo management application" | ||
HOMEPAGE="https://www.digikam.org/" | ||
|
||
LICENSE="GPL-2" | ||
SLOT="5" | ||
IUSE="addressbook calendar gphoto2 heif +imagemagick +lensfun marble mediaplayer mysql opengl openmp +panorama scanner semantic-desktop X" | ||
|
||
# bug 366505 | ||
RESTRICT="test" | ||
|
||
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/qtwebengine-${QTMIN}:5[widgets] | ||
>=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:=[xmp] | ||
media-libs/lcms:2 | ||
media-libs/libjpeg-turbo:= | ||
media-libs/liblqr | ||
media-libs/libpng:0= | ||
>=media-libs/opencv-3.3.0:=[contrib,contribdnn] | ||
media-libs/tiff:0 | ||
addressbook? ( | ||
>=kde-apps/akonadi-contacts-19.04.3:5 | ||
>=kde-frameworks/kcontacts-${KFMIN}:5 | ||
) | ||
calendar? ( >=kde-frameworks/kcalendarcore-${KFMIN}:5 ) | ||
gphoto2? ( media-libs/libgphoto2:= ) | ||
heif? ( | ||
media-libs/libheif:= | ||
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 ) | ||
X? ( | ||
>=dev-qt/qtx11extras-${QTMIN}:5 | ||
x11-libs/libX11 | ||
) | ||
" | ||
DEPEND="${COMMON_DEPEND} | ||
dev-cpp/eigen:3 | ||
dev-libs/boost | ||
" | ||
RDEPEND="${COMMON_DEPEND} | ||
mysql? ( virtual/mysql[server(+)] ) | ||
panorama? ( media-gfx/hugin ) | ||
" | ||
BDEPEND=" | ||
sys-devel/gettext | ||
panorama? ( | ||
sys-devel/bison | ||
sys-devel/flex | ||
) | ||
" | ||
|
||
PATCHES=( "${FILESDIR}/${P}-cmake.patch" ) | ||
|
||
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_QWEBENGINE=ON | ||
-DENABLE_AKONADICONTACTSUPPORT=$(usex addressbook) | ||
$(cmake_use_find_package calendar KF5CalendarCore) | ||
$(cmake_use_find_package gphoto2 Gphoto2) | ||
$(cmake_use_find_package heif Libheif) | ||
$(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) | ||
-DENABLE_KFILEMETADATASUPPORT=$(usex semantic-desktop) | ||
$(cmake_use_find_package X X11) | ||
) | ||
|
||
ecm_src_configure | ||
} |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,119 @@ | ||
From 618e3f3ba195a3b50812d1184ebf90555d659055 Mon Sep 17 00:00:00 2001 | ||
From: Andreas Sturmlechner <[email protected]> | ||
Date: Sun, 17 Feb 2019 23:51:03 +0100 | ||
Subject: [PATCH] Un-break optional Qt5/KF5 detection | ||
|
||
And if we enable an option, make the necessary libraries REQUIRED. | ||
--- | ||
core/CMakeLists.txt | 50 +++++++++++++-------------------------------- | ||
1 file changed, 14 insertions(+), 36 deletions(-) | ||
|
||
diff --git a/core/CMakeLists.txt b/core/CMakeLists.txt | ||
index de599ee881..8aef35e062 100644 | ||
--- a/core/CMakeLists.txt | ||
+++ b/core/CMakeLists.txt | ||
@@ -65,17 +65,14 @@ find_package(Qt5 ${QT_MIN_VERSION} REQUIRED | ||
) | ||
|
||
if(ENABLE_QWEBENGINE) | ||
- find_package(Qt5 ${QT_MIN_VERSION} REQUIRED NO_MODULE COMPONENTS WebEngineWidgets) | ||
+ find_package(Qt5WebEngineWidgets ${QT_MIN_VERSION} REQUIRED NO_MODULE) | ||
else() | ||
- find_package(Qt5 ${QT_MIN_VERSION} REQUIRED NO_MODULE COMPONENTS WebKitWidgets) | ||
+ find_package(Qt5WebKitWidgets ${QT_MIN_VERSION} REQUIRED NO_MODULE) | ||
endif() | ||
|
||
-find_package(Qt5 ${QT_MIN_VERSION} | ||
- OPTIONAL_COMPONENTS | ||
- DBus | ||
- OpenGL | ||
- XmlPatterns # For Rajce plugin | ||
-) | ||
+find_package(Qt5DBus ${QT_MIN_VERSION}) | ||
+find_package(Qt5OpenGL ${QT_MIN_VERSION}) | ||
+find_package(Qt5XmlPatterns ${QT_MIN_VERSION}) # For Rajce plugin | ||
|
||
if(ENABLE_DBUS) | ||
if(NOT Qt5DBus_FOUND) | ||
@@ -86,16 +83,11 @@ 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(Qt5Test ${QT_MIN_VERSION} NO_MODULE) | ||
|
||
- find_package(Qt5 ${QT_MIN_VERSION} | ||
- QUIET | ||
- OPTIONAL_COMPONENTS | ||
- Qml WebView # Optional, for 'sialis' O2 library test tool. | ||
- ) | ||
+ # Optional, for 'sialis' O2 library test tool. | ||
+ find_package(Qt5Qml ${QT_MIN_VERSION} QUIET NO_MODULE) | ||
+ find_package(Qt5WebView ${QT_MIN_VERSION} QUIET NO_MODULE) | ||
endif() | ||
|
||
find_package(KF5 ${KF5_MIN_VERSION} REQUIRED | ||
@@ -121,7 +113,7 @@ find_package(KF5 ${KF5_MIN_VERSION} QUIET | ||
if(ENABLE_KFILEMETADATASUPPORT) | ||
|
||
find_package(KF5 ${KF5_MIN_VERSION} | ||
- QUIET | ||
+ REQUIRED | ||
OPTIONAL_COMPONENTS | ||
FileMetaData # For Plasma destop file indexer support. | ||
) | ||
@@ -130,7 +122,7 @@ endif() | ||
|
||
if(ENABLE_AKONADICONTACTSUPPORT) | ||
|
||
- find_package(KF5 ${AKONADI_MIN_VERSION} QUIET | ||
+ find_package(KF5 ${AKONADI_MIN_VERSION} REQUIRED | ||
OPTIONAL_COMPONENTS | ||
AkonadiContact # For KDE Mail Contacts support. | ||
Contacts # API for contacts/address book data. | ||
@@ -138,28 +130,14 @@ if(ENABLE_AKONADICONTACTSUPPORT) | ||
|
||
endif() | ||
|
||
-find_package(KF5 ${KSANE_MIN_VERSION} QUIET | ||
- OPTIONAL_COMPONENTS | ||
- Sane # For digital scanner support. | ||
-) | ||
+find_package(KF5Sane ${KSANE_MIN_VERSION} QUIET) # For digital scanner support. | ||
|
||
-find_package(KF5 ${CALENDAR_MIN_VERSION} QUIET | ||
- OPTIONAL_COMPONENTS | ||
- CalendarCore # For Calendar tool. | ||
-) | ||
+find_package(KF5CalendarCore ${CALENDAR_MIN_VERSION} QUIET) # For Calendar tool. | ||
|
||
if ("${KF5CalendarCore_VERSION}" VERSION_GREATER 5.6.40) | ||
set(HAVE_KCALENDAR_QDATETIME TRUE) | ||
endif() | ||
|
||
-if(ENABLE_AKONADICONTACTSUPPORT AND (NOT KF5AkonadiContact_FOUND OR NOT KF5Contacts_FOUND)) | ||
- set(ENABLE_AKONADICONTACTSUPPORT OFF) | ||
-endif() | ||
- | ||
-if(ENABLE_KFILEMETADATASUPPORT AND NOT KF5FileMetaData_FOUND) | ||
- set(ENABLE_KFILEMETADATASUPPORT OFF) | ||
-endif() | ||
- | ||
# Check if KIO have been compiled with KIOWidgets. digiKam only needs this one. | ||
if(KF5KIO_FOUND) | ||
get_target_property(KIOWidgets_INCLUDE_DIRS KF5::KIOWidgets | ||
@@ -296,7 +274,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.37.3 | ||
|