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)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 2F66D158041 for ; Thu, 22 Feb 2024 11:32:41 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 57AEAE29AB; Thu, 22 Feb 2024 11:32:40 +0000 (UTC) Received: from smtp.gentoo.org (mail.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (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 3CB0BE29AB for ; Thu, 22 Feb 2024 11:32:40 +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 780E834322B for ; Thu, 22 Feb 2024 11:32:39 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 8AB36118C for ; Thu, 22 Feb 2024 11:32:37 +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: <1708600672.b348e68385d5b0020393469f9abc6b9238995925.asturm@gentoo> Subject: [gentoo-commits] proj/qt:master commit in: x11-misc/sddm/ X-VCS-Repository: proj/qt X-VCS-Files: x11-misc/sddm/sddm-9999.ebuild X-VCS-Directories: x11-misc/sddm/ X-VCS-Committer: asturm X-VCS-Committer-Name: Andreas Sturmlechner X-VCS-Revision: b348e68385d5b0020393469f9abc6b9238995925 X-VCS-Branch: master Date: Thu, 22 Feb 2024 11:32:37 +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: bf67b202-5eea-4f7e-9201-3b1fe770a827 X-Archives-Hash: 486c35001387818cefb3f7799daede6f commit: b348e68385d5b0020393469f9abc6b9238995925 Author: Andreas Sturmlechner gentoo org> AuthorDate: Thu Feb 22 10:31:48 2024 +0000 Commit: Andreas Sturmlechner gentoo org> CommitDate: Thu Feb 22 11:17:52 2024 +0000 URL: https://gitweb.gentoo.org/proj/qt.git/commit/?id=b348e683 x11-misc/sddm: Add IUSE qt5 Even built-in themes are only "semi-compatible" right now, so Qt5 remains default. Qt5 minimum version won't change anymore so simply set it to current latest version in ::gentoo and repurpose QTMIN to Qt6 minimum version. Thanks-to: Mike Lothian fireburn.co.uk> Closes: https://github.com/gentoo/qt/pull/276 Signed-off-by: Andreas Sturmlechner gentoo.org> x11-misc/sddm/sddm-9999.ebuild | 30 +++++++++++++++++++++--------- 1 file changed, 21 insertions(+), 9 deletions(-) diff --git a/x11-misc/sddm/sddm-9999.ebuild b/x11-misc/sddm/sddm-9999.ebuild index f210629a..177c1c2e 100644 --- a/x11-misc/sddm/sddm-9999.ebuild +++ b/x11-misc/sddm/sddm-9999.ebuild @@ -11,7 +11,7 @@ else KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc64 ~riscv ~x86" fi -QTMIN=5.15.2 +QTMIN=6.6.2 inherit cmake linux-info systemd tmpfiles DESCRIPTION="Simple Desktop Display Manager" @@ -19,7 +19,7 @@ HOMEPAGE="https://github.com/sddm/sddm" LICENSE="GPL-2+ MIT CC-BY-3.0 CC-BY-SA-3.0 public-domain" SLOT="0" -IUSE="+elogind systemd test +X" +IUSE="+elogind +qt5 systemd test +X" REQUIRED_USE="^^ ( elogind systemd )" RESTRICT="!test? ( test )" @@ -27,20 +27,29 @@ RESTRICT="!test? ( test )" COMMON_DEPEND=" acct-group/sddm acct-user/sddm - >=dev-qt/qtcore-${QTMIN}:5 - >=dev-qt/qtdbus-${QTMIN}:5 - >=dev-qt/qtdeclarative-${QTMIN}:5 - >=dev-qt/qtgui-${QTMIN}:5 - >=dev-qt/qtnetwork-${QTMIN}:5 sys-libs/pam x11-libs/libXau x11-libs/libxcb:= elogind? ( sys-auth/elogind[pam] ) + qt5? ( + >=dev-qt/qtcore-5.15.12:5 + >=dev-qt/qtdbus-5.15.12:5 + >=dev-qt/qtdeclarative-5.15.12:5 + >=dev-qt/qtgui-5.15.12:5 + >=dev-qt/qtnetwork-5.15.12:5 + ) + !qt5? ( + >=dev-qt/qtbase-${QTMIN}:6[dbus,gui,network] + >=dev-qt/qtdeclarative-${QTMIN}:6 + ) systemd? ( sys-apps/systemd:=[pam] ) !systemd? ( sys-power/upower ) " DEPEND="${COMMON_DEPEND} - test? ( >=dev-qt/qttest-${QTMIN}:5 ) + test? ( + qt5? ( >=dev-qt/qttest-5.15.12:5 ) + !qt5? ( >=dev-qt/qtbase-${QTMIN}:6[network,test] ) + ) " RDEPEND="${COMMON_DEPEND} X? ( x11-base/xorg-server ) @@ -48,7 +57,9 @@ RDEPEND="${COMMON_DEPEND} " BDEPEND=" dev-python/docutils - >=dev-qt/linguist-tools-${QTMIN}:5 + >=dev-build/cmake-3.25.0 + qt5? ( >=dev-qt/linguist-tools-5.15.12:5 ) + !qt5? ( >=dev-qt/qttools-${QTMIN}[linguist] ) kde-frameworks/extra-cmake-modules:0 virtual/pkgconfig " @@ -87,6 +98,7 @@ EOF src_configure() { local mycmakeargs=( -DBUILD_MAN_PAGES=ON + -DBUILD_WITH_QT6=$(usex !qt5) -DDBUS_CONFIG_FILENAME="org.freedesktop.sddm.conf" -DRUNTIME_DIR=/run/sddm -DSYSTEMD_TMPFILES_DIR="/usr/lib/tmpfiles.d"