From baa782f0ec2bad1dbbca0cb233605ef59e35636d Mon Sep 17 00:00:00 2001 From: Andreas Sturmlechner Date: Tue, 26 May 2020 16:16:21 +0200 Subject: [PATCH] media-gfx/digikam: 7.0.0_beta3 version bump Fixes build against Qt 5.15. Package-Manager: Portage-2.3.100, Repoman-2.3.22 Signed-off-by: Andreas Sturmlechner --- media-gfx/digikam/Manifest | 1 + media-gfx/digikam/digikam-7.0.0_beta3.ebuild | 153 ++++++++++++++++++ .../files/digikam-7.0.0_beta3-qt-5.15.patch | 51 ++++++ 3 files changed, 205 insertions(+) create mode 100644 media-gfx/digikam/digikam-7.0.0_beta3.ebuild create mode 100644 media-gfx/digikam/files/digikam-7.0.0_beta3-qt-5.15.patch diff --git a/media-gfx/digikam/Manifest b/media-gfx/digikam/Manifest index 06c96471be98..c96abe6cb1e8 100644 --- a/media-gfx/digikam/Manifest +++ b/media-gfx/digikam/Manifest @@ -1 +1,2 @@ DIST digikam-6.4.0.tar.xz 340146992 BLAKE2B ca1bc8b0d165f9774354d8489a11d46d8d7467edd3c1e90fd3a96024c4b7cd23bfd5c813251183bcca6d4beac9bffeb9d921beaa9a3752f75f1918796aacd719 SHA512 b3b5e9903538d110613aa872c9215f5e7c19f7520a2b9060c24e686f20f72075378b447239dd3e17cb8860cdd35c699399994199b848757f0497ad25a7805e42 +DIST digikam-7.0.0-beta3.tar.xz 571307796 BLAKE2B fb0d82557c3a747f8a4b0a188f9ae7a0f06590ed59eed1418647b73a21c59334473dc0c33018db7f27572e574ac56a202a36a47a26c4b5b589a7f54c1987d2a5 SHA512 da25e1a2ab7c426f9f437c4ed81c334f435fcabf6d388f083bc5192cca9df8114961451adbe8d4e86df319a0a7ae125fb527ce406fce349632b59912777a1f69 diff --git a/media-gfx/digikam/digikam-7.0.0_beta3.ebuild b/media-gfx/digikam/digikam-7.0.0_beta3.ebuild new file mode 100644 index 000000000000..777acac8770f --- /dev/null +++ b/media-gfx/digikam/digikam-7.0.0_beta3.ebuild @@ -0,0 +1,153 @@ +# 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} + if [[ ${PV} =~ beta[0-9]$ ]]; then + SRC_URI="mirror://kde/unstable/${PN}/" + else + SRC_URI="mirror://kde/unstable/${PN}/${PV}/" + fi + SRC_URI+="${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 gphoto2 heif +imagemagick +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.3.0:=[contrib,contribdnn] + 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 ) + 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 ) +" + +PATCHES=( "${FILESDIR}"/${P}-qt-5.15.patch ) + +RESTRICT+=" test" +# bug 366505 + +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) + $(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 +} diff --git a/media-gfx/digikam/files/digikam-7.0.0_beta3-qt-5.15.patch b/media-gfx/digikam/files/digikam-7.0.0_beta3-qt-5.15.patch new file mode 100644 index 000000000000..fe865eb73af3 --- /dev/null +++ b/media-gfx/digikam/files/digikam-7.0.0_beta3-qt-5.15.patch @@ -0,0 +1,51 @@ +From 10fd663f43148fc96ed3afeecf70de15cadd0f8a Mon Sep 17 00:00:00 2001 +From: Andreas Sturmlechner +Date: Sun, 19 Apr 2020 09:55:03 +0200 +Subject: [PATCH] Fix build with Qt 5.15.0 + +Signed-off-by: Andreas Sturmlechner +--- + .../dplugins/generic/view/presentation/opengl/presentationgl.cpp | 1 + + core/libs/dimg/filters/curves/curveswidget.cpp | 1 + + core/libs/dimg/filters/levels/histogrampainter.cpp | 1 + + 3 files changed, 3 insertions(+) + +diff --git a/core/dplugins/generic/view/presentation/opengl/presentationgl.cpp b/core/dplugins/generic/view/presentation/opengl/presentationgl.cpp +index b37699436e..6a4f173ab0 100644 +--- a/core/dplugins/generic/view/presentation/opengl/presentationgl.cpp ++++ b/core/dplugins/generic/view/presentation/opengl/presentationgl.cpp +@@ -44,6 +44,7 @@ + #include + #include + #include ++#include + #include + #include + #include +diff --git a/core/libs/dimg/filters/curves/curveswidget.cpp b/core/libs/dimg/filters/curves/curveswidget.cpp +index cccccbd156..d0beef9bf2 100644 +--- a/core/libs/dimg/filters/curves/curveswidget.cpp ++++ b/core/libs/dimg/filters/curves/curveswidget.cpp +@@ -40,6 +40,7 @@ + #include + #include + #include ++#include + #include + #include + +diff --git a/core/libs/dimg/filters/levels/histogrampainter.cpp b/core/libs/dimg/filters/levels/histogrampainter.cpp +index 241d5fc4c8..f11ad4b560 100644 +--- a/core/libs/dimg/filters/levels/histogrampainter.cpp ++++ b/core/libs/dimg/filters/levels/histogrampainter.cpp +@@ -30,6 +30,7 @@ + // Qt includes + + #include ++#include + + // KDE includes + +-- +2.26.1 + -- 2.26.2