From af69f21e29c8257ef5b5e5f07e99a723c25ff896 Mon Sep 17 00:00:00 2001 From: Jeremy Wootten Date: Sun, 29 Jun 2025 16:50:54 +0100 Subject: [PATCH 1/3] Use default install location for codecore library; use current version --- src/meson.build | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/src/meson.build b/src/meson.build index b5a5aca59..b7872a349 100644 --- a/src/meson.build +++ b/src/meson.build @@ -84,14 +84,13 @@ codecore = library( config_header, dependencies: dependencies, install: true, - install_dir: [true, true, true], - version: '0.0' + version: meson.project_version () ) pkg = import('pkgconfig') pkg.generate( - version: '0.1', + version: meson.project_version (), libraries: codecore, description: 'elementary Code headers', name: 'codecore', @@ -103,5 +102,5 @@ install_data ('codecore.deps', install_dir: get_option('prefix') / get_option('d codecore_dep = declare_dependency( link_with: codecore, dependencies: dependencies, - include_directories: [include_directories('.')] + include_directories: ['.'] ) From a05ac266f675bc2a0da499ec04eacee06522128c Mon Sep 17 00:00:00 2001 From: Jeremy Wootten Date: Mon, 30 Jun 2025 09:41:04 +0100 Subject: [PATCH 2/3] Update src/meson.build MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Specify so version Co-authored-by: Corentin Noël --- src/meson.build | 1 + 1 file changed, 1 insertion(+) diff --git a/src/meson.build b/src/meson.build index b7872a349..0eca94bbd 100644 --- a/src/meson.build +++ b/src/meson.build @@ -84,6 +84,7 @@ codecore = library( config_header, dependencies: dependencies, install: true, + soversion: '0', version: meson.project_version () ) From ab5058bd82c105ec3200a8904971c962b924f663 Mon Sep 17 00:00:00 2001 From: Jeremy Wootten Date: Mon, 30 Jun 2025 09:43:15 +0100 Subject: [PATCH 3/3] Only install shared library not .vapi, .deps. .pc --- src/meson.build | 12 ------------ 1 file changed, 12 deletions(-) diff --git a/src/meson.build b/src/meson.build index 0eca94bbd..c7434a6ae 100644 --- a/src/meson.build +++ b/src/meson.build @@ -88,18 +88,6 @@ codecore = library( version: meson.project_version () ) -pkg = import('pkgconfig') - -pkg.generate( - version: meson.project_version (), - libraries: codecore, - description: 'elementary Code headers', - name: 'codecore', - filebase: 'codecore' -) - -install_data ('codecore.deps', install_dir: get_option('prefix') / get_option('datadir') / 'vala' / 'vapi') - codecore_dep = declare_dependency( link_with: codecore, dependencies: dependencies,