pidgin/pidgin

Fix up the dependencies for our gir files and ensure ours will work as a subproject

2021-09-26, Gary Kramlich
0a4177bbb1c4
Parents a9447c1653a5
Children 18f3ea2e7e6d
Fix up the dependencies for our gir files and ensure ours will work as a subproject

Testing Done:
Tested against gplugin 0.34.1 and everything is working well.

Reviewed at https://reviews.imfreedom.org/r/942/
5 files changed, 50 insertions(+), 44 deletions(-)
  • +30 -26
    finch/meson.build
  • +16 -12
    libpurple/meson.build
  • +2 -2
    meson.build
  • +1 -3
    pidgin/meson.build
  • +1 -1
    subprojects/gplugin.wrap
    • --- a/finch/meson.build Fri Sep 24 02:56:53 2021 -0500
    +++ b/finch/meson.build Sun Sep 26 00:25:14 2021 -0500
    @@ -151,6 +151,7 @@
    # the built lists are append to below
    libfinch_built_sources = []
    libfinch_built_headers = []
    +libfinch_generated_sources = []
    finch_SOURCES = [
    'finch.c'
    @@ -203,10 +204,38 @@
    version : PURPLE_LIB_VERSION,
    dependencies : [libpurple_dep, libgnt_dep, ncurses, glib, winmm],
    install : true)
    +
    + if enable_introspection
    + introspection_sources = libfinch_headers
    +
    + Finch_gir_includes = [
    + libgnt_gir[0],
    + 'GPlugin-1.0',
    + # subproject needs to be before libpurple in the repo so that
    + # meson will use our variables and not try to discover them from
    + # libpurple.
    + libpurple_gir[0],
    + ]
    +
    + libfinch_gir = gnome.generate_gir(libfinch,
    + sources : introspection_sources,
    + includes : Finch_gir_includes,
    + namespace : 'Finch',
    + symbol_prefix : 'finch',
    + identifier_prefix : 'Finch',
    + export_packages : 'finch',
    + nsversion : '@0@.@1@'.format(purple_major_version,
    + purple_minor_version),
    + install : true,
    + dependencies: [libgnt_dep, gplugin_dep],
    + extra_args : ['-DFINCH_COMPILATION', '--quiet'])
    + libfinch_generated_sources += libfinch_gir
    + endif
    +
    libfinch_dep = declare_dependency(
    include_directories : [toplevel_inc, libfinch_inc],
    link_with : libfinch,
    - sources: libfinch_built_headers,
    + sources: libfinch_built_headers + libfinch_generated_sources,
    dependencies : [libpurple_dep, libgnt_dep, glib])
    finch = executable('finch3',
    @@ -229,30 +258,5 @@
    requires : ['gnt', 'purple-3'],
    variables : ['plugindir=${libdir}/finch-@0@'.format(purple_major_version)])
    - if enable_introspection
    - introspection_sources = libfinch_headers
    -
    - Finch_gir_includes = [
    - libgnt_gir[0],
    - 'GPlugin-1.0',
    - # subproject needs to be before libpurple in the repo so that
    - # meson will use our variables and not try to discover them from
    - # libpurple.
    - libpurple_gir[0],
    - ]
    -
    - gnome.generate_gir(libfinch,
    - sources : introspection_sources,
    - includes : Finch_gir_includes,
    - namespace : 'Finch',
    - symbol_prefix : 'finch',
    - identifier_prefix : 'Finch',
    - export_packages : 'finch',
    - nsversion : '@0@.@1@'.format(purple_major_version,
    - purple_minor_version),
    - install : true,
    - extra_args : ['-DFINCH_COMPILATION', '--quiet'])
    - endif
    -
    subdir('plugins')
    endif # enable_consoleui
    --- a/libpurple/meson.build Fri Sep 24 02:56:53 2021 -0500
    +++ b/libpurple/meson.build Sun Sep 26 00:25:14 2021 -0500
    @@ -188,6 +188,8 @@
    'xmlnode.h',
    ]
    +purple_generated_sources = []
    +
    purple_filebase = 'purple-@0@'.format(purple_major_version)
    purple_include_base = purple_filebase / 'libpurple'
    @@ -289,23 +291,12 @@
    libxml, farstream, gstreamer, gstreamer_video,
    gstreamer_app, json, math])
    -libpurple_dep = declare_dependency(
    - # Ensure purple headers built before any dependencies:
    - sources : [purple_builtheaders],
    - include_directories : [toplevel_inc, libpurple_inc],
    - link_with : libpurple,
    - dependencies : [gstreamer, gplugin_dep, glib, gio])
    -
    install_headers(purple_coreheaders,
    subdir : purple_include_base)
    install_headers(purple_mediaheaders,
    subdir : purple_include_base / 'media')
    -if meson.version().version_compare('>=0.54.0')
    - meson.override_dependency(purple_filebase, libpurple_dep)
    -endif
    -
    pkgconfig.generate(
    name : 'libpurple',
    description : 'libpurple is a GLib-based instant messenger library.',
    @@ -332,9 +323,22 @@
    export_packages : purple_filebase,
    nsversion : '@0@.@1@'.format(purple_major_version,
    purple_minor_version),
    - dependencies: [ gplugin_dep ],
    + dependencies: [gplugin_dep],
    install : true,
    extra_args : ['-DPURPLE_COMPILATION', '--quiet'])
    +
    + purple_generated_sources += libpurple_gir
    +endif
    +
    +libpurple_dep = declare_dependency(
    + # Ensure purple headers built before any dependencies:
    + sources : [purple_builtheaders] + purple_generated_sources,
    + include_directories : [toplevel_inc, libpurple_inc],
    + link_with : libpurple,
    + dependencies : [gstreamer, gplugin_dep, glib, gio])
    +
    +if meson.version().version_compare('>=0.54.0')
    + meson.override_dependency(purple_filebase, libpurple_dep)
    endif
    PURPLE3_URL_HANDLER_DESKTOP = 'purple3-url-handler.desktop'
    --- a/meson.build Fri Sep 24 02:56:53 2021 -0500
    +++ b/meson.build Sun Sep 26 00:25:14 2021 -0500
    @@ -571,12 +571,12 @@
    # Check for GPlugin
    #######################################################################
    gplugin_dep = dependency('gplugin',
    - version : ['>=0.33.0', '<0.34.0'],
    + version : ['>=0.34.1', '<0.35.0'],
    fallback : ['gplugin', 'gplugin_dep'])
    if get_option('gtkui')
    gplugin_gtk_dep = dependency('gplugin-gtk',
    - version : ['>=0.33.0', '<0.34.0'],
    + version : ['>=0.34.1', '<0.35.0'],
    fallback : ['gplugin-gtk', 'gplugin_gtk_dep'])
    endif
    --- a/pidgin/meson.build Fri Sep 24 02:56:53 2021 -0500
    +++ b/pidgin/meson.build Sun Sep 26 00:25:14 2021 -0500
    @@ -332,9 +332,7 @@
    export_packages : 'pidgin-@0@'.format(purple_major_version),
    nsversion : '@0@.@1@'.format(purple_major_version,
    purple_minor_version),
    - include_directories : [
    - talkatu_include_directories,
    - ],
    + dependencies : [gplugin_dep, gplugin_gtk_dep, talkatu_dep],
    install : true,
    extra_args : ['-DPIDGIN_COMPILATION', '--quiet'])
    endif
    --- a/subprojects/gplugin.wrap Fri Sep 24 02:56:53 2021 -0500
    +++ b/subprojects/gplugin.wrap Sun Sep 26 00:25:14 2021 -0500
    @@ -1,4 +1,4 @@
    [wrap-hg]
    directory = gplugin
    url = https://keep.imfreedom.org/gplugin/gplugin
    -revision = v0.33.0
    +revision = v0.34.1