From b04f7cd0546976dc4f7ea440648ac0eedd8df3ce Mon Sep 17 00:00:00 2001 From: Colin Clark Date: Wed, 21 Jun 2023 14:24:41 +0100 Subject: [PATCH] Remove exiv2 0.28.0 restriction https://github.com/BestImageViewer/geeqie/pull/1119 The bug was fixed in the above commit. --- meson.build | 12 ++---------- 1 file changed, 2 insertions(+), 10 deletions(-) diff --git a/meson.build b/meson.build index a4cab49cb..412399fec 100644 --- a/meson.build +++ b/meson.build @@ -280,15 +280,7 @@ else endif exiv2_dep = [] -# See https://github.com/BestImageViewer/geeqie/issues/1090 -# for the reason for 0.28.0 exclusion -req_version = ['>=0.11', '!=0.28.0'] - -req_version_str = '' -foreach req_version_str_ : req_version - req_version_str += req_version_str_ -endforeach - +req_version = '>=0.11' option = get_option('exiv2') if not option.disabled() exiv2_dep = dependency('exiv2', version : req_version, required : get_option('exiv2')) @@ -296,7 +288,7 @@ if not option.disabled() conf_data.set('HAVE_EXIV2', 1) summary({'exiv2' : ['image metadata processed by exiv2:', true]}, section : 'Configuration', bool_yn : true) else - summary({'exiv2' : ['exiv2 ' + req_version_str + ' not found - image data not processed by exiv2:', false]}, section : 'Configuration', bool_yn : true) + summary({'exiv2' : ['exiv2 ' + req_version + ' not found - image data not processed by exiv2:', false]}, section : 'Configuration', bool_yn : true) endif else summary({'exiv2' : ['disabled - image data processed by exiv2:', false]}, section : 'Configuration', bool_yn : true)