From ccccb5c2ed9d426207c1c3383e1e308050120126 Mon Sep 17 00:00:00 2001 From: Ross Vandegrift Date: Thu, 15 Sep 2022 10:48:29 +0800 Subject: [PATCH] correct edje pkg-config generation for luaold Origin: other Forwarded: no Last-Update: 2019-12-24 edje.pc gets its lua Requies entry from -Dlua-interpreter. But it should get the appropriate versioned entry instead. Last-Update: 2019-12-24 Gbp-Pq: Name 25_edje_check_luaold.diff --- meson.build | 23 ++++++++++++++++++++++- 1 file changed, 22 insertions(+), 1 deletion(-) diff --git a/meson.build b/meson.build index c430367..9c94f8b 100644 --- a/meson.build +++ b/meson.build @@ -268,6 +268,27 @@ else ] endif +luaold_interpreters = [ + ['lua', ['>=5.1.0','<5.3.0']], + ['lua51', ['>=5.1.0','<5.2.0']], + ['lua-5.1', ['>=5.1.0','<5.2.0']], + ['lua5.1', ['>=5.1.0','<5.2.0']], + ['lua52', ['>=5.2.0','<5.3.0']], + ['lua-5.2', ['>=5.2.0','<5.3.0']], + ['lua5.2', ['>=5.2.0','<5.3.0']], +] + +if get_option('lua-interpreter') == 'lua' + foreach l : luaold_interpreters + lua = dependency(l[0], version: l[1], required:false) + if lua.found() == true + break + endif + endforeach +else + lua = dependency(get_option('lua-interpreter')) +endif + subprojects = [ # name | option | mod | lib | bin | bench | tests | examples | pkg-config options | name of static libs ['evil' ,[] , false, true, false, false, false, false, [], []], @@ -306,7 +327,7 @@ subprojects = [ ['efreet' ,[] , false, false, true, false, false, false, ['eina', 'efl', 'eo'], []], ['ecore_imf_evas' ,[] , false, true, false, false, false, false, ['eina', 'efl', 'eo'], []], ['ephysics' ,['physics'] , false, true, false, false, false, false, ['eina', 'efl', 'eo'], []], -['edje' ,[] , false, true, true, false, true, true, ['evas', 'eo', 'efl', get_option('lua-interpreter')], []], +['edje' ,[] , false, true, true, false, true, true, ['evas', 'eo', 'efl', lua], []], ['emotion' ,[] , true, true, false, false, true, true, ['eina', 'efl', 'eo'], []], ['ethumb' ,[] , true, true, true, false, false, false, ['eina', 'efl', 'eo'], []], ['ethumb_client' ,[] , false, true, true, false, false, true, ['eina', 'efl', 'eo', 'ethumb'], []],