--- 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 = [] @@ -203,10 +204,38 @@
version : PURPLE_LIB_VERSION,
dependencies : [libpurple_dep, libgnt_dep, ncurses, glib, winmm],
+ if enable_introspection + introspection_sources = libfinch_headers + # subproject needs to be before libpurple in the repo so that + # meson will use our variables and not try to discover them from + libfinch_gir = gnome.generate_gir(libfinch, + sources : introspection_sources, + includes : Finch_gir_includes, + symbol_prefix : 'finch', + identifier_prefix : 'Finch', + export_packages : 'finch', + nsversion : '@0@.@1@'.format(purple_major_version, + dependencies: [libgnt_dep, gplugin_dep], + extra_args : ['-DFINCH_COMPILATION', '--quiet']) + libfinch_generated_sources += libfinch_gir libfinch_dep = declare_dependency(
include_directories : [toplevel_inc, libfinch_inc],
- 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
- # subproject needs to be before libpurple in the repo so that
- # meson will use our variables and not try to discover them from
- gnome.generate_gir(libfinch,
- sources : introspection_sources,
- includes : Finch_gir_includes,
- symbol_prefix : 'finch',
- identifier_prefix : 'Finch',
- export_packages : 'finch',
- nsversion : '@0@.@1@'.format(purple_major_version,
- extra_args : ['-DFINCH_COMPILATION', '--quiet'])
--- 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 @@
+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],
- 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)
description : 'libpurple is a GLib-based instant messenger library.',
@@ -332,9 +323,22 @@
export_packages : purple_filebase,
nsversion : '@0@.@1@'.format(purple_major_version,
- dependencies: [ gplugin_dep ],
+ dependencies: [gplugin_dep], extra_args : ['-DPURPLE_COMPILATION', '--quiet'])
+ purple_generated_sources += libpurple_gir +libpurple_dep = declare_dependency( + # Ensure purple headers built before any dependencies: + sources : [purple_builtheaders] + purple_generated_sources, + include_directories : [toplevel_inc, libpurple_inc], + dependencies : [gstreamer, gplugin_dep, glib, gio]) +if meson.version().version_compare('>=0.54.0') + meson.override_dependency(purple_filebase, libpurple_dep) 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 @@
#######################################################################
gplugin_dep = dependency('gplugin',
- version : ['>=0.33.0', '<0.34.0'],
+ version : ['>=0.34.1', '<0.35.0'], fallback : ['gplugin', 'gplugin_dep'])
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'])
--- 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,
- include_directories : [
- talkatu_include_directories,
+ dependencies : [gplugin_dep, gplugin_gtk_dep, talkatu_dep], extra_args : ['-DPIDGIN_COMPILATION', '--quiet'])
--- 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 @@
url = https://keep.imfreedom.org/gplugin/gplugin