From 91990b7cf8024d13a89edbeddb873869eda21a87 Mon Sep 17 00:00:00 2001 From: "Carsten Haitzler (Rasterman)" Date: Thu, 27 Dec 2018 11:54:30 +0000 Subject: [PATCH] meson - fix pc file versions that were missing mirco version --- src/bindings/cxx/meson.build | 2 +- src/bindings/mono/meson.build | 2 +- src/lib/efreet/meson.build | 4 ++-- src/lib/eina/meson.build | 2 +- src/lib/evas_goal/meson.build | 2 +- 5 files changed, 6 insertions(+), 6 deletions(-) diff --git a/src/bindings/cxx/meson.build b/src/bindings/cxx/meson.build index f4b99f6c46..11c716a4c6 100644 --- a/src/bindings/cxx/meson.build +++ b/src/bindings/cxx/meson.build @@ -104,7 +104,7 @@ foreach lib : cxx_sublibs name : '-'.join(package_name.split('_')) + '-cxx', description : lib[0]+' cxx bindings', subdirs : tmp_package_subdirs, - version : version_major + '.' + version_minor, + version : version_major + '.' + version_minor + '.' + version_micro, libraries : dep, requires : growing_deps + [package_name], ) diff --git a/src/bindings/mono/meson.build b/src/bindings/mono/meson.build index 2bcab9bf82..4710e4c0cc 100644 --- a/src/bindings/mono/meson.build +++ b/src/bindings/mono/meson.build @@ -124,7 +124,7 @@ efl_mono_test_suite_path=join_paths(meson.current_build_dir()) pkgconfig.generate( name : 'efl-mono', description : 'Efl C# bindings', - version : version_major + '.' + version_minor, + version : version_major + '.' + version_minor + '.' + version_micro, libraries : ['-r:${assemblies_dir}/efl_mono.dll'], variables : ['assemblies_dir='+join_paths(dir_lib, 'efl-mono-'+version_major), 'mono_libs=-r:${assemblies_dir}/efl_mono.dll'] diff --git a/src/lib/efreet/meson.build b/src/lib/efreet/meson.build index fc4a232c38..ea4ef9a6c0 100644 --- a/src/lib/efreet/meson.build +++ b/src/lib/efreet/meson.build @@ -84,13 +84,13 @@ install_headers(efreet_header_src, pkgconfig.generate(efreet_mime_lib, name : 'efreet-mime', subdirs : package_version_name, - version : version_major + '.' + version_minor, + version : version_major + '.' + version_minor + '.' + version_micro, libraries : [tmp_deps] + tmp_pub_deps, ) pkgconfig.generate(efreet_trash_lib, name : 'efreet-trash', subdirs : package_version_name, - version : version_major + '.' + version_minor, + version : version_major + '.' + version_minor + '.' + version_micro, libraries : [tmp_deps] + tmp_pub_deps, ) diff --git a/src/lib/eina/meson.build b/src/lib/eina/meson.build index 8a445f4056..245c9cd8fa 100644 --- a/src/lib/eina/meson.build +++ b/src/lib/eina/meson.build @@ -400,6 +400,6 @@ automatic_pkgfile = false pkgconfig.generate(eina_lib, name : 'eina', subdirs : ['eina-'+version_major, 'efl-'+version_major, join_paths('eina-'+version_major, 'eina')], - version : version_major + '.' + version_minor, + version : version_major + '.' + version_minor + '.' + version_micro, libraries : eina_pub_deps, ) diff --git a/src/lib/evas_goal/meson.build b/src/lib/evas_goal/meson.build index d233520925..60426ad526 100644 --- a/src/lib/evas_goal/meson.build +++ b/src/lib/evas_goal/meson.build @@ -31,6 +31,6 @@ endforeach pkgconfig.generate(evas_lib, name : 'evas', subdirs : ['evas-'+version_major] + tmp_package_subdirs, - version : version_major + '.' + version_minor, + version : version_major + '.' + version_minor + '.' + version_micro, libraries : [eina, ecore, ector, emile, dependency('luajit')], )