[Spice-devel] [PATCH spice-gtk 3/5] meson: Remove unecessary variable spice_protocol_min_version

[Eduardo Lima (Etrunko)]

On 9/26/18 5:16 AM, Frediano Ziglio wrote:
>>
>> Signed-off-by: Eduardo Lima (Etrunko) <etrunko at redhat.com>
>> ---
>>  meson.build | 7 +++----
>>  1 file changed, 3 insertions(+), 4 deletions(-)
>>
>> diff --git a/meson.build b/meson.build
>> index eba2c38..629f109 100644
>> --- a/meson.build
>> +++ b/meson.build
>> @@ -30,7 +30,6 @@ spice_gtk_global_cflags = ['-DHAVE_CONFIG_H',
>>  # other global vars
>>  compiler = meson.get_compiler('c')
>>  spice_gtk_config_data = configuration_data()
>> -spice_protocol_min_version='0.12.13'
>>  spice_gtk_include = [include_directories('.')]
>>  spice_gtk_deps = []
>>  spice_gtk_host_system = host_machine.system()
>> @@ -72,13 +71,13 @@ endforeach
>>  #
>>  # check for mandatory dependencies
>>  #
>> -spice_protocol_version='0.12.15'
>> +spice_protocol_version='>= 0.12.15'
>>  
>>  glib_version = '2.46'
>>  glib_version_info = '>= @0@'.format(glib_version)
>>  pixman_version = '>= 0.17.7'
>>  
> 
> Not strong but these naming maybe are confusing. For glib you have
> glib_version with just the version and glib_version_info with the
> condition for the version while for spice-protocol you have just
> spice_protocol_version which is not just the version but the
> condition. Not strong about this but looks a bit incoherent.

And for pixman I used the condition as well, but named it _version. The
thing is that the glib_version is reused down below for defining
-DGLIB_VERSION_MIN_REQUIRED and -DGLIB_VERSION_MAX_ALLOWED, while the
others are not.

> 
>> -deps = {'spice-protocol' : '>= @0@'.format(spice_protocol_version),
>> +deps = {'spice-protocol' : spice_protocol_version,
>>          'glib-2.0'       : glib_version_info,
>>          'gio-2.0'        : glib_version_info,
>>          'gobject-2.0'    : glib_version_info,
>> @@ -423,7 +422,7 @@ pkgconfig = import('pkgconfig')
>>  pkgconfig.generate(spice_client_glib_lib,
>>                     description : 'SPICE Client GLib 2.0 library',
>>                     subdirs : 'spice-client-glib-2.0',
>> -                   requires : 'spice-protocol >=
>> @0@'.format(spice_protocol_min_version),
>> +                   requires : 'spice-protocol
>> @0@'.format(spice_protocol_version),
>>                     variables : 'exec_prefix=${prefix}')
>>  
>>  #
> 
> On my installed spice-client-glib-2.0.pc file there's no
> version requirement for spice-protocol. Why this difference?

I don't remember, maybe a leftover when I started and borrowed the code
from spice-server. To be removed.

-- 
Eduardo de Barros Lima (Etrunko)
Software Engineer - RedHat
etrunko at redhat.com