commit: 40fdeac404e8a617e6fd2dd3ad2258b1418b3811 Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> AuthorDate: Sun Mar 15 20:41:37 2026 +0000 Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> CommitDate: Sun Mar 15 23:27:18 2026 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=40fdeac4
media-gfx/kphotoalbum: add 6.2.0 See also: https://www.kphotoalbum.org/2026/03/13/kphotoalbum-6.2.0-released/ https://mail.kde.org/pipermail/kde-announce-apps/2026-March/005908.html Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org> media-gfx/kphotoalbum/Manifest | 1 + .../files/kphotoalbum-6.2.0-build_testing.patch | 98 ++++++++++++++++++++++ media-gfx/kphotoalbum/kphotoalbum-6.2.0.ebuild | 67 +++++++++++++++ 3 files changed, 166 insertions(+) diff --git a/media-gfx/kphotoalbum/Manifest b/media-gfx/kphotoalbum/Manifest index 11eac5304183..c867265af418 100644 --- a/media-gfx/kphotoalbum/Manifest +++ b/media-gfx/kphotoalbum/Manifest @@ -1,2 +1,3 @@ DIST kphotoalbum-6.1.0-backport-qtmultimedia.tar.xz 11168 BLAKE2B b67126d4ad49b5bfc0a91ef390df6b1caadcfa58ced9596ede0defbc3a566a0c4c33014d5b5f67dbe4ec259678a7e0e0bdec078b6d59593bcfc484ab7166406f SHA512 5f13051190c56e1c353e97b17f9bde8e262303eb671cb1c5a46059dd0cacdfb814096d771cee85552487016a761589a80bf6b1f748526cc09214ce1165b9f116 DIST kphotoalbum-6.1.0.tar.xz 14356604 BLAKE2B 06730d1cb5559637a26f9d7ee257e46047a3bfb9e7740d5534dab0e428ce6ba3cfe2b798fce2a8ba4980733cc38473ac276bcdb55a24cc7979633f556529d234 SHA512 8f66a076dddfea6e0d0ad9c405abf5fc0a4ce48d0db265754cf442ba183f45db30999b1647ccbb4ae7b237304c33aef3fa383fe3efd2b3f531fd870ed8499b77 +DIST kphotoalbum-6.2.0.tar.xz 14432360 BLAKE2B c6521da2f269654d27681dcb50519dc256c3b9e107bee8e63049b07517c1057b47f4b67460ec942ab862881b4a71e48f560b2c1328690e41ed0cb441aca93ea4 SHA512 b87afb23d6c34eef5078e79de41ab0bdea8d72a5b7f836818cba99a03aa8e4d1f291eab85d1f1be3f8b7849f1dc43c59f78d27b954fa3097ed4bb076a55c7e53 diff --git a/media-gfx/kphotoalbum/files/kphotoalbum-6.2.0-build_testing.patch b/media-gfx/kphotoalbum/files/kphotoalbum-6.2.0-build_testing.patch new file mode 100644 index 000000000000..bc921c7ad9cb --- /dev/null +++ b/media-gfx/kphotoalbum/files/kphotoalbum-6.2.0-build_testing.patch @@ -0,0 +1,98 @@ +From 818ab01d5d4960574e4e73e841934fb5b070087e Mon Sep 17 00:00:00 2001 +From: Andreas Sturmlechner <[email protected]> +Date: Sun, 15 Mar 2026 22:17:31 +0100 +Subject: [PATCH] Conditionalise tests behind BUILD_TESTING + +Condensed downstream version of upstream MR: +https://invent.kde.org/graphics/kphotoalbum/-/merge_requests/76 + +Signed-off-by: Andreas Sturmlechner <[email protected]> +--- + CMakeLists.txt | 7 +++++-- + kpa-thumbnailtool/CMakeLists.txt | 3 ++- + lib/CMakeLists.txt | 12 +++++++++--- + 3 files changed, 16 insertions(+), 6 deletions(-) + +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 6710239a6..bca10b493 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -685,14 +685,17 @@ if(Marble_FOUND) + ) + endif() + +-add_subdirectory(DB) + add_subdirectory(lib) + add_subdirectory(images) + add_subdirectory(icons) + add_subdirectory(demo) + add_subdirectory(themes) + add_subdirectory(scripts) +-add_subdirectory(Utilities) ++ ++if(BUILD_TESTING) ++ add_subdirectory(DB) ++ add_subdirectory(Utilities) ++endif() + + add_subdirectory(doc) + +diff --git a/kpa-thumbnailtool/CMakeLists.txt b/kpa-thumbnailtool/CMakeLists.txt +index 385fe487d..9bb1d217a 100644 +--- a/kpa-thumbnailtool/CMakeLists.txt ++++ b/kpa-thumbnailtool/CMakeLists.txt +@@ -17,6 +17,7 @@ target_link_libraries(kpa-thumbnailtool PRIVATE + + install(TARGETS kpa-thumbnailtool ${KDE_INSTALL_TARGETS_DEFAULT_ARGS}) + ++if(BUILD_TESTING) + include(ECMAddTests) + ecm_add_test( + TestThumbnailCacheConverter.h +@@ -26,6 +27,6 @@ ecm_add_test( + TEST_NAME ThumbnailCacheConverter + LINK_LIBRARIES Qt6::Core Qt6::Test KF6::I18n + ) +- ++endif() + + # vi:expandtab:tabstop=4 shiftwidth=4: +diff --git a/lib/CMakeLists.txt b/lib/CMakeLists.txt +index 3c9c1e0bc..281b334ab 100644 +--- a/lib/CMakeLists.txt ++++ b/lib/CMakeLists.txt +@@ -83,7 +83,9 @@ endif() + install(TARGETS kpabase ${KDE_INSTALL_TARGETS_DEFAULT_ARGS}) + + # unit tests: +-add_subdirectory(kpabase) ++if(BUILD_TESTING) ++ add_subdirectory(kpabase) ++endif() + + ################################################################################ + ### KPA::Thumbnails +@@ -108,7 +110,9 @@ target_link_libraries(kpathumbnails + install(TARGETS kpathumbnails ${KDE_INSTALL_TARGETS_DEFAULT_ARGS}) + + # unit tests: +-add_subdirectory(kpathumbnails) ++if(BUILD_TESTING) ++ add_subdirectory(kpathumbnails) ++endif() + + ################################################################################ + ### KPA::Exif +@@ -146,6 +150,8 @@ target_link_libraries(kpaexif + install(TARGETS kpaexif ${KDE_INSTALL_TARGETS_DEFAULT_ARGS}) + + # unit tests: +-add_subdirectory(kpaexif) ++if(BUILD_TESTING) ++ add_subdirectory(kpaexif) ++endif() + + # vi:expandtab:tabstop=4 shiftwidth=4: +-- +2.53.0 + diff --git a/media-gfx/kphotoalbum/kphotoalbum-6.2.0.ebuild b/media-gfx/kphotoalbum/kphotoalbum-6.2.0.ebuild new file mode 100644 index 000000000000..a27e7f606490 --- /dev/null +++ b/media-gfx/kphotoalbum/kphotoalbum-6.2.0.ebuild @@ -0,0 +1,67 @@ +# Copyright 1999-2026 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +ECM_HANDBOOK="forceoptional" +ECM_TEST="forceoptional" +KFMIN=6.9.0 +QTMIN=6.8.1 +inherit ecm kde.org xdg + +DESCRIPTION="Tool for indexing, searching, and viewing images" +HOMEPAGE="https://www.kphotoalbum.org/"; + +if [[ ${KDE_BUILD_TYPE} != live ]]; then + SRC_URI="mirror://kde/stable/${PN}/${PV}/${P}.tar.xz" + KEYWORDS="~amd64 ~x86" +fi + +LICENSE="GPL-2+ FDL-1.2 CC-BY-SA-4.0" +SLOT="0" +IUSE="+map +raw share" + +DEPEND=" + >=dev-qt/qtbase-${QTMIN}:6[dbus,gui,sql,sqlite,widgets,xml] + >=dev-qt/qtmultimedia-${QTMIN}:6 + >=kde-frameworks/karchive-${KFMIN}:6 + >=kde-frameworks/kcolorscheme-${KFMIN}:6 + >=kde-frameworks/kcompletion-${KFMIN}:6 + >=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/kjobwidgets-${KFMIN}:6 + >=kde-frameworks/kservice-${KFMIN}:6 + >=kde-frameworks/ktextwidgets-${KFMIN}:6 + >=kde-frameworks/kwidgetsaddons-${KFMIN}:6 + >=kde-frameworks/kxmlgui-${KFMIN}:6 + media-gfx/exiv2:= + media-libs/libjpeg-turbo:= + map? ( kde-apps/marble:6 ) + raw? ( kde-apps/libkdcraw:6 ) + share? ( >=kde-frameworks/purpose-${KFMIN}:6 ) +" +RDEPEND="${DEPEND} + !${CATEGORY}/${PN}:5 + media-video/ffmpeg +" + +DOCS=( CHANGELOG.{md,old} README.md ) + +# downstream version of https://invent.kde.org/graphics/kphotoalbum/-/merge_requests/76 +PATCHES=( "${FILESDIR}"/${P}-build_testing.patch ) + +src_configure() { + local mycmakeargs=( + -DCMAKE_DISABLE_FIND_PACKAGE_LIBVLC=ON + -DCMAKE_DISABLE_FIND_PACKAGE_Phonon4Qt6=ON + $(cmake_use_find_package map Marble) + $(cmake_use_find_package raw KDcrawQt6) + $(cmake_use_find_package share KF6Purpose) + ) + + ecm_src_configure +}
