Merge updates from master

3 files changed, 74 insertions, 0 deletions

diff --git a/eclass/qt5-build.eclass b/eclass/qt5-build.eclass
index db333767fae6..223955f5ac12 100644
--- a/eclass/qt5-build.eclass
+++ b/eclass/qt5-build.eclass
@@ -237,6 +237,9 @@ qt5-build_src_configure() {
 		append-ldflags -Wl,--undefined-version
 	fi
 
+	# many bugs, no one to fix
+	filter-lto
+
 	qt5_foreach_target_subdir qt5_qmake
 }
 
diff --git a/media-gfx/kphotoalbum/Manifest b/media-gfx/kphotoalbum/Manifest
index eb90501ca754..81a99faaaded 100644
--- a/media-gfx/kphotoalbum/Manifest
+++ b/media-gfx/kphotoalbum/Manifest
@@ -1 +1,2 @@
 DIST kphotoalbum-5.11.0.tar.xz 12005836 BLAKE2B 1a2872bc791cec6701a4bfe8b6ddac264731f7afdcb35d864bcd07cc0b5e5a4015184a071d9db9735d21b080c898d5ea598d0879bb979032abe464434f6fb821 SHA512 dd521b5e158a691da69e333fcefd3cf48135053c7510dbd7f22d94299059fe58037c56e70b92edfcd1d8d7a55b04f80278ff3bdde08dba16507dc43ca77af96e
+DIST kphotoalbum-5.12.0.tar.xz 11907204 BLAKE2B c4a9193d74c902788a5f68794948ca544f92eb1d2ef7a8c856b96832c7f1b8c5ba8b828744407e74a7101c3e954e83758444d31138c35c3a9045fae94f227e39 SHA512 f4d31d1c00ae2d8ec5a0475a4b3332e32f1ed980034419e6d07388544b65a6bd445c04c0640fba4fd5084c83840b6211ee64d556b6a82e4b182b5f07fbab3338
diff --git a/media-gfx/kphotoalbum/kphotoalbum-5.12.0.ebuild b/media-gfx/kphotoalbum/kphotoalbum-5.12.0.ebuild
new file mode 100644
index 000000000000..60d41b1ab741
--- /dev/null
+++ b/media-gfx/kphotoalbum/kphotoalbum-5.12.0.ebuild
@@ -0,0 +1,70 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+ECM_HANDBOOK="forceoptional"
+ECM_TEST="forceoptional"
+KFMIN=5.106.0
+QTMIN=5.15.9
+inherit ecm kde.org
+
+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="5"
+IUSE="map phonon +raw share +vlc"
+
+REQUIRED_USE="|| ( phonon vlc )"
+
+DEPEND="
+	>=dev-qt/qtdbus-${QTMIN}:5
+	>=dev-qt/qtgui-${QTMIN}:5[jpeg]
+	>=dev-qt/qtsql-${QTMIN}:5[sqlite]
+	>=dev-qt/qtwidgets-${QTMIN}:5
+	>=dev-qt/qtxml-${QTMIN}:5
+	>=kde-frameworks/karchive-${KFMIN}:5
+	>=kde-frameworks/kcompletion-${KFMIN}: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/kjobwidgets-${KFMIN}:5
+	>=kde-frameworks/kservice-${KFMIN}:5
+	>=kde-frameworks/ktextwidgets-${KFMIN}:5
+	>=kde-frameworks/kwidgetsaddons-${KFMIN}:5
+	>=kde-frameworks/kxmlgui-${KFMIN}:5
+	media-gfx/exiv2:=
+	media-libs/libjpeg-turbo:=
+	map? ( kde-apps/marble:5 )
+	phonon? ( >=media-libs/phonon-4.11.0[qt5(+)] )
+	raw? ( kde-apps/libkdcraw:5 )
+	share? ( >=kde-frameworks/kxmlgui-${KFMIN}:5 )
+	vlc? ( media-video/vlc:= )
+"
+RDEPEND="${DEPEND}
+	media-video/ffmpeg
+"
+
+DOCS=( CHANGELOG.{md,old} README.md )
+
+src_configure() {
+	local mycmakeargs=(
+		-DCMAKE_DISABLE_FIND_PACKAGE_QtAV=ON # bug 758641, last-rited
+		$(cmake_use_find_package map Marble)
+		$(cmake_use_find_package phonon Phonon4Qt5)
+		$(cmake_use_find_package raw KF5KDcraw)
+		$(cmake_use_find_package share KF5Purpose)
+		$(cmake_use_find_package vlc LIBVLC)
+	)
+
+	ecm_src_configure
+}