[Spice-commits] 2 commits - meson.build src/meson.build

[GitLab Mirror]

 meson.build     |    5 -----
 src/meson.build |    2 +-
 2 files changed, 1 insertion(+), 6 deletions(-)

New commits:
commit 64151fd5321115da0915cc22ac7ef7462eb3c43c
Author: Eduardo Lima (Etrunko) <etrunko at redhat.com>
Date:   Fri Feb 1 15:35:27 2019 -0200

    meson: Update python module usage
    
    Since version 0.48, the python3 module has been deprecated:
    
    https://mesonbuild.com/Release-notes-for-0-48-0.html#python3-module-is-deprecated
    
    Signed-off-by: Eduardo Lima (Etrunko) <etrunko at redhat.com>
    Acked-by: Marc-André Lureau <marcandre.lureau at redhat.com>

diff --git a/src/meson.build b/src/meson.build
index a5746f3..9217955 100644
--- a/src/meson.build
+++ b/src/meson.build
@@ -286,7 +286,7 @@ if spice_gtk_has_gtk
   endif
 
   # keymaps
-  python = import('python3').find_python()
+  python = import('python').find_installation()
   keymapgen = files('./keycodemapdb/tools/keymap-gen')
   keymapcsv = files('./keycodemapdb/data/keymaps.csv')
   keymaps = ['xorgevdev',
commit c753ad75fbc8e25f9be5bd049c623445eb5edce3
Author: Eduardo Lima (Etrunko) <etrunko at redhat.com>
Date:   Fri Feb 1 15:34:20 2019 -0200

    meson: Drop unused spice_gtk_has_* variables
    
    Signed-off-by: Eduardo Lima (Etrunko) <etrunko at redhat.com>
    Acked-by: Marc-André Lureau <marcandre.lureau at redhat.com>

diff --git a/meson.build b/meson.build
index 8e540c9..1276fb9 100644
--- a/meson.build
+++ b/meson.build
@@ -299,25 +299,20 @@ if d.found()
 endif
 
 # lz4
-spice_gtk_has_lz4 = false
 d = dependency('liblz4', required : get_option('lz4'))
 if d.found()
   spice_glib_deps += d
   spice_gtk_config_data.set('USE_LZ4', '1')
-  spice_gtk_has_lz4 = true
 endif
 
 # sasl
-spice_gtk_has_sasl = false
 d = dependency('libsasl2', required : get_option('sasl'))
 if d.found()
   spice_glib_deps += d
   spice_gtk_config_data.set('HAVE_SASL', '1')
-  spice_gtk_has_sasl = true
 endif
 
 # smartcard check
-spice_gtk_has_smartcard = false
 d = dependency('libcacard', version : '>= 2.5.1', required : get_option('smartcard'))
 if d.found()
   spice_glib_deps += d