head 1.1; branch 1.1.1; access; symbols netbsd-11-0-RC5:1.1.1.1.2.2 netbsd-11-0-RC4:1.1.1.1.2.2 netbsd-11-0-RC3:1.1.1.1.2.2 netbsd-11-0-RC2:1.1.1.1.2.2 netbsd-11-0-RC1:1.1.1.1.2.2 netbsd-9:1.1.1.1.0.6 netbsd-10:1.1.1.1.0.4 netbsd-11:1.1.1.1.0.2 xkbcomp-1-5-0:1.1.1.1 xorg:1.1.1; locks; strict; comment @# @; 1.1 date 2025.12.09.06.00.32; author mrg; state Exp; branches 1.1.1.1; next ; commitid rXOCxy6gW5LKgHlG; 1.1.1.1 date 2025.12.09.06.00.32; author mrg; state Exp; branches 1.1.1.1.2.1 1.1.1.1.4.1 1.1.1.1.6.1; next ; commitid rXOCxy6gW5LKgHlG; 1.1.1.1.2.1 date 2025.12.09.06.00.32; author martin; state dead; branches; next 1.1.1.1.2.2; commitid 4LfsjMPXG9eWJSlG; 1.1.1.1.2.2 date 2025.12.10.16.37.22; author martin; state Exp; branches; next ; commitid 4LfsjMPXG9eWJSlG; 1.1.1.1.4.1 date 2025.12.09.06.00.32; author martin; state dead; branches; next 1.1.1.1.4.2; commitid pawUR5Jzt6bT9OoG; 1.1.1.1.4.2 date 2026.01.02.11.01.43; author martin; state Exp; branches; next ; commitid pawUR5Jzt6bT9OoG; 1.1.1.1.6.1 date 2025.12.09.06.00.32; author martin; state dead; branches; next 1.1.1.1.6.2; commitid AXnzVUMwXRjydOoG; 1.1.1.1.6.2 date 2026.01.02.11.12.35; author martin; state Exp; branches; next ; commitid AXnzVUMwXRjydOoG; desc @@ 1.1 log @Initial revision @ text @man_substs = configuration_data() man_substs.set('xorgversion', f'"xkbcomp @@xkbcomp_version@@" "X Version 11"') man_substs.set('xkbconfigroot', XKBCONFIGROOT) man_substs.set('miscmansuffix', 7) dir_man1 = join_paths(get_option('prefix'), get_option('mandir'), 'man1') xkbcomp_man = configure_file( input: 'xkbcomp.man', output: 'xkbcomp.1', configuration: man_substs, install: true, install_dir: dir_man1 ) @ 1.1.1.1 log @initial import of xkbcomp-1.5.0 @ text @@ 1.1.1.1.6.1 log @file meson.build was added on branch netbsd-9 on 2026-01-02 11:12:35 +0000 @ text @d1 14 @ 1.1.1.1.6.2 log @Pull up the following, requested by mrg in ticket #1992: external/mit/xkbcomp/dist/COPYING up to 1.1.1.2 external/mit/xkbcomp/dist/ChangeLog up to 1.1.1.16 external/mit/xkbcomp/dist/Makefile.am up to 1.1.1.8 external/mit/xkbcomp/dist/Makefile.in up to 1.1.1.14 external/mit/xkbcomp/dist/README up to 1.1.1.4 external/mit/xkbcomp/dist/aclocal.m4 up to 1.1.1.15 external/mit/xkbcomp/dist/action.c up to 1.1.1.5 external/mit/xkbcomp/dist/action.h up to 1.1.1.5 external/mit/xkbcomp/dist/alias.c up to 1.1.1.6 external/mit/xkbcomp/dist/alias.h up to 1.1.1.4 external/mit/xkbcomp/dist/compat.c up to 1.1.1.9 external/mit/xkbcomp/dist/compile up to 1.1.1.7 external/mit/xkbcomp/dist/config.guess up to 1.1.1.14 external/mit/xkbcomp/dist/config.h.in up to 1.1.1.6 external/mit/xkbcomp/dist/config.sub up to 1.1.1.14 external/mit/xkbcomp/dist/configure up to 1.1.1.16 external/mit/xkbcomp/dist/configure.ac up to 1.1.1.16 external/mit/xkbcomp/dist/depcomp up to 1.1.1.11 external/mit/xkbcomp/dist/expr.c up to 1.6 external/mit/xkbcomp/dist/expr.h up to 1.1.1.4 external/mit/xkbcomp/dist/geometry.c up to 1.1.1.7 external/mit/xkbcomp/dist/indicators.c up to 1.1.1.6 external/mit/xkbcomp/dist/indicators.h up to 1.1.1.5 external/mit/xkbcomp/dist/install-sh up to 1.1.1.10 external/mit/xkbcomp/dist/keycodes.c up to 1.1.1.9 external/mit/xkbcomp/dist/keycodes.h up to 1.1.1.3 external/mit/xkbcomp/dist/keymap.c up to 1.1.1.4 external/mit/xkbcomp/dist/keytypes.c up to 1.1.1.6 external/mit/xkbcomp/dist/listing.c up to 1.2 external/mit/xkbcomp/dist/misc.c up to 1.1.1.5 external/mit/xkbcomp/dist/misc.h up to 1.1.1.4 external/mit/xkbcomp/dist/missing up to 1.1.1.11 external/mit/xkbcomp/dist/parseutils.c up to 1.1.1.9 external/mit/xkbcomp/dist/parseutils.h up to 1.1.1.7 external/mit/xkbcomp/dist/symbols.c up to 1.1.1.11 external/mit/xkbcomp/dist/tokens.h up to 1.1.1.3 external/mit/xkbcomp/dist/utils.c up to 1.1.1.6 external/mit/xkbcomp/dist/utils.h up to 1.9 external/mit/xkbcomp/dist/vmod.c up to 1.1.1.5 external/mit/xkbcomp/dist/vmod.h up to 1.1.1.4 external/mit/xkbcomp/dist/xkbcomp.c up to 1.3 external/mit/xkbcomp/dist/xkbcomp.h up to 1.1.1.6 external/mit/xkbcomp/dist/xkbcomp.pc.in up to 1.1.1.4 external/mit/xkbcomp/dist/xkbparse.c up to 1.1.1.13 external/mit/xkbcomp/dist/xkbparse.y up to 1.1.1.8 external/mit/xkbcomp/dist/xkbpath.c up to 1.1.1.6 external/mit/xkbcomp/dist/xkbpath.h up to 1.1.1.3 external/mit/xkbcomp/dist/xkbscan.c up to 1.1.1.9 external/mit/xkbcomp/dist/ylwrap up to 1.1.1.11 external/mit/xkbcomp/dist/man/Makefile.am up to 1.1.1.3 external/mit/xkbcomp/dist/man/Makefile.in up to 1.1.1.9 external/mit/xkbcomp/dist/man/xkbcomp.man up to 1.1.1.5 Import xkbcomp 1.5.0, which fixes CVE-2018-15853, CVE-2018-15859, CVE-2018-15861, and CVE-2018-15863. @ text @a0 14 man_substs = configuration_data() man_substs.set('xorgversion', f'"xkbcomp @@xkbcomp_version@@" "X Version 11"') man_substs.set('xkbconfigroot', XKBCONFIGROOT) man_substs.set('miscmansuffix', 7) dir_man1 = join_paths(get_option('prefix'), get_option('mandir'), 'man1') xkbcomp_man = configure_file( input: 'xkbcomp.man', output: 'xkbcomp.1', configuration: man_substs, install: true, install_dir: dir_man1 ) @ 1.1.1.1.4.1 log @file meson.build was added on branch netbsd-10 on 2026-01-02 11:01:43 +0000 @ text @d1 14 @ 1.1.1.1.4.2 log @Pull up the following, requested by mrg in ticket #1213: external/mit/xkbcomp/dist/man/meson.build up to 1.1.1.1 external/mit/xkbcomp/dist/meson.build up to 1.1.1.1 external/mit/xkbcomp/dist/meson.options up to 1.1.1.1 external/mit/xkbcomp/dist/ChangeLog up to 1.1.1.16 external/mit/xkbcomp/dist/Makefile.am up to 1.1.1.8 external/mit/xkbcomp/dist/Makefile.in up to 1.1.1.14 external/mit/xkbcomp/dist/aclocal.m4 up to 1.1.1.15 external/mit/xkbcomp/dist/action.c up to 1.1.1.5 external/mit/xkbcomp/dist/action.h up to 1.1.1.5 external/mit/xkbcomp/dist/alias.c up to 1.1.1.6 external/mit/xkbcomp/dist/alias.h up to 1.1.1.4 external/mit/xkbcomp/dist/compat.c up to 1.1.1.9 external/mit/xkbcomp/dist/compile up to 1.1.1.7 external/mit/xkbcomp/dist/config.guess up to 1.1.1.14 external/mit/xkbcomp/dist/config.h.in up to 1.1.1.6 external/mit/xkbcomp/dist/config.sub up to 1.1.1.14 external/mit/xkbcomp/dist/configure up to 1.1.1.16 external/mit/xkbcomp/dist/configure.ac up to 1.1.1.16 external/mit/xkbcomp/dist/depcomp up to 1.1.1.11 external/mit/xkbcomp/dist/expr.c up to 1.6 external/mit/xkbcomp/dist/expr.h up to 1.1.1.4 external/mit/xkbcomp/dist/geometry.c up to 1.1.1.7 external/mit/xkbcomp/dist/indicators.c up to 1.1.1.6 external/mit/xkbcomp/dist/indicators.h up to 1.1.1.5 external/mit/xkbcomp/dist/install-sh up to 1.1.1.10 external/mit/xkbcomp/dist/keycodes.c up to 1.1.1.9 external/mit/xkbcomp/dist/keymap.c up to 1.1.1.4 external/mit/xkbcomp/dist/keytypes.c up to 1.1.1.6 external/mit/xkbcomp/dist/listing.c up to 1.2 external/mit/xkbcomp/dist/misc.c up to 1.1.1.5 external/mit/xkbcomp/dist/misc.h up to 1.1.1.4 external/mit/xkbcomp/dist/missing up to 1.1.1.11 external/mit/xkbcomp/dist/parseutils.c up to 1.1.1.9 external/mit/xkbcomp/dist/parseutils.h up to 1.1.1.7 external/mit/xkbcomp/dist/symbols.c up to 1.1.1.11 external/mit/xkbcomp/dist/utils.c up to 1.1.1.6 external/mit/xkbcomp/dist/utils.h up to 1.9 external/mit/xkbcomp/dist/vmod.c up to 1.1.1.5 external/mit/xkbcomp/dist/vmod.h up to 1.1.1.4 external/mit/xkbcomp/dist/xkbcomp.c up to 1.3 external/mit/xkbcomp/dist/xkbcomp.h up to 1.1.1.6 external/mit/xkbcomp/dist/xkbcomp.pc.in up to 1.1.1.4 external/mit/xkbcomp/dist/xkbparse.c up to 1.1.1.13 external/mit/xkbcomp/dist/xkbparse.y up to 1.1.1.8 external/mit/xkbcomp/dist/xkbpath.c up to 1.1.1.6 external/mit/xkbcomp/dist/xkbpath.h up to 1.1.1.3 external/mit/xkbcomp/dist/xkbscan.c up to 1.1.1.9 external/mit/xkbcomp/dist/ylwrap up to 1.1.1.11 external/mit/xkbcomp/dist/man/Makefile.am up to 1.1.1.3 external/mit/xkbcomp/dist/man/Makefile.in up to 1.1.1.9 external/mit/xkbcomp/dist/man/xkbcomp.man up to 1.1.1.5 Import xkbcomp 1.5.0, which fixes CVE-2018-15853, CVE-2018-15859, CVE-2018-15861, and CVE-2018-15863. @ text @a0 14 man_substs = configuration_data() man_substs.set('xorgversion', f'"xkbcomp @@xkbcomp_version@@" "X Version 11"') man_substs.set('xkbconfigroot', XKBCONFIGROOT) man_substs.set('miscmansuffix', 7) dir_man1 = join_paths(get_option('prefix'), get_option('mandir'), 'man1') xkbcomp_man = configure_file( input: 'xkbcomp.man', output: 'xkbcomp.1', configuration: man_substs, install: true, install_dir: dir_man1 ) @ 1.1.1.1.2.1 log @file meson.build was added on branch netbsd-11 on 2025-12-10 16:37:22 +0000 @ text @d1 14 @ 1.1.1.1.2.2 log @Pull up the following revisions, requested by mrg in ticket #116: external/mit/xorg-server//dist/glamor/glamor_glx_provider.c delete external/mit/xorg-server//dist/glamor/glamor_glx_provider.h delete external/mit/xorg-server/dist/ChangeLog up to 1.1.1.31 external/mit/xorg-server/dist/configure up to 1.24 external/mit/xorg-server/dist/configure.ac up to 1.26 external/mit/xorg-server/dist/meson.build up to 1.1.1.21 external/mit/xorg-server/dist/glamor/Makefile.am up to 1.1.1.4 external/mit/xorg-server/dist/glamor/Makefile.in up to 1.1.1.14 external/mit/xorg-server/dist/glamor/glamor.c up to 1.1.1.9 external/mit/xorg-server/dist/glamor/glamor.h up to 1.1.1.6 external/mit/xorg-server/dist/glamor/glamor_egl.c up to 1.1.1.7 external/mit/xorg-server/dist/glamor/glamor_priv.h up to 1.1.1.7 external/mit/xorg-server/dist/glamor/meson.build up to 1.1.1.3 external/mit/xorg-server/dist/hw/xfree86/glamor_egl/Makefile.am up to 1.1.1.3 external/mit/xorg-server/dist/hw/xfree86/glamor_egl/Makefile.in up to 1.1.1.14 external/mit/xorg-server/dist/hw/xfree86/glamor_egl/meson.build up to 1.1.1.3 external/mit/xorg-server/include/dix-config.h up to 1.57 external/mit/xorg-server/include/version-config.h up to 1.27 external/mit/xorg-server/include/xorg-config.h up to 1.37 external/mit/xorg-server/include/xorg-server.h up to 1.37 external/mit/xkbcomp//dist/man/meson.build up to external/mit/xkbcomp//dist/meson.build up to external/mit/xkbcomp//dist/meson.options up to external/mit/xkbcomp/dist/ChangeLog up to 1.1.1.16 external/mit/xkbcomp/dist/Makefile.am up to 1.1.1.8 external/mit/xkbcomp/dist/Makefile.in up to 1.1.1.14 external/mit/xkbcomp/dist/aclocal.m4 up to 1.1.1.15 external/mit/xkbcomp/dist/alias.c up to 1.1.1.6 external/mit/xkbcomp/dist/compat.c up to 1.1.1.9 external/mit/xkbcomp/dist/compile up to 1.1.1.7 external/mit/xkbcomp/dist/config.guess up to 1.1.1.14 external/mit/xkbcomp/dist/config.h.in up to 1.1.1.6 external/mit/xkbcomp/dist/config.sub up to 1.1.1.14 external/mit/xkbcomp/dist/configure up to 1.1.1.16 external/mit/xkbcomp/dist/configure.ac up to 1.1.1.16 external/mit/xkbcomp/dist/depcomp up to 1.1.1.11 external/mit/xkbcomp/dist/expr.c up to 1.6 external/mit/xkbcomp/dist/install-sh up to 1.1.1.10 external/mit/xkbcomp/dist/keycodes.c up to 1.1.1.9 external/mit/xkbcomp/dist/keytypes.c up to 1.1.1.6 external/mit/xkbcomp/dist/missing up to 1.1.1.11 external/mit/xkbcomp/dist/symbols.c up to 1.1.1.11 external/mit/xkbcomp/dist/utils.c up to 1.1.1.6 external/mit/xkbcomp/dist/utils.h up to 1.8 external/mit/xkbcomp/dist/vmod.c up to 1.1.1.5 external/mit/xkbcomp/dist/xkbcomp.c up to 1.3 external/mit/xkbcomp/dist/xkbcomp.pc.in up to 1.1.1.4 external/mit/xkbcomp/dist/xkbparse.c up to 1.1.1.13 external/mit/xkbcomp/dist/xkbparse.y up to 1.1.1.8 external/mit/xkbcomp/dist/xkbpath.c up to 1.1.1.6 external/mit/xkbcomp/dist/xkbscan.c up to 1.1.1.9 external/mit/xkbcomp/dist/ylwrap up to 1.1.1.11 external/mit/xkbcomp/dist/man/Makefile.am up to 1.1.1.3 external/mit/xkbcomp/dist/man/Makefile.in up to 1.1.1.9 external/mit/xkbcomp/dist/man/xkbcomp.man up to 1.1.1.5 Import xorg-server 21.1.21 and xkbcomp 1.5.0. @ text @a0 14 man_substs = configuration_data() man_substs.set('xorgversion', f'"xkbcomp @@xkbcomp_version@@" "X Version 11"') man_substs.set('xkbconfigroot', XKBCONFIGROOT) man_substs.set('miscmansuffix', 7) dir_man1 = join_paths(get_option('prefix'), get_option('mandir'), 'man1') xkbcomp_man = configure_file( input: 'xkbcomp.man', output: 'xkbcomp.1', configuration: man_substs, install: true, install_dir: dir_man1 ) @