Hello community, here is the log from the commit of package xkbcomp for openSUSE:Factory checked in at 2015-11-18 22:33:02 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/xkbcomp (Old) and /work/SRC/openSUSE:Factory/.xkbcomp.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "xkbcomp" Changes: -------- --- /work/SRC/openSUSE:Factory/xkbcomp/xkbcomp.changes 2014-12-17 19:18:23.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.xkbcomp.new/xkbcomp.changes 2015-11-18 22:33:04.000000000 +0100 @@ -1,0 +2,17 @@ +Fri Nov 13 12:27:11 UTC 2015 - mplus...@suse.com + +- Use url for source +- Add gpg signature +- Make building more verbose + +------------------------------------------------------------------- +Tue Nov 10 13:07:25 UTC 2015 - sndir...@suse.com + +- Update to version 1.3.1 + * Couple of minor fixes, the only user-visible change is that the + warning when a key type is shortened is now on a verbosity level + above the default verbosity. This effectively removes the warning + below for all users of the german keyboard layout (and others): + Type "ONE_LEVEL" has 1 levels, but <RALT> has 2 symbols + +------------------------------------------------------------------- Old: ---- xkbcomp-1.3.0.tar.bz2 New: ---- xkbcomp-1.3.1.tar.bz2 xkbcomp-1.3.1.tar.bz2.sig xkbcomp.keyring ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ xkbcomp.spec ++++++ --- /var/tmp/diff_new_pack.ZFVGex/_old 2015-11-18 22:33:05.000000000 +0100 +++ /var/tmp/diff_new_pack.ZFVGex/_new 2015-11-18 22:33:05.000000000 +0100 @@ -1,7 +1,7 @@ # # spec file for package xkbcomp # -# Copyright (c) 2014 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2015 SUSE LINUX GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -17,14 +17,15 @@ Name: xkbcomp -Version: 1.3.0 +Version: 1.3.1 Release: 0 Summary: Utility to compile XKB keyboard description License: MIT Group: System/X11/Utilities Url: http://xorg.freedesktop.org/ -#Source-URL: http://xorg.freedesktop.org/releases/individual/app/ -Source0: %{name}-%{version}.tar.bz2 +Source0: http://xorg.freedesktop.org/releases/individual/app/%{name}-%{version}.tar.bz2 +Source1: http://xorg.freedesktop.org/releases/individual/app/%{name}-%{version}.tar.bz2.sig +Source2: %{name}.keyring BuildRequires: bison BuildRequires: pkg-config BuildRequires: pkgconfig(x11) @@ -53,7 +54,7 @@ %build %configure -make %{?_smp_mflags} +make %{?_smp_mflags} V=1 %install %make_install ++++++ xkbcomp-1.3.0.tar.bz2 -> xkbcomp-1.3.1.tar.bz2 ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/xkbcomp-1.3.0/ChangeLog new/xkbcomp-1.3.1/ChangeLog --- old/xkbcomp-1.3.0/ChangeLog 2014-11-20 23:20:30.000000000 +0100 +++ new/xkbcomp-1.3.1/ChangeLog 2015-11-05 03:19:52.000000000 +0100 @@ -1,3 +1,71 @@ +commit f909259b1da70bc145f19e5ce595c8e945a2a808 +Author: Peter Hutterer <peter.hutte...@who-t.net> +Date: Thu Nov 5 12:19:22 2015 +1000 + + xkbcomp 1.3.1 + + Signed-off-by: Peter Hutterer <peter.hutte...@who-t.net> + +commit 26d1c57a938ce5c0d4fd9d645ace25308e6a7070 +Author: Peter Hutterer <peter.hutte...@who-t.net> +Date: Tue Nov 3 09:01:19 2015 +1000 + + symbols: increase the warning level for shortening a key type + + Any use of the german keyboard layout or anything else using + level3(ralt_switch) produces the warning + Type "ONE_LEVEL" has 1 levels, but <RALT> has 2 symbols + Ignoring extra symbols + This warning is meaningless, the default definition for RALT comes from + pc(pc105) including altwin(meta_alt) which defines it as TWO_LEVEL + and { Alt_R, Meta_R }. Including level3(ralt_switch) correctly sets it as + ONE_LEVEL but now we get the warning. That makes users file bug reports and we + can't be having that, can we? + + Up the warning level for this case to one past the default. The warning is + only useful when you're testing a new keyboard layout or trying to fix an + actual bug with missing symbols. And then you can run xkbcomp with -w10. + No need to spam the log on every server startup. + + Signed-off-by: Peter Hutterer <peter.hutte...@who-t.net> + Reviewed-by: Hans de Goede <hdego...@redhat.com> + +commit 511adde23a0518db0379b444580b63edcb9138a8 +Author: Matthew Green <m...@netbsd.org> +Date: Tue Jul 28 17:53:48 2015 +0200 + + Adjust a NUL-string assignment to avoid const issues. + + Signed-off-by: Thomas Klausner <w...@netbsd.org> + Signed-off-by: Peter Hutterer <peter.hutte...@who-t.net> + +commit 1ae525b3d236b59e6437b2b5433d460e18370973 +Author: Jon TURNEY <jon.tur...@dronecode.org.uk> +Date: Tue Mar 17 15:19:10 2015 +0000 + + Define WIN32_LEAN_AND_MEAN when building on Win32 + + w32api/rpcnndr.h (included by windows.h) uses TypeString as the name of a structure member. + + xkbcomp.h defines it as a macro for a constant. + + Define WIN32_LEAN_AND_MEAN to avoid this clash. + + Signed-off-by: Jon TURNEY <jon.tur...@dronecode.org.uk> + Reviewed-by: David Macek <david.mace...@gmail.com> + +commit fc3e6ddb2c8e922ea80f2dc5cbc1df2102e30d99 +Author: Alan Coopersmith <alan.coopersm...@oracle.com> +Date: Tue Mar 3 16:24:50 2015 -0800 + + Stop including <X11/Xalloca.h> in parseutils.c + + I can not find any point in our git history at which alloca() or the + Xalloca.h macros ALLOCATE_LOCAL() & DEALLOCATE_LOCAL() were actually + used in this source file. + + Signed-off-by: Alan Coopersmith <alan.coopersm...@oracle.com> + commit 1e8ee9d0aad072f04186df84752f5636340574e0 Author: Peter Hutterer <peter.hutte...@who-t.net> Date: Fri Nov 21 08:18:41 2014 +1000 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/xkbcomp-1.3.0/Makefile.in new/xkbcomp-1.3.1/Makefile.in --- old/xkbcomp-1.3.0/Makefile.in 2014-11-20 23:18:58.000000000 +0100 +++ new/xkbcomp-1.3.1/Makefile.in 2015-11-05 03:19:50.000000000 +0100 @@ -1,7 +1,7 @@ -# Makefile.in generated by automake 1.14.1 from Makefile.am. +# Makefile.in generated by automake 1.15 from Makefile.am. # @configure_input@ -# Copyright (C) 1994-2013 Free Software Foundation, Inc. +# Copyright (C) 1994-2014 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -37,7 +37,17 @@ VPATH = @srcdir@ -am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)' +am__is_gnu_make = { \ + if test -z '$(MAKELEVEL)'; then \ + false; \ + elif test -n '$(MAKE_HOST)'; then \ + true; \ + elif test -n '$(MAKE_VERSION)' && test -n '$(CURDIR)'; then \ + true; \ + else \ + false; \ + fi; \ +} am__make_running_with_option = \ case $${target_option-} in \ ?) ;; \ @@ -102,15 +112,12 @@ host_triplet = @host@ bin_PROGRAMS = xkbcomp$(EXEEXT) subdir = . -DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am \ - $(top_srcdir)/configure $(am__configure_deps) \ - $(srcdir)/config.h.in $(srcdir)/xkbcomp.pc.in xkbparse.c \ - depcomp ylwrap COPYING ChangeLog INSTALL README compile \ - config.guess config.sub install-sh missing ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 am__aclocal_m4_deps = $(top_srcdir)/configure.ac am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ $(ACLOCAL_M4) +DIST_COMMON = $(srcdir)/Makefile.am $(top_srcdir)/configure \ + $(am__configure_deps) $(am__DIST_COMMON) am__CONFIG_DISTCLEAN_FILES = config.status config.cache config.log \ configure.lineno config.status.lineno mkinstalldirs = $(install_sh) -d @@ -238,6 +245,10 @@ CTAGS = ctags CSCOPE = cscope DIST_SUBDIRS = $(SUBDIRS) +am__DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/config.h.in \ + $(srcdir)/xkbcomp.pc.in COPYING ChangeLog INSTALL README \ + compile config.guess config.sub depcomp install-sh missing \ + xkbparse.c ylwrap DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) distdir = $(PACKAGE)-$(VERSION) top_distdir = $(distdir) @@ -466,7 +477,6 @@ echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign Makefile'; \ $(am__cd) $(top_srcdir) && \ $(AUTOMAKE) --foreign Makefile -.PRECIOUS: Makefile Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status @case '$?' in \ *config.status*) \ @@ -802,15 +812,15 @@ $(am__post_remove_distdir) dist-tarZ: distdir - @echo WARNING: "Support for shar distribution archives is" \ - "deprecated." >&2 + @echo WARNING: "Support for distribution archives compressed with" \ + "legacy program 'compress' is deprecated." >&2 @echo WARNING: "It will be removed altogether in Automake 2.0" >&2 tardir=$(distdir) && $(am__tar) | compress -c >$(distdir).tar.Z $(am__post_remove_distdir) dist-shar: distdir - @echo WARNING: "Support for distribution archives compressed with" \ - "legacy program 'compress' is deprecated." >&2 + @echo WARNING: "Support for shar distribution archives is" \ + "deprecated." >&2 @echo WARNING: "It will be removed altogether in Automake 2.0" >&2 shar $(distdir) | GZIP=$(GZIP_ENV) gzip -c >$(distdir).shar.gz $(am__post_remove_distdir) @@ -846,17 +856,17 @@ esac chmod -R a-w $(distdir) chmod u+w $(distdir) - mkdir $(distdir)/_build $(distdir)/_inst + mkdir $(distdir)/_build $(distdir)/_build/sub $(distdir)/_inst chmod a-w $(distdir) test -d $(distdir)/_build || exit 0; \ dc_install_base=`$(am__cd) $(distdir)/_inst && pwd | sed -e 's,^[^:\\/]:[\\/],/,'` \ && dc_destdir="$${TMPDIR-/tmp}/am-dc-$$$$/" \ && am__cwd=`pwd` \ - && $(am__cd) $(distdir)/_build \ - && ../configure \ + && $(am__cd) $(distdir)/_build/sub \ + && ../../configure \ $(AM_DISTCHECK_CONFIGURE_FLAGS) \ $(DISTCHECK_CONFIGURE_FLAGS) \ - --srcdir=.. --prefix="$$dc_install_base" \ + --srcdir=../.. --prefix="$$dc_install_base" \ && $(MAKE) $(AM_MAKEFLAGS) \ && $(MAKE) $(AM_MAKEFLAGS) dvi \ && $(MAKE) $(AM_MAKEFLAGS) check \ @@ -1041,6 +1051,8 @@ mostlyclean-generic pdf pdf-am ps ps-am tags tags-am uninstall \ uninstall-am uninstall-binPROGRAMS uninstall-pkgconfigDATA +.PRECIOUS: Makefile + .PHONY: ChangeLog INSTALL diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/xkbcomp-1.3.0/aclocal.m4 new/xkbcomp-1.3.1/aclocal.m4 --- old/xkbcomp-1.3.0/aclocal.m4 2014-11-20 23:18:57.000000000 +0100 +++ new/xkbcomp-1.3.1/aclocal.m4 2015-11-05 03:19:50.000000000 +0100 @@ -1,6 +1,6 @@ -# generated automatically by aclocal 1.14.1 -*- Autoconf -*- +# generated automatically by aclocal 1.15 -*- Autoconf -*- -# Copyright (C) 1996-2013 Free Software Foundation, Inc. +# Copyright (C) 1996-2014 Free Software Foundation, Inc. # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -235,7 +235,7 @@ AS_VAR_IF([$1], [""], [$5], [$4])dnl ])# PKG_CHECK_VAR -# Copyright (C) 2002-2013 Free Software Foundation, Inc. +# 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, @@ -247,10 +247,10 @@ # 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.14' +[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.14.1], [], +m4_if([$1], [1.15], [], [AC_FATAL([Do not call $0, use AM_INIT_AUTOMAKE([$1]).])])dnl ]) @@ -266,14 +266,14 @@ # 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.14.1])dnl +[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-2013 Free Software Foundation, Inc. +# 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, @@ -318,15 +318,14 @@ # configured tree to be moved without reconfiguration. AC_DEFUN([AM_AUX_DIR_EXPAND], -[dnl Rely on autoconf to set up CDPATH properly. -AC_PREREQ([2.50])dnl -# expand $ac_aux_dir to an absolute path -am_aux_dir=`cd $ac_aux_dir && pwd` +[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-2013 Free Software Foundation, Inc. +# 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, @@ -357,7 +356,7 @@ Usually this means the macro was only invoked conditionally.]]) fi])]) -# Copyright (C) 1999-2013 Free Software Foundation, Inc. +# 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, @@ -548,7 +547,7 @@ # Generate code to set up dependency tracking. -*- Autoconf -*- -# Copyright (C) 1999-2013 Free Software Foundation, Inc. +# 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, @@ -624,7 +623,7 @@ # Do all the work for Automake. -*- Autoconf -*- -# Copyright (C) 1996-2013 Free Software Foundation, Inc. +# Copyright (C) 1996-2014 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -714,8 +713,8 @@ # <http://lists.gnu.org/archive/html/automake/2012-07/msg00001.html> # <http://lists.gnu.org/archive/html/automake/2012-07/msg00014.html> AC_SUBST([mkdir_p], ['$(MKDIR_P)']) -# We need awk for the "check" target. The system "awk" is bad on -# some platforms. +# We need awk for the "check" target (and possibly the TAP driver). The +# system "awk" is bad on some platforms. AC_REQUIRE([AC_PROG_AWK])dnl AC_REQUIRE([AC_PROG_MAKE_SET])dnl AC_REQUIRE([AM_SET_LEADING_DOT])dnl @@ -788,7 +787,11 @@ END AC_MSG_ERROR([Your 'rm' program is bad, sorry.]) fi -fi]) +fi +dnl The trailing newline in this macro's definition is deliberate, for +dnl backward compatibility and to allow trailing 'dnl'-style comments +dnl after the AM_INIT_AUTOMAKE invocation. See automake bug#16841. +]) dnl Hook into '_AC_COMPILER_EXEEXT' early to learn its expansion. Do not dnl add the conditional right here, as _AC_COMPILER_EXEEXT may be further @@ -817,7 +820,7 @@ done echo "timestamp for $_am_arg" >`AS_DIRNAME(["$_am_arg"])`/stamp-h[]$_am_stamp_count]) -# Copyright (C) 2001-2013 Free Software Foundation, Inc. +# 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, @@ -828,7 +831,7 @@ # Define $install_sh. AC_DEFUN([AM_PROG_INSTALL_SH], [AC_REQUIRE([AM_AUX_DIR_EXPAND])dnl -if test x"${install_sh}" != xset; then +if test x"${install_sh+set}" != xset; then case $am_aux_dir in *\ * | *\ *) install_sh="\${SHELL} '$am_aux_dir/install-sh'" ;; @@ -838,7 +841,7 @@ fi AC_SUBST([install_sh])]) -# Copyright (C) 2003-2013 Free Software Foundation, Inc. +# Copyright (C) 2003-2014 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -859,7 +862,7 @@ # Check to see how 'make' treats includes. -*- Autoconf -*- -# Copyright (C) 2001-2013 Free Software Foundation, Inc. +# 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, @@ -909,7 +912,7 @@ # Fake the existence of programs that GNU maintainers use. -*- Autoconf -*- -# Copyright (C) 1997-2013 Free Software Foundation, Inc. +# 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, @@ -948,7 +951,7 @@ # Helper functions for option handling. -*- Autoconf -*- -# Copyright (C) 2001-2013 Free Software Foundation, Inc. +# 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, @@ -977,7 +980,7 @@ AC_DEFUN([_AM_IF_OPTION], [m4_ifset(_AM_MANGLE_OPTION([$1]), [$2], [$3])]) -# Copyright (C) 1999-2013 Free Software Foundation, Inc. +# 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, @@ -1024,7 +1027,7 @@ # For backward compatibility. AC_DEFUN_ONCE([AM_PROG_CC_C_O], [AC_REQUIRE([AC_PROG_CC])]) -# Copyright (C) 2001-2013 Free Software Foundation, Inc. +# 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, @@ -1043,7 +1046,7 @@ # Check to make sure that the build environment is sane. -*- Autoconf -*- -# Copyright (C) 1996-2013 Free Software Foundation, Inc. +# Copyright (C) 1996-2014 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -1124,7 +1127,7 @@ rm -f conftest.file ]) -# Copyright (C) 2009-2013 Free Software Foundation, Inc. +# Copyright (C) 2009-2014 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -1184,7 +1187,7 @@ _AM_SUBST_NOTMAKE([AM_BACKSLASH])dnl ]) -# Copyright (C) 2001-2013 Free Software Foundation, Inc. +# 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, @@ -1212,7 +1215,7 @@ INSTALL_STRIP_PROGRAM="\$(install_sh) -c -s" AC_SUBST([INSTALL_STRIP_PROGRAM])]) -# Copyright (C) 2006-2013 Free Software Foundation, Inc. +# Copyright (C) 2006-2014 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -1231,7 +1234,7 @@ # Check how to create a tarball. -*- Autoconf -*- -# Copyright (C) 2004-2013 Free Software Foundation, Inc. +# Copyright (C) 2004-2014 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/xkbcomp-1.3.0/configure new/xkbcomp-1.3.1/configure --- old/xkbcomp-1.3.0/configure 2014-11-20 23:18:58.000000000 +0100 +++ new/xkbcomp-1.3.1/configure 2015-11-05 03:19:50.000000000 +0100 @@ -1,6 +1,6 @@ #! /bin/sh # Guess values for system-dependent variables and create Makefiles. -# Generated by GNU Autoconf 2.69 for xkbcomp 1.3.0. +# Generated by GNU Autoconf 2.69 for xkbcomp 1.3.1. # # Report bugs to <https://bugs.freedesktop.org/enter_bug.cgi?product=xorg>. # @@ -581,8 +581,8 @@ # Identity of this package. PACKAGE_NAME='xkbcomp' PACKAGE_TARNAME='xkbcomp' -PACKAGE_VERSION='1.3.0' -PACKAGE_STRING='xkbcomp 1.3.0' +PACKAGE_VERSION='1.3.1' +PACKAGE_STRING='xkbcomp 1.3.1' PACKAGE_BUGREPORT='https://bugs.freedesktop.org/enter_bug.cgi?product=xorg' PACKAGE_URL='' @@ -1315,7 +1315,7 @@ # Omit some internal or obsolete options to make the list less imposing. # This message is too long to be a string in the A/UX 3.1 sh. cat <<_ACEOF -\`configure' configures xkbcomp 1.3.0 to adapt to many kinds of systems. +\`configure' configures xkbcomp 1.3.1 to adapt to many kinds of systems. Usage: $0 [OPTION]... [VAR=VALUE]... @@ -1385,7 +1385,7 @@ if test -n "$ac_init_help"; then case $ac_init_help in - short | recursive ) echo "Configuration of xkbcomp 1.3.0:";; + short | recursive ) echo "Configuration of xkbcomp 1.3.1:";; esac cat <<\_ACEOF @@ -1504,7 +1504,7 @@ test -n "$ac_init_help" && exit $ac_status if $ac_init_version; then cat <<\_ACEOF -xkbcomp configure 1.3.0 +xkbcomp configure 1.3.1 generated by GNU Autoconf 2.69 Copyright (C) 2012 Free Software Foundation, Inc. @@ -1828,7 +1828,7 @@ This file contains any messages produced by compilers while running configure, to aid debugging if configure makes a mistake. -It was created by xkbcomp $as_me 1.3.0, which was +It was created by xkbcomp $as_me 1.3.1, which was generated by GNU Autoconf 2.69. Invocation command line was $ $0 $@ @@ -2181,7 +2181,7 @@ # Initialize Automake -am__api_version='1.14' +am__api_version='1.15' ac_aux_dir= for ac_dir in "$srcdir" "$srcdir/.." "$srcdir/../.."; do @@ -2382,8 +2382,8 @@ ac_script='s/[\\$]/&&/g;s/;s,x,x,$//' program_transform_name=`$as_echo "$program_transform_name" | sed "$ac_script"` -# expand $ac_aux_dir to an absolute path -am_aux_dir=`cd $ac_aux_dir && pwd` +# Expand $ac_aux_dir to an absolute path. +am_aux_dir=`cd "$ac_aux_dir" && pwd` if test x"${MISSING+set}" != xset; then case $am_aux_dir in @@ -2402,7 +2402,7 @@ $as_echo "$as_me: WARNING: 'missing' script is too old or missing" >&2;} fi -if test x"${install_sh}" != xset; then +if test x"${install_sh+set}" != xset; then case $am_aux_dir in *\ * | *\ *) install_sh="\${SHELL} '$am_aux_dir/install-sh'" ;; @@ -2696,7 +2696,7 @@ # Define the identity of the package. PACKAGE='xkbcomp' - VERSION='1.3.0' + VERSION='1.3.1' cat >>confdefs.h <<_ACEOF @@ -2730,8 +2730,8 @@ # <http://lists.gnu.org/archive/html/automake/2012-07/msg00014.html> mkdir_p='$(MKDIR_P)' -# We need awk for the "check" target. The system "awk" is bad on -# some platforms. +# We need awk for the "check" target (and possibly the TAP driver). The +# system "awk" is bad on some platforms. # Always define AMTAR for backward compatibility. Yes, it's still used # in the wild :-( We should find a proper way to deprecate it ... AMTAR='$${TAR-tar}' @@ -2789,6 +2789,7 @@ fi fi + # Require X.Org macros 1.8 or later for MAN_SUBSTS set by XORG_MANPAGE_SECTIONS @@ -11428,7 +11429,7 @@ # report actual input values of CONFIG_FILES etc. instead of their # values after options handling. ac_log=" -This file was extended by xkbcomp $as_me 1.3.0, which was +This file was extended by xkbcomp $as_me 1.3.1, which was generated by GNU Autoconf 2.69. Invocation command line was CONFIG_FILES = $CONFIG_FILES @@ -11494,7 +11495,7 @@ cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`" ac_cs_version="\\ -xkbcomp config.status 1.3.0 +xkbcomp config.status 1.3.1 configured by $0, generated by GNU Autoconf 2.69, with options \\"\$ac_cs_config\\" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/xkbcomp-1.3.0/configure.ac new/xkbcomp-1.3.1/configure.ac --- old/xkbcomp-1.3.0/configure.ac 2014-11-20 23:18:40.000000000 +0100 +++ new/xkbcomp-1.3.1/configure.ac 2015-11-05 03:18:55.000000000 +0100 @@ -22,7 +22,7 @@ # Initialize Autoconf AC_PREREQ([2.60]) -AC_INIT([xkbcomp], [1.3.0], +AC_INIT([xkbcomp], [1.3.1], [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg], [xkbcomp]) AC_CONFIG_SRCDIR([Makefile.am]) AC_CONFIG_HEADERS([config.h]) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/xkbcomp-1.3.0/expr.c new/xkbcomp-1.3.1/expr.c --- old/xkbcomp-1.3.0/expr.c 2014-02-02 22:27:00.000000000 +0100 +++ new/xkbcomp-1.3.1/expr.c 2015-07-29 08:14:37.000000000 +0200 @@ -729,8 +729,8 @@ val_rtrn->str = XkbAtomGetString(NULL, expr->value.str); if (val_rtrn->str == NULL) { - static const char *empty = ""; - val_rtrn->str = empty; + static char empty_char = '\0'; + val_rtrn->str = &empty_char; } return True; case ExprIdent: diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/xkbcomp-1.3.0/listing.c new/xkbcomp-1.3.1/listing.c --- old/xkbcomp-1.3.0/listing.c 2014-08-04 07:36:09.000000000 +0200 +++ new/xkbcomp-1.3.1/listing.c 2015-07-29 08:12:15.000000000 +0200 @@ -108,6 +108,7 @@ #endif #ifdef WIN32 +# define WIN32_LEAN_AND_MEAN # include <X11/Xwindows.h> # define FileName(file) file.cFileName # undef TEXT diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/xkbcomp-1.3.0/man/Makefile.in new/xkbcomp-1.3.1/man/Makefile.in --- old/xkbcomp-1.3.0/man/Makefile.in 2014-11-20 23:18:58.000000000 +0100 +++ new/xkbcomp-1.3.1/man/Makefile.in 2015-11-05 03:19:50.000000000 +0100 @@ -1,7 +1,7 @@ -# Makefile.in generated by automake 1.14.1 from Makefile.am. +# Makefile.in generated by automake 1.15 from Makefile.am. # @configure_input@ -# Copyright (C) 1994-2013 Free Software Foundation, Inc. +# Copyright (C) 1994-2014 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -15,7 +15,17 @@ @SET_MAKE@ VPATH = @srcdir@ -am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)' +am__is_gnu_make = { \ + if test -z '$(MAKELEVEL)'; then \ + false; \ + elif test -n '$(MAKE_HOST)'; then \ + true; \ + elif test -n '$(MAKE_VERSION)' && test -n '$(CURDIR)'; then \ + true; \ + else \ + false; \ + fi; \ +} am__make_running_with_option = \ case $${target_option-} in \ ?) ;; \ @@ -79,11 +89,11 @@ build_triplet = @build@ host_triplet = @host@ subdir = man -DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 am__aclocal_m4_deps = $(top_srcdir)/configure.ac am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ $(ACLOCAL_M4) +DIST_COMMON = $(srcdir)/Makefile.am $(am__DIST_COMMON) mkinstalldirs = $(install_sh) -d CONFIG_HEADER = $(top_builddir)/config.h CONFIG_CLEAN_FILES = @@ -137,6 +147,7 @@ am__installdirs = "$(DESTDIR)$(appmandir)" DATA = $(appman_DATA) am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP) +am__DIST_COMMON = $(srcdir)/Makefile.in DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) ACLOCAL = @ACLOCAL@ ADMIN_MAN_DIR = @ADMIN_MAN_DIR@ @@ -287,7 +298,6 @@ echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign man/Makefile'; \ $(am__cd) $(top_srcdir) && \ $(AUTOMAKE) --foreign man/Makefile -.PRECIOUS: Makefile Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status @case '$?' in \ *config.status*) \ @@ -481,6 +491,8 @@ pdf-am ps ps-am tags-am uninstall uninstall-am \ uninstall-appmanDATA +.PRECIOUS: Makefile + .man.$(APP_MAN_SUFFIX): $(AM_V_GEN)$(SED) $(MAN_SUBSTS) < $< > $@ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/xkbcomp-1.3.0/parseutils.c new/xkbcomp-1.3.1/parseutils.c --- old/xkbcomp-1.3.0/parseutils.c 2014-08-04 07:36:09.000000000 +0200 +++ new/xkbcomp-1.3.1/parseutils.c 2015-03-15 23:11:29.000000000 +0100 @@ -29,7 +29,6 @@ #include "xkbpath.h" #include <X11/keysym.h> #include <X11/extensions/XKBgeom.h> -#include <X11/Xalloca.h> #include <limits.h> #include <stdlib.h> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/xkbcomp-1.3.0/symbols.c new/xkbcomp-1.3.1/symbols.c --- old/xkbcomp-1.3.0/symbols.c 2014-02-02 22:27:00.000000000 +0100 +++ new/xkbcomp-1.3.1/symbols.c 2015-11-03 22:53:44.000000000 +0100 @@ -2030,7 +2030,7 @@ type = &xkb->map->types[types[i]]; if (type->num_levels < key->numLevels[i]) { - if (warningLevel > 0) + if (warningLevel > 5) { WARN4 ("Type \"%s\" has %d levels, but %s has %d symbols\n",