[gexiv2] build: Update glib version
- From: Jens Georg <jensgeorg src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gexiv2] build: Update glib version
- Date: Sat, 23 May 2020 17:41:55 +0000 (UTC)
commit c562941164436a9ee1a1f23d07a2b4dd1a3da019
Author: Jens Georg <mail jensge org>
Date: Sat May 23 19:37:03 2020 +0200
build: Update glib version
meson.build | 6 ++++--
test/gexiv2-regression.c | 3 ++-
test/meson.build | 2 +-
3 files changed, 7 insertions(+), 4 deletions(-)
---
diff --git a/meson.build b/meson.build
index b84255f..a083037 100644
--- a/meson.build
+++ b/meson.build
@@ -12,8 +12,10 @@ gnome = import('gnome')
pkg = import('pkgconfig')
exiv2 = dependency('exiv2', version : '>= 0.26')
-gobject = dependency('gobject-2.0', version : '>= 2.38.0')
-gio = dependency('gio-2.0', version : '>= 2.32.0')
+gobject = dependency('gobject-2.0', version : '>= 2.46.0')
+gio = dependency('gio-2.0', version : '>= 2.46.0')
+cc = meson.get_compiler('c')
+math = cc.find_library('m', required : false)
gir = find_program('g-ir-scanner', required: false)
diff --git a/test/gexiv2-regression.c b/test/gexiv2-regression.c
index 1c35519..947d806 100644
--- a/test/gexiv2-regression.c
+++ b/test/gexiv2-regression.c
@@ -13,6 +13,7 @@
#include <gexiv2/gexiv2.h>
#include <string.h>
+#include <math.h>
const char LOREM_IPSUM[] =
"Lorem ipsum dolor sit amet, consetetur sadipscing elitr, sed diam nonumy eirmod tempor invidunt ut labore
et dolore magna aliquyam erat, sed diam voluptua. At vero eos et accusam et justo duo dolores et ea rebum.
Stet clita kasd gubergren, no sea takimata sanctus est Lorem ipsum dolor sit amet. Lorem ipsum dolor sit
amet, consetetur sadipscing elitr, sed diam nonumy eirmod tempor invidunt ut labore et dolore magna aliquyam
erat, sed diam voluptua. At vero eos et accusam et justo duo dolores et ea rebum. Stet clita kasd gubergren,
no sea takimata sanctus est Lorem ipsum dolor sit amet. Lorem ipsum dolor sit amet, consetetur sadipscing
elitr, sed diam nonumy eirmod tempor invidunt ut labore et dolore magna aliquyam erat, sed diam voluptua. At
vero eos et accusam et justo duo dolores et ea rebum. Stet clita kasd gubergren, no sea takimata sanctus est
Lorem ipsum dolor sit amet." \
@@ -289,7 +290,7 @@ static void test_ggo_45(void)
result = gexiv2_metadata_get_gps_altitude(meta, &alt);
g_assert_true(result);
- g_assert_cmpfloat_with_epsilon(alt, 2200.0, 1e-5);
+ g_assert_cmpfloat(fabs(alt - 2200.0), <= , 1e-5);
g_clear_object(&meta);
diff --git a/test/meson.build b/test/meson.build
index 30edde3..f05f37e 100644
--- a/test/meson.build
+++ b/test/meson.build
@@ -9,7 +9,7 @@ test_env.prepend('LD_LIBRARY_PATH', typelib_path)
test_env.prepend('PYTHONPATH', python_module_path)
regression_test = executable('gexiv2-regression', 'gexiv2-regression.c',
- dependencies : [gobject, gio],
+ dependencies : [gobject, gio, math],
include_directories : include_directories('..'),
c_args : '-DSAMPLE_PATH="@0@"'.format(test_sample_path),
link_with : gexiv2)
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]