changeset
Merged in default (pull request #465)
Fri, 08 Feb 2019 03:10:23 +0000
- author
- Gary Kramlich <grim@reaperworld.com>
- date
- Fri, 08 Feb 2019 03:10:23 +0000
- changeset 39429
- 6c109ae83abf
- parent 39424
- 793f7d43e2f0 (current diff)
- parent 39428
- ef00e03ece89 (diff)
- child 39436
- 026ac0b3708f
Merged in default (pull request #465)
Flip dependencies to use fallbacks
Approved-by: Gary Kramlich
--- a/bitbucket-pipelines.yml Thu Feb 07 05:18:32 2019 -0500 +++ b/bitbucket-pipelines.yml Fri Feb 08 03:10:23 2019 +0000 @@ -5,13 +5,6 @@ - step: script: - set -ex - - hg clone https://bitbucket.org/pidgin/talkatu - - meson -Dprefix=/usr talkatu talkatu/build - - ninja -C talkatu/build install - - hg clone https://bitbucket.org/pidgin/libgnt - - meson -Dprefix=/usr libgnt libgnt/build - - ninja -C libgnt/build install - - ldconfig - meson -Dsilc=false -Ddoc=true -Dconsole-logging=true build-pipelines - ninja -C build-pipelines - ninja -C build-pipelines test
--- a/finch/meson.build Thu Feb 07 05:18:32 2019 -0500 +++ b/finch/meson.build Fri Feb 08 03:10:23 2019 +0000 @@ -4,7 +4,11 @@ if libgnt_dep.found() libgnt_gir = ['Gnt-2.9'] else - libgnt_proj = subproject('libgnt') + libgnt_proj = subproject('libgnt', + default_options : [ + 'introspection=' + get_option('introspection').to_string(), + ] + ) libgnt_dep = libgnt_proj.get_variable('libgnt_dep') libgnt_gir = libgnt_proj.get_variable('libgnt_gir') endif @@ -199,7 +203,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'])
--- a/libpurple/meson.build Thu Feb 07 05:18:32 2019 -0500 +++ b/libpurple/meson.build Fri Feb 08 03:10:23 2019 +0000 @@ -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'])
--- a/meson.build Thu Feb 07 05:18:32 2019 -0500 +++ b/meson.build Fri Feb 08 03:10:23 2019 +0000 @@ -299,7 +299,25 @@ gtk = dependency('gtk+-3.0', version : '>= 3.10.0') webkit = dependency('webkitgtk-3.0', version : '>= 1.3.7') - talkatu = dependency('talkatu', version: '>=0.1.0') + + talkatu_dep = dependency('talkatu', version: '>=0.1.0', required : false) + if talkatu_dep.found() + talkatu_gir = 'Talkatu-0.0' + talkatu_include_directories = include_directories( + join_paths(talkatu_dep.get_pkgconfig_variable('prefix'), + 'share/gir-1.0')) + else + talkatu_proj = subproject('talkatu', + default_options : [ + 'doc=' + get_option('doc').to_string(), + 'gobject-introspection=' + get_option('introspection').to_string(), + 'nls=' + get_option('nls').to_string(), + ] + ) + talkatu_dep = talkatu_proj.get_variable('talkatu_dep') + talkatu_gir = talkatu_proj.get_variable('talkatu_gir')[0] + talkatu_include_directories = [] + endif ####################################################################### # Check if we should compile with enchant support @@ -759,7 +777,24 @@ ####################################################################### # 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', + default_options : [ + 'doc=' + get_option('doc').to_string(), + 'gobject-introspection=' + get_option('introspection').to_string(), + 'nls=' + get_option('nls').to_string(), + ] + ) + 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
--- a/pidgin/meson.build Thu Feb 07 05:18:32 2019 -0500 +++ b/pidgin/meson.build Fri Feb 08 03:10:23 2019 +0000 @@ -165,7 +165,7 @@ IOKIT, json, math, - talkatu, + talkatu_dep, webkit, x11, libpurple_dep, @@ -225,7 +225,7 @@ gnome.generate_gir(libpidgin, sources : introspection_sources, - includes : ['GObject-2.0', 'Gtk-3.0', libpurple_gir[0], 'WebKit-3.0', 'Talkatu-0.0'], + includes : ['GObject-2.0', 'Gtk-3.0', libpurple_gir[0], 'WebKit-3.0', talkatu_gir], namespace : 'Pidgin', symbol_prefix : 'pidgin', identifier_prefix : 'Pidgin', @@ -233,8 +233,8 @@ 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')), - include_directories(join_paths(talkatu.get_pkgconfig_variable('prefix'), 'share/gir-1.0')), + gplugin_include_directories, + talkatu_include_directories, ], install : true, extra_args : ['--quiet'])
