From 0952114d20df571e58340d4fae92cc5d0ecee642 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Guido=20G=C3=BCnther?= Date: Mon, 24 Jun 2024 15:37:40 +0200 Subject: [PATCH 1/4] libphosh: Drop wwan-backend.h MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Fixes: bdcb925c6 ("enums: Introduce single header file to gather all enums") Signed-off-by: Guido Günther Part-of: --- src/libphosh.h | 1 - 1 file changed, 1 deletion(-) diff --git a/src/libphosh.h b/src/libphosh.h index 4c02b39ef..485a04b14 100644 --- a/src/libphosh.h +++ b/src/libphosh.h @@ -188,7 +188,6 @@ G_BEGIN_DECLS #include "settings/audio-device-row.h" #include "settings/audio-settings.h" -#include "wwan/phosh-wwan-backend.h" #include "wwan/phosh-wwan-ofono.h" #include "wwan/phosh-wwan-mm.h" #include "wwan/phosh-wwan-iface.h" -- GitLab From 63ab0736cd416e7535468bf7529eae48943043db Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Guido=20G=C3=BCnther?= Date: Sun, 23 Jun 2024 11:39:26 +0200 Subject: [PATCH 2/4] build: Prefix library include dir MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Use a lib_ prefix to distinguish this form paths we use for headers used by plugins and tools that supplement the actual shell. Signed-off-by: Guido Günther Part-of: --- meson.build | 6 +++--- protocol/meson.build | 2 +- src/dbus/meson.build | 2 +- src/meson.build | 12 ++++++------ 4 files changed, 11 insertions(+), 11 deletions(-) diff --git a/meson.build b/meson.build index 4554556b6..01aa3848a 100644 --- a/meson.build +++ b/meson.build @@ -6,7 +6,7 @@ project('phosh', 'c', ) app_id = 'sm.puri.Phosh' -inc_subdir = 'libphosh-0' +lib_inc_subdir = 'libphosh-0' prefix = get_option('prefix') bindir = join_paths(prefix, get_option('bindir')) @@ -24,7 +24,7 @@ plugins_dir = join_paths(prefix, libdir, 'phosh', 'plugins') plugin_prefs_dir = join_paths(prefix, libdir, 'phosh', 'plugins', 'prefs') servicedir = join_paths(datadir, 'dbus-1', 'services') schemasdir = datadir / 'glib-2.0/schemas' -inc_dir = prefix / get_option('includedir') / inc_subdir +lib_inc_dir = prefix / get_option('includedir') / lib_inc_subdir enable_introspection = get_option('introspection') or get_option('gtk_doc') bindings_lib = get_option('bindings-lib') @@ -236,7 +236,7 @@ configure_file( output: 'phosh-config.h', configuration: config_h, install: bindings_lib, - install_dir: inc_dir, + install_dir: lib_inc_dir, ) subdir('data') diff --git a/protocol/meson.build b/protocol/meson.build index 10cdfffa3..d856cea77 100644 --- a/protocol/meson.build +++ b/protocol/meson.build @@ -39,7 +39,7 @@ foreach p : wl_protos 'client-header', '@INPUT@', '@OUTPUT@'], - install_dir: inc_dir, + install_dir: lib_inc_dir, install: bindings_lib, ) wl_proto_sources += custom_target('@0@ source'.format(proto), diff --git a/src/dbus/meson.build b/src/dbus/meson.build index 92c00cf17..2f6aa296a 100644 --- a/src/dbus/meson.build +++ b/src/dbus/meson.build @@ -5,7 +5,7 @@ generated_dbus_sources = [] generated_dbus_headers = [] dbus_prefix = 'PhoshDBus' -dbus_inc_dir = inc_dir / 'dbus' +dbus_inc_dir = lib_inc_dir / 'dbus' # # Protocols where Phosh is the DBus client: diff --git a/src/meson.build b/src/meson.build index 9cc5e5ce6..19e18d2a8 100644 --- a/src/meson.build +++ b/src/meson.build @@ -47,7 +47,7 @@ phosh_enums = gnome.mkenums_simple( 'phosh-enums', sources : phosh_enum_headers, install_header: bindings_lib, - install_dir: inc_dir, + install_dir: lib_inc_dir, ) phosh_settings_sources = files( @@ -493,27 +493,27 @@ if bindings_lib libphosh_tool_headers, libphosh_headers, ], - subdir : inc_subdir, + subdir : lib_inc_subdir, ) install_headers( phosh_monitor_headers, - subdir : inc_subdir / 'monitor', + subdir : lib_inc_subdir / 'monitor', ) install_headers( phosh_notifications_headers, - subdir : inc_subdir / 'notifications', + subdir : lib_inc_subdir / 'notifications', ) install_headers( phosh_settings_widgets_headers, - subdir : inc_subdir / 'settings', + subdir : lib_inc_subdir / 'settings', ) install_headers( phosh_wwan_headers, - subdir : inc_subdir / 'wwan', + subdir : lib_inc_subdir / 'wwan', ) endif -- GitLab From 57fdce63632d0057f0cbab4fc9dbf48964092993 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Guido=20G=C3=BCnther?= Date: Mon, 24 Jun 2024 15:35:59 +0200 Subject: [PATCH 3/4] build: Add dependency on phosh-settings MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit We want the header (and don't want to duplicate it) Signed-off-by: Guido Günther Part-of: --- src/meson.build | 1 + 1 file changed, 1 insertion(+) diff --git a/src/meson.build b/src/meson.build index 19e18d2a8..f3505cf1b 100644 --- a/src/meson.build +++ b/src/meson.build @@ -484,6 +484,7 @@ if bindings_lib filebase: 'libphosh-0', version : meson.project_version(), description: 'Private library for building external components', + requires: 'phosh-settings', url: 'https://world.pages.gitlab.gnome.org/Phosh/phosh/', ) -- GitLab From 095f29c3a46df3f8d5fdc1d2d11cf688be91a44d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Guido=20G=C3=BCnther?= Date: Sun, 23 Jun 2024 11:40:55 +0200 Subject: [PATCH 4/4] build: Set a soname for the shared library MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit We use the project version underscored droping micro revisions. Signed-off-by: Guido Günther Part-of: --- meson.build | 2 ++ src/meson.build | 1 + 2 files changed, 3 insertions(+) diff --git a/meson.build b/meson.build index 01aa3848a..9d247b988 100644 --- a/meson.build +++ b/meson.build @@ -7,6 +7,8 @@ project('phosh', 'c', app_id = 'sm.puri.Phosh' lib_inc_subdir = 'libphosh-0' +ver_parts = meson.project_version().split('.') +soversion = '@0@_@1@'.format(ver_parts[0], ver_parts[1]) prefix = get_option('prefix') bindir = join_paths(prefix, get_option('bindir')) diff --git a/src/meson.build b/src/meson.build index f3505cf1b..07fb7cced 100644 --- a/src/meson.build +++ b/src/meson.build @@ -435,6 +435,7 @@ phosh_lib = both_libraries('phosh', libphosh_sources, include_directories: phosh_lib_inc, dependencies: [phosh_tool_dep, phosh_deps], + soversion: soversion, install: bindings_lib, ) -- GitLab