update to xrdb 1.0.5
This commit is contained in:
matthieu
parent
a99339125b
commit
25faa3f792
@ -1,3 +1,17 @@
|
||||
commit 09ef847d16333d6ae04c3f88ff7f535381cb9405
|
||||
Author: Luca Capello <luca@pca.it>
|
||||
Date: Mon Jan 7 23:48:12 2008 +0100
|
||||
|
||||
Prevent cpp from prefixing errors with <stdin> when the xrdb input is a file
|
||||
|
||||
http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=458246
|
||||
|
||||
commit ab156455b2f759cc4cb0edc3265ccb9bba53f2ed
|
||||
Author: James Cloos <cloos@jhcloos.com>
|
||||
Date: Thu Dec 6 15:51:09 2007 -0500
|
||||
|
||||
Add missing PHONY line for automatic ChangeLog generation
|
||||
|
||||
commit 13917748af3288ae188cbe9c05742411d53ec34f
|
||||
Author: Alan Coopersmith <alan.coopersmith@sun.com>
|
||||
Date: Wed Aug 15 15:35:00 2007 -0700
|
||||
|
||||
@ -38,6 +38,8 @@ EXTRA_DIST = $(appman_PRE) ChangeLog autogen.sh
|
||||
CLEANFILES = $(appman_DATA)
|
||||
MAINTAINERCLEANFILES=ChangeLog
|
||||
|
||||
.PHONY: ChangeLog
|
||||
|
||||
ChangeLog:
|
||||
(GIT_DIR=$(top_srcdir)/.git git-log > .changelog.tmp && mv .changelog.tmp ChangeLog; rm -f .changelog.tmp) || (touch ChangeLog; echo 'git directory not found: installing possibly empty changelog.' >&2)
|
||||
|
||||
|
||||
@ -642,6 +642,8 @@ uninstall-am: uninstall-appmanDATA uninstall-binPROGRAMS \
|
||||
uninstall-info-am
|
||||
|
||||
|
||||
.PHONY: ChangeLog
|
||||
|
||||
ChangeLog:
|
||||
(GIT_DIR=$(top_srcdir)/.git git-log > .changelog.tmp && mv .changelog.tmp ChangeLog; rm -f .changelog.tmp) || (touch ChangeLog; echo 'git directory not found: installing possibly empty changelog.' >&2)
|
||||
|
||||
|
||||
12
app/xrdb/aclocal.m4
vendored
12
app/xrdb/aclocal.m4
vendored
@ -1042,7 +1042,7 @@ AC_DEFUN([XORG_MACROS_VERSION],[
|
||||
XORG_MACROS_needed_major=`echo $XORG_MACROS_needed_version | sed 's/\..*$//'`
|
||||
XORG_MACROS_needed_minor=`echo $XORG_MACROS_needed_version | sed -e 's/^[0-9]*\.//' -e 's/\..*$//'`]
|
||||
AC_MSG_CHECKING([if xorg-macros used to generate configure is at least ${XORG_MACROS_needed_major}.${XORG_MACROS_needed_minor}])
|
||||
[XORG_MACROS_version=1.1.5
|
||||
[XORG_MACROS_version=1.1.6
|
||||
XORG_MACROS_major=`echo $XORG_MACROS_version | sed 's/\..*$//'`
|
||||
XORG_MACROS_minor=`echo $XORG_MACROS_version | sed -e 's/^[0-9]*\.//' -e 's/\..*$//'`]
|
||||
if test $XORG_MACROS_major -ne $XORG_MACROS_needed_major ; then
|
||||
@ -1191,7 +1191,11 @@ AC_DEFUN([XORG_CHECK_LINUXDOC],[
|
||||
XORG_SGML_PATH=$prefix/share/sgml
|
||||
HAVE_DEFS_ENT=
|
||||
|
||||
AC_CHECK_FILE([$XORG_SGML_PATH/X11/defs.ent], [HAVE_DEFS_ENT=yes])
|
||||
if test x"$cross_compiling" = x"yes" ; then
|
||||
HAVE_DEFS_ENT=no
|
||||
else
|
||||
AC_CHECK_FILE([$XORG_SGML_PATH/X11/defs.ent], [HAVE_DEFS_ENT=yes])
|
||||
fi
|
||||
|
||||
AC_PATH_PROG(LINUXDOC, linuxdoc)
|
||||
AC_PATH_PROG(PS2PDF, ps2pdf)
|
||||
@ -1463,14 +1467,14 @@ AC_DEFUN([XORG_RELEASE_VERSION],[
|
||||
AC_DEFINE_UNQUOTED([PACKAGE_VERSION_MAJOR],
|
||||
[`echo $PACKAGE_VERSION | cut -d . -f 1`],
|
||||
[Major version of this package])
|
||||
PVM=`echo $PACKAGE_VERSION | cut -d . -f 2`
|
||||
PVM=`echo $PACKAGE_VERSION | cut -d . -f 2 | cut -d - -f 1`
|
||||
if test "x$PVM" = "x"; then
|
||||
PVM="0"
|
||||
fi
|
||||
AC_DEFINE_UNQUOTED([PACKAGE_VERSION_MINOR],
|
||||
[$PVM],
|
||||
[Minor version of this package])
|
||||
PVP=`echo $PACKAGE_VERSION | cut -d . -f 3`
|
||||
PVP=`echo $PACKAGE_VERSION | cut -d . -f 3 | cut -d - -f 1`
|
||||
if test "x$PVP" = "x"; then
|
||||
PVP="0"
|
||||
fi
|
||||
|
||||
24
app/xrdb/configure
vendored
24
app/xrdb/configure
vendored
@ -1,6 +1,6 @@
|
||||
#! /bin/sh
|
||||
# Guess values for system-dependent variables and create Makefiles.
|
||||
# Generated by GNU Autoconf 2.59 for xrdb 1.0.4.
|
||||
# Generated by GNU Autoconf 2.59 for xrdb 1.0.5.
|
||||
#
|
||||
# Report bugs to <https://bugs.freedesktop.org/enter_bug.cgi?product=xorg>.
|
||||
#
|
||||
@ -269,8 +269,8 @@ SHELL=${CONFIG_SHELL-/bin/sh}
|
||||
# Identity of this package.
|
||||
PACKAGE_NAME='xrdb'
|
||||
PACKAGE_TARNAME='xrdb'
|
||||
PACKAGE_VERSION='1.0.4'
|
||||
PACKAGE_STRING='xrdb 1.0.4'
|
||||
PACKAGE_VERSION='1.0.5'
|
||||
PACKAGE_STRING='xrdb 1.0.5'
|
||||
PACKAGE_BUGREPORT='https://bugs.freedesktop.org/enter_bug.cgi?product=xorg'
|
||||
|
||||
# Factoring default headers for most tests.
|
||||
@ -791,7 +791,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 xrdb 1.0.4 to adapt to many kinds of systems.
|
||||
\`configure' configures xrdb 1.0.5 to adapt to many kinds of systems.
|
||||
|
||||
Usage: $0 [OPTION]... [VAR=VALUE]...
|
||||
|
||||
@ -857,7 +857,7 @@ fi
|
||||
|
||||
if test -n "$ac_init_help"; then
|
||||
case $ac_init_help in
|
||||
short | recursive ) echo "Configuration of xrdb 1.0.4:";;
|
||||
short | recursive ) echo "Configuration of xrdb 1.0.5:";;
|
||||
esac
|
||||
cat <<\_ACEOF
|
||||
|
||||
@ -987,7 +987,7 @@ fi
|
||||
test -n "$ac_init_help" && exit 0
|
||||
if $ac_init_version; then
|
||||
cat <<\_ACEOF
|
||||
xrdb configure 1.0.4
|
||||
xrdb configure 1.0.5
|
||||
generated by GNU Autoconf 2.59
|
||||
|
||||
Copyright (C) 2003 Free Software Foundation, Inc.
|
||||
@ -1001,7 +1001,7 @@ cat >&5 <<_ACEOF
|
||||
This file contains any messages produced by compilers while
|
||||
running configure, to aid debugging if configure makes a mistake.
|
||||
|
||||
It was created by xrdb $as_me 1.0.4, which was
|
||||
It was created by xrdb $as_me 1.0.5, which was
|
||||
generated by GNU Autoconf 2.59. Invocation command line was
|
||||
|
||||
$ $0 $@
|
||||
@ -1599,7 +1599,7 @@ fi
|
||||
|
||||
# Define the identity of the package.
|
||||
PACKAGE='xrdb'
|
||||
VERSION='1.0.4'
|
||||
VERSION='1.0.5'
|
||||
|
||||
|
||||
cat >>confdefs.h <<_ACEOF
|
||||
@ -4130,7 +4130,7 @@ cat >>confdefs.h <<_ACEOF
|
||||
#define PACKAGE_VERSION_MAJOR `echo $PACKAGE_VERSION | cut -d . -f 1`
|
||||
_ACEOF
|
||||
|
||||
PVM=`echo $PACKAGE_VERSION | cut -d . -f 2`
|
||||
PVM=`echo $PACKAGE_VERSION | cut -d . -f 2 | cut -d - -f 1`
|
||||
if test "x$PVM" = "x"; then
|
||||
PVM="0"
|
||||
fi
|
||||
@ -4139,7 +4139,7 @@ cat >>confdefs.h <<_ACEOF
|
||||
#define PACKAGE_VERSION_MINOR $PVM
|
||||
_ACEOF
|
||||
|
||||
PVP=`echo $PACKAGE_VERSION | cut -d . -f 3`
|
||||
PVP=`echo $PACKAGE_VERSION | cut -d . -f 3 | cut -d - -f 1`
|
||||
if test "x$PVP" = "x"; then
|
||||
PVP="0"
|
||||
fi
|
||||
@ -4534,7 +4534,7 @@ _ASBOX
|
||||
} >&5
|
||||
cat >&5 <<_CSEOF
|
||||
|
||||
This file was extended by xrdb $as_me 1.0.4, which was
|
||||
This file was extended by xrdb $as_me 1.0.5, which was
|
||||
generated by GNU Autoconf 2.59. Invocation command line was
|
||||
|
||||
CONFIG_FILES = $CONFIG_FILES
|
||||
@ -4597,7 +4597,7 @@ _ACEOF
|
||||
|
||||
cat >>$CONFIG_STATUS <<_ACEOF
|
||||
ac_cs_version="\\
|
||||
xrdb config.status 1.0.4
|
||||
xrdb config.status 1.0.5
|
||||
configured by $0, generated by GNU Autoconf 2.59,
|
||||
with options \\"`echo "$ac_configure_args" | sed 's/[\\""\`\$]/\\\\&/g'`\\"
|
||||
|
||||
|
||||
@ -1,4 +1,3 @@
|
||||
|
||||
dnl Copyright 2005 Red Hat, Inc.
|
||||
dnl
|
||||
dnl Permission to use, copy, modify, distribute, and sell this software and its
|
||||
@ -22,7 +21,7 @@ dnl
|
||||
dnl Process this file with autoconf to create configure.
|
||||
|
||||
AC_PREREQ([2.57])
|
||||
AC_INIT(xrdb,[1.0.4], [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg],xrdb)
|
||||
AC_INIT(xrdb,[1.0.5], [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg],xrdb)
|
||||
AM_INIT_AUTOMAKE([dist-bzip2])
|
||||
AM_MAINTAINER_MODE
|
||||
|
||||
|
||||
@ -1203,10 +1203,13 @@ Process(int scrno, Bool doScreen, Bool execute)
|
||||
#else
|
||||
if((cmd = (char *)
|
||||
malloc(strlen(cpp_program) + strlen(includes.val) + 1 +
|
||||
strlen(defines.val) + 1)) ==
|
||||
strlen(defines.val) + 1 +
|
||||
strlen(filename ? filename : "") + 1)) ==
|
||||
NULL)
|
||||
fatal("%s: Out of memory\n", ProgramName);
|
||||
sprintf(cmd, "%s%s %s", cpp_program, includes.val, defines.val);
|
||||
sprintf(cmd, "%s%s %s %s", cpp_program,
|
||||
includes.val, defines.val,
|
||||
filename ? filename : "");
|
||||
if (!(input = popen(cmd, "r")))
|
||||
fatal("%s: cannot run '%s'\n", ProgramName, cmd);
|
||||
free(cmd);
|
||||
|
||||
Loading…
Reference in New Issue
Block a user