[gentoo-commits] repo/gentoo:master commit in: media-gfx/digikam/
commit: b368e8ce04e6ba0633d83ff7db535fcdd35ca852
Author: Andreas Sturmlechner gentoo org>
AuthorDate: Tue May 7 21:21:07 2024 +
Commit: Andreas Sturmlechner gentoo org>
CommitDate: Mon May 13 20:25:30 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b368e8ce
media-gfx/digikam: Drop 8.3.0-r1, IUSE=mediaplayer needs more work
Conflicting IUSE opengl vs. mediaplayer (with dev-qt/qtopengl)
Dependencies unhandled in cmake
Deprecated dependency reintroduced (media-sound/pulseaudio)
Bug: https://bugs.gentoo.org/910337
Signed-off-by: Andreas Sturmlechner gentoo.org>
media-gfx/digikam/digikam-8.3.0-r1.ebuild | 156 --
1 file changed, 156 deletions(-)
diff --git a/media-gfx/digikam/digikam-8.3.0-r1.ebuild
b/media-gfx/digikam/digikam-8.3.0-r1.ebuild
deleted file mode 100644
index 207fe74e47ff..
--- a/media-gfx/digikam/digikam-8.3.0-r1.ebuild
+++ /dev/null
@@ -1,156 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-KFMIN=5.115.0
-QTMIN=5.15.12
-inherit ecm kde.org toolchain-funcs
-
-if [[ ${KDE_BUILD_TYPE} != live ]]; then
- TARNAME="digiKam-${PV/_/-}-1"
- if [[ ${PV} =~ beta[0-9]$ ]]; then
- SRC_URI="mirror://kde/unstable/${PN}/${TARNAME}.tar.xz"
- else
- SRC_URI="mirror://kde/stable/${PN}/${PV}/${TARNAME}.tar.xz"
- fi
- KEYWORDS="~amd64 ~arm64 ~x86"
-fi
-
-DESCRIPTION="Digital photo management application"
-HOMEPAGE="https://www.digikam.org/;
-
-LICENSE="GPL-2"
-SLOT="5"
-IUSE="addressbook calendar geolocation gphoto2 heif +imagemagick +lensfun
+mediaplayer mysql opengl openmp +panorama scanner semantic-desktop spell"
-
-# 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/qtnetworkauth-${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/qtx11extras-${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.1:=[xmp]
- media-libs/lcms:2
- media-libs/libjpeg-turbo:=
- media-libs/liblqr
- media-libs/libpng:=
- >=media-libs/opencv-3.3.0:=[contrib,contribdnn,features2d]
- media-libs/tiff:=
- x11-libs/libX11
- addressbook? (
- >=kde-apps/akonadi-contacts-23.08.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 )
- opengl? (
- >=dev-qt/qtopengl-${QTMIN}:5
- virtual/opengl
- )
- mediaplayer? (
- >=dev-qt/qtcore-${QTMIN}:5
- >=dev-qt/qtopengl-${QTMIN}:5
- >=dev-qt/qtmultimedia-${QTMIN}:5[widgets]
- media-video/ffmpeg:=
- || (
- media-libs/portaudio
- media-sound/pulseaudio
- )
- )
- panorama? ( >=kde-frameworks/threadweaver-${KFMIN}:5 )
- scanner? ( >=kde-apps/libksane-23.08.3:5 )
- semantic-desktop? ( >=kde-frameworks/kfilemetadata-${KFMIN}:5 )
- spell? ( >=kde-frameworks/sonnet-${KFMIN}:5 )
-"
-DEPEND="${COMMON_DEPEND}
- dev-cpp/eigen:3
- dev-libs/boost
- addressbook? ( >=kde-apps/akonadi-23.08.3:5 )
-"
-RDEPEND="${COMMON_DEPEND}
- media-libs/exiftool
- mysql? ( virtual/mysql[server(+)] )
- panorama? ( media-gfx/hugin )
-"
-BDEPEND="
- sys-devel/gettext
- panorama? (
- app-alternatives/lex
- app-alternatives/yacc
- )
-"
-
-PATCHES=(
- "${FILESDIR}/${P}-cmake.patch"
- "${FILESDIR}/${P}-cmake-addressbook.patch"
-)
-
-pkg_pretend() {
- [[ ${MERGE_TYPE} != binary ]] && use openmp && tc-check-openmp
- ecm_pkg_pretend
-}
-
-pkg_setup() {
-
[gentoo-commits] repo/gentoo:master commit in: media-gfx/digikam/
commit: 7e020a5c0eda48da9cbadf8ee4a1b098c3607f23
Author: Andreas K. Hüttel gentoo org>
AuthorDate: Wed May 1 11:21:45 2024 +
Commit: Andreas K. Hüttel gentoo org>
CommitDate: Wed May 1 11:22:22 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7e020a5c
media-gfx/digikam: Re-add internal video player
Closes: https://bugs.gentoo.org/910337
Signed-off-by: Andreas K. Hüttel gentoo.org>
media-gfx/digikam/digikam-8.3.0-r1.ebuild | 156 ++
media-gfx/digikam/metadata.xml| 1 +
2 files changed, 157 insertions(+)
diff --git a/media-gfx/digikam/digikam-8.3.0-r1.ebuild
b/media-gfx/digikam/digikam-8.3.0-r1.ebuild
new file mode 100644
index ..207fe74e47ff
--- /dev/null
+++ b/media-gfx/digikam/digikam-8.3.0-r1.ebuild
@@ -0,0 +1,156 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+KFMIN=5.115.0
+QTMIN=5.15.12
+inherit ecm kde.org toolchain-funcs
+
+if [[ ${KDE_BUILD_TYPE} != live ]]; then
+ TARNAME="digiKam-${PV/_/-}-1"
+ if [[ ${PV} =~ beta[0-9]$ ]]; then
+ SRC_URI="mirror://kde/unstable/${PN}/${TARNAME}.tar.xz"
+ else
+ SRC_URI="mirror://kde/stable/${PN}/${PV}/${TARNAME}.tar.xz"
+ fi
+ KEYWORDS="~amd64 ~arm64 ~x86"
+fi
+
+DESCRIPTION="Digital photo management application"
+HOMEPAGE="https://www.digikam.org/;
+
+LICENSE="GPL-2"
+SLOT="5"
+IUSE="addressbook calendar geolocation gphoto2 heif +imagemagick +lensfun
+mediaplayer mysql opengl openmp +panorama scanner semantic-desktop spell"
+
+# 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/qtnetworkauth-${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/qtx11extras-${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.1:=[xmp]
+ media-libs/lcms:2
+ media-libs/libjpeg-turbo:=
+ media-libs/liblqr
+ media-libs/libpng:=
+ >=media-libs/opencv-3.3.0:=[contrib,contribdnn,features2d]
+ media-libs/tiff:=
+ x11-libs/libX11
+ addressbook? (
+ >=kde-apps/akonadi-contacts-23.08.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 )
+ opengl? (
+ >=dev-qt/qtopengl-${QTMIN}:5
+ virtual/opengl
+ )
+ mediaplayer? (
+ >=dev-qt/qtcore-${QTMIN}:5
+ >=dev-qt/qtopengl-${QTMIN}:5
+ >=dev-qt/qtmultimedia-${QTMIN}:5[widgets]
+ media-video/ffmpeg:=
+ || (
+ media-libs/portaudio
+ media-sound/pulseaudio
+ )
+ )
+ panorama? ( >=kde-frameworks/threadweaver-${KFMIN}:5 )
+ scanner? ( >=kde-apps/libksane-23.08.3:5 )
+ semantic-desktop? ( >=kde-frameworks/kfilemetadata-${KFMIN}:5 )
+ spell? ( >=kde-frameworks/sonnet-${KFMIN}:5 )
+"
+DEPEND="${COMMON_DEPEND}
+ dev-cpp/eigen:3
+ dev-libs/boost
+ addressbook? ( >=kde-apps/akonadi-23.08.3:5 )
+"
+RDEPEND="${COMMON_DEPEND}
+ media-libs/exiftool
+ mysql? ( virtual/mysql[server(+)] )
+ panorama? ( media-gfx/hugin )
+"
+BDEPEND="
+ sys-devel/gettext
+ panorama? (
+ app-alternatives/lex
+ app-alternatives/yacc
+ )
+"
+
+PATCHES=(
+ "${FILESDIR}/${P}-cmake.patch"
+ "${FILESDIR}/${P}-cmake-addressbook.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
[gentoo-commits] repo/gentoo:master commit in: media-gfx/digikam/
commit: 8edd50ec8b8fe5177316e0cacb93a518c5a81f82 Author: Andreas Sturmlechner gentoo org> AuthorDate: Mon Apr 22 17:37:50 2024 + Commit: Andreas Sturmlechner gentoo org> CommitDate: Mon Apr 22 17:51:45 2024 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8edd50ec media-gfx/digikam: Drop IUSE marble metadata Signed-off-by: Andreas Sturmlechner gentoo.org> media-gfx/digikam/metadata.xml | 1 - 1 file changed, 1 deletion(-) diff --git a/media-gfx/digikam/metadata.xml b/media-gfx/digikam/metadata.xml index 4c55a9727c8b..0a9720425415 100644 --- a/media-gfx/digikam/metadata.xml +++ b/media-gfx/digikam/metadata.xml @@ -16,7 +16,6 @@ Enable akonadi contact integration Enable support for additional image formats such as XCF, FITS, HEIC etc. Enable support for media-libs/lensfun - Enable support for geolocation using kde-apps/marble Build the panorama plugin which requires media-gfx/hugin Enable kde-frameworks/kfilemetadata support
[gentoo-commits] repo/gentoo:master commit in: media-gfx/digikam/files/, media-gfx/digikam/
commit: ccd6394bec137e86eb3033543fa7dfd041d4de96
Author: Andreas Sturmlechner gentoo org>
AuthorDate: Mon Apr 22 17:04:28 2024 +
Commit: Andreas Sturmlechner gentoo org>
CommitDate: Mon Apr 22 17:07:34 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ccd6394b
media-gfx/digikam: drop 8.2.0
Signed-off-by: Andreas Sturmlechner gentoo.org>
media-gfx/digikam/Manifest | 1 -
media-gfx/digikam/digikam-8.2.0.ebuild | 162 --
.../digikam/files/digikam-8.2.0-akonadi.patch | 95 ---
media-gfx/digikam/files/digikam-8.2.0-cmake.patch | 181 -
4 files changed, 439 deletions(-)
diff --git a/media-gfx/digikam/Manifest b/media-gfx/digikam/Manifest
index 5511dff9e23a..a19232ea2344 100644
--- a/media-gfx/digikam/Manifest
+++ b/media-gfx/digikam/Manifest
@@ -1,2 +1 @@
-DIST digiKam-8.2.0.tar.xz 48172600 BLAKE2B
436f8dcd905ff993cfde3e358e27ac23cb4ad49d24a6328cda209a742874e9fcbc12da507095e2f75a167b653bb1d9e579438bf517e2911f2cb32705230023f1
SHA512
a34c5bde0e579b5f6de1fe90977e01bc385e5c28155d24db09e3cdfe7958c979d2e27cbce402d6c5b70f952fc0ead88318dfa025bb67e540c4d763cb139db7bb
DIST digiKam-8.3.0-1.tar.xz 55664168 BLAKE2B
46b0f26bb781d370c1046fd6de6afb0a0878175f9722a2fc9ed23aad89eb0671f8b219bb7c169ccd22d440ce493d958304a5a527a733862fe4e2c5cd07da8a21
SHA512
c2fdcecafa68641f08b31286d1b9c44828164a0a0bea607fb64a71c73ff53417cdfefa110245adab164fae8ea0980ea86cd69d693dcd43a96bb188197dc78fcd
diff --git a/media-gfx/digikam/digikam-8.2.0.ebuild
b/media-gfx/digikam/digikam-8.2.0.ebuild
deleted file mode 100644
index bb933d2192b4..
--- a/media-gfx/digikam/digikam-8.2.0.ebuild
+++ /dev/null
@@ -1,162 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-KFMIN=5.106.0
-QTMIN=5.15.9
-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 ~arm64 ~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 mysql
opengl openmp +panorama scanner semantic-desktop spell"
-
-# 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/qtnetworkauth-${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/qtx11extras-${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.1:=[xmp]
- media-libs/lcms:2
- media-libs/libjpeg-turbo:=
- media-libs/liblqr
- media-libs/libpng:=
- >=media-libs/opencv-3.3.0:=[contrib,contribdnn,features2d]
- media-libs/tiff:=
- x11-libs/libX11
- 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
- )
- 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 )
- spell? ( >=kde-frameworks/sonnet-${KFMIN}:5 )
-"
-DEPEND="${COMMON_DEPEND}
- dev-cpp/eigen:3
-
[gentoo-commits] repo/gentoo:master commit in: media-gfx/digikam/
commit: 7b18b8f742e7cfcea20a3b74953d21813ce98c68
Author: Arthur Zamarin gentoo org>
AuthorDate: Sat Apr 20 14:51:50 2024 +
Commit: Arthur Zamarin gentoo org>
CommitDate: Sat Apr 20 14:52:07 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7b18b8f7
media-gfx/digikam: Stabilize 8.3.0 amd64, #930324
Signed-off-by: Arthur Zamarin gentoo.org>
media-gfx/digikam/digikam-8.3.0.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/media-gfx/digikam/digikam-8.3.0.ebuild
b/media-gfx/digikam/digikam-8.3.0.ebuild
index 887be4124f06..fd35ed4e3572 100644
--- a/media-gfx/digikam/digikam-8.3.0.ebuild
+++ b/media-gfx/digikam/digikam-8.3.0.ebuild
@@ -14,7 +14,7 @@ if [[ ${KDE_BUILD_TYPE} != live ]]; then
else
SRC_URI="mirror://kde/stable/${PN}/${PV}/${TARNAME}.tar.xz"
fi
- KEYWORDS="~amd64 ~arm64 ~x86"
+ KEYWORDS="amd64 ~arm64 ~x86"
fi
DESCRIPTION="Digital photo management application"
[gentoo-commits] repo/gentoo:master commit in: media-gfx/digikam/, media-gfx/digikam/files/
commit: c3f608950506703a0b4fa667b638434ee8d22cf2
Author: Andreas Sturmlechner gentoo org>
AuthorDate: Tue Mar 26 12:56:13 2024 +
Commit: Andreas Sturmlechner gentoo org>
CommitDate: Tue Mar 26 12:59:44 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c3f60895
media-gfx/digikam: Fix IUSE addressbook
Closes: https://bugs.gentoo.org/927858
Signed-off-by: Andreas Sturmlechner gentoo.org>
media-gfx/digikam/digikam-8.3.0.ebuild | 14 +---
.../files/digikam-8.3.0-cmake-addressbook.patch| 26 ++
2 files changed, 32 insertions(+), 8 deletions(-)
diff --git a/media-gfx/digikam/digikam-8.3.0.ebuild
b/media-gfx/digikam/digikam-8.3.0.ebuild
index cc2ba25def3e..887be4124f06 100644
--- a/media-gfx/digikam/digikam-8.3.0.ebuild
+++ b/media-gfx/digikam/digikam-8.3.0.ebuild
@@ -22,7 +22,7 @@ HOMEPAGE="https://www.digikam.org/;
LICENSE="GPL-2"
SLOT="5"
-IUSE="addressbook calendar gphoto2 heif +imagemagick +lensfun marble mysql
opengl openmp +panorama scanner semantic-desktop spell"
+IUSE="addressbook calendar geolocation gphoto2 heif +imagemagick +lensfun
mysql opengl openmp +panorama scanner semantic-desktop spell"
# bug 366505
RESTRICT="test"
@@ -74,11 +74,6 @@ COMMON_DEPEND="
)
imagemagick? ( media-gfx/imagemagick:= )
lensfun? ( media-libs/lensfun )
- marble? (
- >=dev-qt/qtconcurrent-${QTMIN}:5
- >=kde-apps/marble-23.08.3:5
- >=kde-frameworks/kbookmarks-${KFMIN}:5
- )
opengl? (
>=dev-qt/qtopengl-${QTMIN}:5
virtual/opengl
@@ -106,7 +101,10 @@ BDEPEND="
)
"
-PATCHES=( "${FILESDIR}/${P}-cmake.patch" )
+PATCHES=(
+ "${FILESDIR}/${P}-cmake.patch"
+ "${FILESDIR}/${P}-cmake-addressbook.patch"
+)
pkg_pretend() {
[[ ${MERGE_TYPE} != binary ]] && use openmp && tc-check-openmp
@@ -130,11 +128,11 @@ src_configure() {
-DENABLE_QWEBENGINE=ON
-DENABLE_AKONADICONTACTSUPPORT=$(usex addressbook)
$(cmake_use_find_package calendar KF5CalendarCore)
+ -DENABLE_GEOLOCATION=$(usex geolocation)
$(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_MYSQLSUPPORT=$(usex mysql)
-DENABLE_INTERNALMYSQL=$(usex mysql)
$(cmake_use_find_package opengl OpenGL)
diff --git a/media-gfx/digikam/files/digikam-8.3.0-cmake-addressbook.patch
b/media-gfx/digikam/files/digikam-8.3.0-cmake-addressbook.patch
new file mode 100644
index ..537a36990404
--- /dev/null
+++ b/media-gfx/digikam/files/digikam-8.3.0-cmake-addressbook.patch
@@ -0,0 +1,26 @@
+From 82ce7f02d65c43605c28b9ca69f8cbd7e12a5bee Mon Sep 17 00:00:00 2001
+From: Andreas Sturmlechner
+Date: Tue, 26 Mar 2024 13:23:51 +0100
+Subject: [PATCH] addressbook: Fix upstream's AkonadiCore prefix confusion
+
+Signed-off-by: Andreas Sturmlechner
+---
+ core/utilities/extrasupport/addressbook/CMakeLists.txt | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/core/utilities/extrasupport/addressbook/CMakeLists.txt
b/core/utilities/extrasupport/addressbook/CMakeLists.txt
+index 5923f1fc34..23f31d01d8 100644
+--- a/core/utilities/extrasupport/addressbook/CMakeLists.txt
b/core/utilities/extrasupport/addressbook/CMakeLists.txt
+@@ -16,7 +16,7 @@
include_directories($
++
$
+
$
+
+
$
+--
+2.44.0
+
[gentoo-commits] repo/gentoo:master commit in: media-gfx/digikam/, media-gfx/digikam/files/
commit: 618f27a796065b2f0e48d85d1cd2c3affddffc76
Author: Andreas Sturmlechner gentoo org>
AuthorDate: Mon Mar 25 14:00:44 2024 +
Commit: Andreas Sturmlechner gentoo org>
CommitDate: Mon Mar 25 14:45:50 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=618f27a7
media-gfx/digikam: add 8.3.0
Signed-off-by: Andreas Sturmlechner gentoo.org>
media-gfx/digikam/Manifest| 1 +
media-gfx/digikam/digikam-8.3.0.ebuild| 148 +
media-gfx/digikam/files/digikam-8.3.0-cmake.patch | 192 ++
3 files changed, 341 insertions(+)
diff --git a/media-gfx/digikam/Manifest b/media-gfx/digikam/Manifest
index c25e1b879012..5511dff9e23a 100644
--- a/media-gfx/digikam/Manifest
+++ b/media-gfx/digikam/Manifest
@@ -1 +1,2 @@
DIST digiKam-8.2.0.tar.xz 48172600 BLAKE2B
436f8dcd905ff993cfde3e358e27ac23cb4ad49d24a6328cda209a742874e9fcbc12da507095e2f75a167b653bb1d9e579438bf517e2911f2cb32705230023f1
SHA512
a34c5bde0e579b5f6de1fe90977e01bc385e5c28155d24db09e3cdfe7958c979d2e27cbce402d6c5b70f952fc0ead88318dfa025bb67e540c4d763cb139db7bb
+DIST digiKam-8.3.0-1.tar.xz 55664168 BLAKE2B
46b0f26bb781d370c1046fd6de6afb0a0878175f9722a2fc9ed23aad89eb0671f8b219bb7c169ccd22d440ce493d958304a5a527a733862fe4e2c5cd07da8a21
SHA512
c2fdcecafa68641f08b31286d1b9c44828164a0a0bea607fb64a71c73ff53417cdfefa110245adab164fae8ea0980ea86cd69d693dcd43a96bb188197dc78fcd
diff --git a/media-gfx/digikam/digikam-8.3.0.ebuild
b/media-gfx/digikam/digikam-8.3.0.ebuild
new file mode 100644
index ..cc2ba25def3e
--- /dev/null
+++ b/media-gfx/digikam/digikam-8.3.0.ebuild
@@ -0,0 +1,148 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+KFMIN=5.115.0
+QTMIN=5.15.12
+inherit ecm kde.org toolchain-funcs
+
+if [[ ${KDE_BUILD_TYPE} != live ]]; then
+ TARNAME="digiKam-${PV/_/-}-1"
+ if [[ ${PV} =~ beta[0-9]$ ]]; then
+ SRC_URI="mirror://kde/unstable/${PN}/${TARNAME}.tar.xz"
+ else
+ SRC_URI="mirror://kde/stable/${PN}/${PV}/${TARNAME}.tar.xz"
+ fi
+ KEYWORDS="~amd64 ~arm64 ~x86"
+fi
+
+DESCRIPTION="Digital photo management application"
+HOMEPAGE="https://www.digikam.org/;
+
+LICENSE="GPL-2"
+SLOT="5"
+IUSE="addressbook calendar gphoto2 heif +imagemagick +lensfun marble mysql
opengl openmp +panorama scanner semantic-desktop spell"
+
+# 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/qtnetworkauth-${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/qtx11extras-${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.1:=[xmp]
+ media-libs/lcms:2
+ media-libs/libjpeg-turbo:=
+ media-libs/liblqr
+ media-libs/libpng:=
+ >=media-libs/opencv-3.3.0:=[contrib,contribdnn,features2d]
+ media-libs/tiff:=
+ x11-libs/libX11
+ addressbook? (
+ >=kde-apps/akonadi-contacts-23.08.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-23.08.3:5
+ >=kde-frameworks/kbookmarks-${KFMIN}:5
+ )
+ opengl? (
+ >=dev-qt/qtopengl-${QTMIN}:5
+ virtual/opengl
+ )
+ panorama? ( >=kde-frameworks/threadweaver-${KFMIN}:5 )
+ scanner? ( >=kde-apps/libksane-23.08.3:5 )
+ semantic-desktop? ( >=kde-frameworks/kfilemetadata-${KFMIN}:5 )
+ spell? ( >=kde-frameworks/sonnet-${KFMIN}:5 )
+"
+DEPEND="${COMMON_DEPEND}
+ dev-cpp/eigen:3
+ dev-libs/boost
+ addressbook? ( >=kde-apps/akonadi-23.08.3:5 )
+"
[gentoo-commits] repo/gentoo:master commit in: media-gfx/digikam/
commit: b77bf82f97a9a0db07e7bc5054095867169302db Author: Andreas Sturmlechner gentoo org> AuthorDate: Mon Mar 25 14:44:35 2024 + Commit: Andreas Sturmlechner gentoo org> CommitDate: Mon Mar 25 14:45:50 2024 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b77bf82f media-gfx/digikam: add kde-invent upstream metadata Signed-off-by: Andreas Sturmlechner gentoo.org> media-gfx/digikam/metadata.xml | 1 + 1 file changed, 1 insertion(+) diff --git a/media-gfx/digikam/metadata.xml b/media-gfx/digikam/metadata.xml index 98caf7822427..4c55a9727c8b 100644 --- a/media-gfx/digikam/metadata.xml +++ b/media-gfx/digikam/metadata.xml @@ -10,6 +10,7 @@ https://bugs.kde.org/ + graphics/digikam Enable akonadi contact integration
[gentoo-commits] repo/gentoo:master commit in: media-gfx/digikam/
commit: 29dfb2be6470e0611895f8584e15a2824ba3181c
Author: Andreas Sturmlechner gentoo org>
AuthorDate: Wed Mar 6 20:02:08 2024 +
Commit: Andreas Sturmlechner gentoo org>
CommitDate: Wed Mar 6 20:31:23 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=29dfb2be
media-gfx/digikam: drop 8.1.0-r1
Signed-off-by: Andreas Sturmlechner gentoo.org>
media-gfx/digikam/Manifest| 1 -
media-gfx/digikam/digikam-8.1.0-r1.ebuild | 164 --
2 files changed, 165 deletions(-)
diff --git a/media-gfx/digikam/Manifest b/media-gfx/digikam/Manifest
index 9fa06bb1336f..c25e1b879012 100644
--- a/media-gfx/digikam/Manifest
+++ b/media-gfx/digikam/Manifest
@@ -1,2 +1 @@
-DIST digiKam-8.1.0.tar.xz 35712348 BLAKE2B
0feaa66ec27b0c2a9e776f26c02987554e8653cda29ca1982182ec1a0f70783808cd2e269dcee1f2b65e6e29ba3bc483a2284a6a485c0b7cc46ae80dd2f87069
SHA512
cbf5a776b4138f4f05d074721324b046dfa07ddc01259f569ae46c46a6d5b0b00824ef0962a09041081703348e4defecf15cff800b2c6cf5e04a0e7e963a3ef4
DIST digiKam-8.2.0.tar.xz 48172600 BLAKE2B
436f8dcd905ff993cfde3e358e27ac23cb4ad49d24a6328cda209a742874e9fcbc12da507095e2f75a167b653bb1d9e579438bf517e2911f2cb32705230023f1
SHA512
a34c5bde0e579b5f6de1fe90977e01bc385e5c28155d24db09e3cdfe7958c979d2e27cbce402d6c5b70f952fc0ead88318dfa025bb67e540c4d763cb139db7bb
diff --git a/media-gfx/digikam/digikam-8.1.0-r1.ebuild
b/media-gfx/digikam/digikam-8.1.0-r1.ebuild
deleted file mode 100644
index ff6fc6cdc4c3..
--- a/media-gfx/digikam/digikam-8.1.0-r1.ebuild
+++ /dev/null
@@ -1,164 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-KFMIN=5.106.0
-QTMIN=5.15.9
-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 ~arm64 ~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 mysql
opengl openmp +panorama scanner semantic-desktop spell"
-
-# 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/qtnetworkauth-${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/qtx11extras-${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.1:=[xmp]
- media-libs/lcms:2
- media-libs/libjpeg-turbo:=
- media-libs/liblqr
- media-libs/libpng:=
- >=media-libs/opencv-3.3.0:=[contrib,contribdnn,features2d]
- media-libs/tiff:=
- x11-libs/libX11
- 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
- )
- 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 )
- spell? ( >=kde-frameworks/sonnet-${KFMIN}:5 )
-"
-DEPEND="${COMMON_DEPEND}
- dev-cpp/eigen:3
- dev-libs/boost
- addressbook? ( >=kde-apps/akonadi-19.04.3:5 )
-"
-RDEPEND="${COMMON_DEPEND}
- media-libs/exiftool
-
[gentoo-commits] repo/gentoo:master commit in: media-gfx/digikam/, media-gfx/digikam/files/
commit: 3a6f76cb9b62df941aa0b3d933449baf8e45198a
Author: Andreas Sturmlechner gentoo org>
AuthorDate: Tue Dec 26 08:57:06 2023 +
Commit: Andreas Sturmlechner gentoo org>
CommitDate: Tue Dec 26 08:59:35 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3a6f76cb
media-gfx/digikam: add 8.2.0
Signed-off-by: Andreas Sturmlechner gentoo.org>
media-gfx/digikam/Manifest | 1 +
media-gfx/digikam/digikam-8.2.0.ebuild | 162 ++
.../digikam/files/digikam-8.2.0-akonadi.patch | 95 +++
media-gfx/digikam/files/digikam-8.2.0-cmake.patch | 181 +
4 files changed, 439 insertions(+)
diff --git a/media-gfx/digikam/Manifest b/media-gfx/digikam/Manifest
index da935f8858a3..9fa06bb1336f 100644
--- a/media-gfx/digikam/Manifest
+++ b/media-gfx/digikam/Manifest
@@ -1 +1,2 @@
DIST digiKam-8.1.0.tar.xz 35712348 BLAKE2B
0feaa66ec27b0c2a9e776f26c02987554e8653cda29ca1982182ec1a0f70783808cd2e269dcee1f2b65e6e29ba3bc483a2284a6a485c0b7cc46ae80dd2f87069
SHA512
cbf5a776b4138f4f05d074721324b046dfa07ddc01259f569ae46c46a6d5b0b00824ef0962a09041081703348e4defecf15cff800b2c6cf5e04a0e7e963a3ef4
+DIST digiKam-8.2.0.tar.xz 48172600 BLAKE2B
436f8dcd905ff993cfde3e358e27ac23cb4ad49d24a6328cda209a742874e9fcbc12da507095e2f75a167b653bb1d9e579438bf517e2911f2cb32705230023f1
SHA512
a34c5bde0e579b5f6de1fe90977e01bc385e5c28155d24db09e3cdfe7958c979d2e27cbce402d6c5b70f952fc0ead88318dfa025bb67e540c4d763cb139db7bb
diff --git a/media-gfx/digikam/digikam-8.2.0.ebuild
b/media-gfx/digikam/digikam-8.2.0.ebuild
new file mode 100644
index ..0c699038a243
--- /dev/null
+++ b/media-gfx/digikam/digikam-8.2.0.ebuild
@@ -0,0 +1,162 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+KFMIN=5.106.0
+QTMIN=5.15.9
+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 ~arm64 ~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 mysql
opengl openmp +panorama scanner semantic-desktop spell"
+
+# 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/qtnetworkauth-${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/qtx11extras-${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.1:=[xmp]
+ media-libs/lcms:2
+ media-libs/libjpeg-turbo:=
+ media-libs/liblqr
+ media-libs/libpng:=
+ >=media-libs/opencv-3.3.0:=[contrib,contribdnn,features2d]
+ media-libs/tiff:=
+ x11-libs/libX11
+ 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
+ )
+ 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 )
+ spell? ( >=kde-frameworks/sonnet-${KFMIN}:5 )
+"
+DEPEND="${COMMON_DEPEND}
+ dev-cpp/eigen:3
+
[gentoo-commits] repo/gentoo:master commit in: media-gfx/digikam/
commit: ca16d274fc9134a21bb988a3bc65bda5655f600b
Author: Sam James gentoo org>
AuthorDate: Sun Oct 1 06:25:57 2023 +
Commit: Sam James gentoo org>
CommitDate: Sun Oct 1 06:26:02 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ca16d274
media-gfx/digikam: Keyword 8.1.0-r1 arm64, #907378
Signed-off-by: Sam James gentoo.org>
media-gfx/digikam/digikam-8.1.0-r1.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/media-gfx/digikam/digikam-8.1.0-r1.ebuild
b/media-gfx/digikam/digikam-8.1.0-r1.ebuild
index 1480188f76bc..9bee3a0bbefb 100644
--- a/media-gfx/digikam/digikam-8.1.0-r1.ebuild
+++ b/media-gfx/digikam/digikam-8.1.0-r1.ebuild
@@ -14,7 +14,7 @@ if [[ ${KDE_BUILD_TYPE} != live ]]; then
SRC_URI="mirror://kde/stable/${PN}/${PV}/"
fi
SRC_URI+="digiKam-${PV/_/-}.tar.xz"
- KEYWORDS="amd64 ~x86"
+ KEYWORDS="amd64 ~arm64 ~x86"
S="${WORKDIR}/${PN}-${PV/_/-}"
fi
[gentoo-commits] repo/gentoo:master commit in: media-gfx/digikam/, media-gfx/digikam/files/
commit: ec20f1d83e744fbeb7310fc3cf31be0e8faa6630
Author: Andreas Sturmlechner gentoo org>
AuthorDate: Sat Aug 26 09:42:17 2023 +
Commit: Andreas Sturmlechner gentoo org>
CommitDate: Sat Aug 26 10:31:41 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ec20f1d8
media-gfx/digikam: Fix build with >=kde-apps/akonadi-contact-23.08
Closes: https://bugs.gentoo.org/913046
Signed-off-by: Andreas Sturmlechner gentoo.org>
media-gfx/digikam/digikam-8.1.0-r1.ebuild | 12 +
media-gfx/digikam/files/digikam-8.1.0-cmake.patch | 31 ---
2 files changed, 28 insertions(+), 15 deletions(-)
diff --git a/media-gfx/digikam/digikam-8.1.0-r1.ebuild
b/media-gfx/digikam/digikam-8.1.0-r1.ebuild
index 3eebbe374fb0..1480188f76bc 100644
--- a/media-gfx/digikam/digikam-8.1.0-r1.ebuild
+++ b/media-gfx/digikam/digikam-8.1.0-r1.ebuild
@@ -122,6 +122,18 @@ pkg_setup() {
ecm_pkg_setup
}
+src_prepare() {
+ ecm_src_prepare
+ if has_version ">=kde-apps/akonadi-contacts-23.08.0"; then
+ sed -e "/KF5[:]*Akonadi/s/KF5/KPim5/" \
+ -i core/CMakeLists.txt \
+ core/utilities/extrasupport/CMakeLists.txt \
+
core/utilities/extrasupport/addressbook/CMakeLists.txt \
+ core/app/DigikamCoreTarget.cmake \
+ core/cmake/rules/RulesKDEFramework.cmake || die
+ fi
+}
+
# FIXME: Unbundle libraw (libs/rawengine/libraw)
src_configure() {
local mycmakeargs=(
diff --git a/media-gfx/digikam/files/digikam-8.1.0-cmake.patch
b/media-gfx/digikam/files/digikam-8.1.0-cmake.patch
index 16c1ffa5c37d..8e1f71e661a1 100644
--- a/media-gfx/digikam/files/digikam-8.1.0-cmake.patch
+++ b/media-gfx/digikam/files/digikam-8.1.0-cmake.patch
@@ -1,20 +1,20 @@
-From 05b6e81bd4ceca8d6166aa0a000919cde2bfde3e Mon Sep 17 00:00:00 2001
+From 5171575601ebc553cb747a2757caf63b433820b3 Mon Sep 17 00:00:00 2001
From: Andreas Sturmlechner
Date: Sun, 17 Feb 2019 23:51:03 +0100
Subject: [PATCH] Un-break optional Qt/KF5 detection
And if we enable an option, make the necessary libraries REQUIRED.
---
- core/cmake/rules/RulesKDEFramework.cmake | 34 +++---
+ core/cmake/rules/RulesKDEFramework.cmake | 41 +++--
core/cmake/rules/RulesQtFramework.cmake | 58 +---
core/cmake/rules/RulesX11.cmake | 7 +--
- 3 files changed, 18 insertions(+), 81 deletions(-)
+ 3 files changed, 19 insertions(+), 87 deletions(-)
diff --git a/core/cmake/rules/RulesKDEFramework.cmake
b/core/cmake/rules/RulesKDEFramework.cmake
-index 610033425c..2d8acc7956 100644
+index 610033425c..3ea9b1351d 100644
--- a/core/cmake/rules/RulesKDEFramework.cmake
+++ b/core/cmake/rules/RulesKDEFramework.cmake
-@@ -26,19 +26,15 @@ find_package(KF5 ${KF5_MIN_VERSION} QUIET
+@@ -26,35 +26,20 @@ find_package(KF5 ${KF5_MIN_VERSION} QUIET
)
if(ENABLE_KFILEMETADATASUPPORT)
@@ -30,16 +30,17 @@ index 610033425c..2d8acc7956 100644
if(ENABLE_AKONADICONTACTSUPPORT)
-
+-
-find_package(KF5 ${AKONADI_MIN_VERSION} QUIET
-OPTIONAL_COMPONENTS
-+find_package(KF5 ${AKONADI_MIN_VERSION} REQUIRED
-+COMPONENTS
- Akonadi
- AkonadiContact # For KDE
Mail Contacts support.
- Contacts# API for
contacts/address book data.
-@@ -46,15 +42,9 @@ if(ENABLE_AKONADICONTACTSUPPORT)
-
+-Akonadi
+-AkonadiContact # For KDE
Mail Contacts support.
+-Contacts# API for
contacts/address book data.
+-)
+-
++find_package(KF5Akonadi ${AKONADI_MIN_VERSION} REQUIRED)
++find_package(KF5AkonadiContact ${AKONADI_MIN_VERSION} REQUIRED) # For KDE
Mail Contacts support.
++find_package(KF5Contacts ${AKONADI_MIN_VERSION} REQUIRED) # API for
contacts/address book data.
endif()
-find_package(KF5 ${KSANE_MIN_VERSION} QUIET
@@ -56,7 +57,7 @@ index 610033425c..2d8acc7956 100644
if ("${KF5CalendarCore_VERSION}" VERSION_GREATER 5.6.40)
-@@ -62,18 +52,6 @@ if ("${KF5CalendarCore_VERSION}" VERSION_GREATER 5.6.40)
+@@ -62,18 +47,6 @@ if ("${KF5CalendarCore_VERSION}" VERSION_GREATER 5.6.40)
endif()
@@ -175,5 +176,5 @@ index d7659eed34..9c145970b2 100644
set(HAVE_X11 TRUE)
--
-2.41.0
+2.42.0
[gentoo-commits] repo/gentoo:master commit in: media-gfx/digikam/, media-gfx/digikam/files/
commit: fb253a2f9374a08cc77241967e859ab6f59386d4
Author: Andreas Sturmlechner gentoo org>
AuthorDate: Thu Aug 3 15:18:11 2023 +
Commit: Andreas Sturmlechner gentoo org>
CommitDate: Thu Aug 3 15:34:48 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=fb253a2f
media-gfx/digikam: drop 7.10.0-r1
Signed-off-by: Andreas Sturmlechner gentoo.org>
media-gfx/digikam/Manifest | 1 -
media-gfx/digikam/digikam-7.10.0-r1.ebuild | 150 -
media-gfx/digikam/files/digikam-7.10.0-gcc13.patch | 25
media-gfx/digikam/files/digikam-7.8.0-cmake.patch | 119
.../files/digikam-7.9.0-akonadi-23.04.patch| 27
5 files changed, 322 deletions(-)
diff --git a/media-gfx/digikam/Manifest b/media-gfx/digikam/Manifest
index 95b47c54690a..da935f8858a3 100644
--- a/media-gfx/digikam/Manifest
+++ b/media-gfx/digikam/Manifest
@@ -1,2 +1 @@
-DIST digiKam-7.10.0.tar.xz 349238192 BLAKE2B
527d0c3ca2e2cc2ac4d3eff11ab4e6556d21f29c78b13f92c7a80ab2775c2ba838b0d94f1fd402533dc249148049be365e7f3798eb9a973ee9d38d682f33df64
SHA512
1a5f045161253d73c4012fa949ec718fcc6c6b292ee0557c8015bea81c95fa39d3034ad46a40fdb64221f59832dc8ecdc724e93929ad2c0e35cc51fc82d28f27
DIST digiKam-8.1.0.tar.xz 35712348 BLAKE2B
0feaa66ec27b0c2a9e776f26c02987554e8653cda29ca1982182ec1a0f70783808cd2e269dcee1f2b65e6e29ba3bc483a2284a6a485c0b7cc46ae80dd2f87069
SHA512
cbf5a776b4138f4f05d074721324b046dfa07ddc01259f569ae46c46a6d5b0b00824ef0962a09041081703348e4defecf15cff800b2c6cf5e04a0e7e963a3ef4
diff --git a/media-gfx/digikam/digikam-7.10.0-r1.ebuild
b/media-gfx/digikam/digikam-7.10.0-r1.ebuild
deleted file mode 100644
index 5dc278727087..
--- a/media-gfx/digikam/digikam-7.10.0-r1.ebuild
+++ /dev/null
@@ -1,150 +0,0 @@
-# Copyright 1999-2023 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 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:=
- >=media-libs/opencv-3.3.0:=[contrib,contribdnn,features2d]
- media-libs/tiff:=
- 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
- )
- 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
-
[gentoo-commits] repo/gentoo:master commit in: media-gfx/digikam/
commit: ebc4ac4dbeccd335d2523779fca6d347180f57d0
Author: Sam James gentoo org>
AuthorDate: Thu Aug 3 15:07:53 2023 +
Commit: Sam James gentoo org>
CommitDate: Thu Aug 3 15:07:53 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ebc4ac4d
media-gfx/digikam: Stabilize 8.1.0-r1 amd64, #911209
Signed-off-by: Sam James gentoo.org>
media-gfx/digikam/digikam-8.1.0-r1.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/media-gfx/digikam/digikam-8.1.0-r1.ebuild
b/media-gfx/digikam/digikam-8.1.0-r1.ebuild
index 25088c00bc1d..3eebbe374fb0 100644
--- a/media-gfx/digikam/digikam-8.1.0-r1.ebuild
+++ b/media-gfx/digikam/digikam-8.1.0-r1.ebuild
@@ -14,7 +14,7 @@ if [[ ${KDE_BUILD_TYPE} != live ]]; then
SRC_URI="mirror://kde/stable/${PN}/${PV}/"
fi
SRC_URI+="digiKam-${PV/_/-}.tar.xz"
- KEYWORDS="~amd64 ~x86"
+ KEYWORDS="amd64 ~x86"
S="${WORKDIR}/${PN}-${PV/_/-}"
fi
[gentoo-commits] repo/gentoo:master commit in: media-gfx/digikam/
commit: 0c614f57e1057739e834eb20af8a4daee9af0556
Author: Andreas Sturmlechner gentoo org>
AuthorDate: Tue Jul 25 10:34:27 2023 +
Commit: Andreas Sturmlechner gentoo org>
CommitDate: Tue Jul 25 10:34:27 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0c614f57
media-gfx/digikam: Drop IUSE X
It is broken and we won't fix it.
Bug: https://bugs.gentoo.org/813450
Closes: https://bugs.gentoo.org/911191
Signed-off-by: Andreas Sturmlechner gentoo.org>
media-gfx/digikam/digikam-8.1.0-r1.ebuild | 9 +++--
1 file changed, 3 insertions(+), 6 deletions(-)
diff --git a/media-gfx/digikam/digikam-8.1.0-r1.ebuild
b/media-gfx/digikam/digikam-8.1.0-r1.ebuild
index 8f9f07301fc9..25088c00bc1d 100644
--- a/media-gfx/digikam/digikam-8.1.0-r1.ebuild
+++ b/media-gfx/digikam/digikam-8.1.0-r1.ebuild
@@ -23,7 +23,7 @@ HOMEPAGE="https://www.digikam.org/;
LICENSE="GPL-2"
SLOT="5"
-IUSE="addressbook calendar gphoto2 heif +imagemagick +lensfun marble mysql
opengl openmp +panorama scanner semantic-desktop spell X"
+IUSE="addressbook calendar gphoto2 heif +imagemagick +lensfun marble mysql
opengl openmp +panorama scanner semantic-desktop spell"
# bug 366505
RESTRICT="test"
@@ -39,6 +39,7 @@ COMMON_DEPEND="
>=dev-qt/qtsql-${QTMIN}:5[mysql?]
>=dev-qt/qtwebengine-${QTMIN}:5[widgets]
>=dev-qt/qtwidgets-${QTMIN}:5
+ >=dev-qt/qtx11extras-${QTMIN}:5
>=dev-qt/qtxml-${QTMIN}:5
>=dev-qt/qtxmlpatterns-${QTMIN}:5
>=kde-frameworks/kconfig-${KFMIN}:5
@@ -61,6 +62,7 @@ COMMON_DEPEND="
media-libs/libpng:=
>=media-libs/opencv-3.3.0:=[contrib,contribdnn,features2d]
media-libs/tiff:=
+ x11-libs/libX11
addressbook? (
>=kde-apps/akonadi-contacts-19.04.3:5
>=kde-frameworks/kcontacts-${KFMIN}:5
@@ -86,10 +88,6 @@ COMMON_DEPEND="
scanner? ( >=kde-apps/libksane-19.04.3:5 )
semantic-desktop? ( >=kde-frameworks/kfilemetadata-${KFMIN}:5 )
spell? ( >=kde-frameworks/sonnet-${KFMIN}:5 )
- X? (
- >=dev-qt/qtx11extras-${QTMIN}:5
- x11-libs/libX11
- )
"
DEPEND="${COMMON_DEPEND}
dev-cpp/eigen:3
@@ -148,7 +146,6 @@ src_configure() {
$(cmake_use_find_package scanner KF5Sane)
$(cmake_use_find_package spell KF5Sonnet)
-DENABLE_KFILEMETADATASUPPORT=$(usex semantic-desktop)
- $(cmake_use_find_package X X11)
)
ecm_src_configure
[gentoo-commits] repo/gentoo:master commit in: media-gfx/digikam/files/, media-gfx/digikam/
commit: 568b05e64aaeb061f7acd7647185a07c199e054c
Author: Andreas Sturmlechner gentoo org>
AuthorDate: Tue Jul 25 09:52:59 2023 +
Commit: Andreas Sturmlechner gentoo org>
CommitDate: Tue Jul 25 10:02:10 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=568b05e6
media-gfx/digikam: Fix default config for scaling w/ high-res support
Upstream commit 35e5817353709c5c16521fee116bb3c70196aa0f
KDE-bug: https://bugs.kde.org/show_bug.cgi?id=457272
Signed-off-by: Andreas Sturmlechner gentoo.org>
media-gfx/digikam/digikam-8.1.0-r1.ebuild | 5 ++-
...1.0-fix-config-for-scaling-high-res-icons.patch | 45 ++
2 files changed, 49 insertions(+), 1 deletion(-)
diff --git a/media-gfx/digikam/digikam-8.1.0-r1.ebuild
b/media-gfx/digikam/digikam-8.1.0-r1.ebuild
index 06c5f19b3377..8f9f07301fc9 100644
--- a/media-gfx/digikam/digikam-8.1.0-r1.ebuild
+++ b/media-gfx/digikam/digikam-8.1.0-r1.ebuild
@@ -109,7 +109,10 @@ BDEPEND="
)
"
-PATCHES=( "${FILESDIR}/${P}-cmake.patch" )
+PATCHES=(
+ "${FILESDIR}/${P}-cmake.patch"
+ "${FILESDIR}/${P}-fix-config-for-scaling-high-res-icons.patch" # 8.2.0,
KDE-bug #457272
+)
pkg_pretend() {
[[ ${MERGE_TYPE} != binary ]] && use openmp && tc-check-openmp
diff --git
a/media-gfx/digikam/files/digikam-8.1.0-fix-config-for-scaling-high-res-icons.patch
b/media-gfx/digikam/files/digikam-8.1.0-fix-config-for-scaling-high-res-icons.patch
new file mode 100644
index ..3ec2889d4090
--- /dev/null
+++
b/media-gfx/digikam/files/digikam-8.1.0-fix-config-for-scaling-high-res-icons.patch
@@ -0,0 +1,45 @@
+From 35e5817353709c5c16521fee116bb3c70196aa0f Mon Sep 17 00:00:00 2001
+From: Maik Qualmann
+Date: Tue, 18 Jul 2023 18:31:51 +0200
+Subject: [PATCH] for a new config under Linux scaling and high-resolution
+ icons are enabled BUGS: 457272 FIXED-IN: 8.2.0
+
+---
+ core/utilities/setup/misc/systemsettings.cpp | 12
+ 1 file changed, 12 insertions(+)
+
+diff --git a/core/utilities/setup/misc/systemsettings.cpp
b/core/utilities/setup/misc/systemsettings.cpp
+index f4e15803a11..c164bb0cd36 100644
+--- a/core/utilities/setup/misc/systemsettings.cpp
b/core/utilities/setup/misc/systemsettings.cpp
+@@ -22,6 +22,7 @@
+ // Local includes
+
+ #include "digikam_debug.h"
++#include "digikam_config.h"
+
+ namespace Digikam
+ {
+@@ -56,8 +57,19 @@ void SystemSettings::readSettings()
+ QSettings settings(m_path, QSettings::IniFormat);
+
+ settings.beginGroup(QLatin1String("System"));
++
++#ifdef Q_OS_LINUX
++
++useHighDpiScaling = settings.value(QLatin1String("useHighDpiScaling"),
true).toBool();
++useHighDpiPixmaps = settings.value(QLatin1String("useHighDpiPixmaps"),
true).toBool();
++
++#else
++
+ useHighDpiScaling = settings.value(QLatin1String("useHighDpiScaling"),
false).toBool();
+ useHighDpiPixmaps = settings.value(QLatin1String("useHighDpiPixmaps"),
false).toBool();
++
++#endif
++
+ disableFaceEngine = settings.value(QLatin1String("disableFaceEngine"),
false).toBool();
+ enableLogging = settings.value(QLatin1String("enableLogging"),
false).toBool();
+ disableOpenCL = settings.value(QLatin1String("disableOpenCL"),
true).toBool();
+--
+GitLab
+
[gentoo-commits] repo/gentoo:master commit in: media-gfx/digikam/
commit: abe1d15eedc06f6c28cb9bc357544c31eab6d2ca
Author: Andreas Sturmlechner gentoo org>
AuthorDate: Tue Jul 25 09:47:45 2023 +
Commit: Andreas Sturmlechner gentoo org>
CommitDate: Tue Jul 25 10:02:07 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=abe1d15e
media-gfx/digikam: Add RDEPEND=media-libs/exiftool
Closes: https://bugs.gentoo.org/910495
Signed-off-by: Andreas Sturmlechner gentoo.org>
media-gfx/digikam/{digikam-8.1.0.ebuild => digikam-8.1.0-r1.ebuild} | 1 +
1 file changed, 1 insertion(+)
diff --git a/media-gfx/digikam/digikam-8.1.0.ebuild
b/media-gfx/digikam/digikam-8.1.0-r1.ebuild
similarity index 99%
rename from media-gfx/digikam/digikam-8.1.0.ebuild
rename to media-gfx/digikam/digikam-8.1.0-r1.ebuild
index eeb2f032ad56..06c5f19b3377 100644
--- a/media-gfx/digikam/digikam-8.1.0.ebuild
+++ b/media-gfx/digikam/digikam-8.1.0-r1.ebuild
@@ -97,6 +97,7 @@ DEPEND="${COMMON_DEPEND}
addressbook? ( >=kde-apps/akonadi-19.04.3:5 )
"
RDEPEND="${COMMON_DEPEND}
+ media-libs/exiftool
mysql? ( virtual/mysql[server(+)] )
panorama? ( media-gfx/hugin )
"
[gentoo-commits] repo/gentoo:master commit in: media-gfx/digikam/files/, media-gfx/digikam/
commit: 9c8928dd8769b0fefb6549b17b498643e23d778f
Author: Andreas Sturmlechner gentoo org>
AuthorDate: Thu Jul 6 17:54:25 2023 +
Commit: Andreas Sturmlechner gentoo org>
CommitDate: Sat Jul 8 16:04:34 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9c8928dd
media-gfx/digikam: add 8.1.0
Fixes build with media-gfx/exiv2-0.28.0 (too many commits to backport to 7.10).
Bug: https://bugs.gentoo.org/906463
Signed-off-by: Andreas Sturmlechner gentoo.org>
media-gfx/digikam/Manifest| 1 +
media-gfx/digikam/digikam-8.1.0.ebuild| 151 ++
media-gfx/digikam/files/digikam-8.1.0-cmake.patch | 179 ++
3 files changed, 331 insertions(+)
diff --git a/media-gfx/digikam/Manifest b/media-gfx/digikam/Manifest
index a5cb4eae2133..95b47c54690a 100644
--- a/media-gfx/digikam/Manifest
+++ b/media-gfx/digikam/Manifest
@@ -1 +1,2 @@
DIST digiKam-7.10.0.tar.xz 349238192 BLAKE2B
527d0c3ca2e2cc2ac4d3eff11ab4e6556d21f29c78b13f92c7a80ab2775c2ba838b0d94f1fd402533dc249148049be365e7f3798eb9a973ee9d38d682f33df64
SHA512
1a5f045161253d73c4012fa949ec718fcc6c6b292ee0557c8015bea81c95fa39d3034ad46a40fdb64221f59832dc8ecdc724e93929ad2c0e35cc51fc82d28f27
+DIST digiKam-8.1.0.tar.xz 35712348 BLAKE2B
0feaa66ec27b0c2a9e776f26c02987554e8653cda29ca1982182ec1a0f70783808cd2e269dcee1f2b65e6e29ba3bc483a2284a6a485c0b7cc46ae80dd2f87069
SHA512
cbf5a776b4138f4f05d074721324b046dfa07ddc01259f569ae46c46a6d5b0b00824ef0962a09041081703348e4defecf15cff800b2c6cf5e04a0e7e963a3ef4
diff --git a/media-gfx/digikam/digikam-8.1.0.ebuild
b/media-gfx/digikam/digikam-8.1.0.ebuild
new file mode 100644
index ..eeb2f032ad56
--- /dev/null
+++ b/media-gfx/digikam/digikam-8.1.0.ebuild
@@ -0,0 +1,151 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+KFMIN=5.106.0
+QTMIN=5.15.9
+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 mysql
opengl openmp +panorama scanner semantic-desktop spell 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/qtnetworkauth-${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.1:=[xmp]
+ media-libs/lcms:2
+ media-libs/libjpeg-turbo:=
+ media-libs/liblqr
+ media-libs/libpng:=
+ >=media-libs/opencv-3.3.0:=[contrib,contribdnn,features2d]
+ media-libs/tiff:=
+ 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
+ )
+ 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 )
+ spell? ( >=kde-frameworks/sonnet-${KFMIN}:5 )
+ X? (
+ >=dev-qt/qtx11extras-${QTMIN}:5
+
[gentoo-commits] repo/gentoo:master commit in: media-gfx/digikam/
commit: 4a9772f9f6dad87ed3b92a78d33da36e71c5811a
Author: Andreas Sturmlechner gentoo org>
AuthorDate: Wed May 31 20:04:42 2023 +
Commit: Andreas Sturmlechner gentoo org>
CommitDate: Wed May 31 20:06:20 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4a9772f9
media-gfx/digikam: drop 7.9.0-r1
Signed-off-by: Andreas Sturmlechner gentoo.org>
media-gfx/digikam/Manifest| 1 -
media-gfx/digikam/digikam-7.9.0-r1.ebuild | 154 --
media-gfx/digikam/metadata.xml| 1 -
3 files changed, 156 deletions(-)
diff --git a/media-gfx/digikam/Manifest b/media-gfx/digikam/Manifest
index 5586cc5e3cd7..a5cb4eae2133 100644
--- a/media-gfx/digikam/Manifest
+++ b/media-gfx/digikam/Manifest
@@ -1,2 +1 @@
DIST digiKam-7.10.0.tar.xz 349238192 BLAKE2B
527d0c3ca2e2cc2ac4d3eff11ab4e6556d21f29c78b13f92c7a80ab2775c2ba838b0d94f1fd402533dc249148049be365e7f3798eb9a973ee9d38d682f33df64
SHA512
1a5f045161253d73c4012fa949ec718fcc6c6b292ee0557c8015bea81c95fa39d3034ad46a40fdb64221f59832dc8ecdc724e93929ad2c0e35cc51fc82d28f27
-DIST digiKam-7.9.0.tar.xz 349286920 BLAKE2B
222d614d16bd805f87ea10afd7bed683b80166a115641ccebac75ede7d85b46a1e1c2cdd9fb4a9c5c5395a6703362277b727e6cbefcbfc53323648a0a2fcf863
SHA512
6c5c9dac8a056d4c8c3b4d67f5a607592ee6319b9f372aebf6ef4245d58883897424d4fabae1d04f43ff3561d8e79b4e4bf5c697aa57467f831437b1cf0da1e6
diff --git a/media-gfx/digikam/digikam-7.9.0-r1.ebuild
b/media-gfx/digikam/digikam-7.9.0-r1.ebuild
deleted file mode 100644
index 8dceca760739..
--- a/media-gfx/digikam/digikam-7.9.0-r1.ebuild
+++ /dev/null
@@ -1,154 +0,0 @@
-# Copyright 1999-2023 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:=
- >=media-libs/opencv-3.3.0:=[contrib,contribdnn,features2d]
- media-libs/tiff:=
- 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
-
[gentoo-commits] repo/gentoo:master commit in: media-gfx/digikam/
commit: 96d93b85c8af03bf1ffe59786f2650245c0412b4
Author: Arthur Zamarin gentoo org>
AuthorDate: Wed May 31 19:54:21 2023 +
Commit: Arthur Zamarin gentoo org>
CommitDate: Wed May 31 19:54:21 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=96d93b85
media-gfx/digikam: Stabilize 7.10.0-r1 amd64, #904870
Signed-off-by: Arthur Zamarin gentoo.org>
media-gfx/digikam/digikam-7.10.0-r1.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/media-gfx/digikam/digikam-7.10.0-r1.ebuild
b/media-gfx/digikam/digikam-7.10.0-r1.ebuild
index b4329d0dcc0d..5dc278727087 100644
--- a/media-gfx/digikam/digikam-7.10.0-r1.ebuild
+++ b/media-gfx/digikam/digikam-7.10.0-r1.ebuild
@@ -14,7 +14,7 @@ if [[ ${KDE_BUILD_TYPE} != live ]]; then
SRC_URI="mirror://kde/stable/${PN}/${PV}/"
fi
SRC_URI+="digiKam-${PV/_/-}.tar.xz"
- KEYWORDS="~amd64 ~x86"
+ KEYWORDS="amd64 ~x86"
S="${WORKDIR}/${PN}-${PV/_/-}"
fi
[gentoo-commits] repo/gentoo:master commit in: media-gfx/digikam/files/, media-gfx/digikam/
commit: 8e49dba36a314ad4b4faef9fa355c43daff46f58
Author: Andreas Sturmlechner gentoo org>
AuthorDate: Sun Apr 30 13:43:11 2023 +
Commit: Andreas Sturmlechner gentoo org>
CommitDate: Sun Apr 30 13:47:45 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8e49dba3
media-gfx/digikam: Fix build with GCC-13
Signed-off-by: Andreas Sturmlechner gentoo.org>
media-gfx/digikam/digikam-7.10.0-r1.ebuild | 1 +
media-gfx/digikam/files/digikam-7.10.0-gcc13.patch | 25 ++
2 files changed, 26 insertions(+)
diff --git a/media-gfx/digikam/digikam-7.10.0-r1.ebuild
b/media-gfx/digikam/digikam-7.10.0-r1.ebuild
index a87c4c457218..b4329d0dcc0d 100644
--- a/media-gfx/digikam/digikam-7.10.0-r1.ebuild
+++ b/media-gfx/digikam/digikam-7.10.0-r1.ebuild
@@ -109,6 +109,7 @@ BDEPEND="
PATCHES=(
"${FILESDIR}/${PN}-7.8.0-cmake.patch"
"${FILESDIR}/${PN}-7.9.0-akonadi-23.04.patch" # bug 904976
+ "${FILESDIR}/${P}-gcc13.patch"
)
pkg_pretend() {
diff --git a/media-gfx/digikam/files/digikam-7.10.0-gcc13.patch
b/media-gfx/digikam/files/digikam-7.10.0-gcc13.patch
new file mode 100644
index ..98e78df74d8c
--- /dev/null
+++ b/media-gfx/digikam/files/digikam-7.10.0-gcc13.patch
@@ -0,0 +1,25 @@
+From 9c4fed4b5562c777fc6639ead9bcc95faacdb992 Mon Sep 17 00:00:00 2001
+From: Maik Qualmann
+Date: Sun, 26 Mar 2023 13:19:40 +0200
+Subject: [PATCH] fix compile DNG-SDK with GCC13
+
+---
+ core/libs/dngwriter/extra/dng_sdk/dng_string.cpp | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/core/libs/dngwriter/extra/dng_sdk/dng_string.cpp
b/core/libs/dngwriter/extra/dng_sdk/dng_string.cpp
+index 4e76fc4c86a..7814aff145d 100644
+--- a/core/libs/dngwriter/extra/dng_sdk/dng_string.cpp
b/core/libs/dngwriter/extra/dng_sdk/dng_string.cpp
+@@ -27,7 +27,7 @@
+ # endif
+ #endif
+
+-#if qiPhone || qAndroid
++#if qLinux || qiPhone || qAndroid
+ #include // for isdigit
+ #endif
+
+--
+GitLab
+
[gentoo-commits] repo/gentoo:master commit in: media-gfx/digikam/files/, media-gfx/digikam/
commit: 60007a9f817827169916850b290da8ec3686d133
Author: Andreas Sturmlechner gentoo org>
AuthorDate: Tue Apr 25 10:24:41 2023 +
Commit: Andreas Sturmlechner gentoo org>
CommitDate: Tue Apr 25 15:27:12 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=60007a9f
media-gfx/digikam: Fix build with >=kde-apps/akonadi-contacts-23.04.0
Upstream commit 5b4ba173f6a84a8be1131b1523dc42df95171ec7
Closes: https://bugs.gentoo.org/904976
Signed-off-by: Andreas Sturmlechner gentoo.org>
...am-7.9.0-r1.ebuild => digikam-7.10.0-r1.ebuild} | 17 +++---
media-gfx/digikam/digikam-7.9.0-r1.ebuild | 6 -
.../files/digikam-7.9.0-akonadi-23.04.patch| 27 ++
3 files changed, 40 insertions(+), 10 deletions(-)
diff --git a/media-gfx/digikam/digikam-7.9.0-r1.ebuild
b/media-gfx/digikam/digikam-7.10.0-r1.ebuild
similarity index 92%
copy from media-gfx/digikam/digikam-7.9.0-r1.ebuild
copy to media-gfx/digikam/digikam-7.10.0-r1.ebuild
index 72affdeb5cb8..a87c4c457218 100644
--- a/media-gfx/digikam/digikam-7.9.0-r1.ebuild
+++ b/media-gfx/digikam/digikam-7.10.0-r1.ebuild
@@ -14,7 +14,7 @@ if [[ ${KDE_BUILD_TYPE} != live ]]; then
SRC_URI="mirror://kde/stable/${PN}/${PV}/"
fi
SRC_URI+="digiKam-${PV/_/-}.tar.xz"
- KEYWORDS="amd64 ~x86"
+ KEYWORDS="~amd64 ~x86"
S="${WORKDIR}/${PN}-${PV/_/-}"
fi
@@ -23,7 +23,7 @@ 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"
+IUSE="addressbook calendar gphoto2 heif +imagemagick +lensfun marble mysql
opengl openmp +panorama scanner semantic-desktop X"
# bug 366505
RESTRICT="test"
@@ -77,10 +77,6 @@ COMMON_DEPEND="
>=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
@@ -96,6 +92,7 @@ COMMON_DEPEND="
DEPEND="${COMMON_DEPEND}
dev-cpp/eigen:3
dev-libs/boost
+ addressbook? ( >=kde-apps/akonadi-19.04.3:5 )
"
RDEPEND="${COMMON_DEPEND}
mysql? ( virtual/mysql[server(+)] )
@@ -109,7 +106,10 @@ BDEPEND="
)
"
-PATCHES=( "${FILESDIR}/${PN}-7.8.0-cmake.patch" )
+PATCHES=(
+ "${FILESDIR}/${PN}-7.8.0-cmake.patch"
+ "${FILESDIR}/${PN}-7.9.0-akonadi-23.04.patch" # bug 904976
+)
pkg_pretend() {
[[ ${MERGE_TYPE} != binary ]] && use openmp && tc-check-openmp
@@ -127,6 +127,7 @@ src_configure() {
-DBUILD_TESTING=OFF # bug 698192
-DENABLE_APPSTYLES=ON
-DCMAKE_DISABLE_FIND_PACKAGE_Jasper=ON
+ -DENABLE_MEDIAPLAYER=OFF # bug 758641, last-rited
-DENABLE_QWEBENGINE=ON
-DENABLE_AKONADICONTACTSUPPORT=$(usex addressbook)
$(cmake_use_find_package calendar KF5CalendarCore)
@@ -135,8 +136,6 @@ src_configure() {
$(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)
diff --git a/media-gfx/digikam/digikam-7.9.0-r1.ebuild
b/media-gfx/digikam/digikam-7.9.0-r1.ebuild
index 72affdeb5cb8..8dceca760739 100644
--- a/media-gfx/digikam/digikam-7.9.0-r1.ebuild
+++ b/media-gfx/digikam/digikam-7.9.0-r1.ebuild
@@ -96,6 +96,7 @@ COMMON_DEPEND="
DEPEND="${COMMON_DEPEND}
dev-cpp/eigen:3
dev-libs/boost
+ addressbook? ( >=kde-apps/akonadi-19.04.3:5 )
"
RDEPEND="${COMMON_DEPEND}
mysql? ( virtual/mysql[server(+)] )
@@ -109,7 +110,10 @@ BDEPEND="
)
"
-PATCHES=( "${FILESDIR}/${PN}-7.8.0-cmake.patch" )
+PATCHES=(
+ "${FILESDIR}/${PN}-7.8.0-cmake.patch"
+ "${FILESDIR}/${P}-akonadi-23.04.patch" # bug 904976
+)
pkg_pretend() {
[[ ${MERGE_TYPE} != binary ]] && use openmp && tc-check-openmp
diff --git a/media-gfx/digikam/files/digikam-7.9.0-akonadi-23.04.patch
b/media-gfx/digikam/files/digikam-7.9.0-akonadi-23.04.patch
new file mode 100644
index ..d9b46a7966f0
--- /dev/null
+++ b/media-gfx/digikam/files/digikam-7.9.0-akonadi-23.04.patch
@@ -0,0 +1,27 @@
+From 5b4ba173f6a84a8be1131b1523dc42df95171ec7 Mon Sep 17 00:00:00 2001
+From: Antonio Rojas
+Date: Thu, 20 Apr 2023 17:49:44 +0200
+Subject: [PATCH] Fix build with akonadi 23.04
+
+In KDE PIM 23.04 the KF5:: targets have been renamed to KPim5::
+While the KF5:: targets are kept for backwards
[gentoo-commits] repo/gentoo:master commit in: media-gfx/digikam/
commit: 1be9f3812790bb0b8901aed24727bff0c430cf3e
Author: Andreas Sturmlechner gentoo org>
AuthorDate: Tue Apr 25 10:39:20 2023 +
Commit: Andreas Sturmlechner gentoo org>
CommitDate: Tue Apr 25 15:27:12 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1be9f381
media-gfx/digikam: drop 7.10.0
Signed-off-by: Andreas Sturmlechner gentoo.org>
media-gfx/digikam/digikam-7.10.0.ebuild | 145
1 file changed, 145 deletions(-)
diff --git a/media-gfx/digikam/digikam-7.10.0.ebuild
b/media-gfx/digikam/digikam-7.10.0.ebuild
deleted file mode 100644
index 3e705737e624..
--- a/media-gfx/digikam/digikam-7.10.0.ebuild
+++ /dev/null
@@ -1,145 +0,0 @@
-# Copyright 1999-2023 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 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:=
- >=media-libs/opencv-3.3.0:=[contrib,contribdnn,features2d]
- media-libs/tiff:=
- addressbook? (
- =kde-apps/akonadi-contacts-22*: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
- )
- 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}/${PN}-7.8.0-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_MEDIAPLAYER=OFF # bug 758641, last-rited
- -DENABLE_QWEBENGINE=ON
- -DENABLE_AKONADICONTACTSUPPORT=$(usex addressbook)
- $(cmake_use_find_package calendar KF5CalendarCore)
- $(cmake_use_find_package gphoto2 Gphoto2)
-
[gentoo-commits] repo/gentoo:master commit in: media-gfx/digikam/
commit: 6982a5444fc71b2c36717dc5c4939340dfa82b8e
Author: Andreas Sturmlechner gentoo org>
AuthorDate: Wed Mar 29 09:55:25 2023 +
Commit: Andreas Sturmlechner gentoo org>
CommitDate: Wed Mar 29 10:23:44 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6982a544
media-gfx/digikam: add 7.10.0
See also:
https://www.digikam.org/news/2023-03-13-7.10.0_release_announcement/
USE=addressbook is locked down to =kde-apps/akonadi-contacts-22*:5
because it is broken by KF5 -> KPim5 prefix move of cmake files in 23.04.
Signed-off-by: Andreas Sturmlechner gentoo.org>
media-gfx/digikam/Manifest | 1 +
media-gfx/digikam/digikam-7.10.0.ebuild | 145
2 files changed, 146 insertions(+)
diff --git a/media-gfx/digikam/Manifest b/media-gfx/digikam/Manifest
index ea142444b517..5586cc5e3cd7 100644
--- a/media-gfx/digikam/Manifest
+++ b/media-gfx/digikam/Manifest
@@ -1 +1,2 @@
+DIST digiKam-7.10.0.tar.xz 349238192 BLAKE2B
527d0c3ca2e2cc2ac4d3eff11ab4e6556d21f29c78b13f92c7a80ab2775c2ba838b0d94f1fd402533dc249148049be365e7f3798eb9a973ee9d38d682f33df64
SHA512
1a5f045161253d73c4012fa949ec718fcc6c6b292ee0557c8015bea81c95fa39d3034ad46a40fdb64221f59832dc8ecdc724e93929ad2c0e35cc51fc82d28f27
DIST digiKam-7.9.0.tar.xz 349286920 BLAKE2B
222d614d16bd805f87ea10afd7bed683b80166a115641ccebac75ede7d85b46a1e1c2cdd9fb4a9c5c5395a6703362277b727e6cbefcbfc53323648a0a2fcf863
SHA512
6c5c9dac8a056d4c8c3b4d67f5a607592ee6319b9f372aebf6ef4245d58883897424d4fabae1d04f43ff3561d8e79b4e4bf5c697aa57467f831437b1cf0da1e6
diff --git a/media-gfx/digikam/digikam-7.10.0.ebuild
b/media-gfx/digikam/digikam-7.10.0.ebuild
new file mode 100644
index ..3e705737e624
--- /dev/null
+++ b/media-gfx/digikam/digikam-7.10.0.ebuild
@@ -0,0 +1,145 @@
+# Copyright 1999-2023 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 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:=
+ >=media-libs/opencv-3.3.0:=[contrib,contribdnn,features2d]
+ media-libs/tiff:=
+ addressbook? (
+ =kde-apps/akonadi-contacts-22*: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
+ )
+ 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
+
[gentoo-commits] repo/gentoo:master commit in: media-gfx/digikam/
commit: 650a61885d7e2cb8a4eb76dfc4a9c77ba0f6b58d
Author: Andreas Sturmlechner gentoo org>
AuthorDate: Sun Feb 5 22:55:07 2023 +
Commit: Andreas Sturmlechner gentoo org>
CommitDate: Tue Feb 7 10:36:55 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=650a6188
media-gfx/digikam: destabilize 7.9.0-r1 for ~x86
Bug: https://bugs.gentoo.org/893234
Signed-off-by: Andreas Sturmlechner gentoo.org>
media-gfx/digikam/digikam-7.9.0-r1.ebuild | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/media-gfx/digikam/digikam-7.9.0-r1.ebuild
b/media-gfx/digikam/digikam-7.9.0-r1.ebuild
index 68318827d431..72affdeb5cb8 100644
--- a/media-gfx/digikam/digikam-7.9.0-r1.ebuild
+++ b/media-gfx/digikam/digikam-7.9.0-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2022 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=8
@@ -14,7 +14,7 @@ if [[ ${KDE_BUILD_TYPE} != live ]]; then
SRC_URI="mirror://kde/stable/${PN}/${PV}/"
fi
SRC_URI+="digiKam-${PV/_/-}.tar.xz"
- KEYWORDS="amd64 x86"
+ KEYWORDS="amd64 ~x86"
S="${WORKDIR}/${PN}-${PV/_/-}"
fi
[gentoo-commits] repo/gentoo:master commit in: media-gfx/digikam/
commit: a34a4a8bfe5f39d6224287805e8f70cca1d45afa
Author: Andreas Sturmlechner gentoo org>
AuthorDate: Mon Jan 9 23:36:08 2023 +
Commit: Andreas Sturmlechner gentoo org>
CommitDate: Tue Jan 10 00:04:34 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a34a4a8b
media-gfx/digikam: drop 7.8.0-r3
Signed-off-by: Andreas Sturmlechner gentoo.org>
media-gfx/digikam/Manifest| 1 -
media-gfx/digikam/digikam-7.8.0-r3.ebuild | 150 --
2 files changed, 151 deletions(-)
diff --git a/media-gfx/digikam/Manifest b/media-gfx/digikam/Manifest
index f79f57ee9d87..ea142444b517 100644
--- a/media-gfx/digikam/Manifest
+++ b/media-gfx/digikam/Manifest
@@ -1,2 +1 @@
-DIST digiKam-7.8.0.tar.xz 345431764 BLAKE2B
43fff59b51b98a04ca852cadedafc2792aafa5cf9e90f1ce0ad6174533844c7164e72b623a253d42fc4ea695fa7e4bd6cc954287ac72a35211f9fa564a13cb92
SHA512
d2ec96239760cc06808a73bcbf1a2131653764719d1e23afa8cea8eda449e221b177f2a96ca2a997d1c82a6a4977c4227165c932bdd006d5305cdb4c63f454fc
DIST digiKam-7.9.0.tar.xz 349286920 BLAKE2B
222d614d16bd805f87ea10afd7bed683b80166a115641ccebac75ede7d85b46a1e1c2cdd9fb4a9c5c5395a6703362277b727e6cbefcbfc53323648a0a2fcf863
SHA512
6c5c9dac8a056d4c8c3b4d67f5a607592ee6319b9f372aebf6ef4245d58883897424d4fabae1d04f43ff3561d8e79b4e4bf5c697aa57467f831437b1cf0da1e6
diff --git a/media-gfx/digikam/digikam-7.8.0-r3.ebuild
b/media-gfx/digikam/digikam-7.8.0-r3.ebuild
deleted file mode 100644
index 4b14069014ab..
--- a/media-gfx/digikam/digikam-7.8.0-r3.ebuild
+++ /dev/null
@@ -1,150 +0,0 @@
-# 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:=
- >=media-libs/opencv-3.3.0:=[contrib,contribdnn,features2d]
- media-libs/tiff:=
- 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? (
[gentoo-commits] repo/gentoo:master commit in: media-gfx/digikam/
commit: 544cce49e487d5c7dad2f37921accc6578022692
Author: Andreas Sturmlechner gentoo org>
AuthorDate: Wed Dec 14 19:40:02 2022 +
Commit: Andreas Sturmlechner gentoo org>
CommitDate: Wed Dec 14 20:00:49 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=544cce49
media-gfx/digikam: add 7.9.0
Signed-off-by: Andreas Sturmlechner gentoo.org>
media-gfx/digikam/Manifest | 1 +
media-gfx/digikam/digikam-7.9.0.ebuild | 150 +
2 files changed, 151 insertions(+)
diff --git a/media-gfx/digikam/Manifest b/media-gfx/digikam/Manifest
index 6703c14f46c2..f79f57ee9d87 100644
--- a/media-gfx/digikam/Manifest
+++ b/media-gfx/digikam/Manifest
@@ -1 +1,2 @@
DIST digiKam-7.8.0.tar.xz 345431764 BLAKE2B
43fff59b51b98a04ca852cadedafc2792aafa5cf9e90f1ce0ad6174533844c7164e72b623a253d42fc4ea695fa7e4bd6cc954287ac72a35211f9fa564a13cb92
SHA512
d2ec96239760cc06808a73bcbf1a2131653764719d1e23afa8cea8eda449e221b177f2a96ca2a997d1c82a6a4977c4227165c932bdd006d5305cdb4c63f454fc
+DIST digiKam-7.9.0.tar.xz 349286920 BLAKE2B
222d614d16bd805f87ea10afd7bed683b80166a115641ccebac75ede7d85b46a1e1c2cdd9fb4a9c5c5395a6703362277b727e6cbefcbfc53323648a0a2fcf863
SHA512
6c5c9dac8a056d4c8c3b4d67f5a607592ee6319b9f372aebf6ef4245d58883897424d4fabae1d04f43ff3561d8e79b4e4bf5c697aa57467f831437b1cf0da1e6
diff --git a/media-gfx/digikam/digikam-7.9.0.ebuild
b/media-gfx/digikam/digikam-7.9.0.ebuild
new file mode 100644
index ..352cc9a4f923
--- /dev/null
+++ b/media-gfx/digikam/digikam-7.9.0.ebuild
@@ -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,features2d]
+ 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(+)] )
+
[gentoo-commits] repo/gentoo:master commit in: media-gfx/digikam/files/, media-gfx/digikam/
commit: 45af732d57f4be6f9718110738ef579a1d1f6672
Author: Andreas Sturmlechner gentoo org>
AuthorDate: Wed Oct 12 19:38:30 2022 +
Commit: Andreas Sturmlechner gentoo org>
CommitDate: Wed Oct 12 19:41:21 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=45af732d
media-gfx/digikam: drop 7.5.0
Signed-off-by: Andreas Sturmlechner gentoo.org>
media-gfx/digikam/Manifest | 1 -
media-gfx/digikam/digikam-7.5.0.ebuild | 151 -
media-gfx/digikam/files/digikam-7.3.0-cmake.patch | 118
.../files/digikam-7.5.0-akonadi-22.04.0.patch | 28
4 files changed, 298 deletions(-)
diff --git a/media-gfx/digikam/Manifest b/media-gfx/digikam/Manifest
index dc7db88aa272..6703c14f46c2 100644
--- a/media-gfx/digikam/Manifest
+++ b/media-gfx/digikam/Manifest
@@ -1,2 +1 @@
-DIST digiKam-7.5.0.tar.xz 339573688 BLAKE2B
26014564e9f9d44db65d4588924da2c85897fb514df0a963f51b9fddb1f26ce3ddf18856b2d4b0eb140581ee7948f048986cf79687a31730e29017b5a811a3d6
SHA512
a2f5005b8f8b8cd9ef58a6bd563481a95004fbad7110d13f1ec4d8550311f1765410dda54f5b04c91bde7ec089e145656961c7c70b27242931e78abd698763e9
DIST digiKam-7.8.0.tar.xz 345431764 BLAKE2B
43fff59b51b98a04ca852cadedafc2792aafa5cf9e90f1ce0ad6174533844c7164e72b623a253d42fc4ea695fa7e4bd6cc954287ac72a35211f9fa564a13cb92
SHA512
d2ec96239760cc06808a73bcbf1a2131653764719d1e23afa8cea8eda449e221b177f2a96ca2a997d1c82a6a4977c4227165c932bdd006d5305cdb4c63f454fc
diff --git a/media-gfx/digikam/digikam-7.5.0.ebuild
b/media-gfx/digikam/digikam-7.5.0.ebuild
deleted file mode 100644
index 1db410616c22..
--- a/media-gfx/digikam/digikam-7.5.0.ebuild
+++ /dev/null
@@ -1,151 +0,0 @@
-# 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.2
-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/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 )
- X? (
- >=dev-qt/qtx11extras-${QTMIN}:5
- x11-libs/libX11
- )
-"
-DEPEND="${COMMON_DEPEND}
- dev-cpp/eigen:3
- dev-libs/boost
-"
[gentoo-commits] repo/gentoo:master commit in: media-gfx/digikam/
commit: 09a0f8c8fdcba9ec288f4326db0fe85980498c43
Author: Sam James gentoo org>
AuthorDate: Wed Oct 12 19:21:21 2022 +
Commit: Sam James gentoo org>
CommitDate: Wed Oct 12 19:21:21 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=09a0f8c8
media-gfx/digikam: Stabilize 7.8.0-r1 amd64, #875608
Signed-off-by: Sam James gentoo.org>
media-gfx/digikam/digikam-7.8.0-r1.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/media-gfx/digikam/digikam-7.8.0-r1.ebuild
b/media-gfx/digikam/digikam-7.8.0-r1.ebuild
index 009c5c38aa12..27e1478148f2 100644
--- a/media-gfx/digikam/digikam-7.8.0-r1.ebuild
+++ b/media-gfx/digikam/digikam-7.8.0-r1.ebuild
@@ -14,7 +14,7 @@ if [[ ${KDE_BUILD_TYPE} != live ]]; then
SRC_URI="mirror://kde/stable/${PN}/${PV}/"
fi
SRC_URI+="digiKam-${PV/_/-}.tar.xz"
- KEYWORDS="~amd64 x86"
+ KEYWORDS="amd64 x86"
S="${WORKDIR}/${PN}-${PV/_/-}"
fi
[gentoo-commits] repo/gentoo:master commit in: media-gfx/digikam/
commit: 917aba292f796387b742437dfbe973d102514b7d
Author: Agostino Sarubbo gentoo org>
AuthorDate: Tue Oct 11 09:20:22 2022 +
Commit: Agostino Sarubbo gentoo org>
CommitDate: Tue Oct 11 09:20:25 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=917aba29
media-gfx/digikam: Stabilize 7.8.0-r1 x86, #875608
Signed-off-by: Agostino Sarubbo gentoo.org>
media-gfx/digikam/digikam-7.8.0-r1.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/media-gfx/digikam/digikam-7.8.0-r1.ebuild
b/media-gfx/digikam/digikam-7.8.0-r1.ebuild
index a2f4453e0285..009c5c38aa12 100644
--- a/media-gfx/digikam/digikam-7.8.0-r1.ebuild
+++ b/media-gfx/digikam/digikam-7.8.0-r1.ebuild
@@ -14,7 +14,7 @@ if [[ ${KDE_BUILD_TYPE} != live ]]; then
SRC_URI="mirror://kde/stable/${PN}/${PV}/"
fi
SRC_URI+="digiKam-${PV/_/-}.tar.xz"
- KEYWORDS="~amd64 ~x86"
+ KEYWORDS="~amd64 x86"
S="${WORKDIR}/${PN}-${PV/_/-}"
fi
[gentoo-commits] repo/gentoo:master commit in: media-gfx/digikam/
commit: 3cdc0a5d1f5dd4eb6d1e03c3c5304d772a6ac5c5
Author: Andreas Sturmlechner gentoo org>
AuthorDate: Thu Sep 15 17:45:14 2022 +
Commit: Andreas Sturmlechner gentoo org>
CommitDate: Thu Sep 15 17:46:56 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3cdc0a5d
media-gfx/digikam: Add missing media-libs/opencv[features2d] USEdep
Closes: https://bugs.gentoo.org/774552
Signed-off-by: Andreas Sturmlechner gentoo.org>
media-gfx/digikam/{digikam-7.8.0.ebuild => digikam-7.8.0-r1.ebuild} | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/media-gfx/digikam/digikam-7.8.0.ebuild
b/media-gfx/digikam/digikam-7.8.0-r1.ebuild
similarity index 98%
rename from media-gfx/digikam/digikam-7.8.0.ebuild
rename to media-gfx/digikam/digikam-7.8.0-r1.ebuild
index 5919dbb0d5d7..a2f4453e0285 100644
--- a/media-gfx/digikam/digikam-7.8.0.ebuild
+++ b/media-gfx/digikam/digikam-7.8.0-r1.ebuild
@@ -58,7 +58,7 @@ COMMON_DEPEND="
media-libs/libjpeg-turbo:=
media-libs/liblqr
media-libs/libpng:0=
- >=media-libs/opencv-3.3.0:=[contrib,contribdnn]
+ >=media-libs/opencv-3.3.0:=[contrib,contribdnn,features2d]
media-libs/tiff:0
addressbook? (
>=kde-apps/akonadi-contacts-19.04.3:5
[gentoo-commits] repo/gentoo:master commit in: media-gfx/digikam/, media-gfx/digikam/files/
commit: b7a2d1dd52fe571e0db36d70644c7a263a9b93c4
Author: Andreas Sturmlechner gentoo org>
AuthorDate: Wed Sep 14 13:03:46 2022 +
Commit: Andreas Sturmlechner gentoo org>
CommitDate: Wed Sep 14 13:06:59 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b7a2d1dd
media-gfx/digikam: add 7.8.0
Closes: https://bugs.gentoo.org/861341
Signed-off-by: Andreas Sturmlechner gentoo.org>
media-gfx/digikam/Manifest| 1 +
media-gfx/digikam/digikam-7.8.0.ebuild| 150 ++
media-gfx/digikam/files/digikam-7.8.0-cmake.patch | 119 +
3 files changed, 270 insertions(+)
diff --git a/media-gfx/digikam/Manifest b/media-gfx/digikam/Manifest
index e6006dd17b38..dc7db88aa272 100644
--- a/media-gfx/digikam/Manifest
+++ b/media-gfx/digikam/Manifest
@@ -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
diff --git a/media-gfx/digikam/digikam-7.8.0.ebuild
b/media-gfx/digikam/digikam-7.8.0.ebuild
new file mode 100644
index ..5919dbb0d5d7
--- /dev/null
+++ b/media-gfx/digikam/digikam-7.8.0.ebuild
@@ -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}
+
[gentoo-commits] repo/gentoo:master commit in: media-gfx/digikam/, media-gfx/digikam/files/
commit: f9d833272ef7ee42b6f9514fcac499b2dc691e3c
Author: Andreas Sturmlechner gentoo org>
AuthorDate: Mon May 9 00:07:28 2022 +
Commit: Andreas Sturmlechner gentoo org>
CommitDate: Mon May 9 00:13:41 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f9d83327
media-gfx/digikam: Fix build with kde-apps/akonadi-22.04.0
Closes: https://bugs.gentoo.org/841695
Package-Manager: Portage-3.0.30, Repoman-3.0.3
Signed-off-by: Andreas Sturmlechner gentoo.org>
media-gfx/digikam/digikam-7.5.0.ebuild | 6 -
.../files/digikam-7.5.0-akonadi-22.04.0.patch | 28 ++
2 files changed, 33 insertions(+), 1 deletion(-)
diff --git a/media-gfx/digikam/digikam-7.5.0.ebuild
b/media-gfx/digikam/digikam-7.5.0.ebuild
index 1c774239c811..63edd26cbf88 100644
--- a/media-gfx/digikam/digikam-7.5.0.ebuild
+++ b/media-gfx/digikam/digikam-7.5.0.ebuild
@@ -106,7 +106,11 @@ BDEPEND="
)
"
-PATCHES=( "${FILESDIR}/${PN}-7.3.0-cmake.patch" )
+PATCHES=(
+ "${FILESDIR}/${PN}-7.3.0-cmake.patch"
+ # upstream git master
+ "${FILESDIR}/${P}-akonadi-22.04.0.patch"
+)
pkg_pretend() {
[[ ${MERGE_TYPE} != binary ]] && use openmp && tc-check-openmp
diff --git a/media-gfx/digikam/files/digikam-7.5.0-akonadi-22.04.0.patch
b/media-gfx/digikam/files/digikam-7.5.0-akonadi-22.04.0.patch
new file mode 100644
index ..a2933bc71d3f
--- /dev/null
+++ b/media-gfx/digikam/files/digikam-7.5.0-akonadi-22.04.0.patch
@@ -0,0 +1,28 @@
+From 51efe295a222070743187af0367b0bf957879337 Mon Sep 17 00:00:00 2001
+From: Antonio Rojas
+Date: Fri, 22 Apr 2022 19:13:28 +0200
+Subject: [PATCH] Fix build with akonadi-contacts 22.04
+
+---
+ core/utilities/extrasupport/addressbook/akonadiiface.cpp | 4
+ 1 file changed, 4 insertions(+)
+
+diff --git a/core/utilities/extrasupport/addressbook/akonadiiface.cpp
b/core/utilities/extrasupport/addressbook/akonadiiface.cpp
+index 6a78863cf6..8e65a405da 100644
+--- a/core/utilities/extrasupport/addressbook/akonadiiface.cpp
b/core/utilities/extrasupport/addressbook/akonadiiface.cpp
+@@ -49,7 +49,11 @@
+ #include
+ #endif
+
++#if AKONADI_VERSION >= QT_VERSION_CHECK(5, 19, 80)
++#include
++#else
+ #include
++#endif
+ #include
+
+ #if defined(Q_OS_DARWIN) && defined(Q_CC_CLANG)
+--
+GitLab
+
[gentoo-commits] repo/gentoo:master commit in: media-gfx/digikam/
commit: aec34167fdd63aca8cb339c1c125e5bc61b78ac0
Author: Andreas Sturmlechner gentoo org>
AuthorDate: Sat Mar 12 14:05:02 2022 +
Commit: Andreas Sturmlechner gentoo org>
CommitDate: Sat Mar 12 15:52:46 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=aec34167
media-gfx/digikam: Drop 7.4.0-r1
Package-Manager: Portage-3.0.30, Repoman-3.0.3
Signed-off-by: Andreas Sturmlechner gentoo.org>
media-gfx/digikam/Manifest| 1 -
media-gfx/digikam/digikam-7.4.0-r1.ebuild | 147 --
2 files changed, 148 deletions(-)
diff --git a/media-gfx/digikam/Manifest b/media-gfx/digikam/Manifest
index c4ae0fa1606a..e6006dd17b38 100644
--- a/media-gfx/digikam/Manifest
+++ b/media-gfx/digikam/Manifest
@@ -1,2 +1 @@
-DIST digiKam-7.4.0.tar.xz 339575096 BLAKE2B
b7a556cd8d86bbc60530d697d8ffe42c497cd8ff5dd408f7a2afd1106c96804908e15b6faf1d8090f12aaea62e99d90751ea36c6e36a7bbec62b5f194452d0f1
SHA512
aea494c4636255e25db1cee7968cdec49530064f737897940b9e2184d214b77024f31226fa76e099362966e687e5ed05bc8486ae0645c2c18d9bbcc452dd1b6e
DIST digiKam-7.5.0.tar.xz 339573688 BLAKE2B
26014564e9f9d44db65d4588924da2c85897fb514df0a963f51b9fddb1f26ce3ddf18856b2d4b0eb140581ee7948f048986cf79687a31730e29017b5a811a3d6
SHA512
a2f5005b8f8b8cd9ef58a6bd563481a95004fbad7110d13f1ec4d8550311f1765410dda54f5b04c91bde7ec089e145656961c7c70b27242931e78abd698763e9
diff --git a/media-gfx/digikam/digikam-7.4.0-r1.ebuild
b/media-gfx/digikam/digikam-7.4.0-r1.ebuild
deleted file mode 100644
index 1c774239c811..
--- a/media-gfx/digikam/digikam-7.4.0-r1.ebuild
+++ /dev/null
@@ -1,147 +0,0 @@
-# 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.2
-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/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 )
- 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? (
[gentoo-commits] repo/gentoo:master commit in: media-gfx/digikam/
commit: 57e00367956c736100b2f3736e050ee7edf928e2
Author: Sam James gentoo org>
AuthorDate: Fri Mar 11 23:39:28 2022 +
Commit: Sam James gentoo org>
CommitDate: Fri Mar 11 23:39:28 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=57e00367
media-gfx/digikam: Stabilize 7.5.0 x86, #833841
Signed-off-by: Sam James gentoo.org>
media-gfx/digikam/digikam-7.5.0.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/media-gfx/digikam/digikam-7.5.0.ebuild
b/media-gfx/digikam/digikam-7.5.0.ebuild
index 8010afe031cf..1c774239c811 100644
--- a/media-gfx/digikam/digikam-7.5.0.ebuild
+++ b/media-gfx/digikam/digikam-7.5.0.ebuild
@@ -14,7 +14,7 @@ if [[ ${KDE_BUILD_TYPE} != live ]]; then
SRC_URI="mirror://kde/stable/${PN}/${PV}/"
fi
SRC_URI+="digiKam-${PV/_/-}.tar.xz"
- KEYWORDS="amd64 ~x86"
+ KEYWORDS="amd64 x86"
S="${WORKDIR}/${PN}-${PV/_/-}"
fi
[gentoo-commits] repo/gentoo:master commit in: media-gfx/digikam/
commit: d3d0df50a76740103f3b50d960071524f905e540
Author: Agostino Sarubbo gentoo org>
AuthorDate: Tue Mar 1 11:27:55 2022 +
Commit: Agostino Sarubbo gentoo org>
CommitDate: Tue Mar 1 11:27:55 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d3d0df50
media-gfx/digikam: amd64 stable wrt bug #833841
Package-Manager: Portage-3.0.30, Repoman-3.0.3
RepoMan-Options: --include-arches="amd64"
Signed-off-by: Agostino Sarubbo gentoo.org>
media-gfx/digikam/digikam-7.5.0.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/media-gfx/digikam/digikam-7.5.0.ebuild
b/media-gfx/digikam/digikam-7.5.0.ebuild
index ec7d91762b05..8010afe031cf 100644
--- a/media-gfx/digikam/digikam-7.5.0.ebuild
+++ b/media-gfx/digikam/digikam-7.5.0.ebuild
@@ -14,7 +14,7 @@ if [[ ${KDE_BUILD_TYPE} != live ]]; then
SRC_URI="mirror://kde/stable/${PN}/${PV}/"
fi
SRC_URI+="digiKam-${PV/_/-}.tar.xz"
- KEYWORDS="~amd64 ~x86"
+ KEYWORDS="amd64 ~x86"
S="${WORKDIR}/${PN}-${PV/_/-}"
fi
[gentoo-commits] repo/gentoo:master commit in: media-gfx/digikam/, media-gfx/digikam/files/
commit: 7bf7cf6f0c21532ad1a934dfdeab9b61bd5c1338
Author: Andreas Sturmlechner gentoo org>
AuthorDate: Wed Jan 19 07:56:06 2022 +
Commit: Andreas Sturmlechner gentoo org>
CommitDate: Wed Jan 19 08:29:34 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7bf7cf6f
media-gfx/digikam: Drop 7.3.0-r1
Package-Manager: Portage-3.0.30, Repoman-3.0.3
Signed-off-by: Andreas Sturmlechner gentoo.org>
media-gfx/digikam/Manifest | 1 -
media-gfx/digikam/digikam-7.3.0-r1.ebuild | 152 -
.../files/digikam-7.3.0-akonadi-21.12.0.patch | 31 -
3 files changed, 184 deletions(-)
diff --git a/media-gfx/digikam/Manifest b/media-gfx/digikam/Manifest
index f6db00554838..c4ae0fa1606a 100644
--- a/media-gfx/digikam/Manifest
+++ b/media-gfx/digikam/Manifest
@@ -1,3 +1,2 @@
DIST digiKam-7.4.0.tar.xz 339575096 BLAKE2B
b7a556cd8d86bbc60530d697d8ffe42c497cd8ff5dd408f7a2afd1106c96804908e15b6faf1d8090f12aaea62e99d90751ea36c6e36a7bbec62b5f194452d0f1
SHA512
aea494c4636255e25db1cee7968cdec49530064f737897940b9e2184d214b77024f31226fa76e099362966e687e5ed05bc8486ae0645c2c18d9bbcc452dd1b6e
DIST digiKam-7.5.0.tar.xz 339573688 BLAKE2B
26014564e9f9d44db65d4588924da2c85897fb514df0a963f51b9fddb1f26ce3ddf18856b2d4b0eb140581ee7948f048986cf79687a31730e29017b5a811a3d6
SHA512
a2f5005b8f8b8cd9ef58a6bd563481a95004fbad7110d13f1ec4d8550311f1765410dda54f5b04c91bde7ec089e145656961c7c70b27242931e78abd698763e9
-DIST digikam-7.3.0.tar.xz 256985340 BLAKE2B
9eb9802340f4d071a8378019eba007a25f1e5eeaf9d6acfa9b062c5ecf308a4e59408e078e53cea4d4ed3624d73181f3bb7973622512167bcc44748e063b13ed
SHA512
71cb07de32fb9b07e0f9989a718b2a307618eaaeba6566dc6802b79e48c61f3ab00ca44e12c3971c2efc41448192a2e5a652d2cfd09be058d2bc98f40b5ebaad
diff --git a/media-gfx/digikam/digikam-7.3.0-r1.ebuild
b/media-gfx/digikam/digikam-7.3.0-r1.ebuild
deleted file mode 100644
index 46f064167d80..
--- a/media-gfx/digikam/digikam-7.3.0-r1.ebuild
+++ /dev/null
@@ -1,152 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-KFMIN=5.74.0
-QTMIN=5.15.2
-inherit ecm kde.org toolchain-funcs
-
-if [[ ${KDE_BUILD_TYPE} != live ]]; then
- MY_P=${PN}-${PV/_/-}
- if [[ ${PV} =~ rc[0-9]*$ ]]; then
- SRC_URI="mirror://kde/unstable/${PN}/"
- else
- SRC_URI="mirror://kde/stable/${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 X"
-
-# bug 366505
-RESTRICT+=" test"
-
-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/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/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:=
- )
-
[gentoo-commits] repo/gentoo:master commit in: media-gfx/digikam/
commit: 5ac3e1d1db20d2967d26c79190cbe3aa484684a6
Author: Agostino Sarubbo gentoo org>
AuthorDate: Wed Jan 19 07:44:34 2022 +
Commit: Agostino Sarubbo gentoo org>
CommitDate: Wed Jan 19 07:44:34 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5ac3e1d1
media-gfx/digikam: amd64 stable wrt bug #831256
Package-Manager: Portage-3.0.28, Repoman-3.0.3
RepoMan-Options: --include-arches="amd64"
Signed-off-by: Agostino Sarubbo gentoo.org>
media-gfx/digikam/digikam-7.4.0-r1.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/media-gfx/digikam/digikam-7.4.0-r1.ebuild
b/media-gfx/digikam/digikam-7.4.0-r1.ebuild
index a81df9437262..1c774239c811 100644
--- a/media-gfx/digikam/digikam-7.4.0-r1.ebuild
+++ b/media-gfx/digikam/digikam-7.4.0-r1.ebuild
@@ -14,7 +14,7 @@ if [[ ${KDE_BUILD_TYPE} != live ]]; then
SRC_URI="mirror://kde/stable/${PN}/${PV}/"
fi
SRC_URI+="digiKam-${PV/_/-}.tar.xz"
- KEYWORDS="~amd64 x86"
+ KEYWORDS="amd64 x86"
S="${WORKDIR}/${PN}-${PV/_/-}"
fi
[gentoo-commits] repo/gentoo:master commit in: media-gfx/digikam/
commit: d167731b0302ec6cd9177df0cd511a8f5de00532
Author: Andreas Sturmlechner gentoo org>
AuthorDate: Tue Jan 18 16:12:00 2022 +
Commit: Andreas Sturmlechner gentoo org>
CommitDate: Tue Jan 18 16:31:17 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d167731b
media-gfx/digikam: 7.5.0 version bump
See also:
https://www.digikam.org/news/2022-01-16-7.5.0_release_announcement/
Package-Manager: Portage-3.0.30, Repoman-3.0.3
Signed-off-by: Andreas Sturmlechner gentoo.org>
media-gfx/digikam/Manifest | 1 +
media-gfx/digikam/digikam-7.5.0.ebuild | 147 +
2 files changed, 148 insertions(+)
diff --git a/media-gfx/digikam/Manifest b/media-gfx/digikam/Manifest
index 3c00e7b89718..f6db00554838 100644
--- a/media-gfx/digikam/Manifest
+++ b/media-gfx/digikam/Manifest
@@ -1,2 +1,3 @@
DIST digiKam-7.4.0.tar.xz 339575096 BLAKE2B
b7a556cd8d86bbc60530d697d8ffe42c497cd8ff5dd408f7a2afd1106c96804908e15b6faf1d8090f12aaea62e99d90751ea36c6e36a7bbec62b5f194452d0f1
SHA512
aea494c4636255e25db1cee7968cdec49530064f737897940b9e2184d214b77024f31226fa76e099362966e687e5ed05bc8486ae0645c2c18d9bbcc452dd1b6e
+DIST digiKam-7.5.0.tar.xz 339573688 BLAKE2B
26014564e9f9d44db65d4588924da2c85897fb514df0a963f51b9fddb1f26ce3ddf18856b2d4b0eb140581ee7948f048986cf79687a31730e29017b5a811a3d6
SHA512
a2f5005b8f8b8cd9ef58a6bd563481a95004fbad7110d13f1ec4d8550311f1765410dda54f5b04c91bde7ec089e145656961c7c70b27242931e78abd698763e9
DIST digikam-7.3.0.tar.xz 256985340 BLAKE2B
9eb9802340f4d071a8378019eba007a25f1e5eeaf9d6acfa9b062c5ecf308a4e59408e078e53cea4d4ed3624d73181f3bb7973622512167bcc44748e063b13ed
SHA512
71cb07de32fb9b07e0f9989a718b2a307618eaaeba6566dc6802b79e48c61f3ab00ca44e12c3971c2efc41448192a2e5a652d2cfd09be058d2bc98f40b5ebaad
diff --git a/media-gfx/digikam/digikam-7.5.0.ebuild
b/media-gfx/digikam/digikam-7.5.0.ebuild
new file mode 100644
index ..ec7d91762b05
--- /dev/null
+++ b/media-gfx/digikam/digikam-7.5.0.ebuild
@@ -0,0 +1,147 @@
+# 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.2
+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/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? (
[gentoo-commits] repo/gentoo:master commit in: media-gfx/digikam/
commit: 3cec99ac4f4ad6d93dd2e9d21f17983df0f42d8d
Author: Andreas Sturmlechner gentoo org>
AuthorDate: Tue Jan 18 16:12:43 2022 +
Commit: Andreas Sturmlechner gentoo org>
CommitDate: Tue Jan 18 16:31:18 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3cec99ac
media-gfx/digikam: Fix cmake warning
Package-Manager: Portage-3.0.30, Repoman-3.0.3
Signed-off-by: Andreas Sturmlechner gentoo.org>
media-gfx/digikam/digikam-7.4.0-r1.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/media-gfx/digikam/digikam-7.4.0-r1.ebuild
b/media-gfx/digikam/digikam-7.4.0-r1.ebuild
index 7b575a60fc18..a81df9437262 100644
--- a/media-gfx/digikam/digikam-7.4.0-r1.ebuild
+++ b/media-gfx/digikam/digikam-7.4.0-r1.ebuild
@@ -139,7 +139,7 @@ src_configure() {
$(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)
+ -DENABLE_KFILEMETADATASUPPORT=$(usex semantic-desktop)
$(cmake_use_find_package X X11)
)
[gentoo-commits] repo/gentoo:master commit in: media-gfx/digikam/
commit: 37f8f2d82e5adaa5e83d327725312e83582637b3
Author: Agostino Sarubbo gentoo org>
AuthorDate: Mon Jan 17 08:41:13 2022 +
Commit: Agostino Sarubbo gentoo org>
CommitDate: Mon Jan 17 08:41:13 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=37f8f2d8
media-gfx/digikam: x86 stable wrt bug #831256
Package-Manager: Portage-3.0.28, Repoman-3.0.3
RepoMan-Options: --include-arches="x86"
Signed-off-by: Agostino Sarubbo gentoo.org>
media-gfx/digikam/digikam-7.4.0-r1.ebuild | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/media-gfx/digikam/digikam-7.4.0-r1.ebuild
b/media-gfx/digikam/digikam-7.4.0-r1.ebuild
index b9ebebffc487..7b575a60fc18 100644
--- a/media-gfx/digikam/digikam-7.4.0-r1.ebuild
+++ b/media-gfx/digikam/digikam-7.4.0-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=8
@@ -14,7 +14,7 @@ if [[ ${KDE_BUILD_TYPE} != live ]]; then
SRC_URI="mirror://kde/stable/${PN}/${PV}/"
fi
SRC_URI+="digiKam-${PV/_/-}.tar.xz"
- KEYWORDS="~amd64 ~x86"
+ KEYWORDS="~amd64 x86"
S="${WORKDIR}/${PN}-${PV/_/-}"
fi
[gentoo-commits] repo/gentoo:master commit in: media-gfx/digikam/
commit: 84c15c3858da28a3bfe4c1ff71b28f20573361ac
Author: Andreas Sturmlechner gentoo org>
AuthorDate: Sat Dec 18 17:32:47 2021 +
Commit: Andreas Sturmlechner gentoo org>
CommitDate: Sat Dec 18 17:38:54 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=84c15c38
media-gfx/digikam: Drop 7.3.0 and 7.4.0
Package-Manager: Portage-3.0.30, Repoman-3.0.3
Signed-off-by: Andreas Sturmlechner gentoo.org>
media-gfx/digikam/digikam-7.3.0.ebuild | 147 -
media-gfx/digikam/digikam-7.4.0.ebuild | 145
2 files changed, 292 deletions(-)
diff --git a/media-gfx/digikam/digikam-7.3.0.ebuild
b/media-gfx/digikam/digikam-7.3.0.ebuild
deleted file mode 100644
index bdb373353664..
--- a/media-gfx/digikam/digikam-7.3.0.ebuild
+++ /dev/null
@@ -1,147 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-KFMIN=5.74.0
-QTMIN=5.15.2
-inherit ecm kde.org toolchain-funcs
-
-if [[ ${KDE_BUILD_TYPE} != live ]]; then
- MY_P=${PN}-${PV/_/-}
- if [[ ${PV} =~ rc[0-9]*$ ]]; then
- SRC_URI="mirror://kde/unstable/${PN}/"
- else
- SRC_URI="mirror://kde/stable/${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 X"
-
-# bug 366505
-RESTRICT+=" test"
-
-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/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:=
- 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 )
- 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 )
-"
-
-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)
-
[gentoo-commits] repo/gentoo:master commit in: media-gfx/digikam/, media-gfx/digikam/files/
commit: 61895f0899758028e72b7f9461177b34640e1683
Author: Andreas Sturmlechner gentoo org>
AuthorDate: Sat Dec 18 17:36:15 2021 +
Commit: Andreas Sturmlechner gentoo org>
CommitDate: Sat Dec 18 17:38:53 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=61895f08
media-gfx/digikam: Fix build with >=kde-apps/akonadi-contacts-21.12.0
Closes: https://bugs.gentoo.org/829539
Package-Manager: Portage-3.0.30, Repoman-3.0.3
Signed-off-by: Andreas Sturmlechner gentoo.org>
media-gfx/digikam/digikam-7.3.0-r1.ebuild | 5 +++-
.../files/digikam-7.3.0-akonadi-21.12.0.patch | 31 ++
2 files changed, 35 insertions(+), 1 deletion(-)
diff --git a/media-gfx/digikam/digikam-7.3.0-r1.ebuild
b/media-gfx/digikam/digikam-7.3.0-r1.ebuild
index 7f3918113e25..46f064167d80 100644
--- a/media-gfx/digikam/digikam-7.3.0-r1.ebuild
+++ b/media-gfx/digikam/digikam-7.3.0-r1.ebuild
@@ -108,7 +108,10 @@ RDEPEND="${COMMON_DEPEND}
panorama? ( media-gfx/hugin )
"
-PATCHES=( "${FILESDIR}/${P}-cmake.patch" )
+PATCHES=(
+ "${FILESDIR}/${P}-cmake.patch"
+ "${FILESDIR}/${P}-akonadi-21.12.0.patch"
+)
pkg_pretend() {
[[ ${MERGE_TYPE} != binary ]] && use openmp && tc-check-openmp
diff --git a/media-gfx/digikam/files/digikam-7.3.0-akonadi-21.12.0.patch
b/media-gfx/digikam/files/digikam-7.3.0-akonadi-21.12.0.patch
new file mode 100644
index ..6e4dd25a4028
--- /dev/null
+++ b/media-gfx/digikam/files/digikam-7.3.0-akonadi-21.12.0.patch
@@ -0,0 +1,31 @@
+From 95a8ece964681fc6823e968541da2da2da06b3dd Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?=C3=96mer=20Fad=C4=B1l=20USTA?=
+Date: Sat, 2 Oct 2021 21:50:04 +0300
+Subject: [PATCH] Fix compile for newer Akonadi Build Versions
+
+---
+ core/utilities/extrasupport/addressbook/akonadiiface.cpp | 7 +++
+ 1 file changed, 7 insertions(+)
+
+diff --git a/core/utilities/extrasupport/addressbook/akonadiiface.cpp
b/core/utilities/extrasupport/addressbook/akonadiiface.cpp
+index 8e43dad0da..cb38036e39 100644
+--- a/core/utilities/extrasupport/addressbook/akonadiiface.cpp
b/core/utilities/extrasupport/addressbook/akonadiiface.cpp
+@@ -41,7 +41,14 @@
+ #endif
+
+ #include
++#include
++
++#if AKONADI_VERSION >= QT_VERSION_CHECK(5, 18, 41)
++#include
++#else
+ #include
++#endif
++
+ #include
+ #include
+
+--
+2.34.1
+
[gentoo-commits] repo/gentoo:master commit in: media-gfx/digikam/, media-gfx/digikam/files/
commit: 024c45ad4532e5a05ec7005e11c46875f79342ad
Author: Andreas Sturmlechner gentoo org>
AuthorDate: Sat Dec 18 17:29:27 2021 +
Commit: Andreas Sturmlechner gentoo org>
CommitDate: Sat Dec 18 17:38:52 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=024c45ad
media-gfx/digikam: Add missing usedep, fix cmake (again)
Closes: https://bugs.gentoo.org/829539
Closes: https://bugs.gentoo.org/829571
Package-Manager: Portage-3.0.30, Repoman-3.0.3
Signed-off-by: Andreas Sturmlechner gentoo.org>
media-gfx/digikam/digikam-7.3.0-r1.ebuild | 149 ++
media-gfx/digikam/digikam-7.4.0-r1.ebuild | 147 +
media-gfx/digikam/files/digikam-7.3.0-cmake.patch | 118 +
3 files changed, 414 insertions(+)
diff --git a/media-gfx/digikam/digikam-7.3.0-r1.ebuild
b/media-gfx/digikam/digikam-7.3.0-r1.ebuild
new file mode 100644
index ..7f3918113e25
--- /dev/null
+++ b/media-gfx/digikam/digikam-7.3.0-r1.ebuild
@@ -0,0 +1,149 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+KFMIN=5.74.0
+QTMIN=5.15.2
+inherit ecm kde.org toolchain-funcs
+
+if [[ ${KDE_BUILD_TYPE} != live ]]; then
+ MY_P=${PN}-${PV/_/-}
+ if [[ ${PV} =~ rc[0-9]*$ ]]; then
+ SRC_URI="mirror://kde/unstable/${PN}/"
+ else
+ SRC_URI="mirror://kde/stable/${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 X"
+
+# bug 366505
+RESTRICT+=" test"
+
+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/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/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 )
+ 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}-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
[gentoo-commits] repo/gentoo:master commit in: media-gfx/digikam/
commit: 6c8c0fdcdcf154c5d4e8d3853a8a09987c7c3d95
Author: Andreas Sturmlechner gentoo org>
AuthorDate: Thu Dec 16 15:19:49 2021 +
Commit: Andreas Sturmlechner gentoo org>
CommitDate: Thu Dec 16 16:59:39 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6c8c0fdc
media-gfx/digikam: 7.4.0 version bump
Package-Manager: Portage-3.0.30, Repoman-3.0.3
Signed-off-by: Andreas Sturmlechner gentoo.org>
media-gfx/digikam/Manifest | 1 +
media-gfx/digikam/digikam-7.4.0.ebuild | 145 +
2 files changed, 146 insertions(+)
diff --git a/media-gfx/digikam/Manifest b/media-gfx/digikam/Manifest
index 92a7c106b246..3c00e7b89718 100644
--- a/media-gfx/digikam/Manifest
+++ b/media-gfx/digikam/Manifest
@@ -1 +1,2 @@
+DIST digiKam-7.4.0.tar.xz 339575096 BLAKE2B
b7a556cd8d86bbc60530d697d8ffe42c497cd8ff5dd408f7a2afd1106c96804908e15b6faf1d8090f12aaea62e99d90751ea36c6e36a7bbec62b5f194452d0f1
SHA512
aea494c4636255e25db1cee7968cdec49530064f737897940b9e2184d214b77024f31226fa76e099362966e687e5ed05bc8486ae0645c2c18d9bbcc452dd1b6e
DIST digikam-7.3.0.tar.xz 256985340 BLAKE2B
9eb9802340f4d071a8378019eba007a25f1e5eeaf9d6acfa9b062c5ecf308a4e59408e078e53cea4d4ed3624d73181f3bb7973622512167bcc44748e063b13ed
SHA512
71cb07de32fb9b07e0f9989a718b2a307618eaaeba6566dc6802b79e48c61f3ab00ca44e12c3971c2efc41448192a2e5a652d2cfd09be058d2bc98f40b5ebaad
diff --git a/media-gfx/digikam/digikam-7.4.0.ebuild
b/media-gfx/digikam/digikam-7.4.0.ebuild
new file mode 100644
index ..0a630bfb729d
--- /dev/null
+++ b/media-gfx/digikam/digikam-7.4.0.ebuild
@@ -0,0 +1,145 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+KFMIN=5.88.0
+QTMIN=5.15.2
+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:=
+ 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 )
+ 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? (
[gentoo-commits] repo/gentoo:master commit in: media-gfx/digikam/files/, media-gfx/digikam/
commit: 53a5ff6f18fe4a274b218b319d0f71bab34707bf
Author: Andreas Sturmlechner gentoo org>
AuthorDate: Fri Nov 26 09:25:37 2021 +
Commit: Andreas Sturmlechner gentoo org>
CommitDate: Fri Nov 26 10:27:51 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=53a5ff6f
media-gfx/digikam: Drop 7.2.0-r1
Package-Manager: Portage-3.0.28, Repoman-3.0.3
Signed-off-by: Andreas Sturmlechner gentoo.org>
media-gfx/digikam/Manifest | 1 -
media-gfx/digikam/digikam-7.2.0-r1.ebuild | 149 -
.../digikam-7.2.0-qt-5.15.2-after-f8ad329f.patch | 29
3 files changed, 179 deletions(-)
diff --git a/media-gfx/digikam/Manifest b/media-gfx/digikam/Manifest
index f97122d080d8..92a7c106b246 100644
--- a/media-gfx/digikam/Manifest
+++ b/media-gfx/digikam/Manifest
@@ -1,2 +1 @@
-DIST digikam-7.2.0.tar.xz 255278796 BLAKE2B
5ccc6c6d1f3ce8d83746a1022dcf22b11b87af354f93f0b872a713f438d1bd2ee3f8e59d6206cd83dbbcaf1a8f2568ad0920d887b11d65864802f7eb2b02ba90
SHA512
2908a802fda84caf6b398a5dc328d2e9c00ab68776bde4620db1cb981995879e89d590520bf855471c968f065951280f863620641ccf945c43704e6cf3c0abd7
DIST digikam-7.3.0.tar.xz 256985340 BLAKE2B
9eb9802340f4d071a8378019eba007a25f1e5eeaf9d6acfa9b062c5ecf308a4e59408e078e53cea4d4ed3624d73181f3bb7973622512167bcc44748e063b13ed
SHA512
71cb07de32fb9b07e0f9989a718b2a307618eaaeba6566dc6802b79e48c61f3ab00ca44e12c3971c2efc41448192a2e5a652d2cfd09be058d2bc98f40b5ebaad
diff --git a/media-gfx/digikam/digikam-7.2.0-r1.ebuild
b/media-gfx/digikam/digikam-7.2.0-r1.ebuild
deleted file mode 100644
index 93f92877fffe..
--- a/media-gfx/digikam/digikam-7.2.0-r1.ebuild
+++ /dev/null
@@ -1,149 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-KFMIN=5.74.0
-QTMIN=5.15.2
-inherit ecm kde.org toolchain-funcs
-
-if [[ ${KDE_BUILD_TYPE} != live ]]; then
- MY_P=${PN}-${PV/_/-}
- if [[ ${PV} =~ rc[0-9]*$ ]]; then
- SRC_URI="mirror://kde/unstable/${PN}/"
- else
- SRC_URI="mirror://kde/stable/${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 X"
-
-# bug 366505
-RESTRICT+=" test"
-
-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/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:=
- 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 )
- X? (
-
[gentoo-commits] repo/gentoo:master commit in: media-gfx/digikam/
commit: 60abf2bd307adf0f42846b5a240152440cf45703
Author: Agostino Sarubbo gentoo org>
AuthorDate: Fri Nov 26 08:50:57 2021 +
Commit: Agostino Sarubbo gentoo org>
CommitDate: Fri Nov 26 08:50:57 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=60abf2bd
media-gfx/digikam: amd64 stable wrt bug #822306
Package-Manager: Portage-3.0.20, Repoman-3.0.3
RepoMan-Options: --include-arches="amd64"
Signed-off-by: Agostino Sarubbo gentoo.org>
media-gfx/digikam/digikam-7.3.0.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/media-gfx/digikam/digikam-7.3.0.ebuild
b/media-gfx/digikam/digikam-7.3.0.ebuild
index bdd5d67e8243..bdb373353664 100644
--- a/media-gfx/digikam/digikam-7.3.0.ebuild
+++ b/media-gfx/digikam/digikam-7.3.0.ebuild
@@ -15,7 +15,7 @@ if [[ ${KDE_BUILD_TYPE} != live ]]; then
SRC_URI="mirror://kde/stable/${PN}/${PV}/"
fi
SRC_URI+="${MY_P}.tar.xz"
- KEYWORDS="~amd64 x86"
+ KEYWORDS="amd64 x86"
S="${WORKDIR}/${MY_P}"
fi
[gentoo-commits] repo/gentoo:master commit in: media-gfx/digikam/
commit: 00e85ef853585b0119081085e4bbf485e5ead8f4
Author: Sam James gentoo org>
AuthorDate: Fri Nov 26 01:38:07 2021 +
Commit: Sam James gentoo org>
CommitDate: Fri Nov 26 01:38:07 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=00e85ef8
media-gfx/digikam: Stabilize 7.3.0 x86, #822306
Signed-off-by: Sam James gentoo.org>
media-gfx/digikam/digikam-7.3.0.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/media-gfx/digikam/digikam-7.3.0.ebuild
b/media-gfx/digikam/digikam-7.3.0.ebuild
index bd4f749f819d..bdd5d67e8243 100644
--- a/media-gfx/digikam/digikam-7.3.0.ebuild
+++ b/media-gfx/digikam/digikam-7.3.0.ebuild
@@ -15,7 +15,7 @@ if [[ ${KDE_BUILD_TYPE} != live ]]; then
SRC_URI="mirror://kde/stable/${PN}/${PV}/"
fi
SRC_URI+="${MY_P}.tar.xz"
- KEYWORDS="~amd64 ~x86"
+ KEYWORDS="~amd64 x86"
S="${WORKDIR}/${MY_P}"
fi
[gentoo-commits] repo/gentoo:master commit in: media-gfx/digikam/
commit: ef4420fc8dedd5ae4fc8eb18032bb18a6f4f5fb5
Author: Andreas K. Hüttel gentoo org>
AuthorDate: Wed Aug 4 22:29:12 2021 +
Commit: Andreas K. Hüttel gentoo org>
CommitDate: Wed Aug 4 22:29:49 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ef4420fc
media-gfx/digikam: Version bump 7.3.0
Package-Manager: Portage-3.0.20, Repoman-3.0.3
Signed-off-by: Andreas K. Hüttel gentoo.org>
media-gfx/digikam/Manifest | 1 +
media-gfx/digikam/digikam-7.3.0.ebuild | 147 +
2 files changed, 148 insertions(+)
diff --git a/media-gfx/digikam/Manifest b/media-gfx/digikam/Manifest
index b6b7464360f..f97122d080d 100644
--- a/media-gfx/digikam/Manifest
+++ b/media-gfx/digikam/Manifest
@@ -1 +1,2 @@
DIST digikam-7.2.0.tar.xz 255278796 BLAKE2B
5ccc6c6d1f3ce8d83746a1022dcf22b11b87af354f93f0b872a713f438d1bd2ee3f8e59d6206cd83dbbcaf1a8f2568ad0920d887b11d65864802f7eb2b02ba90
SHA512
2908a802fda84caf6b398a5dc328d2e9c00ab68776bde4620db1cb981995879e89d590520bf855471c968f065951280f863620641ccf945c43704e6cf3c0abd7
+DIST digikam-7.3.0.tar.xz 256985340 BLAKE2B
9eb9802340f4d071a8378019eba007a25f1e5eeaf9d6acfa9b062c5ecf308a4e59408e078e53cea4d4ed3624d73181f3bb7973622512167bcc44748e063b13ed
SHA512
71cb07de32fb9b07e0f9989a718b2a307618eaaeba6566dc6802b79e48c61f3ab00ca44e12c3971c2efc41448192a2e5a652d2cfd09be058d2bc98f40b5ebaad
diff --git a/media-gfx/digikam/digikam-7.3.0.ebuild
b/media-gfx/digikam/digikam-7.3.0.ebuild
new file mode 100644
index 000..bd4f749f819
--- /dev/null
+++ b/media-gfx/digikam/digikam-7.3.0.ebuild
@@ -0,0 +1,147 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+KFMIN=5.74.0
+QTMIN=5.15.2
+inherit ecm kde.org toolchain-funcs
+
+if [[ ${KDE_BUILD_TYPE} != live ]]; then
+ MY_P=${PN}-${PV/_/-}
+ if [[ ${PV} =~ rc[0-9]*$ ]]; then
+ SRC_URI="mirror://kde/unstable/${PN}/"
+ else
+ SRC_URI="mirror://kde/stable/${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 X"
+
+# bug 366505
+RESTRICT+=" test"
+
+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/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:=
+ 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 )
+ X? (
+ >=dev-qt/qtx11extras-${QTMIN}:5
+ x11-libs/libX11
+ )
+"
+DEPEND="${COMMON_DEPEND}
+
[gentoo-commits] repo/gentoo:master commit in: media-gfx/digikam/
commit: 9ec3519e670e1014374146dc71f5ab3af3a382ee
Author: David Seifert gentoo org>
AuthorDate: Fri Jun 18 19:16:47 2021 +
Commit: David Seifert gentoo org>
CommitDate: Fri Jun 18 19:16:47 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9ec3519e
media-gfx/digikam: Depend on dev-libs/boost:=[threads(+)]
Package-Manager: Portage-3.0.20, Repoman-3.0.3
Signed-off-by: David Seifert gentoo.org>
media-gfx/digikam/{digikam-7.2.0.ebuild => digikam-7.2.0-r1.ebuild} | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/media-gfx/digikam/digikam-7.2.0.ebuild
b/media-gfx/digikam/digikam-7.2.0-r1.ebuild
similarity index 99%
rename from media-gfx/digikam/digikam-7.2.0.ebuild
rename to media-gfx/digikam/digikam-7.2.0-r1.ebuild
index 84cafa4714e..93f92877fff 100644
--- a/media-gfx/digikam/digikam-7.2.0.ebuild
+++ b/media-gfx/digikam/digikam-7.2.0-r1.ebuild
@@ -101,7 +101,7 @@ COMMON_DEPEND="
"
DEPEND="${COMMON_DEPEND}
dev-cpp/eigen:3
- dev-libs/boost[threads]
+ dev-libs/boost[threads(+)]
"
RDEPEND="${COMMON_DEPEND}
mysql? ( virtual/mysql[server(+)] )
[gentoo-commits] repo/gentoo:master commit in: media-gfx/digikam/
commit: 833bf2d273e499559e146362af1909fa88412cdc
Author: Sam James gentoo org>
AuthorDate: Tue Jun 1 08:59:35 2021 +
Commit: Sam James gentoo org>
CommitDate: Tue Jun 1 08:59:35 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=833bf2d2
media-gfx/digikam: Stabilize 7.2.0 amd64, #788835
Signed-off-by: Sam James gentoo.org>
media-gfx/digikam/digikam-7.2.0.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/media-gfx/digikam/digikam-7.2.0.ebuild
b/media-gfx/digikam/digikam-7.2.0.ebuild
index 825c823d9db..84cafa4714e 100644
--- a/media-gfx/digikam/digikam-7.2.0.ebuild
+++ b/media-gfx/digikam/digikam-7.2.0.ebuild
@@ -15,7 +15,7 @@ if [[ ${KDE_BUILD_TYPE} != live ]]; then
SRC_URI="mirror://kde/stable/${PN}/${PV}/"
fi
SRC_URI+="${MY_P}.tar.xz"
- KEYWORDS="~amd64 x86"
+ KEYWORDS="amd64 x86"
S="${WORKDIR}/${MY_P}"
fi
[gentoo-commits] repo/gentoo:master commit in: media-gfx/digikam/
commit: b3d14e31ae6a78249b049bbbca9ac7b1033ae50c
Author: Sam James gentoo org>
AuthorDate: Tue Jun 1 08:58:11 2021 +
Commit: Sam James gentoo org>
CommitDate: Tue Jun 1 08:58:11 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b3d14e31
media-gfx/digikam: Stabilize 7.2.0 x86, #788835
Signed-off-by: Sam James gentoo.org>
media-gfx/digikam/digikam-7.2.0.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/media-gfx/digikam/digikam-7.2.0.ebuild
b/media-gfx/digikam/digikam-7.2.0.ebuild
index 7024418a1e3..825c823d9db 100644
--- a/media-gfx/digikam/digikam-7.2.0.ebuild
+++ b/media-gfx/digikam/digikam-7.2.0.ebuild
@@ -15,7 +15,7 @@ if [[ ${KDE_BUILD_TYPE} != live ]]; then
SRC_URI="mirror://kde/stable/${PN}/${PV}/"
fi
SRC_URI+="${MY_P}.tar.xz"
- KEYWORDS="~amd64 ~x86"
+ KEYWORDS="~amd64 x86"
S="${WORKDIR}/${MY_P}"
fi
[gentoo-commits] repo/gentoo:master commit in: media-gfx/digikam/
commit: bcd509519284c5aa64ebea13a11a1f9baa45d9a1
Author: Andreas Sturmlechner gentoo org>
AuthorDate: Sun Mar 7 22:02:01 2021 +
Commit: Andreas Sturmlechner gentoo org>
CommitDate: Thu Mar 25 23:13:18 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=bcd50951
media-gfx/digikam: 7.2.0 version bump
Package-Manager: Portage-3.0.17, Repoman-3.0.2
Signed-off-by: Andreas Sturmlechner gentoo.org>
media-gfx/digikam/Manifest | 1 +
media-gfx/digikam/digikam-7.2.0.ebuild | 147 +
2 files changed, 148 insertions(+)
diff --git a/media-gfx/digikam/Manifest b/media-gfx/digikam/Manifest
index 44d9ec0435a..4577fef4bf0 100644
--- a/media-gfx/digikam/Manifest
+++ b/media-gfx/digikam/Manifest
@@ -1 +1,2 @@
DIST digikam-7.1.0.tar.xz 593501044 BLAKE2B
dcd124a18299a75c02b51642cc33d2a053f1fce4abd82b3f50ea93cc17e8b302b73284106ed716e815741cc38326695f1303e018998a6687f8cd92ab539faeb0
SHA512
df7138a45ff8de6c1e32cb0eea83e1cd4b67f027b149a696d8feb8008ceaae55934c1f1d9625c1ba29de850ad70aa01dc73f1b7517253ca6aa99f0f97b84a3a4
+DIST digikam-7.2.0.tar.xz 255278796 BLAKE2B
5ccc6c6d1f3ce8d83746a1022dcf22b11b87af354f93f0b872a713f438d1bd2ee3f8e59d6206cd83dbbcaf1a8f2568ad0920d887b11d65864802f7eb2b02ba90
SHA512
2908a802fda84caf6b398a5dc328d2e9c00ab68776bde4620db1cb981995879e89d590520bf855471c968f065951280f863620641ccf945c43704e6cf3c0abd7
diff --git a/media-gfx/digikam/digikam-7.2.0.ebuild
b/media-gfx/digikam/digikam-7.2.0.ebuild
new file mode 100644
index 000..c7406e0e9cf
--- /dev/null
+++ b/media-gfx/digikam/digikam-7.2.0.ebuild
@@ -0,0 +1,147 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+KFMIN=5.74.0
+QTMIN=5.15.2
+inherit ecm kde.org toolchain-funcs
+
+if [[ ${KDE_BUILD_TYPE} != live ]]; then
+ MY_P=${PN}-${PV/_/-}
+ if [[ ${PV} =~ rc[0-9]*$ ]]; then
+ SRC_URI="mirror://kde/unstable/${PN}/"
+ else
+ SRC_URI="mirror://kde/stable/${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 X"
+
+# bug 366505
+RESTRICT+=" test"
+
+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/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:=
+ 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 )
+ X? (
+ >=dev-qt/qtx11extras-${QTMIN}:5
+ x11-libs/libX11
+ )
+"
[gentoo-commits] repo/gentoo:master commit in: media-gfx/digikam/
commit: 86cf8851f1124d4bb5d1b7ba55c3f5a98516bdc2
Author: Andreas Sturmlechner gentoo org>
AuthorDate: Sat Dec 5 23:47:12 2020 +
Commit: Andreas Sturmlechner gentoo org>
CommitDate: Sat Dec 5 23:47:56 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=86cf8851
media-gfx/digikam: Fix MissingUseDepDefault on media-libs/qtav
Package-Manager: Portage-3.0.11, Repoman-3.0.2
Signed-off-by: Andreas Sturmlechner gentoo.org>
media-gfx/digikam/{digikam-7.1.0.ebuild => digikam-7.1.0-r1.ebuild} | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/media-gfx/digikam/digikam-7.1.0.ebuild
b/media-gfx/digikam/digikam-7.1.0-r1.ebuild
similarity index 99%
rename from media-gfx/digikam/digikam-7.1.0.ebuild
rename to media-gfx/digikam/digikam-7.1.0-r1.ebuild
index 3fcf93ec3dc..194a341e777 100644
--- a/media-gfx/digikam/digikam-7.1.0.ebuild
+++ b/media-gfx/digikam/digikam-7.1.0-r1.ebuild
@@ -81,7 +81,7 @@ COMMON_DEPEND="
>=kde-frameworks/kbookmarks-${KFMIN}:5
)
mediaplayer? (
- media-libs/qtav[opengl]
+ media-libs/qtav[opengl(+)]
media-video/ffmpeg:=
)
opengl? (
[gentoo-commits] repo/gentoo:master commit in: media-gfx/digikam/
commit: 2ac33ed9e3de45170dd949253c8cf953408b6158
Author: Sam James gentoo org>
AuthorDate: Thu Nov 12 15:26:33 2020 +
Commit: Sam James gentoo org>
CommitDate: Thu Nov 12 15:27:29 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2ac33ed9
media-gfx/digikam: Stabilize 7.1.0 x86, #746596
Signed-off-by: Sam James gentoo.org>
media-gfx/digikam/digikam-7.1.0.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/media-gfx/digikam/digikam-7.1.0.ebuild
b/media-gfx/digikam/digikam-7.1.0.ebuild
index f39976189b8..3fcf93ec3dc 100644
--- a/media-gfx/digikam/digikam-7.1.0.ebuild
+++ b/media-gfx/digikam/digikam-7.1.0.ebuild
@@ -15,7 +15,7 @@ if [[ ${KDE_BUILD_TYPE} != live ]]; then
SRC_URI="mirror://kde/stable/${PN}/${PV}/"
fi
SRC_URI+="${MY_P}.tar.xz"
- KEYWORDS="amd64 ~x86"
+ KEYWORDS="amd64 x86"
S="${WORKDIR}/${MY_P}"
fi
[gentoo-commits] repo/gentoo:master commit in: media-gfx/digikam/
commit: 6d802d3a1df7c5cf5d92a1a3341df103e741158f
Author: Sam James gentoo org>
AuthorDate: Wed Nov 11 15:37:37 2020 +
Commit: Sam James gentoo org>
CommitDate: Wed Nov 11 15:37:37 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6d802d3a
media-gfx/digikam: Stabilize 7.1.0 amd64, #746596
Signed-off-by: Sam James gentoo.org>
media-gfx/digikam/digikam-7.1.0.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/media-gfx/digikam/digikam-7.1.0.ebuild
b/media-gfx/digikam/digikam-7.1.0.ebuild
index d630d405feb..f39976189b8 100644
--- a/media-gfx/digikam/digikam-7.1.0.ebuild
+++ b/media-gfx/digikam/digikam-7.1.0.ebuild
@@ -15,7 +15,7 @@ if [[ ${KDE_BUILD_TYPE} != live ]]; then
SRC_URI="mirror://kde/stable/${PN}/${PV}/"
fi
SRC_URI+="${MY_P}.tar.xz"
- KEYWORDS="~amd64 ~x86"
+ KEYWORDS="amd64 ~x86"
S="${WORKDIR}/${MY_P}"
fi
[gentoo-commits] repo/gentoo:master commit in: media-gfx/digikam/
commit: cda239e9e769e97c7aa97d4baba94ff0727078c5
Author: Andreas Sturmlechner gentoo org>
AuthorDate: Wed Sep 16 15:12:32 2020 +
Commit: Andreas Sturmlechner gentoo org>
CommitDate: Thu Sep 17 20:14:46 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=cda239e9
media-gfx/digikam: Drop 7.0.0
Package-Manager: Portage-3.0.7, Repoman-3.0.1
Signed-off-by: Andreas Sturmlechner gentoo.org>
media-gfx/digikam/Manifest | 1 -
media-gfx/digikam/digikam-7.0.0.ebuild | 148 -
2 files changed, 149 deletions(-)
diff --git a/media-gfx/digikam/Manifest b/media-gfx/digikam/Manifest
index 3bcc594935d..cdab462e093 100644
--- a/media-gfx/digikam/Manifest
+++ b/media-gfx/digikam/Manifest
@@ -1,3 +1,2 @@
DIST digikam-6.4.0.tar.xz 340146992 BLAKE2B
ca1bc8b0d165f9774354d8489a11d46d8d7467edd3c1e90fd3a96024c4b7cd23bfd5c813251183bcca6d4beac9bffeb9d921beaa9a3752f75f1918796aacd719
SHA512
b3b5e9903538d110613aa872c9215f5e7c19f7520a2b9060c24e686f20f72075378b447239dd3e17cb8860cdd35c69934199b848757f0497ad25a7805e42
-DIST digikam-7.0.0.tar.xz 571511148 BLAKE2B
4730a7fd70c7939f229ce6e3e95e8e8f2c37d0e54f033b3161c27e93a2eb5d464a9e1339ba1d6acce4312f91dbc3f4b55333f8b7a9a32d58a20dd04c0fbd8d2b
SHA512
379d31949605ae59aa8aaebc96f264f7fdfd8d6fa51be8b097e79add4042072cbc1f52d7bc96e6045b967c01f282e50bf955923016ee6e0cfd07d09e2a24
DIST digikam-7.1.0.tar.xz 593501044 BLAKE2B
dcd124a18299a75c02b51642cc33d2a053f1fce4abd82b3f50ea93cc17e8b302b73284106ed716e815741cc38326695f1303e018998a6687f8cd92ab539faeb0
SHA512
df7138a45ff8de6c1e32cb0eea83e1cd4b67f027b149a696d8feb8008ceaae55934c1f1d9625c1ba29de850ad70aa01dc73f1b7517253ca6aa99f0f97b84a3a4
diff --git a/media-gfx/digikam/digikam-7.0.0.ebuild
b/media-gfx/digikam/digikam-7.0.0.ebuild
deleted file mode 100644
index 742181ff7bb..000
--- a/media-gfx/digikam/digikam-7.0.0.ebuild
+++ /dev/null
@@ -1,148 +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_P=${PN}-${PV/_/-}
- if [[ ${PV} =~ rc[0-9]*$ ]]; then
- SRC_URI="mirror://kde/unstable/${PN}/"
- else
- SRC_URI="mirror://kde/stable/${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 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? (
[gentoo-commits] repo/gentoo:master commit in: media-gfx/digikam/
commit: ad53e15bf9a0cf422c5461a91327ca2e014807a8
Author: Andreas Sturmlechner gentoo org>
AuthorDate: Wed Sep 9 20:19:22 2020 +
Commit: Andreas Sturmlechner gentoo org>
CommitDate: Thu Sep 10 17:41:47 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ad53e15b
media-gfx/digikam: 7.1.0 version bump
Announcement:
https://www.digikam.org/news/2020-09-06-7.1.0_release_announcement/
Package-Manager: Portage-3.0.6, Repoman-3.0.1
Signed-off-by: Andreas Sturmlechner gentoo.org>
media-gfx/digikam/Manifest | 1 +
media-gfx/digikam/digikam-7.1.0.ebuild | 147 +
2 files changed, 148 insertions(+)
diff --git a/media-gfx/digikam/Manifest b/media-gfx/digikam/Manifest
index 204a1e46a22..3bcc594935d 100644
--- a/media-gfx/digikam/Manifest
+++ b/media-gfx/digikam/Manifest
@@ -1,2 +1,3 @@
DIST digikam-6.4.0.tar.xz 340146992 BLAKE2B
ca1bc8b0d165f9774354d8489a11d46d8d7467edd3c1e90fd3a96024c4b7cd23bfd5c813251183bcca6d4beac9bffeb9d921beaa9a3752f75f1918796aacd719
SHA512
b3b5e9903538d110613aa872c9215f5e7c19f7520a2b9060c24e686f20f72075378b447239dd3e17cb8860cdd35c69934199b848757f0497ad25a7805e42
DIST digikam-7.0.0.tar.xz 571511148 BLAKE2B
4730a7fd70c7939f229ce6e3e95e8e8f2c37d0e54f033b3161c27e93a2eb5d464a9e1339ba1d6acce4312f91dbc3f4b55333f8b7a9a32d58a20dd04c0fbd8d2b
SHA512
379d31949605ae59aa8aaebc96f264f7fdfd8d6fa51be8b097e79add4042072cbc1f52d7bc96e6045b967c01f282e50bf955923016ee6e0cfd07d09e2a24
+DIST digikam-7.1.0.tar.xz 593501044 BLAKE2B
dcd124a18299a75c02b51642cc33d2a053f1fce4abd82b3f50ea93cc17e8b302b73284106ed716e815741cc38326695f1303e018998a6687f8cd92ab539faeb0
SHA512
df7138a45ff8de6c1e32cb0eea83e1cd4b67f027b149a696d8feb8008ceaae55934c1f1d9625c1ba29de850ad70aa01dc73f1b7517253ca6aa99f0f97b84a3a4
diff --git a/media-gfx/digikam/digikam-7.1.0.ebuild
b/media-gfx/digikam/digikam-7.1.0.ebuild
new file mode 100644
index 000..d630d405feb
--- /dev/null
+++ b/media-gfx/digikam/digikam-7.1.0.ebuild
@@ -0,0 +1,147 @@
+# 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_P=${PN}-${PV/_/-}
+ if [[ ${PV} =~ beta[0-9]$ ]]; then
+ SRC_URI="mirror://kde/unstable/${PN}/"
+ else
+ SRC_URI="mirror://kde/stable/${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 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/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:=
+ 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? (
+
[gentoo-commits] repo/gentoo:master commit in: media-gfx/digikam/
commit: 0fcad582c196380017f91e37990226e02ffafd21
Author: Andreas Sturmlechner gentoo org>
AuthorDate: Sat Aug 1 17:22:38 2020 +
Commit: Andreas Sturmlechner gentoo org>
CommitDate: Sat Aug 1 22:57:19 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0fcad582
media-gfx/digikam: 7.0.0 version bump
See also: https://www.digikam.org/news/2020-07-19-7.0.0_release_announcement/
Package-Manager: Portage-3.0.1, Repoman-2.3.23
Signed-off-by: Andreas Sturmlechner gentoo.org>
media-gfx/digikam/Manifest | 1 +
media-gfx/digikam/digikam-7.0.0.ebuild | 148 +
2 files changed, 149 insertions(+)
diff --git a/media-gfx/digikam/Manifest b/media-gfx/digikam/Manifest
index 5b357c514f6..1d898a91296 100644
--- a/media-gfx/digikam/Manifest
+++ b/media-gfx/digikam/Manifest
@@ -1,2 +1,3 @@
DIST digikam-6.4.0.tar.xz 340146992 BLAKE2B
ca1bc8b0d165f9774354d8489a11d46d8d7467edd3c1e90fd3a96024c4b7cd23bfd5c813251183bcca6d4beac9bffeb9d921beaa9a3752f75f1918796aacd719
SHA512
b3b5e9903538d110613aa872c9215f5e7c19f7520a2b9060c24e686f20f72075378b447239dd3e17cb8860cdd35c69934199b848757f0497ad25a7805e42
DIST digikam-7.0.0-rc.tar.xz 566061948 BLAKE2B
0f167387c7110223764f203c829079eb677de0251f440b65d7dbc9c6b6e49a77d7e7bdd44d3f578338b7a06a3a7f694402b7a406537075c4cc32a3abb59cf159
SHA512
fbfb3b91038fa76b3f699304318f91e429f6ac51424f9895d48cf30b5319029a8e2b3791adba56b444329916d51fae5a8adc8f6aedbeae36fd165e781742119e
+DIST digikam-7.0.0.tar.xz 571511148 BLAKE2B
4730a7fd70c7939f229ce6e3e95e8e8f2c37d0e54f033b3161c27e93a2eb5d464a9e1339ba1d6acce4312f91dbc3f4b55333f8b7a9a32d58a20dd04c0fbd8d2b
SHA512
379d31949605ae59aa8aaebc96f264f7fdfd8d6fa51be8b097e79add4042072cbc1f52d7bc96e6045b967c01f282e50bf955923016ee6e0cfd07d09e2a24
diff --git a/media-gfx/digikam/digikam-7.0.0.ebuild
b/media-gfx/digikam/digikam-7.0.0.ebuild
new file mode 100644
index 000..742181ff7bb
--- /dev/null
+++ b/media-gfx/digikam/digikam-7.0.0.ebuild
@@ -0,0 +1,148 @@
+# 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_P=${PN}-${PV/_/-}
+ if [[ ${PV} =~ rc[0-9]*$ ]]; then
+ SRC_URI="mirror://kde/unstable/${PN}/"
+ else
+ SRC_URI="mirror://kde/stable/${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 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
+
[gentoo-commits] repo/gentoo:master commit in: media-gfx/digikam/
commit: a7d49a8c79c227157f00cf77d15b11868f56ff6c
Author: Andreas Sturmlechner gentoo org>
AuthorDate: Sat Aug 1 17:26:05 2020 +
Commit: Andreas Sturmlechner gentoo org>
CommitDate: Sat Aug 1 22:57:19 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a7d49a8c
media-gfx/digikam: Drop 7.0.0_rc
Package-Manager: Portage-3.0.1, Repoman-2.3.23
Signed-off-by: Andreas Sturmlechner gentoo.org>
media-gfx/digikam/Manifest| 1 -
media-gfx/digikam/digikam-7.0.0_rc.ebuild | 148 --
2 files changed, 149 deletions(-)
diff --git a/media-gfx/digikam/Manifest b/media-gfx/digikam/Manifest
index 1d898a91296..204a1e46a22 100644
--- a/media-gfx/digikam/Manifest
+++ b/media-gfx/digikam/Manifest
@@ -1,3 +1,2 @@
DIST digikam-6.4.0.tar.xz 340146992 BLAKE2B
ca1bc8b0d165f9774354d8489a11d46d8d7467edd3c1e90fd3a96024c4b7cd23bfd5c813251183bcca6d4beac9bffeb9d921beaa9a3752f75f1918796aacd719
SHA512
b3b5e9903538d110613aa872c9215f5e7c19f7520a2b9060c24e686f20f72075378b447239dd3e17cb8860cdd35c69934199b848757f0497ad25a7805e42
-DIST digikam-7.0.0-rc.tar.xz 566061948 BLAKE2B
0f167387c7110223764f203c829079eb677de0251f440b65d7dbc9c6b6e49a77d7e7bdd44d3f578338b7a06a3a7f694402b7a406537075c4cc32a3abb59cf159
SHA512
fbfb3b91038fa76b3f699304318f91e429f6ac51424f9895d48cf30b5319029a8e2b3791adba56b444329916d51fae5a8adc8f6aedbeae36fd165e781742119e
DIST digikam-7.0.0.tar.xz 571511148 BLAKE2B
4730a7fd70c7939f229ce6e3e95e8e8f2c37d0e54f033b3161c27e93a2eb5d464a9e1339ba1d6acce4312f91dbc3f4b55333f8b7a9a32d58a20dd04c0fbd8d2b
SHA512
379d31949605ae59aa8aaebc96f264f7fdfd8d6fa51be8b097e79add4042072cbc1f52d7bc96e6045b967c01f282e50bf955923016ee6e0cfd07d09e2a24
diff --git a/media-gfx/digikam/digikam-7.0.0_rc.ebuild
b/media-gfx/digikam/digikam-7.0.0_rc.ebuild
deleted file mode 100644
index 742181ff7bb..000
--- a/media-gfx/digikam/digikam-7.0.0_rc.ebuild
+++ /dev/null
@@ -1,148 +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_P=${PN}-${PV/_/-}
- if [[ ${PV} =~ rc[0-9]*$ ]]; then
- SRC_URI="mirror://kde/unstable/${PN}/"
- else
- SRC_URI="mirror://kde/stable/${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 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 )
[gentoo-commits] repo/gentoo:master commit in: media-gfx/digikam/files/, media-gfx/digikam/
commit: 54c96702dba9bb8dc9fccd90ee19439ecc6a237e
Author: Andreas Sturmlechner gentoo org>
AuthorDate: Tue Jun 30 21:20:54 2020 +
Commit: Andreas Sturmlechner gentoo org>
CommitDate: Tue Jun 30 21:44:04 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=54c96702
media-gfx/digikam: Fix 6.4.0-r1 build w/ Qt-5.15
Thanks-to: Thomas Posch online.posch.name>
Closes: https://bugs.gentoo.org/729446
Package-Manager: Portage-2.3.103, Repoman-2.3.23
Signed-off-by: Andreas Sturmlechner gentoo.org>
media-gfx/digikam/digikam-6.4.0-r1.ebuild | 5 ++-
.../digikam/files/digikam-6.4.0-qt-5.15.patch | 38 ++
2 files changed, 42 insertions(+), 1 deletion(-)
diff --git a/media-gfx/digikam/digikam-6.4.0-r1.ebuild
b/media-gfx/digikam/digikam-6.4.0-r1.ebuild
index f89120250bc..870d93f3a99 100644
--- a/media-gfx/digikam/digikam-6.4.0-r1.ebuild
+++ b/media-gfx/digikam/digikam-6.4.0-r1.ebuild
@@ -109,7 +109,10 @@ RDEPEND="${COMMON_DEPEND}
RESTRICT+=" test"
# bug 366505
-PATCHES=( "${FILESDIR}/${PN}-6.3.0-cmake.patch" )
+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
diff --git a/media-gfx/digikam/files/digikam-6.4.0-qt-5.15.patch
b/media-gfx/digikam/files/digikam-6.4.0-qt-5.15.patch
new file mode 100644
index 000..c2d5154b549
--- /dev/null
+++ b/media-gfx/digikam/files/digikam-6.4.0-qt-5.15.patch
@@ -0,0 +1,38 @@
+Fix build with Qt 5.15
+
+Authored-by: Thomas Posch
+
+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
+ #include
+ #include
++#include
++#include
+ #include
+ #include
+ #include
+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
+ #include
+ #include
++#include
+ #include
+
+ // 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
++#include
+
+ // KDE includes
+
[gentoo-commits] repo/gentoo:master commit in: media-gfx/digikam/files/
commit: 10653a18b21cbe365f877ab4f29c396323ecafbb Author: Andreas Sturmlechner gentoo org> AuthorDate: Tue Jun 16 14:15:35 2020 + Commit: Andreas Sturmlechner gentoo org> CommitDate: Tue Jun 16 16:29:25 2020 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=10653a18 media-gfx/digikam: Drop obsolete 7.0.0_beta3-qt-5.15.patch Package-Manager: Portage-2.3.101, Repoman-2.3.22 Signed-off-by: Andreas Sturmlechner gentoo.org> .../files/digikam-7.0.0_beta3-qt-5.15.patch| 51 -- 1 file changed, 51 deletions(-) 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 deleted file mode 100644 index fe865eb73af..000 --- a/media-gfx/digikam/files/digikam-7.0.0_beta3-qt-5.15.patch +++ /dev/null @@ -1,51 +0,0 @@ -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 cbd156..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 -
[gentoo-commits] repo/gentoo:master commit in: media-gfx/digikam/
commit: 83f6f2200c61db8290f3f0a69d410d698457f2c1
Author: Andreas Sturmlechner gentoo org>
AuthorDate: Mon Jun 15 22:23:44 2020 +
Commit: Andreas Sturmlechner gentoo org>
CommitDate: Mon Jun 15 23:04:02 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=83f6f220
media-gfx/digikam: Drop 7.0.0_beta3
Package-Manager: Portage-2.3.101, Repoman-2.3.22
Signed-off-by: Andreas Sturmlechner gentoo.org>
media-gfx/digikam/Manifest | 1 -
media-gfx/digikam/digikam-7.0.0_beta3.ebuild | 153 ---
2 files changed, 154 deletions(-)
diff --git a/media-gfx/digikam/Manifest b/media-gfx/digikam/Manifest
index 9748c8125c1..5b357c514f6 100644
--- a/media-gfx/digikam/Manifest
+++ b/media-gfx/digikam/Manifest
@@ -1,3 +1,2 @@
DIST digikam-6.4.0.tar.xz 340146992 BLAKE2B
ca1bc8b0d165f9774354d8489a11d46d8d7467edd3c1e90fd3a96024c4b7cd23bfd5c813251183bcca6d4beac9bffeb9d921beaa9a3752f75f1918796aacd719
SHA512
b3b5e9903538d110613aa872c9215f5e7c19f7520a2b9060c24e686f20f72075378b447239dd3e17cb8860cdd35c69934199b848757f0497ad25a7805e42
-DIST digikam-7.0.0-beta3.tar.xz 571307796 BLAKE2B
fb0d82557c3a747f8a4b0a188f9ae7a0f06590ed59eed1418647b73a21c59334473dc0c33018db7f27572e574ac56a202a36a47a26c4b5b589a7f54c1987d2a5
SHA512
da25e1a2ab7c426f9f437c4ed81c334f435fcabf6d388f083bc5192cca9df8114961451adbe8d4e86df319a0a7ae125fb527ce406fce349632b59912777a1f69
DIST digikam-7.0.0-rc.tar.xz 566061948 BLAKE2B
0f167387c7110223764f203c829079eb677de0251f440b65d7dbc9c6b6e49a77d7e7bdd44d3f578338b7a06a3a7f694402b7a406537075c4cc32a3abb59cf159
SHA512
fbfb3b91038fa76b3f699304318f91e429f6ac51424f9895d48cf30b5319029a8e2b3791adba56b444329916d51fae5a8adc8f6aedbeae36fd165e781742119e
diff --git a/media-gfx/digikam/digikam-7.0.0_beta3.ebuild
b/media-gfx/digikam/digikam-7.0.0_beta3.ebuild
deleted file mode 100644
index 3659f26f6ff..000
--- a/media-gfx/digikam/digikam-7.0.0_beta3.ebuild
+++ /dev/null
@@ -1,153 +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}
- 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
- )
-
[gentoo-commits] repo/gentoo:master commit in: media-gfx/digikam/
commit: 60678506e1135938166f1dc2e67187829aa22af6
Author: Andreas Sturmlechner gentoo org>
AuthorDate: Mon Jun 15 21:36:56 2020 +
Commit: Andreas Sturmlechner gentoo org>
CommitDate: Mon Jun 15 23:04:01 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=60678506
media-gfx/digikam: 7.0.0_rc version bump
Package-Manager: Portage-2.3.101, Repoman-2.3.22
Signed-off-by: Andreas Sturmlechner gentoo.org>
media-gfx/digikam/Manifest| 1 +
media-gfx/digikam/digikam-7.0.0_rc.ebuild | 148 ++
2 files changed, 149 insertions(+)
diff --git a/media-gfx/digikam/Manifest b/media-gfx/digikam/Manifest
index c96abe6cb1e..9748c8125c1 100644
--- a/media-gfx/digikam/Manifest
+++ b/media-gfx/digikam/Manifest
@@ -1,2 +1,3 @@
DIST digikam-6.4.0.tar.xz 340146992 BLAKE2B
ca1bc8b0d165f9774354d8489a11d46d8d7467edd3c1e90fd3a96024c4b7cd23bfd5c813251183bcca6d4beac9bffeb9d921beaa9a3752f75f1918796aacd719
SHA512
b3b5e9903538d110613aa872c9215f5e7c19f7520a2b9060c24e686f20f72075378b447239dd3e17cb8860cdd35c69934199b848757f0497ad25a7805e42
DIST digikam-7.0.0-beta3.tar.xz 571307796 BLAKE2B
fb0d82557c3a747f8a4b0a188f9ae7a0f06590ed59eed1418647b73a21c59334473dc0c33018db7f27572e574ac56a202a36a47a26c4b5b589a7f54c1987d2a5
SHA512
da25e1a2ab7c426f9f437c4ed81c334f435fcabf6d388f083bc5192cca9df8114961451adbe8d4e86df319a0a7ae125fb527ce406fce349632b59912777a1f69
+DIST digikam-7.0.0-rc.tar.xz 566061948 BLAKE2B
0f167387c7110223764f203c829079eb677de0251f440b65d7dbc9c6b6e49a77d7e7bdd44d3f578338b7a06a3a7f694402b7a406537075c4cc32a3abb59cf159
SHA512
fbfb3b91038fa76b3f699304318f91e429f6ac51424f9895d48cf30b5319029a8e2b3791adba56b444329916d51fae5a8adc8f6aedbeae36fd165e781742119e
diff --git a/media-gfx/digikam/digikam-7.0.0_rc.ebuild
b/media-gfx/digikam/digikam-7.0.0_rc.ebuild
new file mode 100644
index 000..742181ff7bb
--- /dev/null
+++ b/media-gfx/digikam/digikam-7.0.0_rc.ebuild
@@ -0,0 +1,148 @@
+# 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_P=${PN}-${PV/_/-}
+ if [[ ${PV} =~ rc[0-9]*$ ]]; then
+ SRC_URI="mirror://kde/unstable/${PN}/"
+ else
+ SRC_URI="mirror://kde/stable/${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 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? (
[gentoo-commits] repo/gentoo:master commit in: media-gfx/digikam/
commit: cb6821e0aeb518782eebcdc2ae3e5c9014a60691
Author: Andreas Sturmlechner gentoo org>
AuthorDate: Tue May 26 15:30:25 2020 +
Commit: Andreas Sturmlechner gentoo org>
CommitDate: Tue May 26 15:30:58 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=cb6821e0
media-gfx/digikam: Fix MissingUseDepDefault on virtual/mysql
Package-Manager: Portage-2.3.100, Repoman-2.3.22
Signed-off-by: Andreas Sturmlechner gentoo.org>
media-gfx/digikam/digikam-7.0.0_beta3.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/media-gfx/digikam/digikam-7.0.0_beta3.ebuild
b/media-gfx/digikam/digikam-7.0.0_beta3.ebuild
index 777acac8770..3659f26f6ff 100644
--- a/media-gfx/digikam/digikam-7.0.0_beta3.ebuild
+++ b/media-gfx/digikam/digikam-7.0.0_beta3.ebuild
@@ -104,7 +104,7 @@ DEPEND="${COMMON_DEPEND}
dev-libs/boost[threads]
"
RDEPEND="${COMMON_DEPEND}
- mysql? ( virtual/mysql[server] )
+ mysql? ( virtual/mysql[server(+)] )
panorama? ( media-gfx/hugin )
"
[gentoo-commits] repo/gentoo:master commit in: media-gfx/digikam/, media-gfx/digikam/files/
commit: baa782f0ec2bad1dbbca0cb233605ef59e35636d
Author: Andreas Sturmlechner gentoo org>
AuthorDate: Tue May 26 14:16:21 2020 +
Commit: Andreas Sturmlechner gentoo org>
CommitDate: Tue May 26 14:32:26 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=baa782f0
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 gentoo.org>
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(+)
diff --git a/media-gfx/digikam/Manifest b/media-gfx/digikam/Manifest
index 06c96471be9..c96abe6cb1e 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
b3b5e9903538d110613aa872c9215f5e7c19f7520a2b9060c24e686f20f72075378b447239dd3e17cb8860cdd35c69934199b848757f0497ad25a7805e42
+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 000..777acac8770
--- /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? (
[gentoo-commits] repo/gentoo:master commit in: media-gfx/digikam/
commit: 710007b1d08c5f21a0154052196fde613c3cc07b
Author: Mikle Kolyada gentoo org>
AuthorDate: Sun Apr 26 07:40:12 2020 +
Commit: Mikle Kolyada gentoo org>
CommitDate: Sun Apr 26 07:40:12 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=710007b1
media-gfx/digikam: migrate from libav
Package-Manager: Portage-2.3.89, Repoman-2.3.20
Signed-off-by: Mikle Kolyada gentoo.org>
media-gfx/digikam/digikam-6.4.0-r1.ebuild | 5 ++---
1 file changed, 2 insertions(+), 3 deletions(-)
diff --git a/media-gfx/digikam/digikam-6.4.0-r1.ebuild
b/media-gfx/digikam/digikam-6.4.0-r1.ebuild
index 99983ca35b3..f89120250bc 100644
--- a/media-gfx/digikam/digikam-6.4.0-r1.ebuild
+++ b/media-gfx/digikam/digikam-6.4.0-r1.ebuild
@@ -22,7 +22,7 @@ HOMEPAGE="https://www.digikam.org/;
LICENSE="GPL-2"
SLOT="5"
-IUSE="addressbook calendar dnn heif +imagemagick gphoto2 +lensfun libav marble
mediaplayer mysql opengl openmp +panorama scanner semantic-desktop vkontakte
webkit X"
+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
@@ -80,8 +80,7 @@ COMMON_DEPEND="
)
mediaplayer? (
media-libs/qtav[opengl]
- !libav? ( media-video/ffmpeg:= )
- libav? ( media-video/libav:= )
+ media-video/ffmpeg:=
)
opengl? (
>=dev-qt/qtopengl-${QTMIN}:5
[gentoo-commits] repo/gentoo:master commit in: media-gfx/digikam/
commit: 45bde05b2cc80ab53f5a3038292acb8bf7d4e9b6
Author: Andreas Sturmlechner gentoo org>
AuthorDate: Wed Apr 1 21:22:49 2020 +
Commit: Andreas Sturmlechner gentoo org>
CommitDate: Fri Apr 3 20:06:26 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=45bde05b
media-gfx/digikam: Fix MissingUseDepDefault on virtual/mysql
Package-Manager: Portage-2.3.96, Repoman-2.3.22
Signed-off-by: Andreas Sturmlechner gentoo.org>
media-gfx/digikam/digikam-6.4.0-r1.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/media-gfx/digikam/digikam-6.4.0-r1.ebuild
b/media-gfx/digikam/digikam-6.4.0-r1.ebuild
index f4c4c552dda..99983ca35b3 100644
--- a/media-gfx/digikam/digikam-6.4.0-r1.ebuild
+++ b/media-gfx/digikam/digikam-6.4.0-r1.ebuild
@@ -103,7 +103,7 @@ DEPEND="${COMMON_DEPEND}
dev-libs/boost[threads]
"
RDEPEND="${COMMON_DEPEND}
- mysql? ( virtual/mysql[server] )
+ mysql? ( virtual/mysql[server(+)] )
panorama? ( media-gfx/hugin )
"
[gentoo-commits] repo/gentoo:master commit in: media-gfx/digikam/
commit: e6dda4372aa6a02f61112b246c447b4449bea1bd
Author: Haelwenn (lanodan) Monnier hacktivis me>
AuthorDate: Fri Mar 27 03:34:20 2020 +
Commit: Andreas Sturmlechner gentoo org>
CommitDate: Fri Apr 3 20:06:24 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e6dda437
media-gfx/digikam: dev-qt/qtgui[-gles2 => -gles2-only]
Signed-off-by: Haelwenn (lanodan) Monnier hacktivis.me>
Signed-off-by: Andreas Sturmlechner gentoo.org>
media-gfx/digikam/{digikam-6.4.0.ebuild => digikam-6.4.0-r1.ebuild} | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/media-gfx/digikam/digikam-6.4.0.ebuild
b/media-gfx/digikam/digikam-6.4.0-r1.ebuild
similarity index 99%
rename from media-gfx/digikam/digikam-6.4.0.ebuild
rename to media-gfx/digikam/digikam-6.4.0-r1.ebuild
index 5bce62aec09..f4c4c552dda 100644
--- a/media-gfx/digikam/digikam-6.4.0.ebuild
+++ b/media-gfx/digikam/digikam-6.4.0-r1.ebuild
@@ -36,7 +36,7 @@ COMMON_DEPEND="
dev-libs/expat
>=dev-qt/qtconcurrent-${QTMIN}:5
>=dev-qt/qtdbus-${QTMIN}:5
- >=dev-qt/qtgui-${QTMIN}:5[-gles2]
+ >=dev-qt/qtgui-${QTMIN}:5[-gles2-only]
>=dev-qt/qtnetwork-${QTMIN}:5
>=dev-qt/qtprintsupport-${QTMIN}:5
>=dev-qt/qtsql-${QTMIN}:5[mysql?]
[gentoo-commits] repo/gentoo:master commit in: media-gfx/digikam/, media-gfx/digikam/files/
commit: 89485e67a4051277812b8bc06ca80961b24004f4
Author: Andreas Sturmlechner gentoo org>
AuthorDate: Wed Feb 12 15:14:07 2020 +
Commit: Andreas Sturmlechner gentoo org>
CommitDate: Wed Feb 12 15:14:07 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=89485e67
media-gfx/digikam: Drop 6.3.0-r1
Package-Manager: Portage-2.3.88, Repoman-2.3.20
Signed-off-by: Andreas Sturmlechner gentoo.org>
media-gfx/digikam/Manifest | 1 -
media-gfx/digikam/digikam-6.3.0-r1.ebuild | 157 -
.../digikam-6.3.0-googlephoto-import-crash.patch | 85 ---
3 files changed, 243 deletions(-)
diff --git a/media-gfx/digikam/Manifest b/media-gfx/digikam/Manifest
index 65079a279da..06c96471be9 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
b3b5e9903538d110613aa872c9215f5e7c19f7520a2b9060c24e686f20f72075378b447239dd3e17cb8860cdd35c69934199b848757f0497ad25a7805e42
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 7a9327fbcb3..000
--- 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?
[gentoo-commits] repo/gentoo:master commit in: media-gfx/digikam/
commit: ff7e570c3753d61d7a4aa4b455158d57074b0e96
Author: Agostino Sarubbo gentoo org>
AuthorDate: Wed Feb 12 15:10:14 2020 +
Commit: Agostino Sarubbo gentoo org>
CommitDate: Wed Feb 12 15:10:14 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ff7e570c
media-gfx/digikam: x86 stable wrt bug #705232
Package-Manager: Portage-2.3.84, Repoman-2.3.20
RepoMan-Options: --include-arches="x86"
Signed-off-by: Agostino Sarubbo gentoo.org>
media-gfx/digikam/digikam-6.4.0.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/media-gfx/digikam/digikam-6.4.0.ebuild
b/media-gfx/digikam/digikam-6.4.0.ebuild
index 92dabb81cb7..5bce62aec09 100644
--- a/media-gfx/digikam/digikam-6.4.0.ebuild
+++ b/media-gfx/digikam/digikam-6.4.0.ebuild
@@ -13,7 +13,7 @@ if [[ ${KDE_BUILD_TYPE} != live ]]; then
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"
+ KEYWORDS="amd64 x86"
S="${WORKDIR}/${MY_P}"
fi
[gentoo-commits] repo/gentoo:master commit in: media-gfx/digikam/
commit: 4154c572d768de253708884661c4b562d5da4602
Author: Mikle Kolyada gentoo org>
AuthorDate: Sat Feb 8 13:39:31 2020 +
Commit: Mikle Kolyada gentoo org>
CommitDate: Sat Feb 8 13:39:31 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4154c572
media-gfx/digikam: amd64 stable wrt bug #705232
Package-Manager: Portage-2.3.84, Repoman-2.3.20
RepoMan-Options: --include-arches="amd64"
Signed-off-by: Mikle Kolyada gentoo.org>
media-gfx/digikam/digikam-6.4.0.ebuild | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/media-gfx/digikam/digikam-6.4.0.ebuild
b/media-gfx/digikam/digikam-6.4.0.ebuild
index 9ee9030d8c6..92dabb81cb7 100644
--- a/media-gfx/digikam/digikam-6.4.0.ebuild
+++ b/media-gfx/digikam/digikam-6.4.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
@@ -13,7 +13,7 @@ if [[ ${KDE_BUILD_TYPE} != live ]]; then
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"
+ KEYWORDS="amd64 ~x86"
S="${WORKDIR}/${MY_P}"
fi
[gentoo-commits] repo/gentoo:master commit in: media-gfx/digikam/
commit: b2afe8fcd0f986cdbb14a771b20e8eefb68bd0dd
Author: Andreas Sturmlechner gentoo org>
AuthorDate: Wed Dec 18 11:44:19 2019 +
Commit: Andreas Sturmlechner gentoo org>
CommitDate: Wed Dec 18 12:58:28 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b2afe8fc
media-gfx/digikam: 6.4.0 version bump
Closes: https://bugs.gentoo.org/699954
Closes: https://bugs.gentoo.org/701886
Package-Manager: Portage-2.3.82, Repoman-2.3.20
Signed-off-by: Andreas Sturmlechner gentoo.org>
media-gfx/digikam/Manifest | 1 +
media-gfx/digikam/digikam-6.4.0.ebuild | 153 +
media-gfx/digikam/metadata.xml | 1 +
3 files changed, 155 insertions(+)
diff --git a/media-gfx/digikam/Manifest b/media-gfx/digikam/Manifest
index e3a64e0cf2b..65079a279da 100644
--- a/media-gfx/digikam/Manifest
+++ b/media-gfx/digikam/Manifest
@@ -1 +1,2 @@
DIST digikam-6.3.0.tar.xz 335641824 BLAKE2B
1ecddeee653d6b97570aa3616c6dd0a951210983400fe8aca19ee9e01aef29820f0ab32e3cbc2e92e833868f0f652c5bdd0809324437b6fa778dfdaf04ea3c83
SHA512
9463d7a8351acae32e2fa77c96026d1cb60e56fcc20ad2b71ac7461ff1e5e2e02ca0ef8a12e4d5ae2324aa66e185cdf5b237d6330f4741691876977e773511ce
+DIST digikam-6.4.0.tar.xz 340146992 BLAKE2B
ca1bc8b0d165f9774354d8489a11d46d8d7467edd3c1e90fd3a96024c4b7cd23bfd5c813251183bcca6d4beac9bffeb9d921beaa9a3752f75f1918796aacd719
SHA512
b3b5e9903538d110613aa872c9215f5e7c19f7520a2b9060c24e686f20f72075378b447239dd3e17cb8860cdd35c69934199b848757f0497ad25a7805e42
diff --git a/media-gfx/digikam/digikam-6.4.0.ebuild
b/media-gfx/digikam/digikam-6.4.0.ebuild
new file mode 100644
index 000..c47f0fb32aa
--- /dev/null
+++ b/media-gfx/digikam/digikam-6.4.0.ebuild
@@ -0,0 +1,153 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+CMAKE_MIN_VERSION=3.14.3
+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 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="
+ dev-libs/expat
+ >=dev-qt/qtconcurrent-${QTMIN}:5
+ >=dev-qt/qtdbus-${QTMIN}:5
+ >=dev-qt/qtgui-${QTMIN}:5[-gles2]
+ >=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]
+ !libav? ( media-video/ffmpeg:= )
+ libav? ( media-video/libav:= )
+ )
+ 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
[gentoo-commits] repo/gentoo:master commit in: media-gfx/digikam/, media-gfx/digikam/files/
commit: 9e321ebdb7c1d89da49707236fd2b1b3d856bd9b
Author: Andreas Sturmlechner gentoo org>
AuthorDate: Mon Dec 2 17:15:34 2019 +
Commit: Andreas Sturmlechner gentoo org>
CommitDate: Tue Dec 3 05:03:07 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9e321ebd
media-gfx/digikam: Drop 6.2.0
Package-Manager: Portage-2.3.80, Repoman-2.3.19
Signed-off-by: Andreas Sturmlechner gentoo.org>
media-gfx/digikam/Manifest | 1 -
media-gfx/digikam/digikam-6.2.0.ebuild | 151 -
media-gfx/digikam/files/digikam-6.2.0-cmake.patch | 66 -
.../files/digikam-6.2.0-googlephoto-upload.patch | 25
.../files/digikam-6.2.0-imagemagick-7.0.8.60.patch | 14 --
5 files changed, 257 deletions(-)
diff --git a/media-gfx/digikam/Manifest b/media-gfx/digikam/Manifest
index 456779d4ba2..e3a64e0cf2b 100644
--- a/media-gfx/digikam/Manifest
+++ b/media-gfx/digikam/Manifest
@@ -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
diff --git a/media-gfx/digikam/digikam-6.2.0.ebuild
b/media-gfx/digikam/digikam-6.2.0.ebuild
deleted file mode 100644
index bb0556ae05e..000
--- a/media-gfx/digikam/digikam-6.2.0.ebuild
+++ /dev/null
@@ -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? (
-
[gentoo-commits] repo/gentoo:master commit in: media-gfx/digikam/
commit: 7ed3253fce5b0b3d3e66cedac20862f00f70
Author: Mikle Kolyada gentoo org>
AuthorDate: Mon Dec 2 16:30:22 2019 +
Commit: Mikle Kolyada gentoo org>
CommitDate: Mon Dec 2 16:30:22 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7ed3253f
media-gfx/digikam: x86 stable wrt bug #700038
Package-Manager: Portage-2.3.79, Repoman-2.3.16
RepoMan-Options: --include-arches="x86"
Signed-off-by: Mikle Kolyada gentoo.org>
media-gfx/digikam/digikam-6.3.0-r1.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/media-gfx/digikam/digikam-6.3.0-r1.ebuild
b/media-gfx/digikam/digikam-6.3.0-r1.ebuild
index 92a28832289..8b30b380b54 100644
--- a/media-gfx/digikam/digikam-6.3.0-r1.ebuild
+++ b/media-gfx/digikam/digikam-6.3.0-r1.ebuild
@@ -12,7 +12,7 @@ if [[ ${KDE_BUILD_TYPE} != live ]]; then
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"
+ KEYWORDS="amd64 x86"
S="${WORKDIR}/${MY_P}"
fi
[gentoo-commits] repo/gentoo:master commit in: media-gfx/digikam/
commit: 85965b4aee898428ed3538abbea3e59b538db1ec
Author: Mikle Kolyada gentoo org>
AuthorDate: Mon Dec 2 16:09:45 2019 +
Commit: Mikle Kolyada gentoo org>
CommitDate: Mon Dec 2 16:12:37 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=85965b4a
media-gfx/digikam: amd64 stable wrt bug #700038
Package-Manager: Portage-2.3.79, Repoman-2.3.16
RepoMan-Options: --include-arches="amd64"
Signed-off-by: Mikle Kolyada gentoo.org>
media-gfx/digikam/digikam-6.3.0-r1.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/media-gfx/digikam/digikam-6.3.0-r1.ebuild
b/media-gfx/digikam/digikam-6.3.0-r1.ebuild
index 9850c5cb18c..92a28832289 100644
--- a/media-gfx/digikam/digikam-6.3.0-r1.ebuild
+++ b/media-gfx/digikam/digikam-6.3.0-r1.ebuild
@@ -12,7 +12,7 @@ if [[ ${KDE_BUILD_TYPE} != live ]]; then
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"
+ KEYWORDS="amd64 ~x86"
S="${WORKDIR}/${MY_P}"
fi
[gentoo-commits] repo/gentoo:master commit in: media-gfx/digikam/
commit: a740ed24228aad1ba5b4fac564f9b4856ad68f6b Author: Andreas Sturmlechner gentoo org> AuthorDate: Thu Nov 28 18:21:23 2019 + Commit: Amy Liffey gentoo org> CommitDate: Thu Nov 28 20:02:30 2019 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a740ed24 media-gfx/digikam: IUSE contrib_dnn -> contribdnn Package-Manager: Portage-2.3.80, Repoman-2.3.19 Signed-off-by: Andreas Sturmlechner gentoo.org> Signed-off-by: Amy Liffey gentoo.org> media-gfx/digikam/digikam-6.2.0.ebuild| 2 +- media-gfx/digikam/digikam-6.3.0-r1.ebuild | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/media-gfx/digikam/digikam-6.2.0.ebuild b/media-gfx/digikam/digikam-6.2.0.ebuild index b91dd599e0f..bb0556ae05e 100644 --- a/media-gfx/digikam/digikam-6.2.0.ebuild +++ b/media-gfx/digikam/digikam-6.2.0.ebuild @@ -65,7 +65,7 @@ COMMON_DEPEND=" $(add_kdeapps_dep kcontacts) ) calendar? ( $(add_kdeapps_dep kcalcore) ) - dnn? ( >=media-libs/opencv-3.1.0:=[contrib,contrib_dnn] ) + dnn? ( >=media-libs/opencv-3.1.0:=[contrib,contribdnn] ) gphoto2? ( media-libs/libgphoto2:= ) imagemagick? ( media-gfx/imagemagick:= ) lensfun? ( media-libs/lensfun ) diff --git a/media-gfx/digikam/digikam-6.3.0-r1.ebuild b/media-gfx/digikam/digikam-6.3.0-r1.ebuild index 6ba0fe7a630..9850c5cb18c 100644 --- a/media-gfx/digikam/digikam-6.3.0-r1.ebuild +++ b/media-gfx/digikam/digikam-6.3.0-r1.ebuild @@ -71,7 +71,7 @@ COMMON_DEPEND=" $(add_frameworks_dep kcalendarcore) $(add_kdeapps_dep kcalcore) ) ) - dnn? ( >=media-libs/opencv-3.1.0:=[contrib,contrib_dnn] ) + dnn? ( >=media-libs/opencv-3.1.0:=[contrib,contribdnn] ) gphoto2? ( media-libs/libgphoto2:= ) imagemagick? ( media-gfx/imagemagick:= ) lensfun? ( media-libs/lensfun )
[gentoo-commits] repo/gentoo:master commit in: media-gfx/digikam/
commit: d6a2dbe18cf3e721e5284f144f52ad852f8a8985
Author: Andreas Sturmlechner gentoo org>
AuthorDate: Mon Oct 21 11:54:59 2019 +
Commit: Andreas Sturmlechner gentoo org>
CommitDate: Mon Oct 21 11:59:07 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d6a2dbe1
media-gfx/digikam: Don't even try to build broken tests
Closes: https://bugs.gentoo.org/698192
Package-Manager: Portage-2.3.77, Repoman-2.3.17
Signed-off-by: Andreas Sturmlechner gentoo.org>
media-gfx/digikam/digikam-6.3.0-r1.ebuild | 1 +
1 file changed, 1 insertion(+)
diff --git a/media-gfx/digikam/digikam-6.3.0-r1.ebuild
b/media-gfx/digikam/digikam-6.3.0-r1.ebuild
index df968b3029c..6ba0fe7a630 100644
--- a/media-gfx/digikam/digikam-6.3.0-r1.ebuild
+++ b/media-gfx/digikam/digikam-6.3.0-r1.ebuild
@@ -130,6 +130,7 @@ 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)
[gentoo-commits] repo/gentoo:master commit in: media-gfx/digikam/
commit: 3c20ca44f0a70c8337bb6c133a78ff2b50c89ad3
Author: Andreas Sturmlechner gentoo org>
AuthorDate: Wed Oct 9 22:25:33 2019 +
Commit: Andreas Sturmlechner gentoo org>
CommitDate: Sat Oct 12 21:13:13 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3c20ca44
media-gfx/digikam: Accept kde-frameworks/{kcalendarcore,kcontacts}
Package-Manager: Portage-2.3.76, Repoman-2.3.17
Signed-off-by: Andreas Sturmlechner gentoo.org>
.../digikam/{digikam-6.3.0.ebuild => digikam-6.3.0-r1.ebuild} | 10 --
1 file changed, 8 insertions(+), 2 deletions(-)
diff --git a/media-gfx/digikam/digikam-6.3.0.ebuild
b/media-gfx/digikam/digikam-6.3.0-r1.ebuild
similarity index 95%
rename from media-gfx/digikam/digikam-6.3.0.ebuild
rename to media-gfx/digikam/digikam-6.3.0-r1.ebuild
index 3324004430e..df968b3029c 100644
--- a/media-gfx/digikam/digikam-6.3.0.ebuild
+++ b/media-gfx/digikam/digikam-6.3.0-r1.ebuild
@@ -61,10 +61,16 @@ COMMON_DEPEND="
media-libs/tiff:0
virtual/jpeg:0
addressbook? (
+ || (
+ $(add_frameworks_dep kcontacts)
+ $(add_kdeapps_dep kcontacts)
+ )
$(add_kdeapps_dep akonadi-contacts)
- $(add_kdeapps_dep kcontacts)
)
- calendar? ( $(add_kdeapps_dep kcalcore) )
+ calendar? ( || (
+ $(add_frameworks_dep kcalendarcore)
+ $(add_kdeapps_dep kcalcore)
+ ) )
dnn? ( >=media-libs/opencv-3.1.0:=[contrib,contrib_dnn] )
gphoto2? ( media-libs/libgphoto2:= )
imagemagick? ( media-gfx/imagemagick:= )
[gentoo-commits] repo/gentoo:master commit in: media-gfx/digikam/, media-gfx/digikam/files/
commit: 8de04c5968b95f8fc7e8f6cd6f09444dfe69c281
Author: Andreas Sturmlechner gentoo org>
AuthorDate: Sun Sep 8 15:46:33 2019 +
Commit: Andreas Sturmlechner gentoo org>
CommitDate: Sun Sep 8 16:17:05 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8de04c59
media-gfx/digikam: Drop 6.0.0
Package-Manager: Portage-2.3.75, Repoman-2.3.17
Signed-off-by: Andreas Sturmlechner gentoo.org>
media-gfx/digikam/Manifest| 1 -
media-gfx/digikam/digikam-6.0.0.ebuild| 143 --
media-gfx/digikam/files/digikam-6.0.0-cmake.patch | 62 --
3 files changed, 206 deletions(-)
diff --git a/media-gfx/digikam/Manifest b/media-gfx/digikam/Manifest
index 7d00b123f1a..456779d4ba2 100644
--- a/media-gfx/digikam/Manifest
+++ b/media-gfx/digikam/Manifest
@@ -1,3 +1,2 @@
-DIST digikam-6.0.0.tar.xz 331386500 BLAKE2B
93da3822ad10b3c017aadcdcc1501af5dfcfa07640d73b6987cc7e1229573e02489c166abf16a07378466fcd2bf7c4423415af563b5ab835e6d5d8ea63a04eba
SHA512
b8a70dde0b3838c4ccaffa3324eacb0541642e82177c90a1f8fcbd9691c194369f2760c4ea56c58b7ae049fc1a748d5d88cb537c62e3700ed5e21bad44d01adb
DIST digikam-6.2.0.tar.xz 339472960 BLAKE2B
0db48839474d599a364fba73cad751b889fe6f37c88323d1feddce67acb0ecad306c67976e1524328e6aaf33464c9dd35b1b85cf3c41ba72be9cef664e30d520
SHA512
05667c91af290df0eabd3b18a7c6741ded3f1b01b0a9cb572d6df79f25787d0291624760d6c0fa23bd36665a94bc7ccba845c117ee381de7edff97d1d4158e56
DIST digikam-6.3.0.tar.xz 335641824 BLAKE2B
1ecddeee653d6b97570aa3616c6dd0a951210983400fe8aca19ee9e01aef29820f0ab32e3cbc2e92e833868f0f652c5bdd0809324437b6fa778dfdaf04ea3c83
SHA512
9463d7a8351acae32e2fa77c96026d1cb60e56fcc20ad2b71ac7461ff1e5e2e02ca0ef8a12e4d5ae2324aa66e185cdf5b237d6330f4741691876977e773511ce
diff --git a/media-gfx/digikam/digikam-6.0.0.ebuild
b/media-gfx/digikam/digikam-6.0.0.ebuild
deleted file mode 100644
index 2e6852810eb..000
--- a/media-gfx/digikam/digikam-6.0.0.ebuild
+++ /dev/null
@@ -1,143 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-CMAKE_MAKEFILE_GENERATOR="emake" # keep until CMAKE_MIN_VERSION=3.13.4
-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 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) )
- gphoto2? ( media-libs/libgphoto2:= )
- 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
[gentoo-commits] repo/gentoo:master commit in: media-gfx/digikam/
commit: 6e2e843e3b9fe564670e59c7d8b3fd577a72570a
Author: Thomas Deutschmann gentoo org>
AuthorDate: Sat Sep 7 18:11:59 2019 +
Commit: Thomas Deutschmann gentoo org>
CommitDate: Sat Sep 7 21:05:08 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6e2e843e
media-gfx/digikam: x86 stable (bug #693206)
Package-Manager: Portage-2.3.75, Repoman-2.3.17
Signed-off-by: Thomas Deutschmann gentoo.org>
media-gfx/digikam/digikam-6.2.0.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/media-gfx/digikam/digikam-6.2.0.ebuild
b/media-gfx/digikam/digikam-6.2.0.ebuild
index d28773546dc..04257cd7958 100644
--- a/media-gfx/digikam/digikam-6.2.0.ebuild
+++ b/media-gfx/digikam/digikam-6.2.0.ebuild
@@ -12,7 +12,7 @@ if [[ ${KDE_BUILD_TYPE} != live ]]; then
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"
+ KEYWORDS="~amd64 x86"
S="${WORKDIR}/${MY_P}"
fi
[gentoo-commits] repo/gentoo:master commit in: media-gfx/digikam/, media-gfx/digikam/files/
commit: fb9515fff46d4c559294f5098f21c5bd41422e52
Author: Andreas Sturmlechner gentoo org>
AuthorDate: Fri Sep 6 20:55:12 2019 +
Commit: Andreas Sturmlechner gentoo org>
CommitDate: Sat Sep 7 11:57:55 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=fb9515ff
media-gfx/digikam: 6.3.0 version bump
Package-Manager: Portage-2.3.75, Repoman-2.3.17
Signed-off-by: Andreas Sturmlechner gentoo.org>
media-gfx/digikam/Manifest | 1 +
media-gfx/digikam/digikam-6.3.0.ebuild | 150 +
media-gfx/digikam/files/digikam-6.3.0-cmake.patch | 66 +
.../digikam-6.3.0-googlephoto-import-crash.patch | 85
4 files changed, 302 insertions(+)
diff --git a/media-gfx/digikam/Manifest b/media-gfx/digikam/Manifest
index 6f307d653ae..7d00b123f1a 100644
--- a/media-gfx/digikam/Manifest
+++ b/media-gfx/digikam/Manifest
@@ -1,2 +1,3 @@
DIST digikam-6.0.0.tar.xz 331386500 BLAKE2B
93da3822ad10b3c017aadcdcc1501af5dfcfa07640d73b6987cc7e1229573e02489c166abf16a07378466fcd2bf7c4423415af563b5ab835e6d5d8ea63a04eba
SHA512
b8a70dde0b3838c4ccaffa3324eacb0541642e82177c90a1f8fcbd9691c194369f2760c4ea56c58b7ae049fc1a748d5d88cb537c62e3700ed5e21bad44d01adb
DIST digikam-6.2.0.tar.xz 339472960 BLAKE2B
0db48839474d599a364fba73cad751b889fe6f37c88323d1feddce67acb0ecad306c67976e1524328e6aaf33464c9dd35b1b85cf3c41ba72be9cef664e30d520
SHA512
05667c91af290df0eabd3b18a7c6741ded3f1b01b0a9cb572d6df79f25787d0291624760d6c0fa23bd36665a94bc7ccba845c117ee381de7edff97d1d4158e56
+DIST digikam-6.3.0.tar.xz 335641824 BLAKE2B
1ecddeee653d6b97570aa3616c6dd0a951210983400fe8aca19ee9e01aef29820f0ab32e3cbc2e92e833868f0f652c5bdd0809324437b6fa778dfdaf04ea3c83
SHA512
9463d7a8351acae32e2fa77c96026d1cb60e56fcc20ad2b71ac7461ff1e5e2e02ca0ef8a12e4d5ae2324aa66e185cdf5b237d6330f4741691876977e773511ce
diff --git a/media-gfx/digikam/digikam-6.3.0.ebuild
b/media-gfx/digikam/digikam-6.3.0.ebuild
new file mode 100644
index 000..3324004430e
--- /dev/null
+++ b/media-gfx/digikam/digikam-6.3.0.ebuild
@@ -0,0 +1,150 @@
+# 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,contrib_dnn] )
+ 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)
[gentoo-commits] repo/gentoo:master commit in: media-gfx/digikam/
commit: daf822d04bc41ce38ca966827d00e25490a9170b
Author: David Seifert gentoo org>
AuthorDate: Wed Aug 28 08:18:46 2019 +
Commit: David Seifert gentoo org>
CommitDate: Wed Aug 28 08:18:46 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=daf822d0
media-gfx/digikam: [QA] Remove media-libs/jasper dep
Bug: https://bugs.gentoo.org/689784
Package-Manager: Portage-2.3.68, Repoman-2.3.16
Signed-off-by: David Seifert gentoo.org>
media-gfx/digikam/digikam-6.0.0.ebuild | 5 ++---
1 file changed, 2 insertions(+), 3 deletions(-)
diff --git a/media-gfx/digikam/digikam-6.0.0.ebuild
b/media-gfx/digikam/digikam-6.0.0.ebuild
index f44c5dbd4ce..2e6852810eb 100644
--- a/media-gfx/digikam/digikam-6.0.0.ebuild
+++ b/media-gfx/digikam/digikam-6.0.0.ebuild
@@ -20,7 +20,7 @@ DESCRIPTION="Digital photo management application"
HOMEPAGE="https://www.digikam.org/;
LICENSE="GPL-2"
-IUSE="addressbook calendar gphoto2 jpeg2k +lensfun libav marble mediaplayer
mysql opengl openmp +panorama scanner semantic-desktop vkontakte webkit X"
+IUSE="addressbook calendar gphoto2 +lensfun libav marble mediaplayer mysql
opengl openmp +panorama scanner semantic-desktop vkontakte webkit X"
BDEPEND="
sys-devel/gettext
@@ -66,7 +66,6 @@ COMMON_DEPEND="
)
calendar? ( $(add_kdeapps_dep kcalcore) )
gphoto2? ( media-libs/libgphoto2:= )
- jpeg2k? ( media-libs/jasper:= )
lensfun? ( media-libs/lensfun )
marble? (
$(add_frameworks_dep kbookmarks)
@@ -124,7 +123,7 @@ src_configure() {
-DENABLE_AKONADICONTACTSUPPORT=$(usex addressbook)
$(cmake-utils_use_find_package calendar KF5CalendarCore)
$(cmake-utils_use_find_package gphoto2 Gphoto2)
- $(cmake-utils_use_find_package jpeg2k Jasper)
+ -DCMAKE_DISABLE_FIND_PACKAGE_Jasper=ON
$(cmake-utils_use_find_package lensfun LensFun)
$(cmake-utils_use_find_package marble Marble)
-DENABLE_MEDIAPLAYER=$(usex mediaplayer)
[gentoo-commits] repo/gentoo:master commit in: media-gfx/digikam/files/, media-gfx/digikam/
commit: 95c14433ba569fcc4dba0279e7a1e71b8eff676c
Author: Andreas Sturmlechner gentoo org>
AuthorDate: Thu Aug 22 12:46:04 2019 +
Commit: Andreas Sturmlechner gentoo org>
CommitDate: Thu Aug 22 14:15:37 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=95c14433
media-gfx/digikam: Fix build with ImageMagick-7.0.8.60
Thanks-to: David Haller dhaller.de>
Closes: https://bugs.gentoo.org/692326
Package-Manager: Portage-2.3.72, Repoman-2.3.17
Signed-off-by: Andreas Sturmlechner gentoo.org>
media-gfx/digikam/digikam-6.2.0.ebuild | 1 +
.../digikam/files/digikam-6.2.0-imagemagick-7.0.8.60.patch | 14 ++
2 files changed, 15 insertions(+)
diff --git a/media-gfx/digikam/digikam-6.2.0.ebuild
b/media-gfx/digikam/digikam-6.2.0.ebuild
index 4478b85ae23..d28773546dc 100644
--- a/media-gfx/digikam/digikam-6.2.0.ebuild
+++ b/media-gfx/digikam/digikam-6.2.0.ebuild
@@ -109,6 +109,7 @@ RESTRICT+=" test"
PATCHES=(
"${FILESDIR}/${P}-googlephoto-upload.patch"
"${FILESDIR}/${P}-cmake.patch"
+ "${FILESDIR}/${P}-imagemagick-7.0.8.60.patch"
)
pkg_pretend() {
diff --git a/media-gfx/digikam/files/digikam-6.2.0-imagemagick-7.0.8.60.patch
b/media-gfx/digikam/files/digikam-6.2.0-imagemagick-7.0.8.60.patch
new file mode 100644
index 000..264da2c34f2
--- /dev/null
+++ b/media-gfx/digikam/files/digikam-6.2.0-imagemagick-7.0.8.60.patch
@@ -0,0 +1,14 @@
+--- 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") &&
\ No newline at end of file
[gentoo-commits] repo/gentoo:master commit in: media-gfx/digikam/
commit: 4d94dd12121bae409d2d6560ccdf95990c4f3bc2
Author: Andreas Sturmlechner gentoo org>
AuthorDate: Sat Aug 10 21:22:25 2019 +
Commit: Andreas Sturmlechner gentoo org>
CommitDate: Sun Aug 11 08:19:23 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4d94dd12
media-gfx/digikam: Drop 6.1.0
Package-Manager: Portage-2.3.71, Repoman-2.3.17
Signed-off-by: Andreas Sturmlechner gentoo.org>
media-gfx/digikam/Manifest | 1 -
media-gfx/digikam/digikam-6.1.0.ebuild | 148 -
2 files changed, 149 deletions(-)
diff --git a/media-gfx/digikam/Manifest b/media-gfx/digikam/Manifest
index 6ddcc5345d9..6f307d653ae 100644
--- a/media-gfx/digikam/Manifest
+++ b/media-gfx/digikam/Manifest
@@ -1,3 +1,2 @@
DIST digikam-6.0.0.tar.xz 331386500 BLAKE2B
93da3822ad10b3c017aadcdcc1501af5dfcfa07640d73b6987cc7e1229573e02489c166abf16a07378466fcd2bf7c4423415af563b5ab835e6d5d8ea63a04eba
SHA512
b8a70dde0b3838c4ccaffa3324eacb0541642e82177c90a1f8fcbd9691c194369f2760c4ea56c58b7ae049fc1a748d5d88cb537c62e3700ed5e21bad44d01adb
-DIST digikam-6.1.0.tar.xz 332466544 BLAKE2B
2f9aad537108a905d42bd218052287ccdb76a75e4883990c19a4c12318dbf019fa37b547e1adf4394dad14ab6f2a38d5f0c397060382d525ef7c1cabafa649d6
SHA512
36cffce4fdb751dafc45b2d447fbbd1134b7dc59c19eb6f7aebcf8d66327f6d8a49e787e346984cc842c81dc033ff8f7f8614a81073d99a0c6902770a26053da
DIST digikam-6.2.0.tar.xz 339472960 BLAKE2B
0db48839474d599a364fba73cad751b889fe6f37c88323d1feddce67acb0ecad306c67976e1524328e6aaf33464c9dd35b1b85cf3c41ba72be9cef664e30d520
SHA512
05667c91af290df0eabd3b18a7c6741ded3f1b01b0a9cb572d6df79f25787d0291624760d6c0fa23bd36665a94bc7ccba845c117ee381de7edff97d1d4158e56
diff --git a/media-gfx/digikam/digikam-6.1.0.ebuild
b/media-gfx/digikam/digikam-6.1.0.ebuild
deleted file mode 100644
index 9ea4daced62..000
--- a/media-gfx/digikam/digikam-6.1.0.ebuild
+++ /dev/null
@@ -1,148 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-CMAKE_MAKEFILE_GENERATOR="emake" # keep until CMAKE_MIN_VERSION=3.13.4
-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 jpeg2k +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,contrib_dnn] )
- gphoto2? ( media-libs/libgphoto2:= )
- imagemagick? ( media-gfx/imagemagick:= )
- jpeg2k? ( media-libs/jasper:= )
- 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
[gentoo-commits] repo/gentoo:master commit in: media-gfx/digikam/, media-gfx/digikam/files/
commit: 05f50a1122f113c7e8f8f263b98c08e868b179e6
Author: Andreas Sturmlechner gentoo org>
AuthorDate: Thu Aug 8 15:54:50 2019 +
Commit: Andreas Sturmlechner gentoo org>
CommitDate: Thu Aug 8 16:51:33 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=05f50a11
media-gfx/digikam: 6.2.0 version bump
Package-Manager: Portage-2.3.71, Repoman-2.3.17
Signed-off-by: Andreas Sturmlechner gentoo.org>
media-gfx/digikam/Manifest | 1 +
media-gfx/digikam/digikam-6.2.0.ebuild | 150 +
media-gfx/digikam/files/digikam-6.2.0-cmake.patch | 66 +
.../files/digikam-6.2.0-googlephoto-upload.patch | 25
4 files changed, 242 insertions(+)
diff --git a/media-gfx/digikam/Manifest b/media-gfx/digikam/Manifest
index 7f4d0748a0a..6ddcc5345d9 100644
--- a/media-gfx/digikam/Manifest
+++ b/media-gfx/digikam/Manifest
@@ -1,2 +1,3 @@
DIST digikam-6.0.0.tar.xz 331386500 BLAKE2B
93da3822ad10b3c017aadcdcc1501af5dfcfa07640d73b6987cc7e1229573e02489c166abf16a07378466fcd2bf7c4423415af563b5ab835e6d5d8ea63a04eba
SHA512
b8a70dde0b3838c4ccaffa3324eacb0541642e82177c90a1f8fcbd9691c194369f2760c4ea56c58b7ae049fc1a748d5d88cb537c62e3700ed5e21bad44d01adb
DIST digikam-6.1.0.tar.xz 332466544 BLAKE2B
2f9aad537108a905d42bd218052287ccdb76a75e4883990c19a4c12318dbf019fa37b547e1adf4394dad14ab6f2a38d5f0c397060382d525ef7c1cabafa649d6
SHA512
36cffce4fdb751dafc45b2d447fbbd1134b7dc59c19eb6f7aebcf8d66327f6d8a49e787e346984cc842c81dc033ff8f7f8614a81073d99a0c6902770a26053da
+DIST digikam-6.2.0.tar.xz 339472960 BLAKE2B
0db48839474d599a364fba73cad751b889fe6f37c88323d1feddce67acb0ecad306c67976e1524328e6aaf33464c9dd35b1b85cf3c41ba72be9cef664e30d520
SHA512
05667c91af290df0eabd3b18a7c6741ded3f1b01b0a9cb572d6df79f25787d0291624760d6c0fa23bd36665a94bc7ccba845c117ee381de7edff97d1d4158e56
diff --git a/media-gfx/digikam/digikam-6.2.0.ebuild
b/media-gfx/digikam/digikam-6.2.0.ebuild
new file mode 100644
index 000..4478b85ae23
--- /dev/null
+++ b/media-gfx/digikam/digikam-6.2.0.ebuild
@@ -0,0 +1,150 @@
+# 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,contrib_dnn] )
+ 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) )
+
[gentoo-commits] repo/gentoo:master commit in: media-gfx/digikam/
commit: b1fbfcd052a8363a9584cb66a950e9517a42e90b Author: Andreas Sturmlechner gentoo org> AuthorDate: Fri May 10 19:45:47 2019 + Commit: Andreas Sturmlechner gentoo org> CommitDate: Tue Jul 16 22:16:13 2019 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b1fbfcd0 media-gfx/digikam: Add media-libs/opencv[contrib] DEPEND to USE=dnn Closes: https://bugs.gentoo.org/684692 Package-Manager: Portage-2.3.66, Repoman-2.3.12 Signed-off-by: Andreas Sturmlechner gentoo.org> media-gfx/digikam/digikam-6.1.0.ebuild | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/media-gfx/digikam/digikam-6.1.0.ebuild b/media-gfx/digikam/digikam-6.1.0.ebuild index d0fd3316322..9ea4daced62 100644 --- a/media-gfx/digikam/digikam-6.1.0.ebuild +++ b/media-gfx/digikam/digikam-6.1.0.ebuild @@ -65,7 +65,7 @@ COMMON_DEPEND=" $(add_kdeapps_dep kcontacts) ) calendar? ( $(add_kdeapps_dep kcalcore) ) - dnn? ( >=media-libs/opencv-3.1.0:=[contrib_dnn] ) + dnn? ( >=media-libs/opencv-3.1.0:=[contrib,contrib_dnn] ) gphoto2? ( media-libs/libgphoto2:= ) imagemagick? ( media-gfx/imagemagick:= ) jpeg2k? ( media-libs/jasper:= )
[gentoo-commits] repo/gentoo:master commit in: media-gfx/digikam/
commit: b26a236e9c7620404f263da86f22e5aad53b09ca
Author: Andreas Sturmlechner gentoo org>
AuthorDate: Sat Apr 27 20:14:04 2019 +
Commit: Andreas Sturmlechner gentoo org>
CommitDate: Sat Apr 27 20:51:40 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b26a236e
media-gfx/digikam: Set CMAKE_MAKEFILE_GENERATOR="emake"
We can drop it once CMAKE_MIN_VERSION=3.13.4
Closes: https://bugs.gentoo.org/684528
Package-Manager: Portage-2.3.65, Repoman-2.3.12
Signed-off-by: Andreas Sturmlechner gentoo.org>
media-gfx/digikam/digikam-6.1.0.ebuild | 1 +
1 file changed, 1 insertion(+)
diff --git a/media-gfx/digikam/digikam-6.1.0.ebuild
b/media-gfx/digikam/digikam-6.1.0.ebuild
index 642d4af73a7..d0fd3316322 100644
--- a/media-gfx/digikam/digikam-6.1.0.ebuild
+++ b/media-gfx/digikam/digikam-6.1.0.ebuild
@@ -3,6 +3,7 @@
EAPI=7
+CMAKE_MAKEFILE_GENERATOR="emake" # keep until CMAKE_MIN_VERSION=3.13.4
inherit kde5 toolchain-funcs
if [[ ${KDE_BUILD_TYPE} != live ]]; then
[gentoo-commits] repo/gentoo:master commit in: media-gfx/digikam/
commit: 7c361b273932d64d3b99fabe3b633ccd5bd12022
Author: Andreas Sturmlechner gentoo org>
AuthorDate: Sat Apr 27 13:26:01 2019 +
Commit: Andreas Sturmlechner gentoo org>
CommitDate: Sat Apr 27 14:45:50 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7c361b27
media-gfx/digikam: 6.1.0 version bump
Closes: https://bugs.gentoo.org/683728
Package-Manager: Portage-2.3.65, Repoman-2.3.12
Signed-off-by: Andreas Sturmlechner gentoo.org>
media-gfx/digikam/Manifest | 1 +
media-gfx/digikam/digikam-6.1.0.ebuild | 147 +
media-gfx/digikam/metadata.xml | 2 +
3 files changed, 150 insertions(+)
diff --git a/media-gfx/digikam/Manifest b/media-gfx/digikam/Manifest
index ddeaba42438..7f4d0748a0a 100644
--- a/media-gfx/digikam/Manifest
+++ b/media-gfx/digikam/Manifest
@@ -1 +1,2 @@
DIST digikam-6.0.0.tar.xz 331386500 BLAKE2B
93da3822ad10b3c017aadcdcc1501af5dfcfa07640d73b6987cc7e1229573e02489c166abf16a07378466fcd2bf7c4423415af563b5ab835e6d5d8ea63a04eba
SHA512
b8a70dde0b3838c4ccaffa3324eacb0541642e82177c90a1f8fcbd9691c194369f2760c4ea56c58b7ae049fc1a748d5d88cb537c62e3700ed5e21bad44d01adb
+DIST digikam-6.1.0.tar.xz 332466544 BLAKE2B
2f9aad537108a905d42bd218052287ccdb76a75e4883990c19a4c12318dbf019fa37b547e1adf4394dad14ab6f2a38d5f0c397060382d525ef7c1cabafa649d6
SHA512
36cffce4fdb751dafc45b2d447fbbd1134b7dc59c19eb6f7aebcf8d66327f6d8a49e787e346984cc842c81dc033ff8f7f8614a81073d99a0c6902770a26053da
diff --git a/media-gfx/digikam/digikam-6.1.0.ebuild
b/media-gfx/digikam/digikam-6.1.0.ebuild
new file mode 100644
index 000..642d4af73a7
--- /dev/null
+++ b/media-gfx/digikam/digikam-6.1.0.ebuild
@@ -0,0 +1,147 @@
+# 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 jpeg2k +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_dnn] )
+ gphoto2? ( media-libs/libgphoto2:= )
+ imagemagick? ( media-gfx/imagemagick:= )
+ jpeg2k? ( media-libs/jasper:= )
+ 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}
+
[gentoo-commits] repo/gentoo:master commit in: media-gfx/digikam/
commit: 1bc90972c93adee01d2e8aceee6873fe649b6d2a
Author: Andreas Sturmlechner gentoo org>
AuthorDate: Wed Feb 20 19:05:44 2019 +
Commit: Andreas Sturmlechner gentoo org>
CommitDate: Thu Feb 21 10:29:08 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1bc90972
media-gfx/digikam: Drop 5.9.0
Package-Manager: Portage-2.3.62, Repoman-2.3.12
Signed-off-by: Andreas Sturmlechner gentoo.org>
media-gfx/digikam/Manifest | 1 -
media-gfx/digikam/digikam-5.9.0.ebuild | 167 -
media-gfx/digikam/metadata.xml | 1 -
3 files changed, 169 deletions(-)
diff --git a/media-gfx/digikam/Manifest b/media-gfx/digikam/Manifest
index 08c7e4291d6..ddeaba42438 100644
--- a/media-gfx/digikam/Manifest
+++ b/media-gfx/digikam/Manifest
@@ -1,2 +1 @@
-DIST digikam-5.9.0.tar.xz 132931184 BLAKE2B
cfbcbae8471c9c00bdf846d13bbc1ce3fbbd2ee4cc86500d011f9e15c1a21d7799638f94708794e8bc36a200df455667f9df8fcefdc38aaa00060630807d11cb
SHA512
f6134a957dcd11343e34f0bc90f5560a28ed205c47d2ffd76a5418a4c63f76706045e9179c47f1448304b59081051b524f7a6847c3c1dcee4673047ce5d90e63
DIST digikam-6.0.0.tar.xz 331386500 BLAKE2B
93da3822ad10b3c017aadcdcc1501af5dfcfa07640d73b6987cc7e1229573e02489c166abf16a07378466fcd2bf7c4423415af563b5ab835e6d5d8ea63a04eba
SHA512
b8a70dde0b3838c4ccaffa3324eacb0541642e82177c90a1f8fcbd9691c194369f2760c4ea56c58b7ae049fc1a748d5d88cb537c62e3700ed5e21bad44d01adb
diff --git a/media-gfx/digikam/digikam-5.9.0.ebuild
b/media-gfx/digikam/digikam-5.9.0.ebuild
deleted file mode 100644
index 75e3928b82c..000
--- a/media-gfx/digikam/digikam-5.9.0.ebuild
+++ /dev/null
@@ -1,167 +0,0 @@
-# Copyright 1999-2018 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-if [[ ${KDE_BUILD_TYPE} != live ]]; then
- KDE_HANDBOOK="true"
- KDE_TEST="true"
-fi
-CMAKE_MAKEFILE_GENERATOR="emake"
-KDE_APPS_MINIMAL="17.12.0"
-inherit kde5 toolchain-funcs
-
-DESCRIPTION="Digital photo management application"
-HOMEPAGE="https://www.digikam.org/;
-
-LICENSE="GPL-2"
-IUSE="addressbook calendar gphoto2 jpeg2k +kipi +lensfun marble mediaplayer
semantic-desktop mysql opengl openmp +panorama scanner X"
-
-if [[ ${KDE_BUILD_TYPE} != live ]]; then
- KEYWORDS="amd64 x86"
- 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/${MY_P}.tar.xz"
- S="${WORKDIR}/${MY_P}/core"
-fi
-
-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 qtprintsupport)
- $(add_qt_dep qtsql 'mysql?')
- $(add_qt_dep qtwebkit)
- $(add_qt_dep qtwidgets)
- $(add_qt_dep qtxml)
- dev-libs/expat
- >=media-gfx/exiv2-0.26:=
- media-libs/lcms:2
- media-libs/liblqr
- media-libs/libpng:0=
- media-libs/opencv:=[-qt4(-)]
- || ( =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) )
- gphoto2? ( media-libs/libgphoto2:= )
- jpeg2k? ( media-libs/jasper:= )
- kipi? ( $(add_kdeapps_dep libkipi '' '16.03.80') )
- lensfun? ( media-libs/lensfun )
- marble? (
- $(add_frameworks_dep kbookmarks)
- $(add_kdeapps_dep marble)
- $(add_qt_dep qtconcurrent)
- $(add_qt_dep qtnetwork)
- )
- mediaplayer? ( media-libs/qtav[opengl] )
- opengl? (
- $(add_qt_dep qtopengl)
- virtual/opengl
- )
- panorama? ( $(add_frameworks_dep threadweaver) )
- scanner? ( $(add_kdeapps_dep libksane) )
- semantic-desktop? ( $(add_frameworks_dep kfilemetadata) )
- X? (
- $(add_qt_dep qtx11extras)
- x11-libs/libX11
- )
-"
-DEPEND="${COMMON_DEPEND}
- dev-cpp/eigen:3
- dev-libs/boost[threads]
- sys-devel/gettext
- panorama? (
- sys-devel/bison
- sys-devel/flex
- )
-"
-RDEPEND="${COMMON_DEPEND}
- media-plugins/kipi-plugins:5
- mysql? ( virtual/mysql[server] )
- panorama? ( media-gfx/hugin )
- !media-gfx/digikam:4
[gentoo-commits] repo/gentoo:master commit in: media-gfx/digikam/
commit: eb0b2f3d69f609d5177c7c9310bf78a700647435
Author: Mikle Kolyada gentoo org>
AuthorDate: Wed Feb 20 13:06:04 2019 +
Commit: Mikle Kolyada gentoo org>
CommitDate: Wed Feb 20 13:06:04 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=eb0b2f3d
media-gfx/digikam: amd64 stable wrt bug #677710
Signed-off-by: Mikle Kolyada gentoo.org>
Package-Manager: Portage-2.3.51, Repoman-2.3.11
RepoMan-Options: --include-arches="amd64"
media-gfx/digikam/digikam-6.0.0.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/media-gfx/digikam/digikam-6.0.0.ebuild
b/media-gfx/digikam/digikam-6.0.0.ebuild
index 6e7b4a330b1..f44c5dbd4ce 100644
--- a/media-gfx/digikam/digikam-6.0.0.ebuild
+++ b/media-gfx/digikam/digikam-6.0.0.ebuild
@@ -12,7 +12,7 @@ if [[ ${KDE_BUILD_TYPE} != live ]]; then
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"
+ KEYWORDS="amd64 x86"
S="${WORKDIR}/${MY_P}"
fi
[gentoo-commits] repo/gentoo:master commit in: media-gfx/digikam/
commit: 0b3be7bfff64f0548e33df0be806213c0f4339ad
Author: Thomas Deutschmann gentoo org>
AuthorDate: Mon Feb 18 00:38:05 2019 +
Commit: Thomas Deutschmann gentoo org>
CommitDate: Mon Feb 18 00:38:05 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0b3be7bf
media-gfx/digikam: x86 stable (bug #677710)
Package-Manager: Portage-2.3.60, Repoman-2.3.12
Signed-off-by: Thomas Deutschmann gentoo.org>
media-gfx/digikam/digikam-6.0.0.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/media-gfx/digikam/digikam-6.0.0.ebuild
b/media-gfx/digikam/digikam-6.0.0.ebuild
index 0c70439cb3f..6e7b4a330b1 100644
--- a/media-gfx/digikam/digikam-6.0.0.ebuild
+++ b/media-gfx/digikam/digikam-6.0.0.ebuild
@@ -12,7 +12,7 @@ if [[ ${KDE_BUILD_TYPE} != live ]]; then
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"
+ KEYWORDS="~amd64 x86"
S="${WORKDIR}/${MY_P}"
fi
[gentoo-commits] repo/gentoo:master commit in: media-gfx/digikam/files/, media-gfx/digikam/
commit: f0e4482c6d36030e7cc3146d4de54b78ba047453
Author: Andreas Sturmlechner gentoo org>
AuthorDate: Sun Feb 17 22:54:19 2019 +
Commit: Andreas Sturmlechner gentoo org>
CommitDate: Sun Feb 17 22:59:28 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f0e4482c
media-gfx/digikam: Un-break optional Qt5 detection
Package-Manager: Portage-2.3.60, Repoman-2.3.12
Signed-off-by: Andreas Sturmlechner gentoo.org>
media-gfx/digikam/digikam-6.0.0.ebuild| 2 +
media-gfx/digikam/files/digikam-6.0.0-cmake.patch | 62 +++
2 files changed, 64 insertions(+)
diff --git a/media-gfx/digikam/digikam-6.0.0.ebuild
b/media-gfx/digikam/digikam-6.0.0.ebuild
index 4288c82dc56..0c70439cb3f 100644
--- a/media-gfx/digikam/digikam-6.0.0.ebuild
+++ b/media-gfx/digikam/digikam-6.0.0.ebuild
@@ -105,6 +105,8 @@ RDEPEND="${COMMON_DEPEND}
RESTRICT+=" test"
# bug 366505
+PATCHES=( "${FILESDIR}/${P}-cmake.patch" )
+
pkg_pretend() {
[[ ${MERGE_TYPE} != binary ]] && use openmp && tc-check-openmp
kde5_pkg_pretend
diff --git a/media-gfx/digikam/files/digikam-6.0.0-cmake.patch
b/media-gfx/digikam/files/digikam-6.0.0-cmake.patch
new file mode 100644
index 000..f90067f4812
--- /dev/null
+++ b/media-gfx/digikam/files/digikam-6.0.0-cmake.patch
@@ -0,0 +1,62 @@
+From 0d24a8971700454533c66ab9fc63043c67d44da6 Mon Sep 17 00:00:00 2001
+From: Andreas Sturmlechner
+Date: Sun, 17 Feb 2019 23:51:03 +0100
+Subject: [PATCH] Un-break optional Qt5 detection
+
+---
+ core/CMakeLists.txt | 22 ++
+ 1 file changed, 10 insertions(+), 12 deletions(-)
+
+diff --git a/core/CMakeLists.txt b/core/CMakeLists.txt
+index 27d3819323..17c8aa0320 100644
+--- a/core/CMakeLists.txt
b/core/CMakeLists.txt
+@@ -134,16 +134,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)
+@@ -154,10 +152,10 @@ endif()
+ # Dependencies For unit tests and CLI test tools
+
+ if(BUILD_TESTING)
+-find_package(Qt5 ${QT_MIN_VERSION} NO_MODULE COMPONENTS
+- Test
+- 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}
+@@ -323,7 +321,7 @@ find_package(OpenGL) # For
Presentation tool.
+ 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.20.1
+
[gentoo-commits] repo/gentoo:master commit in: media-gfx/digikam/
commit: babe4b6e128c62f71bd0c3d4a450e00ab197c3e7
Author: Andreas Sturmlechner gentoo org>
AuthorDate: Sat Feb 16 18:34:03 2019 +
Commit: Andreas Sturmlechner gentoo org>
CommitDate: Sat Feb 16 18:34:51 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=babe4b6e
media-gfx/digikam: Set CMAKE_MAKEFILE_GENERATOR="emake"
We can drop it once CMAKE_MIN_VERSION=3.13.4
Bug: https://bugs.gentoo.org/677858
Package-Manager: Portage-2.3.60, Repoman-2.3.12
Signed-off-by: Andreas Sturmlechner gentoo.org>
media-gfx/digikam/digikam-6.0.0.ebuild | 1 +
1 file changed, 1 insertion(+)
diff --git a/media-gfx/digikam/digikam-6.0.0.ebuild
b/media-gfx/digikam/digikam-6.0.0.ebuild
index 1ed43c3ed62..4288c82dc56 100644
--- a/media-gfx/digikam/digikam-6.0.0.ebuild
+++ b/media-gfx/digikam/digikam-6.0.0.ebuild
@@ -3,6 +3,7 @@
EAPI=7
+CMAKE_MAKEFILE_GENERATOR="emake" # keep until CMAKE_MIN_VERSION=3.13.4
inherit kde5 toolchain-funcs
if [[ ${KDE_BUILD_TYPE} != live ]]; then
[gentoo-commits] repo/gentoo:master commit in: media-gfx/digikam/
commit: d8bdf8385f91de37e2ab101358f933b10841b576
Author: Andreas Sturmlechner gentoo org>
AuthorDate: Mon Feb 11 13:16:00 2019 +
Commit: Andreas Sturmlechner gentoo org>
CommitDate: Mon Feb 11 13:16:25 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d8bdf838
media-gfx/digikam: Fix SRC_URI
Signed-off-by: Andreas Sturmlechner gentoo.org>
Package-Manager: Portage-2.3.51, Repoman-2.3.11
media-gfx/digikam/digikam-6.0.0.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/media-gfx/digikam/digikam-6.0.0.ebuild
b/media-gfx/digikam/digikam-6.0.0.ebuild
index 6854dbe74fb..1ed43c3ed62 100644
--- a/media-gfx/digikam/digikam-6.0.0.ebuild
+++ b/media-gfx/digikam/digikam-6.0.0.ebuild
@@ -10,7 +10,7 @@ if [[ ${KDE_BUILD_TYPE} != live ]]; then
MY_P=${PN}-${MY_PV}
SRC_BRANCH=stable
[[ ${PV} =~ beta[0-9]$ ]] && SRC_BRANCH=unstable
- SRC_URI="mirror://kde/${SRC_BRANCH}/digikam/${MY_P}.tar.xz"
+ SRC_URI="mirror://kde/${SRC_BRANCH}/digikam/${PV}/${MY_P}.tar.xz"
KEYWORDS="~amd64 ~x86"
S="${WORKDIR}/${MY_P}"
fi
[gentoo-commits] repo/gentoo:master commit in: media-gfx/digikam/
commit: f46a4519c713d3592be9f38b9c85804ce70dbedc
Author: Andreas Sturmlechner gentoo org>
AuthorDate: Mon Feb 11 10:31:59 2019 +
Commit: Andreas Sturmlechner gentoo org>
CommitDate: Mon Feb 11 12:42:20 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f46a4519
media-gfx/digikam: Drop 6.0.0_beta3
Signed-off-by: Andreas Sturmlechner gentoo.org>
Package-Manager: Portage-2.3.51, Repoman-2.3.11
media-gfx/digikam/Manifest | 1 -
media-gfx/digikam/digikam-6.0.0_beta3.ebuild | 143 ---
2 files changed, 144 deletions(-)
diff --git a/media-gfx/digikam/Manifest b/media-gfx/digikam/Manifest
index 761c42c4259..08c7e4291d6 100644
--- a/media-gfx/digikam/Manifest
+++ b/media-gfx/digikam/Manifest
@@ -1,3 +1,2 @@
DIST digikam-5.9.0.tar.xz 132931184 BLAKE2B
cfbcbae8471c9c00bdf846d13bbc1ce3fbbd2ee4cc86500d011f9e15c1a21d7799638f94708794e8bc36a200df455667f9df8fcefdc38aaa00060630807d11cb
SHA512
f6134a957dcd11343e34f0bc90f5560a28ed205c47d2ffd76a5418a4c63f76706045e9179c47f1448304b59081051b524f7a6847c3c1dcee4673047ce5d90e63
-DIST digikam-6.0.0-beta3.tar.xz 326340364 BLAKE2B
ea43fcf6047a0ee9de824f91a88d49bf61e86cf77255aecec7e1761319d6d6bfbc8b8251f18594848ddaec27b6b50425b01e1d6da24859986a5b5050670a037e
SHA512
4e0ee5406789618644b6af7316b922785b0cddc6ff3d5d972da1d88b5cd3fc6df8b2ccb63d65d7b61a5adff86e25a79a5075cb65302e99e5d3b522aa32fcb68e
DIST digikam-6.0.0.tar.xz 331386500 BLAKE2B
93da3822ad10b3c017aadcdcc1501af5dfcfa07640d73b6987cc7e1229573e02489c166abf16a07378466fcd2bf7c4423415af563b5ab835e6d5d8ea63a04eba
SHA512
b8a70dde0b3838c4ccaffa3324eacb0541642e82177c90a1f8fcbd9691c194369f2760c4ea56c58b7ae049fc1a748d5d88cb537c62e3700ed5e21bad44d01adb
diff --git a/media-gfx/digikam/digikam-6.0.0_beta3.ebuild
b/media-gfx/digikam/digikam-6.0.0_beta3.ebuild
deleted file mode 100644
index 48c1135b4fe..000
--- a/media-gfx/digikam/digikam-6.0.0_beta3.ebuild
+++ /dev/null
@@ -1,143 +0,0 @@
-# Copyright 1999-2018 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-if [[ ${KDE_BUILD_TYPE} != live ]]; then
- KDE_HANDBOOK="true"
- KDE_TEST="true"
-fi
-inherit kde5 toolchain-funcs
-
-DESCRIPTION="Digital photo management application"
-HOMEPAGE="https://www.digikam.org/;
-
-LICENSE="GPL-2"
-IUSE="addressbook calendar gphoto2 jpeg2k +lensfun libav marble mediaplayer
mysql opengl openmp +panorama scanner semantic-desktop vkontakte webkit X"
-
-if [[ ${KDE_BUILD_TYPE} != live ]]; then
- KEYWORDS="~amd64 ~x86"
- 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/${MY_P}.tar.xz"
- S="${WORKDIR}/${MY_P}"
-fi
-
-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) )
- gphoto2? ( media-libs/libgphoto2:= )
- jpeg2k? ( media-libs/jasper:= )
- 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? ( $(add_qt_dep qtwebkit) )
- X? (
- $(add_qt_dep qtx11extras)
-
[gentoo-commits] repo/gentoo:master commit in: media-gfx/digikam/
commit: ef9db3bc9d876430724f41b54ebc7a91be039ba5
Author: Andreas Sturmlechner gentoo org>
AuthorDate: Mon Feb 11 10:31:27 2019 +
Commit: Andreas Sturmlechner gentoo org>
CommitDate: Mon Feb 11 12:42:17 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ef9db3bc
media-gfx/digikam: 6.0.0 version bump
Signed-off-by: Andreas Sturmlechner gentoo.org>
Package-Manager: Portage-2.3.51, Repoman-2.3.11
media-gfx/digikam/Manifest | 1 +
media-gfx/digikam/digikam-6.0.0.ebuild | 141 +
2 files changed, 142 insertions(+)
diff --git a/media-gfx/digikam/Manifest b/media-gfx/digikam/Manifest
index 6c883855d91..761c42c4259 100644
--- a/media-gfx/digikam/Manifest
+++ b/media-gfx/digikam/Manifest
@@ -1,2 +1,3 @@
DIST digikam-5.9.0.tar.xz 132931184 BLAKE2B
cfbcbae8471c9c00bdf846d13bbc1ce3fbbd2ee4cc86500d011f9e15c1a21d7799638f94708794e8bc36a200df455667f9df8fcefdc38aaa00060630807d11cb
SHA512
f6134a957dcd11343e34f0bc90f5560a28ed205c47d2ffd76a5418a4c63f76706045e9179c47f1448304b59081051b524f7a6847c3c1dcee4673047ce5d90e63
DIST digikam-6.0.0-beta3.tar.xz 326340364 BLAKE2B
ea43fcf6047a0ee9de824f91a88d49bf61e86cf77255aecec7e1761319d6d6bfbc8b8251f18594848ddaec27b6b50425b01e1d6da24859986a5b5050670a037e
SHA512
4e0ee5406789618644b6af7316b922785b0cddc6ff3d5d972da1d88b5cd3fc6df8b2ccb63d65d7b61a5adff86e25a79a5075cb65302e99e5d3b522aa32fcb68e
+DIST digikam-6.0.0.tar.xz 331386500 BLAKE2B
93da3822ad10b3c017aadcdcc1501af5dfcfa07640d73b6987cc7e1229573e02489c166abf16a07378466fcd2bf7c4423415af563b5ab835e6d5d8ea63a04eba
SHA512
b8a70dde0b3838c4ccaffa3324eacb0541642e82177c90a1f8fcbd9691c194369f2760c4ea56c58b7ae049fc1a748d5d88cb537c62e3700ed5e21bad44d01adb
diff --git a/media-gfx/digikam/digikam-6.0.0.ebuild
b/media-gfx/digikam/digikam-6.0.0.ebuild
new file mode 100644
index 000..6854dbe74fb
--- /dev/null
+++ b/media-gfx/digikam/digikam-6.0.0.ebuild
@@ -0,0 +1,141 @@
+# 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/${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 gphoto2 jpeg2k +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) )
+ gphoto2? ( media-libs/libgphoto2:= )
+ jpeg2k? ( media-libs/jasper:= )
+ 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? (
+
[gentoo-commits] repo/gentoo:master commit in: media-gfx/digikam/
commit: 395ed52ebd90efd4d603246a150a242ec10578dd
Author: Andreas Sturmlechner gentoo org>
AuthorDate: Thu Oct 4 22:57:04 2018 +
Commit: Andreas Sturmlechner gentoo org>
CommitDate: Thu Oct 4 22:58:07 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=395ed52e
media-gfx/digikam: Move virtual/mysql to RDEPEND-only
Closes: https://bugs.gentoo.org/665922
Signed-off-by: Andreas Sturmlechner gentoo.org>
Package-Manager: Portage-2.3.50, Repoman-2.3.11
media-gfx/digikam/digikam-5.9.0.ebuild | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/media-gfx/digikam/digikam-5.9.0.ebuild
b/media-gfx/digikam/digikam-5.9.0.ebuild
index 5f2a02c25f9..75e3928b82c 100644
--- a/media-gfx/digikam/digikam-5.9.0.ebuild
+++ b/media-gfx/digikam/digikam-5.9.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=6
@@ -74,7 +74,6 @@ COMMON_DEPEND="
$(add_qt_dep qtnetwork)
)
mediaplayer? ( media-libs/qtav[opengl] )
- mysql? ( virtual/mysql[server] )
opengl? (
$(add_qt_dep qtopengl)
virtual/opengl
@@ -98,6 +97,7 @@ DEPEND="${COMMON_DEPEND}
"
RDEPEND="${COMMON_DEPEND}
media-plugins/kipi-plugins:5
+ mysql? ( virtual/mysql[server] )
panorama? ( media-gfx/hugin )
!media-gfx/digikam:4
"
[gentoo-commits] repo/gentoo:master commit in: media-gfx/digikam/files/, media-gfx/digikam/
commit: 19b939a52a4462ec8e7e7650e341ef83d0ea1a16
Author: Johannes Huber gentoo org>
AuthorDate: Wed May 2 19:10:22 2018 +
Commit: Johannes Huber gentoo org>
CommitDate: Wed May 2 19:12:18 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=19b939a5
media-gfx/digikam: Remove 5.7.0-r3
Package-Manager: Portage-2.3.33, Repoman-2.3.9
media-gfx/digikam/Manifest | 1 -
media-gfx/digikam/digikam-5.7.0-r3.ebuild | 174 -
.../digikam/files/digikam-5.7.0-kcalcore-1.patch | 44 --
.../digikam/files/digikam-5.7.0-kcalcore-2.patch | 79 --
.../digikam/files/digikam-5.7.0-kreadconfig5.patch | 28
.../files/digikam-5.7.0-mariadb-10.2-1.patch | 58 ---
.../files/digikam-5.7.0-mariadb-10.2-2.patch | 117 --
.../digikam/files/digikam-5.7.0-qt-5.9.3.patch | 32
8 files changed, 533 deletions(-)
diff --git a/media-gfx/digikam/Manifest b/media-gfx/digikam/Manifest
index d23807cfbbd..0cb547b5865 100644
--- a/media-gfx/digikam/Manifest
+++ b/media-gfx/digikam/Manifest
@@ -1,2 +1 @@
-DIST digikam-5.7.0.tar.xz 123315064 BLAKE2B
0879b25e674e39d204038ab629dec36757ae034e3dd7e9a0a3700f9703272c4a972a21c1db5a42c6c294247a1226b1cb9a8b980bb90cdcc12e0cd752459273ef
SHA512
626c9854311c637b994325237f171adce3dba39159fb336dfe95f1de287e2d08a3aaddd611eea87e8018047d331aff252b555c382cfbe1d8e14413c51a3849f4
DIST digikam-5.9.0.tar.xz 132931184 BLAKE2B
cfbcbae8471c9c00bdf846d13bbc1ce3fbbd2ee4cc86500d011f9e15c1a21d7799638f94708794e8bc36a200df455667f9df8fcefdc38aaa00060630807d11cb
SHA512
f6134a957dcd11343e34f0bc90f5560a28ed205c47d2ffd76a5418a4c63f76706045e9179c47f1448304b59081051b524f7a6847c3c1dcee4673047ce5d90e63
diff --git a/media-gfx/digikam/digikam-5.7.0-r3.ebuild
b/media-gfx/digikam/digikam-5.7.0-r3.ebuild
deleted file mode 100644
index fb65507f36b..000
--- a/media-gfx/digikam/digikam-5.7.0-r3.ebuild
+++ /dev/null
@@ -1,174 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-if [[ ${KDE_BUILD_TYPE} != live ]]; then
- KDE_HANDBOOK="true"
- KDE_TEST="true"
-fi
-CMAKE_MAKEFILE_GENERATOR="emake"
-KDE_APPS_MINIMAL="17.12.0"
-inherit kde5 toolchain-funcs
-
-DESCRIPTION="Digital photo management application"
-HOMEPAGE="https://www.digikam.org/;
-
-LICENSE="GPL-2"
-IUSE="addressbook calendar gphoto2 jpeg2k +kipi +lensfun marble mediaplayer
semantic-desktop mysql opengl openmp +panorama scanner X"
-
-if [[ ${KDE_BUILD_TYPE} != live ]]; then
- KEYWORDS="amd64 x86"
- 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/${MY_P}.tar.xz"
- S="${WORKDIR}/${MY_P}/core"
-fi
-
-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 qtprintsupport)
- $(add_qt_dep qtsql 'mysql?')
- $(add_qt_dep qtwebkit)
- $(add_qt_dep qtwidgets)
- $(add_qt_dep qtxml)
- dev-libs/expat
- >=media-gfx/exiv2-0.26:=
- media-libs/lcms:2
- media-libs/liblqr
- media-libs/libpng:0=
- media-libs/opencv:=[-qt4(-)]
- || ( =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) )
- gphoto2? ( media-libs/libgphoto2:= )
- jpeg2k? ( media-libs/jasper:= )
- kipi? ( $(add_kdeapps_dep libkipi '' '16.03.80') )
- lensfun? ( media-libs/lensfun )
- marble? (
- $(add_frameworks_dep kbookmarks)
- $(add_kdeapps_dep marble)
- $(add_qt_dep qtconcurrent)
- $(add_qt_dep qtnetwork)
- )
- mediaplayer? ( media-libs/qtav[opengl] )
- mysql? ( virtual/mysql[server] )
- opengl? (
- $(add_qt_dep qtopengl)
- virtual/opengl
- )
- panorama? ( $(add_frameworks_dep threadweaver) )
- scanner? ( $(add_kdeapps_dep libksane) )
- semantic-desktop? ( $(add_frameworks_dep kfilemetadata) )
- X? (
- $(add_qt_dep qtx11extras)
- x11-libs/libX11
- )
-"
[gentoo-commits] repo/gentoo:master commit in: media-gfx/digikam/
commit: e54db7cdf44da1c90db03e510c218b3236f93640
Author: Thomas Deutschmann gentoo org>
AuthorDate: Wed May 2 16:18:26 2018 +
Commit: Thomas Deutschmann gentoo org>
CommitDate: Wed May 2 16:32:45 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e54db7cd
media-gfx/digikam: x86 stable (bug #654370)
Package-Manager: Portage-2.3.31, Repoman-2.3.9
media-gfx/digikam/digikam-5.9.0.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/media-gfx/digikam/digikam-5.9.0.ebuild
b/media-gfx/digikam/digikam-5.9.0.ebuild
index 67fabdb5427..5f2a02c25f9 100644
--- a/media-gfx/digikam/digikam-5.9.0.ebuild
+++ b/media-gfx/digikam/digikam-5.9.0.ebuild
@@ -18,7 +18,7 @@ LICENSE="GPL-2"
IUSE="addressbook calendar gphoto2 jpeg2k +kipi +lensfun marble mediaplayer
semantic-desktop mysql opengl openmp +panorama scanner X"
if [[ ${KDE_BUILD_TYPE} != live ]]; then
- KEYWORDS="amd64 ~x86"
+ KEYWORDS="amd64 x86"
MY_PV=${PV/_/-}
MY_P=${PN}-${MY_PV}
SRC_BRANCH=stable
