changeset
Move the talkatu subproject to a fallback subproject
Mon, 27 Sep 2021 22:48:14 -0500
- author
- Gary Kramlich <grim@reaperworld.com>
- date
- Mon, 27 Sep 2021 22:48:14 -0500
- changeset 41060
- 965750033e86
- parent 41059
- 26cbce8851e5
- child 41062
- b61307e4df4f
Move the talkatu subproject to a fallback subproject
Testing Done:
Deleted the talkatu subproject checkout and then did a clean compile.
Reviewed at https://reviews.imfreedom.org/r/951/
--- a/doc/reference/pidgin/meson.build Mon Sep 27 22:46:03 2021 -0500 +++ b/doc/reference/pidgin/meson.build Mon Sep 27 22:48:14 2021 -0500 @@ -26,7 +26,6 @@ # Extra options to supply to fixxref fixxref_args = [ - '--extra-dir=@0@'.format(talkatu_docpath), '--extra-dir=../libpurple', ]
--- a/meson.build Mon Sep 27 22:46:03 2021 -0500 +++ b/meson.build Mon Sep 27 22:48:14 2021 -0500 @@ -259,33 +259,9 @@ gtk = dependency('gtk+-3.0', version : '>= 3.24.0') libhandy = dependency('libhandy-1', version : '>= 1') - talkatu_dep = dependency('talkatu', version: '>=0.1.0', required : false) - if talkatu_dep.found() - talkatu_docpath = talkatu_dep.get_pkgconfig_variable('prefix') / 'share/gtk-doc/html' - - if enable_introspection - talkatu_gir = 'Talkatu-0.0' - talkatu_include_directories = include_directories( - talkatu_dep.get_pkgconfig_variable('prefix') / 'share/gir-1.0') - else - talkatu_include_directories = [] - endif - else - talkatu_proj = subproject('talkatu', - default_options : [ - 'doc=' + get_option('doc').to_string(), - 'introspection=' + enable_introspection.to_string(), - 'nls=' + get_option('nls').to_string(), - ] - ) - talkatu_dep = talkatu_proj.get_variable('talkatu_dep') - - talkatu_docpath = meson.project_build_root() / 'subprojects/talkatu/talkatu/reference/' - if enable_introspection - talkatu_gir = talkatu_proj.get_variable('talkatu_gir')[0] - endif - talkatu_include_directories = [] - endif + talkatu_dep = dependency('talkatu', + version: '>=0.1.0', + fallback: ['talkatu', 'talkatu_dep']) endif # GTK ENABLE_GTK = get_option('gtkui')
--- a/pidgin/meson.build Mon Sep 27 22:46:03 2021 -0500 +++ b/pidgin/meson.build Mon Sep 27 22:48:14 2021 -0500 @@ -316,7 +316,7 @@ Pidgin_gir_includes = [ 'GObject-2.0', 'Gtk-3.0', 'GPlugin-1.0', 'GPluginGtk-1.0', - talkatu_gir, + 'Talkatu-0.0', # subproject needs to be before libpurple in the repo so that # meson will use our variables and not try to discover them from # libpurple.
