[gnome-software] build: Add a glib-2.0 dependency in a few places



commit faac8ba3d92459c0cd82ce9c5f4c37e2919d82f5
Author: Philip Withnall <withnall endlessm com>
Date:   Thu May 16 17:36:19 2019 +0100

    build: Add a glib-2.0 dependency in a few places
    
    The whole project depends implicitly on `glib-2.0` (via `gio-unix-2.0`),
    but it would be better to make this explicit, so that its version
    requirement can be bumped properly in future, when needed.
    
    Add the `dependency()` call and use it in a few key places.
    
    Signed-off-by: Philip Withnall <withnall endlessm com>

 lib/meson.build | 3 +++
 meson.build     | 1 +
 src/meson.build | 3 +++
 3 files changed, 7 insertions(+)
---
diff --git a/lib/meson.build b/lib/meson.build
index c4a88fb5..330cd787 100644
--- a/lib/meson.build
+++ b/lib/meson.build
@@ -54,6 +54,7 @@ install_headers([
 librarydeps = [
   appstream_glib,
   gio_unix,
+  glib,
   gmodule,
   goa,
   gtk,
@@ -108,6 +109,7 @@ executable(
   dependencies : [
     appstream_glib,
     gio_unix,
+    glib,
     gmodule,
     goa,
     gtk,
@@ -138,6 +140,7 @@ if get_option('tests')
     dependencies : [
       appstream_glib,
       gio_unix,
+      glib,
       gmodule,
       goa,
       gtk,
diff --git a/meson.build b/meson.build
index c3c64d2e..8f36aa99 100644
--- a/meson.build
+++ b/meson.build
@@ -103,6 +103,7 @@ gio_unix = dependency('gio-unix-2.0', version : '>= 2.56.0')
 gmodule = dependency('gmodule-2.0')
 goa = dependency('goa-1.0')
 gtk = dependency('gtk+-3.0', version : '>= 3.22.4')
+glib = dependency('glib-2.0')
 json_glib = dependency('json-glib-1.0', version : '>= 1.2.0')
 libm = cc.find_library('m', required: false)
 libsoup = dependency('libsoup-2.4', version : '>= 2.52.0')
diff --git a/src/meson.build b/src/meson.build
index ea8900ba..5e18c750 100644
--- a/src/meson.build
+++ b/src/meson.build
@@ -72,6 +72,7 @@ gnome_software_sources = [
 gnome_software_dependencies = [
   appstream_glib,
   gio_unix,
+  glib,
   gmodule,
   goa,
   gtk,
@@ -138,6 +139,7 @@ executable(
   ],
   dependencies : [
     gio_unix,
+    glib,
   ],
   c_args : cargs,
   install : true,
@@ -297,6 +299,7 @@ if get_option('tests')
     dependencies : [
       appstream_glib,
       gio_unix,
+      glib,
       gmodule,
       goa,
       gtk,


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