grim/pidgin

Fix includes for the introspection targets that I thought weren't needed during the gi-docgen conversation

2021-10-25, Gary Kramlich
a9f32316d828
Parents c1b80c8288bf
Children 8fa1f37d32f2
Fix includes for the introspection targets that I thought weren't needed during the gi-docgen conversation

Testing Done:
ran `meson --wipe && ninja` and verified a BUNCH of warnings magically disappeared into oblivion.

Reviewed at https://reviews.imfreedom.org/r/1087/
8 files changed, 19 insertions(+), 8 deletions(-)
  • +5 -1
    doc/reference/finch/meson.build
  • +5 -0
    doc/reference/pidgin/meson.build
  • +3 -0
    doc/reference/protocols/facebook/meson.build
  • +2 -1
    finch/meson.build
  • +1 -3
    libpurple/meson.build
  • +1 -1
    libpurple/protocols/facebook/meson.build
  • +1 -1
    meson.build
  • +1 -1
    pidgin/meson.build
    • --- a/doc/reference/finch/meson.build Mon Oct 25 22:04:41 2021 -0500
    +++ b/doc/reference/finch/meson.build Mon Oct 25 22:06:07 2021 -0500
    @@ -10,7 +10,7 @@
    )
    finch_doc = custom_target('finch-doc',
    - input : [ finch_toml, libfinch_gir ],
    + input : [ finch_toml, libfinch_gir[0] ],
    output : 'finch',
    command : [
    gidocgen,
    @@ -21,8 +21,12 @@
    '--output-dir=@OUTPUT@',
    '--no-namespace-dir',
    '--content-dir=@0@'.format(meson.current_source_dir()),
    + '--add-include-path=@0@'.format(meson.global_build_root() / 'subprojects/gplugin/gplugin'),
    + '--add-include-path=@0@'.format(meson.global_build_root() / 'subprojects/libgnt'),
    + '--add-include-path=@0@'.format(meson.project_build_root() / 'libpurple'),
    '@INPUT1@'
    ],
    + depends: [ libpurple_gir[0] ],
    depend_files : [ finch_doc_content_files ],
    build_by_default : true,
    install : true,
    --- a/doc/reference/pidgin/meson.build Mon Oct 25 22:04:41 2021 -0500
    +++ b/doc/reference/pidgin/meson.build Mon Oct 25 22:06:07 2021 -0500
    @@ -25,8 +25,13 @@
    '--output-dir=@OUTPUT@',
    '--no-namespace-dir',
    '--content-dir=@0@'.format(meson.current_source_dir()),
    + '--add-include-path=@0@'.format(meson.global_build_root() / 'subprojects/gplugin/gplugin'),
    + '--add-include-path=@0@'.format(meson.global_build_root() / 'subprojects/gplugin/gplugin-gtk3'),
    + '--add-include-path=@0@'.format(meson.project_build_root() / 'libpurple'),
    + '--add-include-path=@0@'.format(meson.global_build_root() / 'subprojects/talkatu/talkatu'),
    '@INPUT1@'
    ],
    + depends: [ libpurple_gir[0] ],
    depend_files : [ pidgin_doc_content_files ],
    build_by_default : true,
    install : true,
    --- a/doc/reference/protocols/facebook/meson.build Mon Oct 25 22:04:41 2021 -0500
    +++ b/doc/reference/protocols/facebook/meson.build Mon Oct 25 22:06:07 2021 -0500
    @@ -21,8 +21,11 @@
    '--output-dir=@OUTPUT@',
    '--no-namespace-dir',
    '--content-dir=@0@'.format(meson.current_source_dir()),
    + '--add-include-path=@0@'.format(meson.global_build_root() / 'subprojects/gplugin/gplugin'),
    + '--add-include-path=@0@'.format(meson.build_root() / 'libpurple'),
    '@INPUT1@'
    ],
    + depends: [ libpurple_gir[0] ],
    depend_files : [ facebook_doc_content_files ],
    build_by_default : true,
    install : true,
    --- a/finch/meson.build Mon Oct 25 22:04:41 2021 -0500
    +++ b/finch/meson.build Mon Oct 25 22:06:07 2021 -0500
    @@ -197,6 +197,7 @@
    libfinch_gir = gnome.generate_gir(libfinch,
    sources : introspection_sources,
    + includes : ['GLib-2.0', 'GModule-2.0', 'GObject-2.0', libpurple_gir[0]],
    namespace : 'Finch',
    symbol_prefix : 'finch',
    header : 'finch.h',
    @@ -205,7 +206,7 @@
    nsversion : '@0@.@1@'.format(purple_major_version,
    purple_minor_version),
    install : true,
    - dependencies: [libgnt_dep, gplugin_dep, libpurple],
    + dependencies: [libgnt_dep, gplugin_dep, libpurple_dep],
    extra_args : ['-DFINCH_COMPILATION', '--quiet'])
    libfinch_generated_sources += libfinch_gir
    endif
    --- a/libpurple/meson.build Mon Oct 25 22:04:41 2021 -0500
    +++ b/libpurple/meson.build Mon Oct 25 22:06:07 2021 -0500
    @@ -325,11 +325,9 @@
    introspection_sources = (purple_coreheaders + purple_builtheaders +
    purple_mediaheaders)
    - Purple_gir_includes = ['GObject-2.0', 'Gio-2.0', 'Gst-1.0', 'GPlugin-1.0']
    -
    libpurple_gir = gnome.generate_gir(libpurple,
    sources : introspection_sources,
    - includes : Purple_gir_includes,
    + includes : ['GLib-2.0', 'Gio-2.0', 'GObject-2.0', 'Gst-1.0', 'GPlugin-1.0'],
    namespace : 'Purple',
    symbol_prefix : 'purple',
    identifier_prefix : 'Purple',
    --- a/libpurple/protocols/facebook/meson.build Mon Oct 25 22:04:41 2021 -0500
    +++ b/libpurple/protocols/facebook/meson.build Mon Oct 25 22:06:07 2021 -0500
    @@ -41,7 +41,7 @@
    if enable_introspection
    introspection_sources = FACEBOOK_SOURCES
    - facebook_gir_includes = ['GObject-2.0', 'Gio-2.0', 'Gst-1.0']
    + facebook_gir_includes = ['GObject-2.0', 'Gio-2.0', 'Gst-1.0', 'Json-1.0', libpurple_gir[0]]
    facebook_gir = gnome.generate_gir(facebook_prpl,
    sources : introspection_sources,
    --- a/meson.build Mon Oct 25 22:04:41 2021 -0500
    +++ b/meson.build Mon Oct 25 22:06:07 2021 -0500
    @@ -22,7 +22,7 @@
    #
    project('pidgin', 'c',
    version : '3.0.0-devel',
    - meson_version : '>=0.56.0')
    + meson_version : '>=0.58.0')
    purple_soversion = 20
    parts = meson.project_version().split('-')
    --- a/pidgin/meson.build Mon Oct 25 22:04:41 2021 -0500
    +++ b/pidgin/meson.build Mon Oct 25 22:06:07 2021 -0500
    @@ -311,7 +311,7 @@
    pidgin_gir = gnome.generate_gir(libpidgin,
    sources : introspection_sources,
    header : 'pidgin.h',
    - includes : ['GLib-2.0', 'GObject-2.0', 'Gtk-3.0'],
    + includes : ['GLib-2.0', 'GObject-2.0', 'Gtk-3.0', libpurple_gir[0], 'Talkatu-0.0'],
    namespace : 'Pidgin',
    symbol_prefix : 'pidgin',
    identifier_prefix : 'Pidgin',