pidgin/pidgin

Various build fixes:

2018-03-01, Shawn Napora
5b861179cad9
Parents 3cbcbdb00e29
Children 4c5211ba7880
Various build fixes:
* Included required libraries for functions used in various files
* Created dbus_codegen_dep in meson build to generate dbus_types.h and other files prior to using them
* Added dbus_codegen_dep where code depends on generated files
* Created package_revision_dep to build package_revision.h for gtkdialogs.c
9 files changed, 20 insertions(+), 6 deletions(-)
  • +1 -0
    finch/libgnt/test/combo.c
  • +1 -0
    finch/libgnt/test/keys.c
  • +3 -0
    finch/libgnt/test/tv.c
  • +7 -3
    libpurple/meson.build
  • +1 -1
    libpurple/plugins/meson.build
  • +1 -1
    libpurple/tests/meson.build
  • +3 -0
    meson.build
  • +2 -0
    pidgin/meson.build
  • +1 -1
    pidgin/plugins/musicmessaging/meson.build
    • --- a/finch/libgnt/test/combo.c Thu Feb 22 22:41:59 2018 -0600
    +++ b/finch/libgnt/test/combo.c Thu Mar 01 08:27:47 2018 -0500
    @@ -4,6 +4,7 @@
    #include <gntcheckbox.h>
    #include <gntcombobox.h>
    #include <gntentry.h>
    +#include <gntfilesel.h>
    #include <gntlabel.h>
    #include <gntslider.h>
    --- a/finch/libgnt/test/keys.c Thu Feb 22 22:41:59 2018 -0600
    +++ b/finch/libgnt/test/keys.c Thu Mar 01 08:27:47 2018 -0500
    @@ -1,3 +1,4 @@
    +#include <string.h>
    #include <gnt.h>
    #include <gntbox.h>
    #include <gntentry.h>
    --- a/finch/libgnt/test/tv.c Thu Feb 22 22:41:59 2018 -0600
    +++ b/finch/libgnt/test/tv.c Thu Mar 01 08:27:47 2018 -0500
    @@ -1,3 +1,6 @@
    +#include <stdlib.h>
    +#include <string.h>
    +#include <unistd.h>
    #include "gntbutton.h"
    #include "gnt.h"
    #include "gntkeys.h"
    --- a/libpurple/meson.build Thu Feb 22 22:41:59 2018 -0600
    +++ b/libpurple/meson.build Thu Mar 01 08:27:47 2018 -0500
    @@ -386,6 +386,9 @@
    endif
    +dbus_codegen_dep = declare_dependency(
    + sources : [dbus_builtsources, dbus_builtheaders])
    +
    libpurple_inc = include_directories('.')
    libpurple = library('purple',
    purple_coresources + purple_builtsources +
    @@ -395,9 +398,10 @@
    install : true,
    version : PURPLE_LIB_VERSION,
    dependencies : # static_link_libs
    - [dbus, dbus_glib, dnsapi, ws2_32, glib, gio, gplugin, libxml,
    - farstream, gstreamer, gstreamer_video,
    - gstreamer_app, idn, json, math])
    + [dbus, dbus_codegen_dep, dbus_glib, dnsapi, ws2_32,
    + glib, gio, gplugin, libxml, farstream, gstreamer,
    + gstreamer_video, gstreamer_app, idn, json, math])
    +
    libpurple_dep = declare_dependency(
    sources : purple_builtheaders, # Ensure built before any dependencies.
    include_directories : [toplevel_inc, libpurple_inc],
    --- a/libpurple/plugins/meson.build Thu Feb 22 22:41:59 2018 -0600
    +++ b/libpurple/plugins/meson.build Thu Mar 01 08:27:47 2018 -0500
    @@ -82,7 +82,7 @@
    '--export-only', '-o', '@OUTPUT@', '@INPUT@'])
    dbus_example = library('dbus-example', 'dbus-example.c', dbus_example_bindings_c,
    - dependencies : [libpurple_dep, dbus],
    + dependencies : [libpurple_dep, dbus_codegen_dep, dbus],
    name_prefix : '')
    endif # enable_dbus
    endif # PLUGINS
    --- a/libpurple/tests/meson.build Thu Feb 22 22:41:59 2018 -0600
    +++ b/libpurple/tests/meson.build Thu Mar 01 08:27:47 2018 -0500
    @@ -25,7 +25,7 @@
    c_args : [
    '-DTEST_DATA_DIR="@0@/data"'.format(meson.current_source_dir())
    ],
    - dependencies : [libpurple_dep, glib, dbus, dbus_glib],
    + dependencies : [libpurple_dep, dbus_codegen_dep, glib, dbus, dbus_glib],
    link_with: test_ui,
    )
    test(prog, e)
    --- a/meson.build Thu Feb 22 22:41:59 2018 -0600
    +++ b/meson.build Thu Mar 01 08:27:47 2018 -0500
    @@ -101,6 +101,9 @@
    input : 'package_revision.h.in',
    output : 'package_revision.h',
    fallback : meson.project_version())
    +
    +package_revision_dep = declare_dependency(
    + sources: package_revision)
    # For man pages.
    man_conf.set('VERSION', purple_display_version)
    --- a/pidgin/meson.build Thu Feb 22 22:41:59 2018 -0600
    +++ b/pidgin/meson.build Thu Mar 01 08:27:47 2018 -0500
    @@ -166,6 +166,8 @@
    webkit,
    x11,
    libpurple_dep,
    + package_revision_dep,
    + dbus_codegen_dep,
    ],
    install : true)
    libpidgin_dep = declare_dependency(
    --- a/pidgin/plugins/musicmessaging/meson.build Thu Feb 22 22:41:59 2018 -0600
    +++ b/pidgin/plugins/musicmessaging/meson.build Thu Mar 01 08:27:47 2018 -0500
    @@ -8,7 +8,7 @@
    output : 'music-messaging-bindings.ch')
    musicmessaging = library('musicmessaging', 'musicmessaging.c', music_messaging_bindings,
    - dependencies : [dbus, libpurple_dep, libpidgin_dep, glib],
    + dependencies : [dbus, dbus_codegen_dep, libpurple_dep, libpidgin_dep, glib],
    name_prefix : '',
    install : true, install_dir : PIDGIN_PLUGINDIR)
    endif