diff options
| -rw-r--r-- | bitbucket-pipelines.yml | 4 | ||||
| -rw-r--r-- | meson.build | 14 | ||||
| -rw-r--r-- | pidgin/meson.build | 6 | ||||
| -rw-r--r-- | subprojects/talkatu.wrap | 4 |
4 files changed, 20 insertions, 8 deletions
diff --git a/bitbucket-pipelines.yml b/bitbucket-pipelines.yml index 56e0e93015..31013da540 100644 --- a/bitbucket-pipelines.yml +++ b/bitbucket-pipelines.yml @@ -5,10 +5,6 @@ pipelines: - step: script: - set -ex - - hg clone https://bitbucket.org/pidgin/talkatu - - meson -Dprefix=/usr talkatu talkatu/build - - ninja -C talkatu/build install - - ldconfig - meson -Dsilc=false -Ddoc=true -Dconsole-logging=true build-pipelines - ninja -C build-pipelines - ninja -C build-pipelines test diff --git a/meson.build b/meson.build index ad281c741a..a540dff1e3 100644 --- a/meson.build +++ b/meson.build @@ -299,7 +299,19 @@ if get_option('gtkui') 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') + 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 diff --git a/pidgin/meson.build b/pidgin/meson.build index d81bc52aea..39e86e2f65 100644 --- a/pidgin/meson.build +++ b/pidgin/meson.build @@ -165,7 +165,7 @@ if ENABLE_GTK IOKIT, json, math, - talkatu, + talkatu_dep, webkit, x11, libpurple_dep, @@ -225,7 +225,7 @@ if ENABLE_GTK 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', @@ -234,7 +234,7 @@ if ENABLE_GTK purple_minor_version), include_directories : [ gplugin_include_directories, - include_directories(join_paths(talkatu.get_pkgconfig_variable('prefix'), 'share/gir-1.0')), + talkatu_include_directories, ], install : true, extra_args : ['--quiet']) diff --git a/subprojects/talkatu.wrap b/subprojects/talkatu.wrap new file mode 100644 index 0000000000..04edfc82ba --- /dev/null +++ b/subprojects/talkatu.wrap @@ -0,0 +1,4 @@ +[wrap-hg] +directory = talkatu +url = https://bitbucket.com/pidgin/talkatu +revision = default |