Update to util-macros 1.19.2
This commit is contained in:
matthieu
parent
4ae54e6e96
commit
29028f9d32
@ -1,3 +1,175 @@
|
||||
commit 771b773b50717884b37f6b2473166b4be4670076
|
||||
Author: Alan Coopersmith <alan.coopersmith@oracle.com>
|
||||
Date: Sun Mar 4 17:40:10 2018 -0800
|
||||
|
||||
Version bump: 1.19.2
|
||||
|
||||
Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
|
||||
|
||||
commit 6694c973c8c2b5fae5934a49578f69d2817ab49c
|
||||
Author: Alan Coopersmith <alan.coopersmith@oracle.com>
|
||||
Date: Sat Nov 4 17:29:24 2017 -0700
|
||||
|
||||
Update check for manpage section numbers to not rely on Solaris version
|
||||
|
||||
Check for a specific file instead of a specific set of versions from
|
||||
uname, to cope with manpage section alignment coming to 11.4 instead
|
||||
of 12.0.
|
||||
|
||||
Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
|
||||
Reviewed-by: Matthieu Herrb <matthieu@herrb.eu>
|
||||
|
||||
commit 39f07f7db58ebbf3dcb64a2bf9098ed5cf3d1223
|
||||
Author: Emil Velikov <emil.veliko@collabora.com>
|
||||
Date: Tue Feb 14 11:38:21 2017 +0000
|
||||
|
||||
Rework INSTALL_CMD to touch/echo >&2 only as needed
|
||||
|
||||
Analogous to previous commit.
|
||||
|
||||
With this commit we no longer get the following erroneous messages
|
||||
during `make distcheck'.
|
||||
|
||||
"
|
||||
failed to copy INSTALL from util-macros: installing possibly empty INSTALL.
|
||||
...
|
||||
failed to copy INSTALL from util-macros: installing possibly empty INSTALL.
|
||||
"
|
||||
|
||||
Cc: Gaetan Nadon <memsize@videotron.ca>
|
||||
Cc: Peter Hutterer <peter.hutterer@who-t.net>
|
||||
Signed-off-by: Emil Velikov <emil.velikov@collabora.com>
|
||||
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
|
||||
|
||||
commit 4fc573e2f3cbbed7baa5e05fb798c2e4f4236f7d
|
||||
Author: Emil Velikov <emil.velikov@collabora.com>
|
||||
Date: Tue Feb 14 11:38:20 2017 +0000
|
||||
|
||||
Rework CHANGELOG_CMD to touch/echo >&2 only as needed
|
||||
|
||||
Currently CHANGELOG_CMD issues a
|
||||
|
||||
touch ChangeLog; echo "Scary message" >&2
|
||||
|
||||
even if the file is already present. For example, when running `make
|
||||
distcheck' the following is observed:
|
||||
|
||||
"
|
||||
/bin/sh: ../../.changelog.tmp: Permission denied
|
||||
git directory not found: installing possibly empty changelog.
|
||||
...
|
||||
/bin/sh: ../../.changelog.tmp: Permission denied
|
||||
git directory not found: installing possibly empty changelog.
|
||||
"
|
||||
|
||||
That in itself happens since srcdir is RO, thus shell redirection [to
|
||||
srcddir/.changelog.tmp] fails. At the same time the latter message is
|
||||
wrong and misleading since the file is already there, with the correct
|
||||
contents.
|
||||
|
||||
Silence the permissing warning (/dev/null is our friend), and add
|
||||
a simple `test -e .../ChangeLog || (...' prior to the touch/echo combo.
|
||||
|
||||
As we're here also update the message to be more generic, since there
|
||||
are multiple other reasons why things can fail.
|
||||
|
||||
Cc: Gaetan Nadon <memsize@videotron.ca>
|
||||
Cc: Peter Hutterer <peter.hutterer@who-t.net>
|
||||
Signed-off-by: Emil Velikov <emil.velikov@collabora.com>
|
||||
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
|
||||
|
||||
commit 4b6b1dfea16214b5104b5373341dc8bc7016d0b5
|
||||
Author: Matt Turner <mattst88@gmail.com>
|
||||
Date: Sun Jan 29 11:23:47 2017 -0800
|
||||
|
||||
Version bump: 1.19.1
|
||||
|
||||
Signed-off-by: Matt Turner <mattst88@gmail.com>
|
||||
|
||||
commit 65cb10c33477c4c3f140058dddbb28269c62e1a6
|
||||
Author: Mihail Konev <k.mvc@ya.ru>
|
||||
Date: Thu Jan 26 13:52:48 2017 +1000
|
||||
|
||||
autogen: add default patch prefix
|
||||
|
||||
Signed-off-by: Mihail Konev <k.mvc@ya.ru>
|
||||
|
||||
commit 9353e122654a89217051310b5a13654c97313282
|
||||
Author: Emil Velikov <emil.l.velikov@gmail.com>
|
||||
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>
|
||||
Reviewed-by: Peter Hutterer <peter.hutterer@who-t.net>
|
||||
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
|
||||
|
||||
commit c02080b28503dfd33a2172906dfc1a58278d0c42
|
||||
Author: Peter Hutterer <peter.hutterer@who-t.net>
|
||||
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>
|
||||
Reviewed-by: Emil Velikov <emil.velikov@collabora.com>
|
||||
|
||||
commit d7acec2d3a3abe79814ceb72e2c0d4d95ed31d37
|
||||
Author: Andreas Boll <andreas.boll.dev@gmail.com>
|
||||
Date: Tue Jan 12 13:59:40 2016 +0100
|
||||
|
||||
Fix XORG_WITH_XMLTO to work with xmlto >= 0.0.27
|
||||
|
||||
Starting with xmlto version 0.0.27 the return code of
|
||||
xmlto --skip-validation txt conftest.xml
|
||||
is non-zero if conftest.xml is an empty file.
|
||||
|
||||
As a consequence the macro XORG_WITH_XMLTO returns
|
||||
"xmlto cannot generate text format, this format skipped"
|
||||
and therefore libraries like libxi, libxdmcp and others won't convert
|
||||
docbook XML to text format.
|
||||
|
||||
This changed behavior was introduced with the following change in xmlto:
|
||||
xmlto.in: use correctly exit code from xsltproc
|
||||
See also: https://fedorahosted.org/xmlto/changeset/77
|
||||
|
||||
This patch fixes this by additionally testing xmlto with a non-empty XML
|
||||
file.
|
||||
|
||||
More details can be found at:
|
||||
https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=613674
|
||||
|
||||
Thanks to Peter Pearse, Helmut Grohne and Gaetan Nadon.
|
||||
|
||||
v2: To maintain compatibility with older xorg tarballs don't replace
|
||||
the original test with the empty XML file but instead add a fallback
|
||||
to additionally test with a non-empty XML file if the original test fails.
|
||||
Use the alternate solution with <x></x> to skip compatibility issues
|
||||
with different docbook versions.
|
||||
|
||||
Signed-off-by: Andreas Boll <andreas.boll.dev@gmail.com>
|
||||
Reviewed-by: Gaetan Nadon <memsize@videotron.ca>
|
||||
Signed-off-by: Julien Cristau <jcristau@debian.org>
|
||||
|
||||
commit 8b92f46ab371ec51dac2b73c768173cd63126402
|
||||
Author: Alan Coopersmith <alan.coopersmith@oracle.com>
|
||||
Date: Tue Oct 27 16:19:51 2015 -0700
|
||||
|
||||
XORG_MANPAGE_SECTIONS: limit SysV man page sections to Solaris 2.0-11
|
||||
|
||||
All others (including other SunOS/Solaris releases) use the
|
||||
traditional Bell Labs / BSD / Linux section numbering.
|
||||
|
||||
(The [[01]] is an m4-quoted shell character set of "[01]" to make sure
|
||||
autoconf doesn't lose the [] when generating the configure script.)
|
||||
|
||||
Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
|
||||
Reviewed-by: Jeremy Huddleston Sequoia <jeremyhu@apple.com>
|
||||
|
||||
commit 9a54b858601bd305de2737b06e609084a2a114c2
|
||||
Author: Gaetan Nadon <memsize@videotron.ca>
|
||||
Date: Thu Mar 27 09:10:01 2014 -0400
|
||||
|
||||
27
util/macros/configure
vendored
27
util/macros/configure
vendored
@ -1,6 +1,6 @@
|
||||
#! /bin/sh
|
||||
# Guess values for system-dependent variables and create Makefiles.
|
||||
# Generated by GNU Autoconf 2.69 for util-macros 1.19.0.
|
||||
# Generated by GNU Autoconf 2.69 for util-macros 1.19.2.
|
||||
#
|
||||
# Report bugs to <https://bugs.freedesktop.org/enter_bug.cgi?product=xorg>.
|
||||
#
|
||||
@ -580,8 +580,8 @@ MAKEFLAGS=
|
||||
# Identity of this package.
|
||||
PACKAGE_NAME='util-macros'
|
||||
PACKAGE_TARNAME='util-macros'
|
||||
PACKAGE_VERSION='1.19.0'
|
||||
PACKAGE_STRING='util-macros 1.19.0'
|
||||
PACKAGE_VERSION='1.19.2'
|
||||
PACKAGE_STRING='util-macros 1.19.2'
|
||||
PACKAGE_BUGREPORT='https://bugs.freedesktop.org/enter_bug.cgi?product=xorg'
|
||||
PACKAGE_URL=''
|
||||
|
||||
@ -1201,7 +1201,7 @@ if test "$ac_init_help" = "long"; then
|
||||
# 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 util-macros 1.19.0 to adapt to many kinds of systems.
|
||||
\`configure' configures util-macros 1.19.2 to adapt to many kinds of systems.
|
||||
|
||||
Usage: $0 [OPTION]... [VAR=VALUE]...
|
||||
|
||||
@ -1267,7 +1267,7 @@ fi
|
||||
|
||||
if test -n "$ac_init_help"; then
|
||||
case $ac_init_help in
|
||||
short | recursive ) echo "Configuration of util-macros 1.19.0:";;
|
||||
short | recursive ) echo "Configuration of util-macros 1.19.2:";;
|
||||
esac
|
||||
cat <<\_ACEOF
|
||||
|
||||
@ -1342,7 +1342,7 @@ fi
|
||||
test -n "$ac_init_help" && exit $ac_status
|
||||
if $ac_init_version; then
|
||||
cat <<\_ACEOF
|
||||
util-macros configure 1.19.0
|
||||
util-macros configure 1.19.2
|
||||
generated by GNU Autoconf 2.69
|
||||
|
||||
Copyright (C) 2012 Free Software Foundation, Inc.
|
||||
@ -1359,7 +1359,7 @@ cat >config.log <<_ACEOF
|
||||
This file contains any messages produced by compilers while
|
||||
running configure, to aid debugging if configure makes a mistake.
|
||||
|
||||
It was created by util-macros $as_me 1.19.0, which was
|
||||
It was created by util-macros $as_me 1.19.2, which was
|
||||
generated by GNU Autoconf 2.69. Invocation command line was
|
||||
|
||||
$ $0 $@
|
||||
@ -2184,7 +2184,7 @@ fi
|
||||
|
||||
# Define the identity of the package.
|
||||
PACKAGE='util-macros'
|
||||
VERSION='1.19.0'
|
||||
VERSION='1.19.2'
|
||||
|
||||
|
||||
cat >>confdefs.h <<_ACEOF
|
||||
@ -2304,10 +2304,11 @@ _ACEOF
|
||||
|
||||
|
||||
|
||||
CHANGELOG_CMD="(GIT_DIR=\$(top_srcdir)/.git git log > \$(top_srcdir)/.changelog.tmp && \
|
||||
CHANGELOG_CMD="((GIT_DIR=\$(top_srcdir)/.git git log > \$(top_srcdir)/.changelog.tmp) 2>/dev/null && \
|
||||
mv \$(top_srcdir)/.changelog.tmp \$(top_srcdir)/ChangeLog) \
|
||||
|| (rm -f \$(top_srcdir)/.changelog.tmp; touch \$(top_srcdir)/ChangeLog; \
|
||||
echo 'git directory not found: installing possibly empty changelog.' >&2)"
|
||||
|| (rm -f \$(top_srcdir)/.changelog.tmp; test -e \$(top_srcdir)/ChangeLog || ( \
|
||||
touch \$(top_srcdir)/ChangeLog; \
|
||||
echo 'git failed to create ChangeLog: installing empty ChangeLog.' >&2))"
|
||||
|
||||
|
||||
|
||||
@ -2868,7 +2869,7 @@ cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
|
||||
# report actual input values of CONFIG_FILES etc. instead of their
|
||||
# values after options handling.
|
||||
ac_log="
|
||||
This file was extended by util-macros $as_me 1.19.0, which was
|
||||
This file was extended by util-macros $as_me 1.19.2, which was
|
||||
generated by GNU Autoconf 2.69. Invocation command line was
|
||||
|
||||
CONFIG_FILES = $CONFIG_FILES
|
||||
@ -2921,7 +2922,7 @@ _ACEOF
|
||||
cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
|
||||
ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`"
|
||||
ac_cs_version="\\
|
||||
util-macros config.status 1.19.0
|
||||
util-macros config.status 1.19.2
|
||||
configured by $0, generated by GNU Autoconf 2.69,
|
||||
with options \\"\$ac_cs_config\\"
|
||||
|
||||
|
||||
@ -23,7 +23,7 @@ dnl Process this file with autoconf to create configure.
|
||||
|
||||
AC_PREREQ([2.62])
|
||||
AC_INIT([util-macros],
|
||||
[1.19.0],
|
||||
[1.19.2],
|
||||
[https://bugs.freedesktop.org/enter_bug.cgi?product=xorg],
|
||||
[util-macros])
|
||||
AC_CONFIG_SRCDIR([Makefile.am])
|
||||
|
||||
@ -1,6 +1,6 @@
|
||||
dnl @configure_input@
|
||||
dnl
|
||||
dnl Copyright (c) 2005, 2006, Oracle and/or its affiliates. All rights reserved.
|
||||
dnl Copyright (c) 2005, 2015, Oracle and/or its affiliates. All rights reserved.
|
||||
dnl
|
||||
dnl Permission is hereby granted, free of charge, to any person obtaining a
|
||||
dnl copy of this software and associated documentation files (the "Software"),
|
||||
@ -115,6 +115,17 @@ AC_DEFUN([XORG_MANPAGE_SECTIONS],[
|
||||
AC_REQUIRE([AC_CANONICAL_HOST])
|
||||
AC_REQUIRE([AC_PROG_SED])
|
||||
|
||||
case $host_os in
|
||||
solaris*)
|
||||
# Solaris 2.0 - 11.3 use SysV man page section numbers, so we
|
||||
# check for a man page file found in later versions that use
|
||||
# traditional section numbers instead
|
||||
AC_CHECK_FILE([/usr/share/man/man7/attributes.7],
|
||||
[SYSV_MAN_SECTIONS=false], [SYSV_MAN_SECTIONS=true])
|
||||
;;
|
||||
*) SYSV_MAN_SECTIONS=false ;;
|
||||
esac
|
||||
|
||||
if test x$APP_MAN_SUFFIX = x ; then
|
||||
APP_MAN_SUFFIX=1
|
||||
fi
|
||||
@ -130,8 +141,8 @@ if test x$LIB_MAN_DIR = x ; then
|
||||
fi
|
||||
|
||||
if test x$FILE_MAN_SUFFIX = x ; then
|
||||
case $host_os in
|
||||
solaris*) FILE_MAN_SUFFIX=4 ;;
|
||||
case $SYSV_MAN_SECTIONS in
|
||||
true) FILE_MAN_SUFFIX=4 ;;
|
||||
*) FILE_MAN_SUFFIX=5 ;;
|
||||
esac
|
||||
fi
|
||||
@ -140,8 +151,8 @@ if test x$FILE_MAN_DIR = x ; then
|
||||
fi
|
||||
|
||||
if test x$MISC_MAN_SUFFIX = x ; then
|
||||
case $host_os in
|
||||
solaris*) MISC_MAN_SUFFIX=5 ;;
|
||||
case $SYSV_MAN_SECTIONS in
|
||||
true) MISC_MAN_SUFFIX=5 ;;
|
||||
*) MISC_MAN_SUFFIX=7 ;;
|
||||
esac
|
||||
fi
|
||||
@ -150,8 +161,8 @@ if test x$MISC_MAN_DIR = x ; then
|
||||
fi
|
||||
|
||||
if test x$DRIVER_MAN_SUFFIX = x ; then
|
||||
case $host_os in
|
||||
solaris*) DRIVER_MAN_SUFFIX=7 ;;
|
||||
case $SYSV_MAN_SECTIONS in
|
||||
true) DRIVER_MAN_SUFFIX=7 ;;
|
||||
*) DRIVER_MAN_SUFFIX=4 ;;
|
||||
esac
|
||||
fi
|
||||
@ -160,8 +171,8 @@ if test x$DRIVER_MAN_DIR = x ; then
|
||||
fi
|
||||
|
||||
if test x$ADMIN_MAN_SUFFIX = x ; then
|
||||
case $host_os in
|
||||
solaris*) ADMIN_MAN_SUFFIX=1m ;;
|
||||
case $SYSV_MAN_SECTIONS in
|
||||
true) ADMIN_MAN_SUFFIX=1m ;;
|
||||
*) ADMIN_MAN_SUFFIX=8 ;;
|
||||
esac
|
||||
fi
|
||||
@ -423,13 +434,24 @@ m4_ifval([$1],
|
||||
fi])
|
||||
|
||||
# Test for the ability of xmlto to generate a text target
|
||||
#
|
||||
# NOTE: xmlto 0.0.27 or higher return a non-zero return code in the
|
||||
# following test for empty XML docbook files.
|
||||
# For compatibility reasons use the following empty XML docbook file and if
|
||||
# it fails try it again with a non-empty XML file.
|
||||
have_xmlto_text=no
|
||||
cat > conftest.xml << "EOF"
|
||||
EOF
|
||||
AS_IF([test "$have_xmlto" = yes],
|
||||
[AS_IF([$XMLTO --skip-validation txt conftest.xml >/dev/null 2>&1],
|
||||
[have_xmlto_text=yes],
|
||||
[AC_MSG_WARN([xmlto cannot generate text format, this format skipped])])])
|
||||
[# Try it again with a non-empty XML file.
|
||||
cat > conftest.xml << "EOF"
|
||||
<x></x>
|
||||
EOF
|
||||
AS_IF([$XMLTO --skip-validation txt conftest.xml >/dev/null 2>&1],
|
||||
[have_xmlto_text=yes],
|
||||
[AC_MSG_WARN([xmlto cannot generate text format, this format skipped])])])])
|
||||
rm -f conftest.xml
|
||||
AM_CONDITIONAL([HAVE_XMLTO_TEXT], [test $have_xmlto_text = yes])
|
||||
AM_CONDITIONAL([HAVE_XMLTO], [test "$have_xmlto" = yes])
|
||||
@ -1825,7 +1847,8 @@ AC_REQUIRE([PKG_PROG_PKG_CONFIG])
|
||||
macros_datadir=`$PKG_CONFIG --print-errors --variable=pkgdatadir xorg-macros`
|
||||
INSTALL_CMD="(cp -f "$macros_datadir/INSTALL" \$(top_srcdir)/.INSTALL.tmp && \
|
||||
mv \$(top_srcdir)/.INSTALL.tmp \$(top_srcdir)/INSTALL) \
|
||||
|| (rm -f \$(top_srcdir)/.INSTALL.tmp; touch \$(top_srcdir)/INSTALL; \
|
||||
echo 'util-macros \"pkgdatadir\" from xorg-macros.pc not found: installing possibly empty INSTALL.' >&2)"
|
||||
|| (rm -f \$(top_srcdir)/.INSTALL.tmp; test -e \$(top_srcdir)/INSTALL || ( \
|
||||
touch \$(top_srcdir)/INSTALL; \
|
||||
echo 'failed to copy INSTALL from util-macros: installing empty INSTALL.' >&2))"
|
||||
AC_SUBST([INSTALL_CMD])
|
||||
]) # XORG_INSTALL
|
||||
|
||||
@ -56,9 +56,10 @@ AC_DEFUN([XORG_RELEASE_VERSION],[
|
||||
#
|
||||
#
|
||||
AC_DEFUN([XORG_CHANGELOG], [
|
||||
CHANGELOG_CMD="(GIT_DIR=\$(top_srcdir)/.git git log > \$(top_srcdir)/.changelog.tmp && \
|
||||
CHANGELOG_CMD="((GIT_DIR=\$(top_srcdir)/.git git log > \$(top_srcdir)/.changelog.tmp) 2>/dev/null && \
|
||||
mv \$(top_srcdir)/.changelog.tmp \$(top_srcdir)/ChangeLog) \
|
||||
|| (rm -f \$(top_srcdir)/.changelog.tmp; touch \$(top_srcdir)/ChangeLog; \
|
||||
echo 'git directory not found: installing possibly empty changelog.' >&2)"
|
||||
|| (rm -f \$(top_srcdir)/.changelog.tmp; test -e \$(top_srcdir)/ChangeLog || ( \
|
||||
touch \$(top_srcdir)/ChangeLog; \
|
||||
echo 'git failed to create ChangeLog: installing empty ChangeLog.' >&2))"
|
||||
AC_SUBST([CHANGELOG_CMD])
|
||||
]) # XORG_CHANGELOG
|
||||
|
||||
Loading…
Reference in New Issue
Block a user