[gnome-calculator] GCalc: removed libvala dependency



commit b2844a7c1edda789798bbe623c810b9e09ba2362
Author: Daniel Espinosa <esodan gmail com>
Date:   Thu Jun 20 13:56:14 2019 -0500

    GCalc: removed libvala dependency
    
    Now GCalc depends only on GLib for GLib.Scanner

 gcalc/gcalc.deps.in |  1 -
 gcalc/meson.build   |  2 --
 meson.build         | 10 ----------
 3 files changed, 13 deletions(-)
---
diff --git a/gcalc/gcalc.deps.in b/gcalc/gcalc.deps.in
index 23d423ce..773dede3 100644
--- a/gcalc/gcalc.deps.in
+++ b/gcalc/gcalc.deps.in
@@ -1,3 +1,2 @@
 gio-2.0
 gee-0.8
-libvala-@VALA_API_VERSION@
diff --git a/gcalc/meson.build b/gcalc/meson.build
index 2073964e..76623829 100644
--- a/gcalc/meson.build
+++ b/gcalc/meson.build
@@ -14,7 +14,6 @@ conf.set('libdir', '${exec_prefix}/'+get_option ('libdir'))
 conf.set('PROJECT_NAME', PROJECT_NAME)
 conf.set('PROJECT_VERSION', meson.project_version ())
 conf.set('API_VERSION', API_VERSION)
-conf.set('VALA_API_VERSION', vala_version)
 
 configure_file(input : 'gcalc.pc.in',
        output : 'gcalc-@0@.pc'.format(API_VERSION),
@@ -129,7 +128,6 @@ gcalc_deps = [
        posix,
        libxml,
        libsoup,
-       vala_dep,
        libmath,
        gee
 ]
diff --git a/meson.build b/meson.build
index d1f364b9..955d8079 100644
--- a/meson.build
+++ b/meson.build
@@ -27,16 +27,6 @@ libxml = dependency('libxml-2.0')
 libsoup = dependency('libsoup-2.4', version: '>= 2.42')
 gee = dependency('gee-0.8', version: '>= 0.20.0')
 
-# Vala compiler as expression parser
-vala_version = get_option ('vala-version')
-if vala_version == ''
-       vc = find_program('valac')
-       r = run_command(vc, '--api-version')
-       vala_version = r.stdout().strip()
-endif
-vala_dep_str = 'libvala-@0@'.format (vala_version)
-vala_dep = dependency(vala_dep_str)
-
 # Libraries
 cc = meson.get_compiler('c')
 valac = meson.get_compiler('vala')


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]