Mercurial > pidgin3 / changeset

--- a/bitbucket-pipelines.yml	Thu Feb 07 01:50:39 2019 -0500
+++ b/bitbucket-pipelines.yml	Thu Feb 07 01:57:11 2019 -0500
@@ -5,10 +5,6 @@
     - 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

--- a/meson.build	Thu Feb 07 01:50:39 2019 -0500
+++ b/meson.build	Thu Feb 07 01:57:11 2019 -0500
@@ -299,7 +299,19 @@
 	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

--- a/pidgin/meson.build	Thu Feb 07 01:50:39 2019 -0500
+++ b/pidgin/meson.build	Thu Feb 07 01:57:11 2019 -0500
@@ -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',
@@ -234,7 +234,7 @@
 		                                 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'])

--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/subprojects/talkatu.wrap	Thu Feb 07 01:57:11 2019 -0500
@@ -0,0 +1,4 @@
+[wrap-hg]
+directory = talkatu
+url = https://bitbucket.com/pidgin/talkatu
+revision = default