public inbox for gentoo-commits@lists.gentoo.org
 help / color / mirror / Atom feed
From: "Andreas Sturmlechner" <asturm@gentoo.org>
To: gentoo-commits@lists.gentoo.org
Subject: [gentoo-commits] proj/kde:master commit in: media-gfx/kphotoalbum/
Date: Mon, 21 Oct 2024 19:07:29 +0000 (UTC)	[thread overview]
Message-ID: <1729537539.0262db6d52c2a9a9ca732ab8d7983b7976b2163c.asturm@gentoo> (raw)

commit:     0262db6d52c2a9a9ca732ab8d7983b7976b2163c
Author:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Mon Sep  9 19:37:08 2024 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Mon Oct 21 19:05:39 2024 +0000
URL:        https://gitweb.gentoo.org/proj/kde.git/commit/?id=0262db6d

media-gfx/kphotoalbum: Port to KF6

Upstream commits:
170d891063f0bcdd0a1ff53b7d7c24322d3e8125
e6ecedc24ce664581bd495854bc9ebc53dd22713
f4b880cb02a91ff17af220023480a4d736540d0b

Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>

 media-gfx/kphotoalbum/kphotoalbum-9999.ebuild | 54 +++++++++++++--------------
 1 file changed, 25 insertions(+), 29 deletions(-)

diff --git a/media-gfx/kphotoalbum/kphotoalbum-9999.ebuild b/media-gfx/kphotoalbum/kphotoalbum-9999.ebuild
index 17da1cafb2..41b8321ccb 100644
--- a/media-gfx/kphotoalbum/kphotoalbum-9999.ebuild
+++ b/media-gfx/kphotoalbum/kphotoalbum-9999.ebuild
@@ -3,10 +3,11 @@
 
 EAPI=8
 
+EGIT_BRANCH="kf6"
 ECM_HANDBOOK="forceoptional"
 ECM_TEST="forceoptional"
-KFMIN=5.115.0
-QTMIN=5.15.12
+KFMIN=6.5.0
+QTMIN=6.7.2
 inherit ecm kde.org
 
 DESCRIPTION="Tool for indexing, searching, and viewing images"
@@ -18,36 +19,32 @@ if [[ ${KDE_BUILD_TYPE} != live ]]; then
 fi
 
 LICENSE="GPL-2+ FDL-1.2 CC-BY-SA-4.0"
-SLOT="5"
+SLOT="0"
 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
+	>=dev-qt/qtbase-${QTMIN}:6[dbus,gui,sql,sqlite,widgets,xml]
+	>=kde-frameworks/karchive-${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:5 )
-	phonon? ( >=media-libs/phonon-4.12.0[qt5(-)] )
-	raw? ( kde-apps/libkdcraw:5 )
-	share? ( >=kde-frameworks/kxmlgui-${KFMIN}:5 )
+	map? ( kde-apps/marble:6 )
+	phonon? ( >=media-libs/phonon-4.12.0[qt6(-)] )
+	raw? ( kde-apps/libkdcraw:6 )
+	share? ( >=kde-frameworks/kxmlgui-${KFMIN}:6 )
 	vlc? ( media-video/vlc:= )
 "
 RDEPEND="${DEPEND}
@@ -58,11 +55,10 @@ 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 phonon Phonon4Qt6)
+		$(cmake_use_find_package raw KDcrawQt6)
+		$(cmake_use_find_package share KF6Purpose)
 		$(cmake_use_find_package vlc LIBVLC)
 	)
 


             reply	other threads:[~2024-10-21 19:07 UTC|newest]

Thread overview: 24+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2024-10-21 19:07 Andreas Sturmlechner [this message]
  -- strict thread matches above, loose matches on Subject: below --
2024-10-21 19:23 [gentoo-commits] proj/kde:master commit in: media-gfx/kphotoalbum/ Andreas Sturmlechner
2023-03-29 10:41 Andreas Sturmlechner
2023-01-09 19:38 Andreas Sturmlechner
2022-09-16 18:36 Andreas Sturmlechner
2022-09-14 15:09 Andreas Sturmlechner
2022-07-09 12:52 Andreas Sturmlechner
2022-05-08 13:33 Andreas Sturmlechner
2021-06-28 14:14 Andreas Sturmlechner
2020-10-10 21:39 Andreas Sturmlechner
2020-08-08 10:41 Andreas Sturmlechner
2020-07-01 23:12 Andreas Sturmlechner
2020-07-01 23:12 Andreas Sturmlechner
2020-02-22 19:43 Andreas Sturmlechner
2019-11-11  0:19 Andreas Sturmlechner
2019-07-17 18:22 Andreas Sturmlechner
2019-06-22 17:19 Andreas Sturmlechner
2019-04-28 15:31 Andreas Sturmlechner
2019-02-05 20:03 Andreas Sturmlechner
2013-03-01 21:15 Chris Reffett
2013-02-11  5:00 Chris Reffett
2012-04-26  8:03 Johannes Huber
2012-04-26  7:57 Johannes Huber
2012-04-24 21:34 Chris Reffett

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=1729537539.0262db6d52c2a9a9ca732ab8d7983b7976b2163c.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