Attachment 223641 Details for Bug 254583 – evdev and ldconfig patch

[patch] evdev and ldconfig patch

libxkbcommon-evdev.patch (text/plain), 3.65 KB, created by Evgenii Khramtsov on 2021-03-27 14:57:17 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Evgenii Khramtsov

Created: 2021-03-27 14:57:17 UTC

Size: 3.65 KB

patch

obsolete

>Index: x11/libxkbcommon/Makefile
>===================================================================
>--- x11/libxkbcommon/Makefile	(revision 569259)
>+++ x11/libxkbcommon/Makefile	(working copy)
>@@ -2,6 +2,7 @@
> 
> PORTNAME=	libxkbcommon
> PORTVERSION=	1.1.0
>+PORTREVISION=	1
> CATEGORIES=	x11
> MASTER_SITES=	https://xkbcommon.org/download/
> DIST_SUBDIR=	xorg/lib
>@@ -16,14 +17,19 @@
> 
> 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=	X11
>-OPTIONS_DEFAULT=X11
>+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
>Index: x11/libxkbcommon/files/patch-meson.build
>===================================================================
>--- x11/libxkbcommon/files/patch-meson.build	(nonexistent)
>+++ x11/libxkbcommon/files/patch-meson.build	(working copy)
>@@ -0,0 +1,14 @@
>+--- 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)
>
>Property changes on: x11/libxkbcommon/files/patch-meson.build
>___________________________________________________________________
>Added: fbsd:nokeywords
>## -0,0 +1 ##
>+yes
>\ No newline at end of property
>Added: svn:eol-style
>## -0,0 +1 ##
>+native
>\ No newline at end of property
>Added: svn:mime-type
>## -0,0 +1 ##
>+text/plain
>\ No newline at end of property
>Index: x11/libxkbcommon/pkg-plist
>===================================================================
>--- x11/libxkbcommon/pkg-plist	(revision 569259)
>+++ x11/libxkbcommon/pkg-plist	(working copy)
>@@ -1,29 +1,31 @@
> 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%%include/xkbcommon/xkbcommon-x11.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

Actions: View | Diff

Attachments on bug 254583: 223614 | 223641 | 223662