pidgin/pidgin

Fix an issue where we would get a warning about gplugin.pc not found while generating gir files

2020-10-12, Gary Kramlich
df346d4c3074
Parents 141508c66433
Children e9573eaa68f9
Fix an issue where we would get a warning about gplugin.pc not found while generating gir files

Testing Done:
built the gir's and made sure the warning was gone.

Reviewed at https://reviews.imfreedom.org/r/151/
2 files changed, 21 insertions(+), 3 deletions(-)
  • +10 -1
    finch/meson.build
  • +11 -2
    pidgin/meson.build
    • --- a/finch/meson.build Sat Oct 10 02:05:12 2020 -0500
    +++ b/finch/meson.build Mon Oct 12 20:54:13 2020 -0500
    @@ -212,9 +212,18 @@
    if enable_introspection
    introspection_sources = libfinch_headers
    + Finch_gir_includes = [
    + libgnt_gir[0],
    + gplugin_gir,
    + # 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 : [libgnt_gir[0], libpurple_gir[0], gplugin_gir],
    + includes : Finch_gir_includes,
    namespace : 'Finch',
    symbol_prefix : 'finch',
    identifier_prefix : 'Finch',
    --- a/pidgin/meson.build Sat Oct 10 02:05:12 2020 -0500
    +++ b/pidgin/meson.build Mon Oct 12 20:54:13 2020 -0500
    @@ -217,7 +217,7 @@
    libpidgin_dep = declare_dependency(
    include_directories : [toplevel_inc, libpidgin_inc],
    link_with : libpidgin,
    - dependencies : [gtk, glib, math, talkatu_dep])
    + dependencies : [gtk, glib, math, talkatu_dep, gplugin_gtk_dep])
    pidgin = executable('pidgin3',
    pidgin_SOURCES,
    @@ -267,9 +267,18 @@
    if enable_introspection
    introspection_sources = libpidgin_headers
    + Pidgin_gir_includes = [
    + 'GObject-2.0', 'Gtk-3.0',
    + talkatu_gir, gplugin_gir, gplugin_gtk_gir,
    + # 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(libpidgin,
    sources : introspection_sources,
    - includes : ['GObject-2.0', 'Gtk-3.0', libpurple_gir[0], talkatu_gir, gplugin_gir, gplugin_gtk_gir],
    + includes : Pidgin_gir_includes,
    namespace : 'Pidgin',
    symbol_prefix : 'pidgin',
    identifier_prefix : 'Pidgin',