Import the latest version of widl from wine 7f95c692998daa83cbeffcbe261ebbff80af54a8 (wine-7.0-rc3-17-g7f95c692998).
This fixes a regression in widl in the mingw-w64 setup after 826215b4e0b54fe459bce203024fe50ec883cad8, which imported a newer version of wine from upstream, which regressed importing tlb files in the mingw-w64 directory layout. Signed-off-by: Martin Storsjö <[email protected]> --- mingw-w64-tools/widl/VERSION | 2 +- mingw-w64-tools/widl/configure | 20 ++++++++++---------- mingw-w64-tools/widl/src/widl.c | 6 +++++- 3 files changed, 16 insertions(+), 12 deletions(-) diff --git a/mingw-w64-tools/widl/VERSION b/mingw-w64-tools/widl/VERSION index beaf6b3f8..34d6c19cc 100644 --- a/mingw-w64-tools/widl/VERSION +++ b/mingw-w64-tools/widl/VERSION @@ -1 +1 @@ -WIDL version 7.0-rc2 +WIDL version 7.0-rc3 diff --git a/mingw-w64-tools/widl/configure b/mingw-w64-tools/widl/configure index b2c271643..eaeeac83d 100755 --- a/mingw-w64-tools/widl/configure +++ b/mingw-w64-tools/widl/configure @@ -1,6 +1,6 @@ #! /bin/sh # Guess values for system-dependent variables and create Makefiles. -# Generated by GNU Autoconf 2.71 for widl 7.0-rc2. +# Generated by GNU Autoconf 2.71 for widl 7.0-rc3. # # Report bugs to <[email protected]>. # @@ -610,8 +610,8 @@ MAKEFLAGS= # Identity of this package. PACKAGE_NAME='widl' PACKAGE_TARNAME='widl' -PACKAGE_VERSION='7.0-rc2' -PACKAGE_STRING='widl 7.0-rc2' +PACKAGE_VERSION='7.0-rc3' +PACKAGE_STRING='widl 7.0-rc3' PACKAGE_BUGREPORT='[email protected]' PACKAGE_URL='' @@ -1319,7 +1319,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 widl 7.0-rc2 to adapt to many kinds of systems. +\`configure' configures widl 7.0-rc3 to adapt to many kinds of systems. Usage: $0 [OPTION]... [VAR=VALUE]... @@ -1391,7 +1391,7 @@ fi if test -n "$ac_init_help"; then case $ac_init_help in - short | recursive ) echo "Configuration of widl 7.0-rc2:";; + short | recursive ) echo "Configuration of widl 7.0-rc3:";; esac cat <<\_ACEOF @@ -1493,7 +1493,7 @@ fi test -n "$ac_init_help" && exit $ac_status if $ac_init_version; then cat <<\_ACEOF -widl configure 7.0-rc2 +widl configure 7.0-rc3 generated by GNU Autoconf 2.71 Copyright (C) 2021 Free Software Foundation, Inc. @@ -1905,7 +1905,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 widl $as_me 7.0-rc2, which was +It was created by widl $as_me 7.0-rc3, which was generated by GNU Autoconf 2.71. Invocation command line was $ $0$ac_configure_args_raw @@ -3296,7 +3296,7 @@ fi # Define the identity of the package. PACKAGE='widl' - VERSION='7.0-rc2' + VERSION='7.0-rc3' printf "%s\n" "#define PACKAGE \"$PACKAGE\"" >>confdefs.h @@ -5784,7 +5784,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 widl $as_me 7.0-rc2, which was +This file was extended by widl $as_me 7.0-rc3, which was generated by GNU Autoconf 2.71. Invocation command line was CONFIG_FILES = $CONFIG_FILES @@ -5852,7 +5852,7 @@ ac_cs_config_escaped=`printf "%s\n" "$ac_cs_config" | sed "s/^ //; s/'/'\\\\\\\\ cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 ac_cs_config='$ac_cs_config_escaped' ac_cs_version="\\ -widl config.status 7.0-rc2 +widl config.status 7.0-rc3 configured by $0, generated by GNU Autoconf 2.71, with options \\"\$ac_cs_config\\" diff --git a/mingw-w64-tools/widl/src/widl.c b/mingw-w64-tools/widl/src/widl.c index 5cec4dc4d..a21d75797 100644 --- a/mingw-w64-tools/widl/src/widl.c +++ b/mingw-w64-tools/widl/src/widl.c @@ -699,7 +699,11 @@ int open_typelib( const char *name ) if (stdinc) { - if (dlldir) TRYOPEN( strmake( "%s%s/%s", dlldir, pe_dir, name )); + if (dlldir) + { + TRYOPEN( strmake( "%s%s/%s", dlldir, pe_dir, name )); + TRYOPEN( strmake( "%s/%s", dlldir, name )); + } for (i = 0; i < ARRAY_SIZE(default_dirs); i++) { if (i && !strcmp( default_dirs[i], default_dirs[0] )) continue; -- 2.25.1 _______________________________________________ Mingw-w64-public mailing list [email protected] https://lists.sourceforge.net/lists/listinfo/mingw-w64-public
