Attachment #223641 for bug #254583

View | Details | Raw Unified | Return to bug 254583 | Differences between
Collapse All | Expand All





PORTNAME=	libxkbcommon
PORTVERSION=	1.1.0
PORTREVISION=	1
CATEGORIES=	x11
MASTER_SITES=	https://xkbcommon.org/download/
DIST_SUBDIR=	xorg/lib


USES=		bison gnome meson pkgconfig tar:xz
USE_GNOME=	libxml2
USE_LDCONFIG=	yes
MESON_ARGS=	-Denable-docs=false \
		-Denable-wayland=false \
		-Dx-locale-root="${PREFIX}/lib/X11/locale"

OPTIONS_DEFINE=	EVDEV X11
OPTIONS_DEFAULT=EVDEV X11
OPTIONS_SUB=	yes

EVDEV_BUILD_DEPENDS=	${LOCALBASE}/include/linux/input.h:devel/evdev-proto
EVDEV_DESC=		Interactive debugger for XKB keymaps for evdev
EVDEV_LIB_DEPENDS=	libepoll-shim.so:devel/libepoll-shim
EVDEV_USES=		localbase
X11_USES=	xorg
X11_USE=	XORG=xcb
X11_MESON_TRUE=	enable-x11




--- meson.build.orig	2021-02-27 20:49:04 UTC
+++ meson.build
@@ -412,9 +412,10 @@ if build_tools
     install_man('tools/xkbcli-how-to-type.1')
     configh_data.set10('HAVE_XKBCLI_HOW_TO_TYPE', true)
     if cc.has_header('linux/input.h')
+        epoll_dep = dependency('epoll-shim', required: false)
         executable('xkbcli-interactive-evdev',
                    'tools/interactive-evdev.c',
-                   dependencies: tools_dep,
+                   dependencies: [tools_dep, epoll_dep],
                    install: true,
                    install_dir: dir_libexec)
         configh_data.set10('HAVE_XKBCLI_INTERACTIVE_EVDEV', true)




bin/xkbcli
include/xkbcommon/xkbcommon.h
include/xkbcommon/xkbcommon-compat.h
include/xkbcommon/xkbcommon-compose.h
include/xkbcommon/xkbcommon-keysyms.h
include/xkbcommon/xkbcommon-names.h
%%X11%%include/xkbcommon/xkbcommon-x11.h
include/xkbcommon/xkbcommon.h
include/xkbcommon/xkbregistry.h
%%X11%%lib/libxkbcommon-x11.so
%%X11%%lib/libxkbcommon-x11.so.0
%%X11%%lib/libxkbcommon-x11.so.0.0.0
lib/libxkbcommon.so
lib/libxkbcommon.so.0
lib/libxkbcommon.so.0.0.0
%%X11%%lib/libxkbcommon-x11.so
%%X11%%lib/libxkbcommon-x11.so.0
%%X11%%lib/libxkbcommon-x11.so.0.0.0
lib/libxkbregistry.so
lib/libxkbregistry.so.0
lib/libxkbregistry.so.0.0.0
%%X11%%libdata/pkgconfig/xkbcommon-x11.pc
libdata/pkgconfig/xkbcommon.pc
%%X11%%libdata/pkgconfig/xkbcommon-x11.pc
libdata/pkgconfig/xkbregistry.pc
libexec/xkbcommon/xkbcli-compile-keymap
libexec/xkbcommon/xkbcli-how-to-type
%%EVDEV%%libexec/xkbcommon/xkbcli-interactive-evdev
%%X11%%libexec/xkbcommon/xkbcli-interactive-x11
libexec/xkbcommon/xkbcli-list
man/man1/xkbcli-compile-keymap.1.gz
man/man1/xkbcli-how-to-type.1.gz
%%EVDEV%%man/man1/xkbcli-interactive-evdev.1.gz
%%X11%%man/man1/xkbcli-interactive-x11.1.gz
man/man1/xkbcli-list.1.gz
man/man1/xkbcli.1.gz

Return to bug 254583

Lines 2-7 Link Here

(-)x11/libxkbcommon/Makefile (-2 / +8 lines)
2		2
3	PORTNAME= libxkbcommon	3	PORTNAME= libxkbcommon
4	PORTVERSION= 1.1.0	4	PORTVERSION= 1.1.0
		5	PORTREVISION= 1
5	CATEGORIES= x11	6	CATEGORIES= x11
6	MASTER_SITES= https://xkbcommon.org/download/	7	MASTER_SITES= https://xkbcommon.org/download/
7	DIST_SUBDIR= xorg/lib	8	DIST_SUBDIR= xorg/lib
Lines 16-29 Link Here
16		17
17	USES= bison gnome meson pkgconfig tar:xz	18	USES= bison gnome meson pkgconfig tar:xz
18	USE_GNOME= libxml2	19	USE_GNOME= libxml2
		20	USE_LDCONFIG= yes
19	MESON_ARGS= -Denable-docs=false \	21	MESON_ARGS= -Denable-docs=false \
20	-Denable-wayland=false \	22	-Denable-wayland=false \
21	-Dx-locale-root="${PREFIX}/lib/X11/locale"	23	-Dx-locale-root="${PREFIX}/lib/X11/locale"
22		24
23	OPTIONS_DEFINE= X11	25	OPTIONS_DEFINE= EVDEV X11
24	OPTIONS_DEFAULT=X11	26	OPTIONS_DEFAULT=EVDEV X11
25	OPTIONS_SUB= yes	27	OPTIONS_SUB= yes
26		28
		29	EVDEV_BUILD_DEPENDS= ${LOCALBASE}/include/linux/input.h:devel/evdev-proto
		30	EVDEV_DESC= Interactive debugger for XKB keymaps for evdev
		31	EVDEV_LIB_DEPENDS= libepoll-shim.so:devel/libepoll-shim
		32	EVDEV_USES= localbase
27	X11_USES= xorg	33	X11_USES= xorg
28	X11_USE= XORG=xcb	34	X11_USE= XORG=xcb
29	X11_MESON_TRUE= enable-x11	35	X11_MESON_TRUE= enable-x11

Line 0 Link Here

(-)x11/libxkbcommon/files/patch-meson.build (+14 lines)
	1	--- meson.build.orig 2021-02-27 20:49:04 UTC
	2	+++ meson.build
	3	@@ -412,9 +412,10 @@ if build_tools
	4	install_man('tools/xkbcli-how-to-type.1')
	5	configh_data.set10('HAVE_XKBCLI_HOW_TO_TYPE', true)
	6	if cc.has_header('linux/input.h')
	7	+ epoll_dep = dependency('epoll-shim', required: false)
	8	executable('xkbcli-interactive-evdev',
	9	'tools/interactive-evdev.c',
	10	- dependencies: tools_dep,
	11	+ dependencies: [tools_dep, epoll_dep],
	12	install: true,
	13	install_dir: dir_libexec)
	14	configh_data.set10('HAVE_XKBCLI_INTERACTIVE_EVDEV', true)

Lines 1-29 Link Here

(-)x11/libxkbcommon/pkg-plist (-6 / +8 lines)
1	bin/xkbcli	1	bin/xkbcli
2	include/xkbcommon/xkbcommon.h
3	include/xkbcommon/xkbcommon-compat.h	2	include/xkbcommon/xkbcommon-compat.h
4	include/xkbcommon/xkbcommon-compose.h	3	include/xkbcommon/xkbcommon-compose.h
5	include/xkbcommon/xkbcommon-keysyms.h	4	include/xkbcommon/xkbcommon-keysyms.h
6	include/xkbcommon/xkbcommon-names.h	5	include/xkbcommon/xkbcommon-names.h
		6	%%X11%%include/xkbcommon/xkbcommon-x11.h
		7	include/xkbcommon/xkbcommon.h
7	include/xkbcommon/xkbregistry.h	8	include/xkbcommon/xkbregistry.h
8	%%X11%%include/xkbcommon/xkbcommon-x11.h	9	%%X11%%lib/libxkbcommon-x11.so
		10	%%X11%%lib/libxkbcommon-x11.so.0
		11	%%X11%%lib/libxkbcommon-x11.so.0.0.0
9	lib/libxkbcommon.so	12	lib/libxkbcommon.so
10	lib/libxkbcommon.so.0	13	lib/libxkbcommon.so.0
11	lib/libxkbcommon.so.0.0.0	14	lib/libxkbcommon.so.0.0.0
12	%%X11%%lib/libxkbcommon-x11.so
13	%%X11%%lib/libxkbcommon-x11.so.0
14	%%X11%%lib/libxkbcommon-x11.so.0.0.0
15	lib/libxkbregistry.so	15	lib/libxkbregistry.so
16	lib/libxkbregistry.so.0	16	lib/libxkbregistry.so.0
17	lib/libxkbregistry.so.0.0.0	17	lib/libxkbregistry.so.0.0.0
		18	%%X11%%libdata/pkgconfig/xkbcommon-x11.pc
18	libdata/pkgconfig/xkbcommon.pc	19	libdata/pkgconfig/xkbcommon.pc
19	%%X11%%libdata/pkgconfig/xkbcommon-x11.pc
20	libdata/pkgconfig/xkbregistry.pc	20	libdata/pkgconfig/xkbregistry.pc
21	libexec/xkbcommon/xkbcli-compile-keymap	21	libexec/xkbcommon/xkbcli-compile-keymap
22	libexec/xkbcommon/xkbcli-how-to-type	22	libexec/xkbcommon/xkbcli-how-to-type
		23	%%EVDEV%%libexec/xkbcommon/xkbcli-interactive-evdev
23	%%X11%%libexec/xkbcommon/xkbcli-interactive-x11	24	%%X11%%libexec/xkbcommon/xkbcli-interactive-x11
24	libexec/xkbcommon/xkbcli-list	25	libexec/xkbcommon/xkbcli-list
25	man/man1/xkbcli-compile-keymap.1.gz	26	man/man1/xkbcli-compile-keymap.1.gz
26	man/man1/xkbcli-how-to-type.1.gz	27	man/man1/xkbcli-how-to-type.1.gz
		28	%%EVDEV%%man/man1/xkbcli-interactive-evdev.1.gz
27	%%X11%%man/man1/xkbcli-interactive-x11.1.gz	29	%%X11%%man/man1/xkbcli-interactive-x11.1.gz
28	man/man1/xkbcli-list.1.gz	30	man/man1/xkbcli-list.1.gz
29	man/man1/xkbcli.1.gz	31	man/man1/xkbcli.1.gz