From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 992D1158041 for ; Sun, 3 Mar 2024 14:10:45 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id E5B15E2A0E; Sun, 3 Mar 2024 14:10:44 +0000 (UTC) Received: from smtp.gentoo.org (woodpecker.gentoo.org [140.211.166.183]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id C3D21E2A0E for ; Sun, 3 Mar 2024 14:10:44 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id B851233D3C2 for ; Sun, 3 Mar 2024 14:10:43 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 1E692B2F for ; Sun, 3 Mar 2024 14:10:42 +0000 (UTC) From: "Andreas Sturmlechner" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Andreas Sturmlechner" Message-ID: <1709474883.8d314edcbad07b0cd146be4f7fdc88a25ad90d81.asturm@gentoo> Subject: [gentoo-commits] proj/kde:master commit in: kde-apps/kamoso/ X-VCS-Repository: proj/kde X-VCS-Files: kde-apps/kamoso/kamoso-9999.ebuild X-VCS-Directories: kde-apps/kamoso/ X-VCS-Committer: asturm X-VCS-Committer-Name: Andreas Sturmlechner X-VCS-Revision: 8d314edcbad07b0cd146be4f7fdc88a25ad90d81 X-VCS-Branch: master Date: Sun, 3 Mar 2024 14:10:42 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: 8443cc37-2f92-4f46-9450-0b4f90934440 X-Archives-Hash: 4c65a403f95ba83e47aaded814834dd1 commit: 8d314edcbad07b0cd146be4f7fdc88a25ad90d81 Author: Andreas Sturmlechner gentoo org> AuthorDate: Sun Mar 3 14:08:03 2024 +0000 Commit: Andreas Sturmlechner gentoo org> CommitDate: Sun Mar 3 14:08:03 2024 +0000 URL: https://gitweb.gentoo.org/proj/kde.git/commit/?id=8d314edc kde-apps/kamoso: Revert "attempt Qt6 (but not KF6) port" This reverts commit 40468034431f090d7806623f2b0fc464bb67a107. The remaining parts of KF6 porting work are simply missing and our ebuild can do nothing about that, build system will happily detect Qt5 and build with it. Signed-off-by: Andreas Sturmlechner gentoo.org> kde-apps/kamoso/kamoso-9999.ebuild | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/kde-apps/kamoso/kamoso-9999.ebuild b/kde-apps/kamoso/kamoso-9999.ebuild index c69ccd7ec5..235b968268 100644 --- a/kde-apps/kamoso/kamoso-9999.ebuild +++ b/kde-apps/kamoso/kamoso-9999.ebuild @@ -6,7 +6,7 @@ EAPI=8 ECM_TEST="true" ECM_HANDBOOK="forceoptional" KFMIN=5.113.0 -QTMIN=6.6.2 +QTMIN=5.15.9 inherit ecm gear.kde.org DESCRIPTION="Application to take pictures and videos from your webcam by KDE" @@ -21,8 +21,9 @@ RESTRICT="test" # bug 653674 COMMON_DEPEND=" dev-libs/glib:2 - >=dev-qt/qtbase-${QTMIN}:6[gui,widgets] - >=dev-qt/qtdeclarative-${QTMIN}:6 + >=dev-qt/qtdeclarative-${QTMIN}:5 + >=dev-qt/qtgui-${QTMIN}:5 + >=dev-qt/qtwidgets-${QTMIN}:5 >=kde-frameworks/kconfig-${KFMIN}:5 >=kde-frameworks/kcoreaddons-${KFMIN}:5 >=kde-frameworks/ki18n-${KFMIN}:5 @@ -33,10 +34,10 @@ COMMON_DEPEND=" virtual/opengl " DEPEND="${COMMON_DEPEND} - test? ( >=dev-qt/qtbase-${QTMIN}:6[opengl] ) + test? ( >=dev-qt/qtopengl-${QTMIN}:5 ) " RDEPEND="${COMMON_DEPEND} - >=dev-qt/qtdeclarative-${QTMIN}:6 + >=dev-qt/qtquickcontrols2-${QTMIN}:5 >=kde-frameworks/kirigami-${KFMIN}:5 media-plugins/gst-plugins-jpeg:1.0 media-plugins/gst-plugins-libpng:1.0