diff options
| -rw-r--r-- | finch/meson.build | 56 | ||||
| -rw-r--r-- | libpurple/meson.build | 28 | ||||
| -rw-r--r-- | meson.build | 4 | ||||
| -rw-r--r-- | pidgin/meson.build | 4 | ||||
| -rw-r--r-- | subprojects/gplugin.wrap | 2 |
5 files changed, 50 insertions, 44 deletions
diff --git a/finch/meson.build b/finch/meson.build index 0877682042..508e7aa8e2 100644 --- a/finch/meson.build +++ b/finch/meson.build @@ -151,6 +151,7 @@ libfinch_enum_headers = [ # the built lists are append to below libfinch_built_sources = [] libfinch_built_headers = [] +libfinch_generated_sources = [] finch_SOURCES = [ 'finch.c' @@ -203,31 +204,6 @@ if enable_consoleui version : PURPLE_LIB_VERSION, dependencies : [libpurple_dep, libgnt_dep, ncurses, glib, winmm], install : true) - libfinch_dep = declare_dependency( - include_directories : [toplevel_inc, libfinch_inc], - link_with : libfinch, - sources: libfinch_built_headers, - dependencies : [libpurple_dep, libgnt_dep, glib]) - - finch = executable('finch3', - finch_SOURCES, - c_args : ['-DSTANDALONE', '-DGNTSEAL_ENABLE'], - dependencies : [libpurple_dep, libgnt_dep, libfinch_dep], - install : true) - - if meson.version().version_compare('>=0.54.0') - meson.override_dependency('finch-3', libfinch_dep) - endif - - pkgconfig.generate( - name : 'Finch', - description : 'Finch is an instant messenger application that uses libpurple for protocol support and ncurses (libgnt) for the UI.', - version : meson.project_version(), - filebase : 'finch-3', - subdirs : 'finch-3', - libraries : [libfinch], - requires : ['gnt', 'purple-3'], - variables : ['plugindir=${libdir}/finch-@0@'.format(purple_major_version)]) if enable_introspection introspection_sources = libfinch_headers @@ -241,7 +217,7 @@ if enable_consoleui libpurple_gir[0], ] - gnome.generate_gir(libfinch, + libfinch_gir = gnome.generate_gir(libfinch, sources : introspection_sources, includes : Finch_gir_includes, namespace : 'Finch', @@ -251,8 +227,36 @@ if enable_consoleui 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 + libfinch_generated_sources, + dependencies : [libpurple_dep, libgnt_dep, glib]) + + finch = executable('finch3', + finch_SOURCES, + c_args : ['-DSTANDALONE', '-DGNTSEAL_ENABLE'], + dependencies : [libpurple_dep, libgnt_dep, libfinch_dep], + install : true) + + if meson.version().version_compare('>=0.54.0') + meson.override_dependency('finch-3', libfinch_dep) + endif + + pkgconfig.generate( + name : 'Finch', + description : 'Finch is an instant messenger application that uses libpurple for protocol support and ncurses (libgnt) for the UI.', + version : meson.project_version(), + filebase : 'finch-3', + subdirs : 'finch-3', + libraries : [libfinch], + requires : ['gnt', 'purple-3'], + variables : ['plugindir=${libdir}/finch-@0@'.format(purple_major_version)]) + subdir('plugins') endif # enable_consoleui diff --git a/libpurple/meson.build b/libpurple/meson.build index c0139ca7d3..ff4b2f0504 100644 --- a/libpurple/meson.build +++ b/libpurple/meson.build @@ -188,6 +188,8 @@ purple_coreheaders = [ 'xmlnode.h', ] +purple_generated_sources = [] + purple_filebase = 'purple-@0@'.format(purple_major_version) purple_include_base = purple_filebase / 'libpurple' @@ -289,23 +291,12 @@ libpurple = library('purple', 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 @@ if enable_introspection 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' diff --git a/meson.build b/meson.build index c07e42a2f8..cfaa3b0ca7 100644 --- a/meson.build +++ b/meson.build @@ -571,12 +571,12 @@ endif # 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 diff --git a/pidgin/meson.build b/pidgin/meson.build index e11080321a..edc087adac 100644 --- a/pidgin/meson.build +++ b/pidgin/meson.build @@ -332,9 +332,7 @@ if ENABLE_GTK 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 diff --git a/subprojects/gplugin.wrap b/subprojects/gplugin.wrap index 898476fff7..9c3448419d 100644 --- a/subprojects/gplugin.wrap +++ b/subprojects/gplugin.wrap @@ -1,4 +1,4 @@ [wrap-hg] directory = gplugin url = https://keep.imfreedom.org/gplugin/gplugin -revision = v0.33.0 +revision = v0.34.1 |