aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTakuya Wakazono <pastalian46@gmail.com>2024-08-18 21:50:07 +0900
committerTakuya Wakazono <pastalian46@gmail.com>2024-08-18 21:52:38 +0900
commit1062ae41fc96744e09e9bae9ddbdbf40ac6a34e9 (patch)
tree43b9bcf4848f1034b4e6af211bb47e5655a61f15
parentmedia-sound/dzr: drop 240704 (diff)
downloadguru-1062ae41fc96744e09e9bae9ddbdbf40ac6a34e9.tar.gz
guru-1062ae41fc96744e09e9bae9ddbdbf40ac6a34e9.tar.bz2
guru-1062ae41fc96744e09e9bae9ddbdbf40ac6a34e9.zip
app-editors/neovim-qt: fix Qt6 build
Signed-off-by: Takuya Wakazono <pastalian46@gmail.com>
-rw-r--r--app-editors/neovim-qt/neovim-qt-0.2.18-r1.ebuild (renamed from app-editors/neovim-qt/neovim-qt-0.2.18.ebuild)17
1 files changed, 7 insertions, 10 deletions
diff --git a/app-editors/neovim-qt/neovim-qt-0.2.18.ebuild b/app-editors/neovim-qt/neovim-qt-0.2.18-r1.ebuild
index 1d896fd1a..9dbb3629b 100644
--- a/app-editors/neovim-qt/neovim-qt-0.2.18.ebuild
+++ b/app-editors/neovim-qt/neovim-qt-0.2.18-r1.ebuild
@@ -12,12 +12,11 @@ SRC_URI="https://github.com/equalsraf/neovim-qt/archive/v${PV}.tar.gz -> ${P}.ta
LICENSE="ISC"
SLOT="0"
KEYWORDS="~amd64 ~x86"
-IUSE="qt5 qt6 test"
-REQUIRED_USE="|| ( qt5 qt6 )"
+IUSE="qt6 test"
COMMON_DEPEND="
- qt5? (
- dev-libs/msgpack:=
+ dev-libs/msgpack:=
+ !qt6? (
dev-qt/qtcore:5
dev-qt/qtgui:5
dev-qt/qtnetwork:5
@@ -26,16 +25,14 @@ COMMON_DEPEND="
)
qt6? (
dev-qt/qtbase:6[gui,network,widgets]
- dev-qt/qtsvg:5
+ dev-qt/qtsvg:6
)
"
# NOTE: see <https://github.com/equalsraf/neovim-qt/issues/1005> for dejavu dep
DEPEND="
${COMMON_DEPEND}
- test? (
- qt5? ( dev-qt/qttest:5 )
- media-fonts/dejavu[X]
- )
+ !qt6? ( dev-qt/qttest:5 )
+ test? ( media-fonts/dejavu[X] )
"
RDEPEND="
${COMMON_DEPEND}
@@ -49,7 +46,7 @@ src_configure() {
-DUSE_GCOV=OFF
-DENABLE_TESTS=$(usex test)
-DBUILD_SHARED_LIBS=OFF # upstream explicitly builds static lib
- -DQT_VERSION_MAJOR=$(usex qt5 5 6)
+ -DWITH_QT=$(usex qt6 Qt6 Qt5)
)
cmake_src_configure