gentoo-mirror/gentoo
1
0
Fork 0
mirror of https://github.com/gentoo-mirror/gentoo.git synced 2026-11-07 18:07:08 -08:00
Code Issues Projects Releases Wiki Activity

dev-util/cmake: default to Qt 5 for now with USE=gui

Browse Source 
Unfortunate, but I don't use the CMake GUI and the user has a reasonable
request here. Still make Qt 6 available w/ USE=qt6 though.

Revisit when Plasma 6 is out to avoid the referenced jarring issue wrt
text rendering.

Bug: https://bugs.gentoo.org/914489
Signed-off-by: Sam James <sam@gentoo.org>
This commit is contained in:
Sam James
2023-09-22 23:25:06 +01:00
parent dfeab0091f
commit bec4e679fa
2 changed files with 18 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
dev-util/cmake/cmake-3.27.6-r1.ebuild
+9 -4
View File
@@ -60,7 +60,7 @@ S="${WORKDIR}/${MY_P}"
LICENSE="BSD"
SLOT="0"
IUSE="${CMAKE_DOCS_USEFLAG} dap emacs gui ncurses test"
IUSE="${CMAKE_DOCS_USEFLAG} dap emacs gui ncurses qt6 test"
RESTRICT="!test? ( test )"
RDEPEND="
@@ -75,9 +75,14 @@ RDEPEND="
dap? ( dev-cpp/cppdap )
emacs? ( >=app-editors/emacs-23.1:* )
gui? (
dev-qt/qtbase:6[gui,widgets]
!qt6? (
dev-qt/qtcore:5
dev-qt/qtgui:5
dev-qt/qtwidgets:5
)
qt6? ( dev-qt/qtbase:6[gui,widgets] )
)
ncurses? ( sys-libs/ncurses:0= )
ncurses? ( sys-libs/ncurses:= )
"
DEPEND="${RDEPEND}"
BDEPEND+="
@@ -205,7 +210,7 @@ src_configure() {
-DBUILD_QtDialog=$(usex gui)
)
use gui && mycmakeargs+=( -DCMake_QT_MAJOR_VERSION=6 )
use gui && mycmakeargs+=( -DCMake_QT_MAJOR_VERSION=$(usex qt6 6 5) )
cmake_src_configure
}
dev-util/cmake/cmake-9999.ebuild
+9 -4
View File
@@ -59,7 +59,7 @@ S="${WORKDIR}/${MY_P}"
LICENSE="BSD"
SLOT="0"
IUSE="${CMAKE_DOCS_USEFLAG} dap emacs gui ncurses test"
IUSE="${CMAKE_DOCS_USEFLAG} dap emacs gui ncurses qt6 test"
RESTRICT="!test? ( test )"
RDEPEND="
@@ -74,9 +74,14 @@ RDEPEND="
dap? ( dev-cpp/cppdap )
emacs? ( >=app-editors/emacs-23.1:* )
gui? (
dev-qt/qtbase:6[gui,widgets]
!qt6? (
dev-qt/qtcore:5
dev-qt/qtgui:5
dev-qt/qtwidgets:5
)
qt6? ( dev-qt/qtbase:6[gui,widgets] )
)
ncurses? ( sys-libs/ncurses:0= )
ncurses? ( sys-libs/ncurses:= )
"
DEPEND="${RDEPEND}"
BDEPEND+="
@@ -201,7 +206,7 @@ src_configure() {
-DBUILD_QtDialog=$(usex gui)
)
use gui && mycmakeargs+=( -DCMake_QT_MAJOR_VERSION=6 )
use gui && mycmakeargs+=( -DCMake_QT_MAJOR_VERSION=$(usex qt6 6 5) )
cmake_src_configure
}