Module Name: src
Committed By: nros
Date: Fri Feb 10 13:22:58 UTC 2023
Modified Files:
src/external/mit/xorg/lib/xkeyboard-config: xkeyboard-config.man
xkeyboard-config.pc.in
Log Message:
Fix xkb_base in the pkg-config file and mapage for xkeyboard-config
The xkbdata files are installed in /usr/X11R7/lib/X11/xkb
not /usr/X11R7/share/X11/xkb. The wrong directory causes
build failures in pkgsrc packages that use the xkb_base
variable.
Also base the datadir on the vars from bsd.x11.mk.
Also use @xkb_base@ instead of /usr/X11R7/share/lib/X11/xkb
in the manpage to show the right xkbdata directory.
To generate a diff of this commit:
cvs rdiff -u -r1.11 -r1.12 \
src/external/mit/xorg/lib/xkeyboard-config/xkeyboard-config.man
cvs rdiff -u -r1.1 -r1.2 \
src/external/mit/xorg/lib/xkeyboard-config/xkeyboard-config.pc.in
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/external/mit/xorg/lib/xkeyboard-config/xkeyboard-config.man
diff -u src/external/mit/xorg/lib/xkeyboard-config/xkeyboard-config.man:1.11 src/external/mit/xorg/lib/xkeyboard-config/xkeyboard-config.man:1.12
--- src/external/mit/xorg/lib/xkeyboard-config/xkeyboard-config.man:1.11 Mon Oct 17 07:40:23 2022
+++ src/external/mit/xorg/lib/xkeyboard-config/xkeyboard-config.man Fri Feb 10 13:22:58 2023
@@ -13,7 +13,7 @@ settings in the xorg.conf(5).
.SH XKB DATA FILES LOAD PATHS
xkeyboard-config provides the XKB data files installed in
-/usr/X11R7/share/X11/xkb. User-specific data files may be elsewhere but it depends on
+@xkb_base@. User-specific data files may be elsewhere but it depends on
the tool whether those files are loaded. For example, the libxkbcommon
library will by default load XKB data files from the user's home directory.
See the libxkbcommon documentation for details.
@@ -22,7 +22,7 @@ See the libxkbcommon documentation for d
The "custom" layout is a layout that is listed as available to tools
reading the data files but is not actually provided by xkeyboard-config.
-A user may save a layout specification in the /usr/X11R7/share/X11/xkb/symbols/custom file
+A user may save a layout specification in the @xkb_base@/symbols/custom file
and that layout will be available to most tools interacting with the
xkeyboard-config data files. This is primarily aimed at systems running X
where additional lookup paths cannot easily be added.
@@ -1475,23 +1475,23 @@ terminate:ctrl_alt_bksp Ctrl+Alt+Backspa
.SH FILES
-/usr/X11R7/share/X11/xkb/compat
+@xkb_base@/compat
-/usr/X11R7/share/X11/xkb/compiled
+@xkb_base@/compiled
-/usr/X11R7/share/X11/xkb/geometry
+@xkb_base@/geometry
-/usr/X11R7/share/X11/xkb/keycodes
+@xkb_base@/keycodes
-/usr/X11R7/share/X11/xkb/keymap
+@xkb_base@/keymap
-/usr/X11R7/share/X11/xkb/rules
+@xkb_base@/rules
-/usr/X11R7/share/X11/xkb/semantics
+@xkb_base@/semantics
-/usr/X11R7/share/X11/xkb/symbols
+@xkb_base@/symbols
-/usr/X11R7/share/X11/xkb/types
+@xkb_base@/types
.SH SEE ALSO
setxkbmap(1)
Index: src/external/mit/xorg/lib/xkeyboard-config/xkeyboard-config.pc.in
diff -u src/external/mit/xorg/lib/xkeyboard-config/xkeyboard-config.pc.in:1.1 src/external/mit/xorg/lib/xkeyboard-config/xkeyboard-config.pc.in:1.2
--- src/external/mit/xorg/lib/xkeyboard-config/xkeyboard-config.pc.in:1.1 Tue Oct 18 07:36:38 2022
+++ src/external/mit/xorg/lib/xkeyboard-config/xkeyboard-config.pc.in Fri Feb 10 13:22:58 2023
@@ -1,6 +1,7 @@
-
-datadir=/usr/X11R7/share
-xkb_base=/usr/X11R7/share/X11/xkb
+prefix=@prefix@
+datarootdir=@datarootdir@
+datadir=@datadir@
+xkb_base=@xkb_base@
Name: XKeyboardConfig
Description: X Keyboard configuration data
