Whenever declare_dependency is used to add some compile flags or dependent
libraries to the outcome of dependency(), the version of the original
dependency is dropped in the summary.  Make sure that declare_dependency()
has a version argument in those cases.

Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
---
 meson.build | 12 ++++++++----
 1 file changed, 8 insertions(+), 4 deletions(-)

diff --git a/meson.build b/meson.build
index db38e777edad..3467159381b7 100644
--- a/meson.build
+++ b/meson.build
@@ -1164,7 +1164,8 @@ if have_system and get_option('curses').allowed()
   curses_compile_args = ['-DNCURSES_WIDECHAR=1']
   if curses.found()
     if cc.links(curses_test, args: curses_compile_args, dependencies: [curses])
-      curses = declare_dependency(compile_args: curses_compile_args, dependencies: [curses])
+      curses = declare_dependency(compile_args: curses_compile_args, dependencies: [curses],
+                                  version: curses.version())
     else
       msg = 'curses package not usable'
       curses = not_found
@@ -1253,7 +1254,8 @@ endif
 if sdl.found()
   # work around 2.0.8 bug
   sdl = declare_dependency(compile_args: '-Wno-undef',
-                           dependencies: sdl)
+                           dependencies: sdl,
+                           version: sdl.version())
   sdl_image = dependency('SDL2_image', required: get_option('sdl_image'),
                          method: 'pkg-config')
 else
@@ -1476,7 +1478,8 @@ if not gnutls_crypto.found()
     if gcrypt.found() and get_option('prefer_static')
       gcrypt = declare_dependency(dependencies: [
         gcrypt,
-        cc.find_library('gpg-error', required: true)])
+        cc.find_library('gpg-error', required: true)],
+        version: gcrypt.version())
     endif
   endif
   if (not get_option('nettle').auto() or have_system) and not gcrypt.found()
@@ -1510,7 +1513,8 @@ if not get_option('gtk').auto() or have_system
     gtkx11 = dependency('gtk+-x11-3.0', version: '>=3.22.0',
                         method: 'pkg-config',
                         required: false)
-    gtk = declare_dependency(dependencies: [gtk, gtkx11])
+    gtk = declare_dependency(dependencies: [gtk, gtkx11],
+                             version: gtk.version())
 
     if not get_option('vte').auto() or have_system
       vte = dependency('vte-2.91',
-- 
2.39.2

On 3/30/23 03:46, Paolo Bonzini wrote:
> -        cc.find_library('gpg-error', required: true)])
> +        cc.find_library('gpg-error', required: true)],
> +        version: gcrypt.version())

Indentation.

Reviewed-by: Richard Henderson <richard.henderson@linaro.org>


r~

On 3/31/23 07:54, Richard Henderson wrote:
> On 3/30/23 03:46, Paolo Bonzini wrote:
>> -        cc.find_library('gpg-error', required: true)])
>> +        cc.find_library('gpg-error', required: true)],
>> +        version: gcrypt.version())
> 
> Indentation.

Bah, mis-read the patch.

> 
> Reviewed-by: Richard Henderson <richard.henderson@linaro.org>
> 
> 
> r~

On 30/3/23 12:46, Paolo Bonzini wrote:
> Whenever declare_dependency is used to add some compile flags or dependent
> libraries to the outcome of dependency(), the version of the original
> dependency is dropped in the summary.  Make sure that declare_dependency()
> has a version argument in those cases.

Hard to prevent keeping doing that in the future...

> Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
> ---
>   meson.build | 12 ++++++++----
>   1 file changed, 8 insertions(+), 4 deletions(-)

Reviewed-by: Philippe Mathieu-Daudé <philmd@linaro.org>