pidgin/pidgin

Make libpurple depend on its schemas

11 months ago, Gary Kramlich
d039c29040d3
Parents eb8592c26889
Children a401fa6276ac
Make libpurple depend on its schemas

In certain situations you could build libpurple but not the schemas which would
cause runtime failures.

Testing Done:
Built

Reviewed at https://reviews.imfreedom.org/r/2452/
2 files changed, 4 insertions(+), 3 deletions(-)
  • +1 -1
    libpurple/data/meson.build
  • +3 -2
    libpurple/meson.build
    • --- a/libpurple/data/meson.build Sun Apr 30 17:42:35 2023 -0500
    +++ b/libpurple/data/meson.build Tue May 23 00:18:04 2023 -0500
    @@ -21,5 +21,5 @@
    gnome.post_install(glib_compile_schemas: true)
    # Compile the schemas in the current directory; this is only useful for testing
    -gnome.compile_schemas(depend_files: files(settings_schemas))
    +purple_schemas = gnome.compile_schemas(depend_files: files(settings_schemas))
    testenv.prepend('GSETTINGS_SCHEMA_DIR', meson.current_build_dir())
    --- a/libpurple/meson.build Sun Apr 30 17:42:35 2023 -0500
    +++ b/libpurple/meson.build Tue May 23 00:18:04 2023 -0500
    @@ -342,10 +342,12 @@
    enums_h,
    ]
    +subdir('data')
    +
    libpurple_inc = include_directories('.')
    libpurple = library('purple3',
    purple_coresources + purple_builtsources +
    - purple_builtheaders,
    + purple_builtheaders + purple_schemas,
    'purpleprivate.h',
    c_args : ['-DPURPLE_COMPILATION', '-DG_LOG_USE_STRUCTURED', '-DG_LOG_DOMAIN="Purple"'],
    include_directories : [toplevel_inc, libpurple_inc],
    @@ -408,7 +410,6 @@
    meson.override_dependency(purple_filebase, libpurple_dep)
    -subdir('data')
    subdir('tests')
    subdir('plugins')
    subdir('protocols')