Attachment 215906 Details for Bug 247520 – v1

[patch] v1

bug247520.diff (text/plain), 1.81 KB, created by Jan Beich on 2020-06-24 13:20:29 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Jan Beich

Created: 2020-06-24 13:20:29 UTC

Size: 1.81 KB

patch

obsolete

>From a89732263e56b40b636f296a1eb0db47aa6230e3 Mon Sep 17 00:00:00 2001
>From: Jan Beich <jbeich@FreeBSD.org>
>Date: Tue, 23 Jun 2020 22:52:32 +0000
>Subject: [PATCH] x11/libxkbcommon: make X11 optional
>
>PR:		247520
>Submitted by:	jbeich
>Approved by:	?
>---
> x11/libxkbcommon/Makefile  | 11 +++++++++--
> x11/libxkbcommon/pkg-plist | 10 +++++-----
> 2 files changed, 14 insertions(+), 7 deletions(-)
>
>diff --git a/x11/libxkbcommon/Makefile b/x11/libxkbcommon/Makefile
>index 0b3bf88df2d1..86a0a7c2d25e 100644
>--- a/x11/libxkbcommon/Makefile
>+++ b/x11/libxkbcommon/Makefile
>@@ -15,12 +15,19 @@ LICENSE_FILE=	${WRKSRC}/LICENSE
> 
> RUN_DEPENDS=	xkeyboard-config>0:x11/xkeyboard-config
> 
>-USES=		bison meson pkgconfig tar:xz xorg
>-USE_XORG=	xcb
>+USES=		bison meson pkgconfig tar:xz
> MESON_ARGS=	-Denable-docs=false \
> 		-Denable-wayland=false \
> 		-Dx-locale-root="${PREFIX}/lib/X11/locale"
> 
>+OPTIONS_DEFINE=	X11
>+OPTIONS_DEFAULT=X11
>+OPTIONS_SUB=	yes
>+
>+X11_USES=	xorg
>+X11_USE=	XORG=xcb
>+X11_MESON_TRUE=	enable-x11
>+
> .include <bsd.port.pre.mk>
> 
> .if ${OSVERSION} < 1200000
>diff --git a/x11/libxkbcommon/pkg-plist b/x11/libxkbcommon/pkg-plist
>index 5c2fb72d1036..ff403a3fc136 100644
>--- a/x11/libxkbcommon/pkg-plist
>+++ b/x11/libxkbcommon/pkg-plist
>@@ -3,12 +3,12 @@ include/xkbcommon/xkbcommon-compat.h
> include/xkbcommon/xkbcommon-compose.h
> include/xkbcommon/xkbcommon-keysyms.h
> include/xkbcommon/xkbcommon-names.h
>-include/xkbcommon/xkbcommon-x11.h
>+%%X11%%include/xkbcommon/xkbcommon-x11.h
> lib/libxkbcommon.so
> lib/libxkbcommon.so.0
> lib/libxkbcommon.so.0.0.0
>-lib/libxkbcommon-x11.so
>-lib/libxkbcommon-x11.so.0
>-lib/libxkbcommon-x11.so.0.0.0
>+%%X11%%lib/libxkbcommon-x11.so
>+%%X11%%lib/libxkbcommon-x11.so.0
>+%%X11%%lib/libxkbcommon-x11.so.0.0.0
> libdata/pkgconfig/xkbcommon.pc
>-libdata/pkgconfig/xkbcommon-x11.pc
>+%%X11%%libdata/pkgconfig/xkbcommon-x11.pc

Actions: View | Diff

Attachments on bug 247520: 215906