Mercurial > pidgin3 / changeset

--- a/libpurple/meson.build	Thu Jun 15 19:59:02 2017 -0400
+++ b/libpurple/meson.build	Thu Jun 15 20:29:26 2017 -0400
@@ -14,13 +14,9 @@
 	'ciphers/aescipher.c',
 	'ciphers/descipher.c',
 	'ciphers/des3cipher.c',
-	'ciphers/hmaccipher.c',
 	'ciphers/md4hash.c',
-	'ciphers/md5hash.c',
 	'ciphers/pbkdf2cipher.c',
 	'ciphers/rc4cipher.c',
-	'ciphers/sha1hash.c',
-	'ciphers/sha256hash.c',
 	'cipher.c',
 	'circularbuffer.c',
 	'cmds.c',
@@ -53,7 +49,6 @@
 	'mime.c',
 	'nat-pmp.c',
 	'network.c',
-	'ntlm.c',
 	'notify.c',
 	'plugins.c',
 	'pluginpref.c',
@@ -135,7 +130,6 @@
 	'nat-pmp.h',
 	'network.h',
 	'notify.h',
-	'ntlm.h',
 	'plugins.h',
 	'pluginpref.h',
 	'pounce.h',
@@ -184,7 +178,6 @@
 
 if IS_WIN32
 	purple_coresources += [
-		'win32/giowin32.c',
 		'win32/libc_interface.c',
 		'win32/win32dep.c'
 	]
@@ -211,13 +204,9 @@
 	'ciphers/aescipher.h',
 	'ciphers/descipher.h',
 	'ciphers/des3cipher.h',
-	'ciphers/hmaccipher.h',
 	'ciphers/md4hash.h',
-	'ciphers/md5hash.h',
 	'ciphers/pbkdf2cipher.h',
 	'ciphers/rc4cipher.h',
-	'ciphers/sha1hash.h',
-	'ciphers/sha256hash.h'
 ]
 
 purple_enumheaders = [

--- a/libpurple/protocols/simple/meson.build	Thu Jun 15 19:59:02 2017 -0400
+++ b/libpurple/protocols/simple/meson.build	Thu Jun 15 20:29:26 2017 -0400
@@ -1,4 +1,6 @@
 SIMPLESOURCES = [
+	'ntlm.c',
+	'ntlm.h',
 	'simple.c',
 	'simple.h',
 	'sipmsg.c',

--- a/libpurple/tests/meson.build	Thu Jun 15 19:59:02 2017 -0400
+++ b/libpurple/tests/meson.build	Thu Jun 15 20:29:26 2017 -0400
@@ -1,5 +1,8 @@
-foreach prog : ['des', 'des3', 'hmac', 'md4', 'md5', 'sha1', 'sha256', 'trie', 'util', 'xmlnode']
+foreach prog : ['des', 'des3', 'image', 'md4', 'smiley', 'smiley_list', 'trie', 'util', 'xmlnode']
 	e = executable('test_' + prog, 'test_@0@.c'.format(prog),
+	               c_args : [
+	                   '-DTEST_DATA_DIR="@0@/data"'.format(meson.current_source_dir())
+	               ],
 	               dependencies : [libpurple_dep, glib])
 	test(prog, e)
 endforeach