From 862a720c830ac23e16b2644b91b122ca4aca2dbf Mon Sep 17 00:00:00 2001 From: Jan Beich Date: Thu, 25 Mar 2021 18:58:14 +0000 Subject: x11/libxcvt: avoid conflict with xorg-server Nowadays, kde5 depends on both xorg-server and xwayland-devel. Once upstream of both switches to libxcvt and xwayland-devel is updated it'd make kde5 uninstallable. Backporting to xorg-server is complicated by numerious patch conflicts and autotools. Stop installing cvt(1) as Xwayland doesn't use xorg.conf(5). --- x11-servers/xorg-server/Makefile | 1 - 1 file changed, 1 deletion(-) (limited to 'x11-servers') diff --git a/x11-servers/xorg-server/Makefile b/x11-servers/xorg-server/Makefile index 638090921b5b..bf56659f4dbd 100644 --- a/x11-servers/xorg-server/Makefile +++ b/x11-servers/xorg-server/Makefile @@ -81,7 +81,6 @@ BUILD_DEPENDS+= libepoxy>0:graphics/libepoxy # only for configure .endif .if ${SLAVE_PORT} == "no" -CONFLICTS_INSTALL+= libxcvt # bin/cvt, https://gitlab.freedesktop.org/xorg/xserver/-/merge_requests/637 USE_GL+= gbm USE_XORG+= pciaccess CONFIGURE_ARGS+=--disable-dmx --disable-xephyr --disable-xnest --disable-xvfb \ -- cgit v1.2.3