commit: 05fefac10ba726e61a5e92f250584ec5dbc169c7 Author: David Michael <fedora.dm0 <AT> gmail <DOT> com> AuthorDate: Fri Jan 8 00:17:59 2021 +0000 Commit: Michał Górny <mgorny <AT> gentoo <DOT> org> CommitDate: Tue Jan 12 18:33:36 2021 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=05fefac1
xfce-base/xfwm4: enable libXi and drop the exo dep The exo dependency appears to have been for calling exo-csource, which was replaced with xdt-csource from xfce4-dev-tools, but this is only used in maintainer mode, so just drop it. Package-Manager: Portage-3.0.12, Repoman-3.0.2 Signed-off-by: David Michael <fedora.dm0 <AT> gmail.com> Closes: https://github.com/gentoo/gentoo/pull/18988 Signed-off-by: Michał Górny <mgorny <AT> gentoo.org> xfce-base/xfwm4/xfwm4-4.16.1.ebuild | 23 +++++++++++------------ 1 file changed, 11 insertions(+), 12 deletions(-) diff --git a/xfce-base/xfwm4/xfwm4-4.16.1.ebuild b/xfce-base/xfwm4/xfwm4-4.16.1.ebuild index 0a4b9d4fdac..52677c1a05f 100644 --- a/xfce-base/xfwm4/xfwm4-4.16.1.ebuild +++ b/xfce-base/xfwm4/xfwm4-4.16.1.ebuild @@ -12,12 +12,16 @@ SRC_URI="https://archive.xfce.org/src/xfce/${PN}/${PV%.*}/${P}.tar.bz2" LICENSE="GPL-2+" SLOT="0" KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~x86-solaris" -IUSE="opengl startup-notification +xcomposite +xpresent" +IUSE="opengl startup-notification +xpresent" RDEPEND=">=dev-libs/glib-2.20 >=x11-libs/gtk+-3.22:3 x11-libs/libX11 + x11-libs/libXcomposite + x11-libs/libXdamage x11-libs/libXext + x11-libs/libXfixes + x11-libs/libXi x11-libs/libXinerama x11-libs/libXrandr x11-libs/libXrender @@ -29,12 +33,7 @@ RDEPEND=">=dev-libs/glib-2.20 >=xfce-base/xfconf-4.13:= opengl? ( media-libs/libepoxy:=[X(+)] ) startup-notification? ( x11-libs/startup-notification ) - xpresent? ( x11-libs/libXpresent ) - xcomposite? ( - x11-libs/libXcomposite - x11-libs/libXdamage - x11-libs/libXfixes - )" + xpresent? ( x11-libs/libXpresent )" # libICE/libSM: not really used anywhere but checked by configure # https://bugzilla.xfce.org/show_bug.cgi?id=11914 DEPEND="${RDEPEND} @@ -43,18 +42,18 @@ DEPEND="${RDEPEND} BDEPEND=" dev-util/intltool sys-devel/gettext - xfce-base/exo virtual/pkgconfig" src_configure() { local myconf=( $(use_enable opengl epoxy) $(use_enable startup-notification) - --enable-xsync - --enable-render - --enable-randr $(use_enable xpresent) - $(use_enable xcomposite compositor) + --enable-compositor + --enable-randr + --enable-render + --enable-xi2 + --enable-xsync ) econf "${myconf[@]}"