From: "Andreas Sturmlechner" <asturm@gentoo.org>
To: gentoo-commits@lists.gentoo.org
Subject: [gentoo-commits] repo/gentoo:master commit in: media-gfx/digikam/, media-gfx/digikam/files/
Date: Fri, 01 Aug 2025 19:08:47 +0000 (UTC) [thread overview]
Message-ID: <1754075117.d06abc0a62980b763c90750d3f27660cc0352d4c.asturm@gentoo> (raw)
commit: d06abc0a62980b763c90750d3f27660cc0352d4c
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Thu Jul 31 17:20:06 2025 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Fri Aug 1 19:05:17 2025 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d06abc0a
media-gfx/digikam: drop 8.6.0
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>
media-gfx/digikam/Manifest | 1 -
media-gfx/digikam/digikam-8.6.0.ebuild | 148 ---------------------
media-gfx/digikam/files/digikam-8.6.0-qt-6.9.patch | 25 ----
3 files changed, 174 deletions(-)
diff --git a/media-gfx/digikam/Manifest b/media-gfx/digikam/Manifest
index cfd5d1dc8196..6d0942bfb756 100644
--- a/media-gfx/digikam/Manifest
+++ b/media-gfx/digikam/Manifest
@@ -1,2 +1 @@
-DIST digiKam-8.6.0.tar.xz 58958608 BLAKE2B 53af396f9ed32ff315affa77465ddd9a9fff290362c9c6065eccded627a8f7138c74099e2095344b049b639ad81f7289e95d9ef284b1a5c31e35bd638add90a8 SHA512 fc9899eb9a291c2d88b5104c3b6fa86f8db67b26fdbb1328c714eb30407c9dbf13267433c5070f18451e4fb99d3530dba83bf404b26095ed336b348737d7cae2
DIST digiKam-8.7.0.tar.xz 55060536 BLAKE2B 56cc227064ee6c22eab550a768ad1b87956b0e8d86f1ed2d96a1a2bf0660fb9c44259d47f85fcef4ce62f2229a4fd7f522966db2095a73d24a89b446684d46d4 SHA512 a055b582197aeb4ac1f0f037300f5fb136949047c317865c89d30b39e5114cf2cca087acc7f0196e39b43c3be5ea4623261a6e7b6a52b843d266b4cbf261addd
diff --git a/media-gfx/digikam/digikam-8.6.0.ebuild b/media-gfx/digikam/digikam-8.6.0.ebuild
deleted file mode 100644
index 2da116ae8788..000000000000
--- a/media-gfx/digikam/digikam-8.6.0.ebuild
+++ /dev/null
@@ -1,148 +0,0 @@
-# Copyright 1999-2025 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-KFMIN=6.9.0
-QTMIN=6.8.1
-inherit ecm kde.org toolchain-funcs xdg
-
-if [[ ${KDE_BUILD_TYPE} != live ]]; then
- TARNAME="digiKam-${PV/_/-}"
- 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"
-fi
-
-DESCRIPTION="Digital photo management application"
-HOMEPAGE="https://www.digikam.org/"
-
-LICENSE="GPL-2"
-SLOT="0"
-IUSE="addressbook calendar geolocation gphoto2 heif +imagemagick jpegxl +lensfun mysql openmp +panorama scanner semantic-desktop spell video"
-
-# bug 366505
-RESTRICT="test"
-
-# slot op: Uses Qt::GuiPrivate for qtx11extras_p.h
-COMMON_DEPEND="
- dev-libs/expat
- >=dev-qt/qtbase-${QTMIN}:6=[concurrent,dbus,-gles2-only,gui,mysql?,network,opengl,sql,widgets,X,xml]
- >=dev-qt/qtnetworkauth-${QTMIN}:6
- >=dev-qt/qtscxml-${QTMIN}:6
- >=dev-qt/qtsvg-${QTMIN}:6
- >=dev-qt/qtwebengine-${QTMIN}:6[widgets]
- >=kde-frameworks/kconfig-${KFMIN}:6
- >=kde-frameworks/kconfigwidgets-${KFMIN}:6
- >=kde-frameworks/kcoreaddons-${KFMIN}:6
- >=kde-frameworks/ki18n-${KFMIN}:6
- >=kde-frameworks/kiconthemes-${KFMIN}:6
- >=kde-frameworks/kio-${KFMIN}:6
- >=kde-frameworks/knotifications-${KFMIN}:6
- >=kde-frameworks/knotifyconfig-${KFMIN}:6
- >=kde-frameworks/kservice-${KFMIN}:6
- >=kde-frameworks/kwidgetsaddons-${KFMIN}:6
- >=kde-frameworks/kwindowsystem-${KFMIN}:6
- >=kde-frameworks/kxmlgui-${KFMIN}:6
- >=kde-frameworks/solid-${KFMIN}:6
- >=media-gfx/exiv2-0.27.1:=[xmp]
- media-libs/lcms:2
- media-libs/libjpeg-turbo:=
- media-libs/liblqr
- media-libs/libpng:=
- >=media-libs/opencv-4.8.0:=[contrib,contribdnn,features2d]
- media-libs/tiff:=
- virtual/opengl
- x11-libs/libX11
- addressbook? (
- >=kde-apps/akonadi-contacts-24.05.2:6
- >=kde-frameworks/kcontacts-${KFMIN}:6
- )
- calendar? ( >=kde-frameworks/kcalendarcore-${KFMIN}:6 )
- gphoto2? ( media-libs/libgphoto2:= )
- heif? (
- media-libs/libheif:=
- media-libs/x265:=
- )
- imagemagick? ( media-gfx/imagemagick:= )
- jpegxl? ( media-libs/libjxl:= )
- lensfun? ( media-libs/lensfun )
- panorama? ( >=kde-frameworks/threadweaver-${KFMIN}:6 )
- scanner? ( >=kde-apps/libksane-24.05.2:6 )
- semantic-desktop? ( >=kde-frameworks/kfilemetadata-${KFMIN}:6 )
- spell? ( >=kde-frameworks/sonnet-${KFMIN}:6 )
- video? ( >=dev-qt/qtmultimedia-${QTMIN}:6 )
-"
-DEPEND="${COMMON_DEPEND}
- dev-cpp/eigen:3
- dev-libs/boost
- addressbook? ( >=kde-apps/akonadi-24.05.2:6 )
-"
-RDEPEND="${COMMON_DEPEND}
- !${CATEGORY}/${PN}:5
- media-libs/exiftool
- mysql? ( virtual/mysql[server(+)] )
- panorama? ( media-gfx/hugin )
-"
-BDEPEND="
- sys-devel/gettext
- panorama? (
- app-alternatives/lex
- app-alternatives/yacc
- )
-"
-
-# bundled, but unused CMake files: core/libs/dplugins/webservices/o2
-CMAKE_QA_COMPAT_SKIP=1
-
-PATCHES=(
- "${FILESDIR}/${PN}-8.4.0-cmake.patch"
- "${FILESDIR}/${PN}-8.3.0-cmake-addressbook.patch"
- "${FILESDIR}/${P}-qt-6.9.patch" # bug 957105
-)
-
-pkg_pretend() {
- [[ ${MERGE_TYPE} != binary ]] && use openmp && tc-check-openmp
-}
-
-pkg_setup() {
- [[ ${MERGE_TYPE} != binary ]] && use openmp && tc-check-openmp
-}
-
-src_prepare() {
- ecm_src_prepare
- rm -r project/bundles || die
-}
-
-# FIXME: Unbundle libraw (libs/rawengine/libraw)
-# TODO: adding IUSE X requires upstreaming WITH_X11 option for libX11,
-# see core/cmake/rules/RulesX11.cmake; only used in core/libs/dimg/filters/icc
-src_configure() {
- local mycmakeargs=(
- -DBUILD_WITH_QT6=ON
- -DBUILD_TESTING=OFF # bug 698192
- -DENABLE_APPSTYLES=ON
- -DCMAKE_DISABLE_FIND_PACKAGE_Jasper=ON
- -DENABLE_SHOWFOTO=ON # built unconditionally so far, new option since 8.0
- -DENABLE_AKONADICONTACTSUPPORT=$(usex addressbook)
- $(cmake_use_find_package calendar KF6CalendarCore)
- -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 jpegxl Libjxl)
- $(cmake_use_find_package lensfun LensFun)
- -DENABLE_MYSQLSUPPORT=$(usex mysql)
- -DENABLE_INTERNALMYSQL=$(usex mysql)
- $(cmake_use_find_package panorama KF6ThreadWeaver)
- $(cmake_use_find_package scanner KSaneWidgets6)
- -DENABLE_KFILEMETADATASUPPORT=$(usex semantic-desktop)
- $(cmake_use_find_package spell KF6Sonnet)
- -DENABLE_MEDIAPLAYER=$(usex video)
- )
-
- ecm_src_configure
-}
diff --git a/media-gfx/digikam/files/digikam-8.6.0-qt-6.9.patch b/media-gfx/digikam/files/digikam-8.6.0-qt-6.9.patch
deleted file mode 100644
index ad157610d402..000000000000
--- a/media-gfx/digikam/files/digikam-8.6.0-qt-6.9.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-From 325b19fc7f0d04cdc1308f235c207c1ab43e945d Mon Sep 17 00:00:00 2001
-From: Andras Man <andras.mantia-ext@siemens-energy.com>
-Date: Fri, 4 Apr 2025 18:47:03 +0300
-Subject: [PATCH] Fix build with Qt 6.9.0
-
----
- core/libs/widgets/text/localizeselector.cpp | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/core/libs/widgets/text/localizeselector.cpp b/core/libs/widgets/text/localizeselector.cpp
-index b284b270979..ab70a9379c3 100644
---- a/core/libs/widgets/text/localizeselector.cpp
-+++ b/core/libs/widgets/text/localizeselector.cpp
-@@ -326,7 +326,7 @@ bool s_inlineTranslateString(const QString& text, const QString& trCode, QString
- }
- else
- {
-- error = QChar(trengine->error());
-+ error = QChar::fromLatin1(trengine->error());
- }
-
- return false;
---
-GitLab
-
next reply other threads:[~2025-08-01 19:09 UTC|newest]
Thread overview: 26+ messages / expand[flat|nested] mbox.gz Atom feed top
2025-08-01 19:08 Andreas Sturmlechner [this message]
-- strict thread matches above, loose matches on Subject: below --
2025-06-04 18:59 [gentoo-commits] repo/gentoo:master commit in: media-gfx/digikam/, media-gfx/digikam/files/ Andreas Sturmlechner
2025-01-05 21:05 Andreas Sturmlechner
2024-03-26 12:59 Andreas Sturmlechner
2024-03-25 14:46 Andreas Sturmlechner
2023-12-26 8:59 Andreas Sturmlechner
2023-08-26 10:32 Andreas Sturmlechner
2023-08-03 15:34 Andreas Sturmlechner
2022-09-14 13:07 Andreas Sturmlechner
2022-05-09 0:13 Andreas Sturmlechner
2022-01-19 8:29 Andreas Sturmlechner
2021-12-18 17:42 Andreas Sturmlechner
2021-12-18 17:42 Andreas Sturmlechner
2020-05-26 14:53 Andreas Sturmlechner
2020-02-12 15:21 Andreas Sturmlechner
2019-12-03 5:04 Andreas Sturmlechner
2019-09-08 16:18 Andreas Sturmlechner
2019-09-07 11:58 Andreas Sturmlechner
2019-08-08 16:52 Andreas Sturmlechner
2017-08-06 8:07 Andreas Sturmlechner
2017-04-27 12:17 Michael Palimaka
2017-02-18 23:33 Andreas Sturmlechner
2017-02-12 23:09 Andreas Sturmlechner
2016-12-11 10:12 Johannes Huber
2016-10-31 19:04 Johannes Huber
2016-08-17 20:47 Michael Palimaka
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1754075117.d06abc0a62980b763c90750d3f27660cc0352d4c.asturm@gentoo \
--to=asturm@gentoo.org \
--cc=gentoo-commits@lists.gentoo.org \
--cc=gentoo-dev@lists.gentoo.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox