Hello community, here is the log from the commit of package xkbcomp for openSUSE:Factory checked in at 2018-06-15 14:33:37 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/xkbcomp (Old) and /work/SRC/openSUSE:Factory/.xkbcomp.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "xkbcomp" Fri Jun 15 14:33:37 2018 rev:13 rq:615212 version:1.4.2 Changes: -------- --- /work/SRC/openSUSE:Factory/xkbcomp/xkbcomp.changes 2018-03-08 10:53:50.845225292 +0100 +++ /work/SRC/openSUSE:Factory/.xkbcomp.new/xkbcomp.changes 2018-06-15 14:33:39.504032414 +0200 @@ -1,0 +2,10 @@ +Fri Jun 8 10:40:35 UTC 2018 - [email protected] + +- Update to version 1.4.2 + * Only one patch, fixing keymap compilation errors when the + keycodes maximum is set to a value above the permitted X11 + maximum of 255. While we already ignored keys with codes + above 255, we still failed on the maximum=374; line that + xkeyboard-config 2.24 produces now. + +------------------------------------------------------------------- Old: ---- xkbcomp-1.4.1.tar.bz2 xkbcomp-1.4.1.tar.bz2.sig New: ---- xkbcomp-1.4.2.tar.bz2 xkbcomp-1.4.2.tar.bz2.sig ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ xkbcomp.spec ++++++ --- /var/tmp/diff_new_pack.0eRUcz/_old 2018-06-15 14:33:40.080011346 +0200 +++ /var/tmp/diff_new_pack.0eRUcz/_new 2018-06-15 14:33:40.080011346 +0200 @@ -17,7 +17,7 @@ Name: xkbcomp -Version: 1.4.1 +Version: 1.4.2 Release: 0 Summary: Utility to compile XKB keyboard description License: MIT ++++++ xkbcomp-1.4.1.tar.bz2 -> xkbcomp-1.4.2.tar.bz2 ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/xkbcomp-1.4.1/ChangeLog new/xkbcomp-1.4.2/ChangeLog --- old/xkbcomp-1.4.1/ChangeLog 2018-03-01 18:52:00.000000000 +0100 +++ new/xkbcomp-1.4.2/ChangeLog 2018-06-08 01:17:34.000000000 +0200 @@ -1,3 +1,31 @@ +commit 2abe23d23d3755335c10ff573e4e1f93b682e9d9 +Author: Peter Hutterer <[email protected]> +Date: Fri Jun 8 09:10:03 2018 +1000 + + xkbcomp 1.4.2 + + Signed-off-by: Peter Hutterer <[email protected]> + +commit 5bc2849273a224a2df593b7e8df31f0bde666482 +Author: Peter Hutterer <[email protected]> +Date: Thu Jun 7 11:25:01 2018 +1000 + + Ignore xkb_keycodes.maximum of > 255 + + Continuation from 7fdfabd75 "keycodes: Ignore high keycodes" + + A keymap with a key > 255 will have a xkb_keycodes.maximum of that keycode. + Let's not throw a fatal error on that, just crop it back to the maximum of + 255. This doesn't set the "high_keycode_warned" on purpose so we get this for + the first key that actually matters. + + Reproducible with xkeyboard-config 2.24 which has a maximum of 374. + + https://bugzilla.redhat.com/show_bug.cgi?id=1587998 + + Signed-off-by: Peter Hutterer <[email protected]> + Reviewed-by: Daniel Stone <[email protected]> + commit 34842845b191082fd1cfff3b7038332cdcadb825 Author: Adam Jackson <[email protected]> Date: Thu Mar 1 11:15:18 2018 -0500 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/xkbcomp-1.4.1/compile new/xkbcomp-1.4.2/compile --- old/xkbcomp-1.4.1/compile 2018-03-01 18:51:58.000000000 +0100 +++ new/xkbcomp-1.4.2/compile 2018-06-08 01:17:31.000000000 +0200 @@ -1,4 +1,4 @@ -#!/bin/sh +#! /bin/sh # Wrapper for compilers which do not understand '-c -o'. scriptversion=2016-01-11.22; # UTC diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/xkbcomp-1.4.1/config.guess new/xkbcomp-1.4.2/config.guess --- old/xkbcomp-1.4.1/config.guess 2018-03-01 18:51:58.000000000 +0100 +++ new/xkbcomp-1.4.2/config.guess 2018-06-08 01:17:31.000000000 +0200 @@ -1,4 +1,4 @@ -#!/bin/sh +#! /bin/sh # Attempt to guess a canonical system name. # Copyright 1992-2017 Free Software Foundation, Inc. diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/xkbcomp-1.4.1/config.sub new/xkbcomp-1.4.2/config.sub --- old/xkbcomp-1.4.1/config.sub 2018-03-01 18:51:58.000000000 +0100 +++ new/xkbcomp-1.4.2/config.sub 2018-06-08 01:17:31.000000000 +0200 @@ -1,4 +1,4 @@ -#!/bin/sh +#! /bin/sh # Configuration validation subroutine script. # Copyright 1992-2017 Free Software Foundation, Inc. diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/xkbcomp-1.4.1/configure new/xkbcomp-1.4.2/configure --- old/xkbcomp-1.4.1/configure 2018-03-01 18:51:57.000000000 +0100 +++ new/xkbcomp-1.4.2/configure 2018-06-08 01:17:31.000000000 +0200 @@ -1,6 +1,6 @@ #! /bin/sh # Guess values for system-dependent variables and create Makefiles. -# Generated by GNU Autoconf 2.69 for xkbcomp 1.4.1. +# Generated by GNU Autoconf 2.69 for xkbcomp 1.4.2. # # 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.4.1' -PACKAGE_STRING='xkbcomp 1.4.1' +PACKAGE_VERSION='1.4.2' +PACKAGE_STRING='xkbcomp 1.4.2' 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.4.1 to adapt to many kinds of systems. +\`configure' configures xkbcomp 1.4.2 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.4.1:";; + short | recursive ) echo "Configuration of xkbcomp 1.4.2:";; 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.4.1 +xkbcomp configure 1.4.2 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.4.1, which was +It was created by xkbcomp $as_me 1.4.2, which was generated by GNU Autoconf 2.69. Invocation command line was $ $0 $@ @@ -2696,7 +2696,7 @@ # Define the identity of the package. PACKAGE='xkbcomp' - VERSION='1.4.1' + VERSION='1.4.2' cat >>confdefs.h <<_ACEOF @@ -11428,7 +11428,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.4.1, which was +This file was extended by xkbcomp $as_me 1.4.2, which was generated by GNU Autoconf 2.69. Invocation command line was CONFIG_FILES = $CONFIG_FILES @@ -11494,7 +11494,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.4.1 +xkbcomp config.status 1.4.2 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.4.1/configure.ac new/xkbcomp-1.4.2/configure.ac --- old/xkbcomp-1.4.1/configure.ac 2018-03-01 18:51:55.000000000 +0100 +++ new/xkbcomp-1.4.2/configure.ac 2018-06-08 01:17:28.000000000 +0200 @@ -22,7 +22,7 @@ # Initialize Autoconf AC_PREREQ([2.60]) -AC_INIT([xkbcomp], [1.4.1], +AC_INIT([xkbcomp], [1.4.2], [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.4.1/depcomp new/xkbcomp-1.4.2/depcomp --- old/xkbcomp-1.4.1/depcomp 2018-03-01 18:51:58.000000000 +0100 +++ new/xkbcomp-1.4.2/depcomp 2018-06-08 01:17:31.000000000 +0200 @@ -1,4 +1,4 @@ -#!/bin/sh +#! /bin/sh # depcomp - compile a program generating dependencies as side-effects scriptversion=2016-01-11.22; # UTC diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/xkbcomp-1.4.1/keycodes.c new/xkbcomp-1.4.2/keycodes.c --- old/xkbcomp-1.4.1/keycodes.c 2018-03-01 18:51:55.000000000 +0100 +++ new/xkbcomp-1.4.2/keycodes.c 2018-06-08 01:17:28.000000000 +0200 @@ -663,7 +663,7 @@ ACTION1("Assignment to field %s ignored\n", field.str); return 0; } - if ((tmp.ival < XkbMinLegalKeyCode) || (tmp.ival > XkbMaxLegalKeyCode)) + if ((tmp.ival < XkbMinLegalKeyCode)) { ERROR3 ("Illegal keycode %d (must be in the range %d-%d inclusive)\n", @@ -671,6 +671,14 @@ ACTION1("Value of \"%s\" not changed\n", field.str); return 0; } + if ((tmp.ival > XkbMaxLegalKeyCode)) + { + WARN2("Unsupported maximum keycode %d, clipping.\n", tmp.ival); + ACTION2("X11 cannot support keycodes above 255.\n"); + info->explicitMax = XkbMaxLegalKeyCode; + info->effectiveMax = XkbMaxLegalKeyCode; + return 1; + } if (which == MIN_KEYCODE_DEF) { if ((info->explicitMax > 0) && (info->explicitMax < tmp.ival)) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/xkbcomp-1.4.1/missing new/xkbcomp-1.4.2/missing --- old/xkbcomp-1.4.1/missing 2018-03-01 18:51:58.000000000 +0100 +++ new/xkbcomp-1.4.2/missing 2018-06-08 01:17:31.000000000 +0200 @@ -1,4 +1,4 @@ -#!/bin/sh +#! /bin/sh # Common wrapper for a few potentially missing GNU programs. scriptversion=2016-01-11.22; # UTC diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/xkbcomp-1.4.1/ylwrap new/xkbcomp-1.4.2/ylwrap --- old/xkbcomp-1.4.1/ylwrap 2018-03-01 18:51:58.000000000 +0100 +++ new/xkbcomp-1.4.2/ylwrap 2018-06-08 01:17:31.000000000 +0200 @@ -1,4 +1,4 @@ -#!/bin/sh +#! /bin/sh # ylwrap - wrapper for lex/yacc invocations. scriptversion=2016-01-11.22; # UTC
