Merged in default (pull request #465)

Flip dependencies to use fallbacks

Approved-by: Gary Kramlich

7 files changed, 59 insertions, 19 deletions

diff --git a/bitbucket-pipelines.yml b/bitbucket-pipelines.yml
index ba16058693..31013da540 100644
--- a/bitbucket-pipelines.yml
+++ b/bitbucket-pipelines.yml
@@ -5,13 +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
-          - 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
diff --git a/finch/meson.build b/finch/meson.build
index 6f6d36223c..74c38f6c8f 100644
--- a/finch/meson.build
+++ b/finch/meson.build
@@ -4,7 +4,11 @@ if get_option('consoleui')
 	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 @@ if enable_consoleui
 		    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 --git a/libpurple/meson.build b/libpurple/meson.build
index a8a73b455b..dd9ff47e85 100644
--- a/libpurple/meson.build
+++ b/libpurple/meson.build
@@ -262,7 +262,7 @@ libpurple = library('purple',
                     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 @@ libpurple_dep = declare_dependency(
     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 @@ if enable_introspection
 	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 @@ if enable_introspection
 	    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 --git a/meson.build b/meson.build
index 8420b72a46..2fec6691ec 100644
--- a/meson.build
+++ b/meson.build
@@ -299,7 +299,25 @@ 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',
+		    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 @@ endif
 #######################################################################
 # 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
diff --git a/pidgin/meson.build b/pidgin/meson.build
index d9ef6f5fdb..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',
@@ -233,8 +233,8 @@ if ENABLE_GTK
 		    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'])
diff --git a/subprojects/gplugin.wrap b/subprojects/gplugin.wrap
new file mode 100644
index 0000000000..802afbaff9
--- /dev/null
+++ b/subprojects/gplugin.wrap
@@ -0,0 +1,4 @@
+[wrap-hg]
+directory = gplugin
+url = https://bitbucket.com/gplugin/gplugin
+revision = default
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