Source-Changes-HG archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

[xsrc/xorg]: xsrc/external/mit/setxkbmap/dist initial import of setxkbmap-1.3.2



details:   https://anonhg.NetBSD.org/xsrc/rev/dbb13a9ac2ce
branches:  xorg
changeset: 10335:dbb13a9ac2ce
user:      mrg <mrg%NetBSD.org@localhost>
date:      Mon Jul 15 04:50:43 2019 +0000

description:
initial import of setxkbmap-1.3.2

diffstat:

 external/mit/setxkbmap/dist/ChangeLog       |    71 +
 external/mit/setxkbmap/dist/Makefile.am     |     2 +
 external/mit/setxkbmap/dist/Makefile.in     |     7 +-
 external/mit/setxkbmap/dist/README.md       |    19 +
 external/mit/setxkbmap/dist/aclocal.m4      |  2549 ++++++++++++++------------
 external/mit/setxkbmap/dist/config.guess    |   679 +++---
 external/mit/setxkbmap/dist/config.sub      |   304 +-
 external/mit/setxkbmap/dist/configure       |    79 +-
 external/mit/setxkbmap/dist/configure.ac    |     4 +-
 external/mit/setxkbmap/dist/man/Makefile.in |     2 +
 external/mit/setxkbmap/dist/setxkbmap.c     |     5 +-
 11 files changed, 2013 insertions(+), 1708 deletions(-)

diffs (truncated from 5461 to 300 lines):

diff -r 1fe0edb91f64 -r dbb13a9ac2ce external/mit/setxkbmap/dist/ChangeLog
--- a/external/mit/setxkbmap/dist/ChangeLog     Thu Jul 11 05:43:07 2019 +0000
+++ b/external/mit/setxkbmap/dist/ChangeLog     Mon Jul 15 04:50:43 2019 +0000
@@ -1,3 +1,74 @@
+commit e03ecc3e00b411108449923cf006251b54f91c26
+Author: Alan Coopersmith <alan.coopersmith%oracle.com@localhost>
+Date:   Sun Jul 14 11:10:40 2019 -0700
+
+    setxkbmap 1.3.2
+    
+    Signed-off-by: Alan Coopersmith <alan.coopersmith%oracle.com@localhost>
+
+commit 7e74a1d3d443df68a1a4be9ccce7439462c1531a
+Author: Alan Coopersmith <alan.coopersmith%oracle.com@localhost>
+Date:   Sun Jun 9 11:52:36 2019 -0700
+
+    Correct error messages for missing/invalid file passed to -config
+    
+    Now a non-existent file prints:
+        Couldn't find configuration file "not-there"
+    and a file that fails to parse prints:
+        Couldn't parse configuration file "not-right"
+    
+    Fixes: #3, https://bugs.freedesktop.org/show_bug.cgi?id=101845
+    
+    Signed-off-by: Alan Coopersmith <alan.coopersmith%oracle.com@localhost>
+
+commit 51cd85bbec1e62d566b1c893ecc668886165a047
+Author: Alan Coopersmith <alan.coopersmith%oracle.com@localhost>
+Date:   Wed Nov 21 16:57:00 2018 -0800
+
+    Update configure.ac bug URL for gitlab migration
+    
+    Signed-off-by: Alan Coopersmith <alan.coopersmith%oracle.com@localhost>
+
+commit 6a7bc86d92de1b76baf5ae5e615ccc936378a8ee
+Author: Alan Coopersmith <alan.coopersmith%oracle.com@localhost>
+Date:   Fri Nov 16 20:46:00 2018 -0800
+
+    Update README for gitlab migration
+    
+    Signed-off-by: Alan Coopersmith <alan.coopersmith%oracle.com@localhost>
+
+commit dd99b3c20ac656132b1bffac28a6fff05506e0ff
+Author: Mihail Konev <k.mvc%ya.ru@localhost>
+Date:   Thu Jan 26 14:00:20 2017 +1000
+
+    autogen: add default patch prefix
+    
+    Signed-off-by: Mihail Konev <k.mvc%ya.ru@localhost>
+
+commit 4b2f89773764dc4cacee0410567806019ae9f8c7
+Author: Emil Velikov <emil.l.velikov%gmail.com@localhost>
+Date:   Mon Mar 9 12:00:52 2015 +0000
+
+    autogen.sh: use quoted string variables
+    
+    Place quotes around the $srcdir, $ORIGDIR and $0 variables to prevent
+    fall-outs, when they contain space.
+    
+    Signed-off-by: Emil Velikov <emil.l.velikov%gmail.com@localhost>
+    Reviewed-by: Peter Hutterer <peter.hutterer%who-t.net@localhost>
+    Signed-off-by: Peter Hutterer <peter.hutterer%who-t.net@localhost>
+
+commit 7fd69e4d7d7932bf463f3c59f4aa9e0a91dabcfb
+Author: Peter Hutterer <peter.hutterer%who-t.net@localhost>
+Date:   Tue Jan 24 10:32:07 2017 +1000
+
+    autogen.sh: use exec instead of waiting for configure to finish
+    
+    Syncs the invocation of configure with the one from the server.
+    
+    Signed-off-by: Peter Hutterer <peter.hutterer%who-t.net@localhost>
+    Reviewed-by: Emil Velikov <emil.velikov%collabora.com@localhost>
+
 commit 352f4da35ea9c0cce3812f96279315e31d1420ec
 Author: Alan Coopersmith <alan.coopersmith%oracle.com@localhost>
 Date:   Thu Apr 16 22:27:46 2015 -0700
diff -r 1fe0edb91f64 -r dbb13a9ac2ce external/mit/setxkbmap/dist/Makefile.am
--- a/external/mit/setxkbmap/dist/Makefile.am   Thu Jul 11 05:43:07 2019 +0000
+++ b/external/mit/setxkbmap/dist/Makefile.am   Mon Jul 15 04:50:43 2019 +0000
@@ -50,3 +50,5 @@
 lint:
        $(LINT) $(ALL_LINT_FLAGS) $(setxkbmap_SOURCES)
 endif LINT
+
+EXTRA_DIST = README.md
diff -r 1fe0edb91f64 -r dbb13a9ac2ce external/mit/setxkbmap/dist/Makefile.in
--- a/external/mit/setxkbmap/dist/Makefile.in   Thu Jul 11 05:43:07 2019 +0000
+++ b/external/mit/setxkbmap/dist/Makefile.in   Mon Jul 15 04:50:43 2019 +0000
@@ -203,8 +203,8 @@
 CSCOPE = cscope
 DIST_SUBDIRS = $(SUBDIRS)
 am__DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/config.h.in COPYING \
-       ChangeLog INSTALL README compile config.guess config.sub \
-       depcomp install-sh missing
+       ChangeLog INSTALL compile config.guess config.sub depcomp \
+       install-sh missing
 DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
 distdir = $(PACKAGE)-$(VERSION)
 top_distdir = $(distdir)
@@ -308,6 +308,8 @@
 PACKAGE_VERSION = @PACKAGE_VERSION@
 PATH_SEPARATOR = @PATH_SEPARATOR@
 PKG_CONFIG = @PKG_CONFIG@
+PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@
+PKG_CONFIG_PATH = @PKG_CONFIG_PATH@
 SED = @SED@
 SETXKBMAP_CFLAGS = @SETXKBMAP_CFLAGS@
 SETXKBMAP_LIBS = @SETXKBMAP_LIBS@
@@ -380,6 +382,7 @@
 @LINT_TRUE@ALL_LINT_FLAGS = $(LINT_FLAGS) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
 @LINT_TRUE@            $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS)
 
+EXTRA_DIST = README.md
 all: config.h
        $(MAKE) $(AM_MAKEFLAGS) all-recursive
 
diff -r 1fe0edb91f64 -r dbb13a9ac2ce external/mit/setxkbmap/dist/README.md
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/external/mit/setxkbmap/dist/README.md     Mon Jul 15 04:50:43 2019 +0000
@@ -0,0 +1,19 @@
+setxkbmap is an X11 client to change the keymaps in the X server for a
+specified keyboard to use the layout determined by the options listed
+on the command line.
+
+All questions regarding this software should be directed at the
+Xorg mailing list:
+
+  https://lists.x.org/mailman/listinfo/xorg
+
+The master development code repository can be found at:
+
+  https://gitlab.freedesktop.org/xorg/app/setxkbmap
+
+Please submit bug reports and requests to merge patches there.
+
+For patch submission instructions, see:
+
+  https://www.x.org/wiki/Development/Documentation/SubmittingPatches
+
diff -r 1fe0edb91f64 -r dbb13a9ac2ce external/mit/setxkbmap/dist/aclocal.m4
--- a/external/mit/setxkbmap/dist/aclocal.m4    Thu Jul 11 05:43:07 2019 +0000
+++ b/external/mit/setxkbmap/dist/aclocal.m4    Mon Jul 15 04:50:43 2019 +0000
@@ -20,1165 +20,71 @@
 If you have problems, you may need to regenerate the build system entirely.
 To do so, use the procedure documented by the package, typically 'autoreconf'.])])
 
-# Copyright (C) 2002-2014 Free Software Foundation, Inc.
-#
-# This file is free software; the Free Software Foundation
-# gives unlimited permission to copy and/or distribute it,
-# with or without modifications, as long as this notice is preserved.
-
-# AM_AUTOMAKE_VERSION(VERSION)
-# ----------------------------
-# Automake X.Y traces this macro to ensure aclocal.m4 has been
-# generated from the m4 files accompanying Automake X.Y.
-# (This private macro should not be called outside this file.)
-AC_DEFUN([AM_AUTOMAKE_VERSION],
-[am__api_version='1.15'
-dnl Some users find AM_AUTOMAKE_VERSION and mistake it for a way to
-dnl require some minimum version.  Point them to the right macro.
-m4_if([$1], [1.15], [],
-      [AC_FATAL([Do not call $0, use AM_INIT_AUTOMAKE([$1]).])])dnl
-])
-
-# _AM_AUTOCONF_VERSION(VERSION)
-# -----------------------------
-# aclocal traces this macro to find the Autoconf version.
-# This is a private macro too.  Using m4_define simplifies
-# the logic in aclocal, which can simply ignore this definition.
-m4_define([_AM_AUTOCONF_VERSION], [])
-
-# AM_SET_CURRENT_AUTOMAKE_VERSION
-# -------------------------------
-# Call AM_AUTOMAKE_VERSION and AM_AUTOMAKE_VERSION so they can be traced.
-# This function is AC_REQUIREd by AM_INIT_AUTOMAKE.
-AC_DEFUN([AM_SET_CURRENT_AUTOMAKE_VERSION],
-[AM_AUTOMAKE_VERSION([1.15])dnl
-m4_ifndef([AC_AUTOCONF_VERSION],
-  [m4_copy([m4_PACKAGE_VERSION], [AC_AUTOCONF_VERSION])])dnl
-_AM_AUTOCONF_VERSION(m4_defn([AC_AUTOCONF_VERSION]))])
-
-# AM_AUX_DIR_EXPAND                                         -*- Autoconf -*-
-
-# Copyright (C) 2001-2014 Free Software Foundation, Inc.
-#
-# This file is free software; the Free Software Foundation
-# gives unlimited permission to copy and/or distribute it,
-# with or without modifications, as long as this notice is preserved.
-
-# For projects using AC_CONFIG_AUX_DIR([foo]), Autoconf sets
-# $ac_aux_dir to '$srcdir/foo'.  In other projects, it is set to
-# '$srcdir', '$srcdir/..', or '$srcdir/../..'.
-#
-# Of course, Automake must honor this variable whenever it calls a
-# tool from the auxiliary directory.  The problem is that $srcdir (and
-# therefore $ac_aux_dir as well) can be either absolute or relative,
-# depending on how configure is run.  This is pretty annoying, since
-# it makes $ac_aux_dir quite unusable in subdirectories: in the top
-# source directory, any form will work fine, but in subdirectories a
-# relative path needs to be adjusted first.
-#
-# $ac_aux_dir/missing
-#    fails when called from a subdirectory if $ac_aux_dir is relative
-# $top_srcdir/$ac_aux_dir/missing
-#    fails if $ac_aux_dir is absolute,
-#    fails when called from a subdirectory in a VPATH build with
-#          a relative $ac_aux_dir
-#
-# The reason of the latter failure is that $top_srcdir and $ac_aux_dir
-# are both prefixed by $srcdir.  In an in-source build this is usually
-# harmless because $srcdir is '.', but things will broke when you
-# start a VPATH build or use an absolute $srcdir.
-#
-# So we could use something similar to $top_srcdir/$ac_aux_dir/missing,
-# iff we strip the leading $srcdir from $ac_aux_dir.  That would be:
-#   am_aux_dir='\$(top_srcdir)/'`expr "$ac_aux_dir" : "$srcdir//*\(.*\)"`
-# and then we would define $MISSING as
-#   MISSING="\${SHELL} $am_aux_dir/missing"
-# This will work as long as MISSING is not called from configure, because
-# unfortunately $(top_srcdir) has no meaning in configure.
-# However there are other variables, like CC, which are often used in
-# configure, and could therefore not use this "fixed" $ac_aux_dir.
-#
-# Another solution, used here, is to always expand $ac_aux_dir to an
-# absolute PATH.  The drawback is that using absolute paths prevent a
-# configured tree to be moved without reconfiguration.
-
-AC_DEFUN([AM_AUX_DIR_EXPAND],
-[AC_REQUIRE([AC_CONFIG_AUX_DIR_DEFAULT])dnl
-# Expand $ac_aux_dir to an absolute path.
-am_aux_dir=`cd "$ac_aux_dir" && pwd`
-])
-
-# AM_CONDITIONAL                                            -*- Autoconf -*-
-
-# Copyright (C) 1997-2014 Free Software Foundation, Inc.
-#
-# This file is free software; the Free Software Foundation
-# gives unlimited permission to copy and/or distribute it,
-# with or without modifications, as long as this notice is preserved.
-
-# AM_CONDITIONAL(NAME, SHELL-CONDITION)
-# -------------------------------------
-# Define a conditional.
-AC_DEFUN([AM_CONDITIONAL],
-[AC_PREREQ([2.52])dnl
- m4_if([$1], [TRUE],  [AC_FATAL([$0: invalid condition: $1])],
-       [$1], [FALSE], [AC_FATAL([$0: invalid condition: $1])])dnl
-AC_SUBST([$1_TRUE])dnl
-AC_SUBST([$1_FALSE])dnl
-_AM_SUBST_NOTMAKE([$1_TRUE])dnl
-_AM_SUBST_NOTMAKE([$1_FALSE])dnl
-m4_define([_AM_COND_VALUE_$1], [$2])dnl
-if $2; then
-  $1_TRUE=
-  $1_FALSE='#'
-else
-  $1_TRUE='#'
-  $1_FALSE=
-fi
-AC_CONFIG_COMMANDS_PRE(
-[if test -z "${$1_TRUE}" && test -z "${$1_FALSE}"; then
-  AC_MSG_ERROR([[conditional "$1" was never defined.
-Usually this means the macro was only invoked conditionally.]])
-fi])])
-
-# Copyright (C) 1999-2014 Free Software Foundation, Inc.
-#
-# This file is free software; the Free Software Foundation
-# gives unlimited permission to copy and/or distribute it,
-# with or without modifications, as long as this notice is preserved.
-
-
-# There are a few dirty hacks below to avoid letting 'AC_PROG_CC' be
-# written in clear, in which case automake, when reading aclocal.m4,
-# will think it sees a *use*, and therefore will trigger all it's
-# C support machinery.  Also note that it means that autoscan, seeing
-# CC etc. in the Makefile, will ask for an AC_PROG_CC use...
-
-
-# _AM_DEPENDENCIES(NAME)
-# ----------------------
-# See how the compiler implements dependency checking.
-# NAME is "CC", "CXX", "OBJC", "OBJCXX", "UPC", or "GJC".
-# We try a few techniques and use that to set a single cache variable.
-#
-# We don't AC_REQUIRE the corresponding AC_PROG_CC since the latter was
-# modified to invoke _AM_DEPENDENCIES(CC); we would have a circular
-# dependency, and given that the user is not expected to run this macro,
-# just rely on AC_PROG_CC.
-AC_DEFUN([_AM_DEPENDENCIES],
-[AC_REQUIRE([AM_SET_DEPDIR])dnl
-AC_REQUIRE([AM_OUTPUT_DEPENDENCY_COMMANDS])dnl
-AC_REQUIRE([AM_MAKE_INCLUDE])dnl
-AC_REQUIRE([AM_DEP_TRACK])dnl
-
-m4_if([$1], [CC],   [depcc="$CC"   am_compiler_list=],



Home | Main Index | Thread Index | Old Index