Commit 192a0f35 authored by Iain Lane's avatar Iain Lane

New upstream version 0.56.2

parents c97094c8 9a079492
commit 9a079492ea698f573dfc7129f1c79e4a865803b4
Author: Christian Persch <chpe@src.gnome.org>
Date: Sat Apr 20 19:41:46 2019 +0200
parser: glue: Correct parameter collection
If the minimum value is greater than the maximum_value (which can happen e.g.
when the minimum is 1 and the maximum is m_column_count - cursor.column),
the parameter collection should return the minimum value, not the maximum value.
(cherry picked from commit 8afa5e46905492779027ed2c04e8a63e30cd74df)
src/parser-glue.hh | 11 +++++++----
1 file changed, 7 insertions(+), 4 deletions(-)
commit d08b9d0e4c3dbca586496d1807da9b430de0aadc
Author: Christian Persch <chpe@src.gnome.org>
Date: Sat Apr 20 19:41:46 2019 +0200
Revert "parser: glue: Use std::clamp"
This reverts commit 1a84c427cd2ea05939b86eb47c21a437d0ce6d79.
https://bugzilla.redhat.com/show_bug.cgi?id=1701590
(cherry picked from commit d4da2ac7417c710bc7e9824062ab09d1187e815a)
src/parser-glue.hh | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
commit 609852a7c0323c7661d46a34a42023ab7deeaeaf
Author: Christian Persch <chpe@src.gnome.org>
Date: Mon Apr 8 23:05:16 2019 +0200
Post release version bump
configure.ac | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
commit 52e546badeedf12dbbd7706042f1d0f3a9e4f0b3
Author: Egmont Koblinger <egmont@gmail.com>
Date: Mon Apr 8 22:58:54 2019 +0200
#! /bin/sh
# Guess values for system-dependent variables and create Makefiles.
# Generated by GNU Autoconf 2.69 for vte 0.56.1.
# Generated by GNU Autoconf 2.69 for vte 0.56.2.
#
# Report bugs to <http://bugzilla.gnome.org/enter_bug.cgi?product=vte>.
#
......@@ -651,8 +651,8 @@ MAKEFLAGS=
# Identity of this package.
PACKAGE_NAME='vte'
PACKAGE_TARNAME='vte'
PACKAGE_VERSION='0.56.1'
PACKAGE_STRING='vte 0.56.1'
PACKAGE_VERSION='0.56.2'
PACKAGE_STRING='vte 0.56.2'
PACKAGE_BUGREPORT='http://bugzilla.gnome.org/enter_bug.cgi?product=vte'
PACKAGE_URL=''
......@@ -1572,7 +1572,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 vte 0.56.1 to adapt to many kinds of systems.
\`configure' configures vte 0.56.2 to adapt to many kinds of systems.
Usage: $0 [OPTION]... [VAR=VALUE]...
......@@ -1643,7 +1643,7 @@ fi
if test -n "$ac_init_help"; then
case $ac_init_help in
short | recursive ) echo "Configuration of vte 0.56.1:";;
short | recursive ) echo "Configuration of vte 0.56.2:";;
esac
cat <<\_ACEOF
......@@ -1803,7 +1803,7 @@ fi
test -n "$ac_init_help" && exit $ac_status
if $ac_init_version; then
cat <<\_ACEOF
vte configure 0.56.1
vte configure 0.56.2
generated by GNU Autoconf 2.69
Copyright (C) 2012 Free Software Foundation, Inc.
......@@ -2339,7 +2339,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 vte $as_me 0.56.1, which was
It was created by vte $as_me 0.56.2, which was
generated by GNU Autoconf 2.69. Invocation command line was
$ $0 $@
......@@ -3208,7 +3208,7 @@ fi
# Define the identity of the package.
PACKAGE='vte'
VERSION='0.56.1'
VERSION='0.56.2'
cat >>confdefs.h <<_ACEOF
......@@ -3437,7 +3437,7 @@ VTE_API_VERSION_U=`$as_echo "$VTE_API_VERSION" | $as_tr_sh`
LT_VERSION_INFO="5600:1:5600"
LT_VERSION_INFO="5600:2:5600"
################################################################################
......@@ -10426,11 +10426,8 @@ _LT_EOF
test $ac_status = 0; }; then
# Now try to grab the symbols.
nlist=conftest.nm
if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$NM conftest.$ac_objext \| "$lt_cv_sys_global_symbol_pipe" \> $nlist\""; } >&5
(eval $NM conftest.$ac_objext \| "$lt_cv_sys_global_symbol_pipe" \> $nlist) 2>&5
ac_status=$?
$as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
test $ac_status = 0; } && test -s "$nlist"; then
$ECHO "$as_me:$LINENO: $NM conftest.$ac_objext | $lt_cv_sys_global_symbol_pipe > $nlist" >&5
if eval "$NM" conftest.$ac_objext \| "$lt_cv_sys_global_symbol_pipe" \> $nlist 2>&5 && test -s "$nlist"; then
# Try sorting and uniquifying the output.
if sort "$nlist" | uniq > "$nlist"T; then
mv -f "$nlist"T "$nlist"
......@@ -12522,6 +12519,12 @@ lt_prog_compiler_static=
lt_prog_compiler_pic='-KPIC'
lt_prog_compiler_static='-static'
;;
# flang / f18. f95 an alias for gfortran or flang on Debian
flang* | f18* | f95*)
lt_prog_compiler_wl='-Wl,'
lt_prog_compiler_pic='-fPIC'
lt_prog_compiler_static='-static'
;;
# icc used to be incompatible with GCC.
# ICC 10 doesn't accept -KPIC any more.
icc* | ifort*)
......@@ -23010,7 +23013,7 @@ VTE_MAJOR_VERSION=0
VTE_MINOR_VERSION=56
VTE_MICRO_VERSION=1
VTE_MICRO_VERSION=2
......@@ -23626,7 +23629,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 vte $as_me 0.56.1, which was
This file was extended by vte $as_me 0.56.2, which was
generated by GNU Autoconf 2.69. Invocation command line was
CONFIG_FILES = $CONFIG_FILES
......@@ -23692,7 +23695,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="\\
vte config.status 0.56.1
vte config.status 0.56.2
configured by $0, generated by GNU Autoconf 2.69,
with options \\"\$ac_cs_config\\"
......
m4_define([version_major],0)
m4_define([version_minor],56)
m4_define([version_micro],1)
m4_define([version_micro],2)
m4_define([version_triplet],version_major.version_minor.version_micro)
AC_PREREQ([2.63])
......
......@@ -15,7 +15,7 @@
<div>
<div><table class="navigation" id="top" width="100%" cellpadding="2" cellspacing="0"><tr><th valign="middle"><p class="title">VTE Reference Manual</p></th></tr></table></div>
<div><p class="releaseinfo">
Documentation for VTE version 0.56.1
Documentation for VTE version 0.56.2
.
The latest version of this documentation can be found on-line at the
<a class="ulink" href="http://library.gnome.org/devel/vte/" target="_top">GNOME Library</a>.
......
......@@ -201,7 +201,7 @@ equal to the required one, and <code class="literal">0</code> otherwise.</p>
<hr>
<div class="refsect2">
<a name="VTE-MICRO-VERSION:CAPS"></a><h3>VTE_MICRO_VERSION</h3>
<pre class="programlisting">#define VTE_MICRO_VERSION (1)
<pre class="programlisting">#define VTE_MICRO_VERSION (2)
</pre>
<p>The micro version number of the VTE library
(e.g. in version 3.1.4 this is 4).</p>
......
This diff is collapsed.
......@@ -4063,7 +4063,8 @@ _LT_EOF
if AC_TRY_EVAL(ac_compile); then
# Now try to grab the symbols.
nlist=conftest.nm
if AC_TRY_EVAL(NM conftest.$ac_objext \| "$lt_cv_sys_global_symbol_pipe" \> $nlist) && test -s "$nlist"; then
$ECHO "$as_me:$LINENO: $NM conftest.$ac_objext | $lt_cv_sys_global_symbol_pipe > $nlist" >&AS_MESSAGE_LOG_FD
if eval "$NM" conftest.$ac_objext \| "$lt_cv_sys_global_symbol_pipe" \> $nlist 2>&AS_MESSAGE_LOG_FD && test -s "$nlist"; then
# Try sorting and uniquifying the output.
if sort "$nlist" | uniq > "$nlist"T; then
mv -f "$nlist"T "$nlist"
......@@ -4703,6 +4704,12 @@ m4_if([$1], [CXX], [
_LT_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC'
_LT_TAGVAR(lt_prog_compiler_static, $1)='-static'
;;
# flang / f18. f95 an alias for gfortran or flang on Debian
flang* | f18* | f95*)
_LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
_LT_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC'
_LT_TAGVAR(lt_prog_compiler_static, $1)='-static'
;;
# icc used to be incompatible with GCC.
# ICC 10 doesn't accept -KPIC any more.
icc* | ifort*)
......
......@@ -273,7 +273,7 @@ public:
* Returns: the value of the parameter at index @idx, or @default_v if
* the parameter at this index has default value, or the index
* is out of bounds. The returned value is clamped to the
* range @min_v..@max_v.
* range @min_v..@max_v (or returns min_v, if min_v > max_v).
*/
inline constexpr int param(unsigned int idx,
int default_v,
......@@ -281,7 +281,8 @@ public:
int max_v) const noexcept
{
auto v = param(idx, default_v);
return std::clamp(v, min_v, max_v);
// not using std::clamp() since it's not guaranteed that min_v <= max_v
return std::max(std::min(v, max_v), min_v);
}
/* param_nonfinal:
......@@ -372,7 +373,8 @@ public:
*
* Collects one final parameter.
*
* Returns: the parameter value clamped to the @min_v .. @max_v range,
* Returns: the parameter value clamped to the @min_v .. @max_v range (or @min_v,
* if min_v > max_v),
* or @default_v if the parameter has default value or is not a final parameter
*/
inline constexpr int collect1(unsigned int idx,
......@@ -381,7 +383,8 @@ public:
int max_v) const noexcept
{
int v = __builtin_expect(idx < size(), 1) ? vte_seq_arg_value_final(m_seq->args[idx], default_v) : default_v;
return std::clamp(v, min_v, max_v);
// not using std::clamp() since it's not guaranteed that min_v <= max_v
return std::max(std::min(v, max_v), min_v);
}
/* collect_subparams:
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment