Sun, 16 Jul 2017 18:55:56 -0500
meson: Link ws2_32 to prpls which need it
Various prpls need to be linked to ws2_32 for htons() and friends.
The automake build achieves this by adding it to LIBADD. This patch
manually adds it to the prpls which need it.
--- a/libpurple/protocols/bonjour/meson.build Tue Jul 18 17:17:18 2017 -0500 +++ b/libpurple/protocols/bonjour/meson.build Sun Jul 16 18:55:56 2017 -0500 @@ -27,10 +27,10 @@ bonjour_prpl = static_library('bonjour', BONJOURSOURCES, c_args : '-DPURPLE_STATIC_PRPL', link_args : bonjour_link_args, - dependencies : [libxml, avahi, libpurple_dep, glib]) + dependencies : [libxml, avahi, libpurple_dep, glib, ws2_32]) elif DYNAMIC_BONJOUR bonjour_prpl = shared_library('bonjour', BONJOURSOURCES, link_args : bonjour_link_args, - dependencies : [libxml, avahi, libpurple_dep, glib], + dependencies : [libxml, avahi, libpurple_dep, glib, ws2_32], install : true, install_dir : PURPLE_PLUGINDIR) endif
--- a/libpurple/protocols/irc/meson.build Tue Jul 18 17:17:18 2017 -0500 +++ b/libpurple/protocols/irc/meson.build Sun Jul 16 18:55:56 2017 -0500 @@ -10,9 +10,9 @@ if STATIC_IRC irc_prpl = static_library('irc', IRCSOURCES, c_args : '-DPURPLE_STATIC_PRPL', - dependencies : [sasl, libpurple_dep, glib, gio]) + dependencies : [sasl, libpurple_dep, glib, gio, ws2_32]) elif DYNAMIC_IRC irc_prpl = shared_library('irc', IRCSOURCES, - dependencies : [sasl, libpurple_dep, glib, gio], + dependencies : [sasl, libpurple_dep, glib, gio, ws2_32], install : true, install_dir : PURPLE_PLUGINDIR) endif
--- a/libpurple/protocols/jabber/meson.build Tue Jul 18 17:17:18 2017 -0500 +++ b/libpurple/protocols/jabber/meson.build Sun Jul 16 18:55:56 2017 -0500 @@ -98,10 +98,10 @@ if STATIC_JABBER jabber_prpl = static_library('jabber', JABBERSOURCES, c_args : '-DPURPLE_STATIC_PRPL', - dependencies : [gstreamer, idn, libxml, sasl, libpurple_dep, glib, gio, math]) + dependencies : [gstreamer, idn, libxml, sasl, libpurple_dep, glib, gio, math, ws2_32]) elif DYNAMIC_JABBER jabber_prpl = shared_library('jabber', JABBERSOURCES, - dependencies : [gstreamer, idn, libxml, sasl, libpurple_dep, glib, gio, math], + dependencies : [gstreamer, idn, libxml, sasl, libpurple_dep, glib, gio, math, ws2_32], install : true, install_dir : PURPLE_PLUGINDIR) endif
--- a/libpurple/protocols/novell/meson.build Tue Jul 18 17:17:18 2017 -0500 +++ b/libpurple/protocols/novell/meson.build Sun Jul 16 18:55:56 2017 -0500 @@ -26,9 +26,9 @@ if STATIC_NOVELL novell_prpl = static_library('novell', NOVELLSOURCES, c_args : '-DPURPLE_STATIC_PRPL', - dependencies : [libpurple_dep, glib]) + dependencies : [libpurple_dep, glib, ws2_32]) elif DYNAMIC_NOVELL novell_prpl = shared_library('novell', NOVELLSOURCES, - dependencies : [libpurple_dep, glib], + dependencies : [libpurple_dep, glib, ws2_32], install : true, install_dir : PURPLE_PLUGINDIR) endif
--- a/libpurple/protocols/oscar/meson.build Tue Jul 18 17:17:18 2017 -0500 +++ b/libpurple/protocols/oscar/meson.build Sun Jul 16 18:55:56 2017 -0500 @@ -50,10 +50,10 @@ if STATIC_OSCAR oscar_prpl = static_library('oscar', OSCARSOURCES, c_args : '-DPURPLE_STATIC_PRPL', - dependencies : [libpurple_dep, glib]) + dependencies : [libpurple_dep, glib, ws2_32]) elif DYNAMIC_OSCAR oscar_prpl = shared_library('oscar', OSCARSOURCES, - dependencies : [libpurple_dep, glib], + dependencies : [libpurple_dep, glib, ws2_32], install : true, install_dir : PURPLE_PLUGINDIR) endif
--- a/libpurple/protocols/simple/meson.build Tue Jul 18 17:17:18 2017 -0500 +++ b/libpurple/protocols/simple/meson.build Sun Jul 16 18:55:56 2017 -0500 @@ -10,9 +10,9 @@ if STATIC_SIMPLE simple_prpl = static_library('simple', SIMPLESOURCES, c_args : '-DPURPLE_STATIC_PRPL', - dependencies : [libpurple_dep, nettle, glib, gio]) + dependencies : [libpurple_dep, nettle, glib, gio, ws2_32]) elif DYNAMIC_SIMPLE simple_prpl = shared_library('simple', SIMPLESOURCES, - dependencies : [libpurple_dep, nettle, glib, gio], + dependencies : [libpurple_dep, nettle, glib, gio, ws2_32], install : true, install_dir : PURPLE_PLUGINDIR) endif