Tue, 04 Sep 2018 04:15:33 +0000
Merged in rw_grim/pidgin (pull request #386)
Add talkatu as a requirement for the build
Approved-by: Elliott Sales de Andrade <quantum.analyst@gmail.com>
--- a/bitbucket-pipelines.yml Mon Sep 03 23:12:00 2018 -0500 +++ b/bitbucket-pipelines.yml Tue Sep 04 04:15:33 2018 +0000 @@ -5,9 +5,13 @@ - step: script: - set -ex - - meson -Dsilc=false -Ddoc=true -Ddebug=true build - - ninja -C build - - ninja -C build test + - hg clone https://bitbucket.org/pidgin/talkatu + - meson -Dprefix=/usr talkatu talkatu/build + - ninja -C talkatu/build install + - ldconfig + - meson -Dsilc=false -Ddoc=true -Ddebug=true build-pipelines + - ninja -C build-pipelines + - ninja -C build-pipelines test branches: release-2.x.y: - step:
--- a/meson.build Mon Sep 03 23:12:00 2018 -0500 +++ b/meson.build Tue Sep 04 04:15:33 2018 +0000 @@ -307,6 +307,7 @@ conf.set('HAVE_PANGO14', pango.found()) webkit = dependency('webkitgtk-3.0', version : '>= 1.3.7') + talkatu = dependency('talkatu', version: '>=0.1.0') ####################################################################### # Check if we should compile with enchant support
--- a/pidgin/meson.build Mon Sep 03 23:12:00 2018 -0500 +++ b/pidgin/meson.build Tue Sep 04 04:15:33 2018 +0000 @@ -167,6 +167,7 @@ IOKIT, json, math, + talkatu, webkit, x11, libpurple_dep, @@ -226,7 +227,7 @@ gnome.generate_gir(libpidgin, sources : introspection_sources, - includes : ['GObject-2.0', 'Gtk-3.0', libpurple_gir[0], 'WebKit-3.0'], + includes : ['GObject-2.0', 'Gtk-3.0', libpurple_gir[0], 'WebKit-3.0', 'Talkatu-0.0'], namespace : 'Pidgin', symbol_prefix : 'pidgin', identifier_prefix : 'Pidgin',