[spice-gtk] build: Fix compatibility with Meson 0.49

Submitted by Frediano Ziglio on Aug. 29, 2019, 4:04 a.m.

Details

Message ID 20190829040412.4648-1-fziglio@redhat.com
State Accepted
Commit aed7c51a2357f5af27682c4079ae09d805779ddc
Headers show
Series "build: Fix compatibility with Meson 0.49" ( rev: 1 ) in Spice

Not browsing as part of any series.

Commit Message

Frediano Ziglio Aug. 29, 2019, 4:04 a.m.
The "install" argument for configure_file is available since 0.50.
However this is already "false" if "install_dir" is not provided.

Update also spice-common submodule to import a similar fix for
spice-common module. This brings in the following changes:

Frediano Ziglio (10):
      gitignore: Ignore auto generated generated_messages.h file
      Do not check for HAVE_CONFIG_H
      build: Remove unused git-version-gen file
      recorder: Update
      build: Disable Celt support by default
      codegen: Use has_end_attr instead of has_attr("end")
      codegen: Exit with error on error generating C structures
      protocol: Removed unneeded type specifications
      codegen: Add a check for C structure fields
      meson: Remove "install" argument from configure_file

Uri Lublin (2):
      ptypes.py: remove useless condition member != None
      test-marshallers.proto: ArrayMessage: make space for name

Signed-off-by: Frediano Ziglio <fziglio@redhat.com>
---
 meson.build              | 1 -
 subprojects/spice-common | 2 +-
 2 files changed, 1 insertion(+), 2 deletions(-)

Patch hide | download patch | download mbox

diff --git a/meson.build b/meson.build
index 07dbb701..171a3f67 100644
--- a/meson.build
+++ b/meson.build
@@ -365,7 +365,6 @@  foreach key, value : config_data
 endforeach
 
 configure_file(output : 'config.h',
-               install : false,
                configuration : spice_gtk_config_data)
 
 #
diff --git a/subprojects/spice-common b/subprojects/spice-common
index 5bcfa711..4727c19d 160000
--- a/subprojects/spice-common
+++ b/subprojects/spice-common
@@ -1 +1 @@ 
-Subproject commit 5bcfa711d90839c7c4c50310db67f0d5912a3824
+Subproject commit 4727c19d36b33071928500adaa832ecef6bdd942

Comments

On 8/29/19 1:04 AM, Frediano Ziglio wrote:
> The "install" argument for configure_file is available since 0.50.
> However this is already "false" if "install_dir" is not provided.
> 
> Update also spice-common submodule to import a similar fix for
> spice-common module. This brings in the following changes:
> 
> Frediano Ziglio (10):
>       gitignore: Ignore auto generated generated_messages.h file
>       Do not check for HAVE_CONFIG_H
>       build: Remove unused git-version-gen file
>       recorder: Update
>       build: Disable Celt support by default
>       codegen: Use has_end_attr instead of has_attr("end")
>       codegen: Exit with error on error generating C structures
>       protocol: Removed unneeded type specifications
>       codegen: Add a check for C structure fields
>       meson: Remove "install" argument from configure_file
> 
> Uri Lublin (2):
>       ptypes.py: remove useless condition member != None
>       test-marshallers.proto: ArrayMessage: make space for name
> 
> Signed-off-by: Frediano Ziglio <fziglio@redhat.com>
> ---
>  meson.build              | 1 -
>  subprojects/spice-common | 2 +-
>  2 files changed, 1 insertion(+), 2 deletions(-)
> 
> diff --git a/meson.build b/meson.build
> index 07dbb701..171a3f67 100644
> --- a/meson.build
> +++ b/meson.build
> @@ -365,7 +365,6 @@ foreach key, value : config_data
>  endforeach
>  
>  configure_file(output : 'config.h',
> -               install : false,
>                 configuration : spice_gtk_config_data)
>  
>  #
> diff --git a/subprojects/spice-common b/subprojects/spice-common
> index 5bcfa711..4727c19d 160000
> --- a/subprojects/spice-common
> +++ b/subprojects/spice-common
> @@ -1 +1 @@
> -Subproject commit 5bcfa711d90839c7c4c50310db67f0d5912a3824
> +Subproject commit 4727c19d36b33071928500adaa832ecef6bdd942
> 
Acked-by: Eduardo Lima (Etrunko) <etrunko@redhat.com>