# HG changeset patch # User Elliott Sales de Andrade # Date 1549522239 18000 # Node ID 2e4f09a49404e1c03eab874e9a4791fb719a3d83 # Parent c86fffd8efd9bb2a808c70dea083eb9326f0efb8 Add fallback for gplugin. diff -r c86fffd8efd9 -r 2e4f09a49404 finch/meson.build --- a/finch/meson.build Thu Feb 07 01:21:47 2019 -0500 +++ b/finch/meson.build Thu Feb 07 01:50:39 2019 -0500 @@ -199,7 +199,7 @@ nsversion : '@0@.@1@'.format(purple_major_version, purple_minor_version), include_directories : [ - include_directories(join_paths(gplugin.get_pkgconfig_variable('prefix'), 'share/gir-1.0')), + gplugin_include_directories, ], install : true, extra_args : ['--quiet']) diff -r c86fffd8efd9 -r 2e4f09a49404 libpurple/meson.build --- a/libpurple/meson.build Thu Feb 07 01:21:47 2019 -0500 +++ b/libpurple/meson.build Thu Feb 07 01:50:39 2019 -0500 @@ -262,7 +262,7 @@ install : true, version : PURPLE_LIB_VERSION, dependencies : # static_link_libs - [dnsapi, ws2_32, glib, gio, gplugin, libxml, + [dnsapi, ws2_32, glib, gio, gplugin_dep, libxml, farstream, gstreamer, gstreamer_video, gstreamer_app, json, math]) @@ -271,7 +271,7 @@ sources : [purple_builtheaders], include_directories : [toplevel_inc, libpurple_inc], link_with : libpurple, - dependencies : [gstreamer, gplugin, glib, gio]) + dependencies : [gstreamer, gplugin_dep, glib, gio]) install_headers(purple_coreheaders, subdir : purple_include_base) @@ -294,7 +294,7 @@ introspection_sources = (purple_coreheaders + purple_builtheaders + purple_mediaheaders) - Purple_gir_includes = ['GObject-2.0', 'Gio-2.0', 'GPlugin-0.0'] + Purple_gir_includes = ['GObject-2.0', 'Gio-2.0', gplugin_gir] if enable_gst Purple_gir_includes += ['Gst-1.0'] endif @@ -309,7 +309,7 @@ nsversion : '@0@.@1@'.format(purple_major_version, purple_minor_version), include_directories : [ - include_directories(join_paths(gplugin.get_pkgconfig_variable('prefix'), 'share/gir-1.0')), + gplugin_include_directories, ], install : true, extra_args : ['--quiet']) diff -r c86fffd8efd9 -r 2e4f09a49404 meson.build --- a/meson.build Thu Feb 07 01:21:47 2019 -0500 +++ b/meson.build Thu Feb 07 01:50:39 2019 -0500 @@ -759,7 +759,18 @@ ####################################################################### # Check for GPlugin 0.28.0 ####################################################################### -gplugin = dependency('gplugin', version : '>= 0.28.0') +gplugin_dep = dependency('gplugin', version : '>= 0.28.0', required : false) +if gplugin_dep.found() + gplugin_gir = 'GPlugin-0.0' + gplugin_include_directories = include_directories( + join_paths(gplugin_dep.get_pkgconfig_variable('prefix'), + 'share/gir-1.0')) +else + gplugin_proj = subproject('gplugin') + gplugin_dep = gplugin_proj.get_variable('gplugin_dep') + gplugin_gir = gplugin_proj.get_variable('gplugin_gir')[0] + gplugin_include_directories = [] +endif ####################################################################### # Check for GObject Introspection diff -r c86fffd8efd9 -r 2e4f09a49404 pidgin/meson.build --- a/pidgin/meson.build Thu Feb 07 01:21:47 2019 -0500 +++ b/pidgin/meson.build Thu Feb 07 01:50:39 2019 -0500 @@ -233,7 +233,7 @@ nsversion : '@0@.@1@'.format(purple_major_version, purple_minor_version), include_directories : [ - include_directories(join_paths(gplugin.get_pkgconfig_variable('prefix'), 'share/gir-1.0')), + gplugin_include_directories, include_directories(join_paths(talkatu.get_pkgconfig_variable('prefix'), 'share/gir-1.0')), ], install : true, diff -r c86fffd8efd9 -r 2e4f09a49404 subprojects/gplugin.wrap --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/subprojects/gplugin.wrap Thu Feb 07 01:50:39 2019 -0500 @@ -0,0 +1,4 @@ +[wrap-hg] +directory = gplugin +url = https://bitbucket.com/gplugin/gplugin +revision = default