diff options
| author | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2012-01-15 17:40:40 -0600 |
|---|---|---|
| committer | Slávek Banko <slavek.banko@axis.cz> | 2012-06-03 15:53:49 +0200 |
| commit | 0588836c47b8b80e99e74df39db237e09a314cab (patch) | |
| tree | 41901f91657f91db2d4f842e7995418f3b602ddb | |
| parent | 6c64b46075f0493618615817654a46c22ebb1d23 (diff) | |
| download | tdenetwork-0588836c47b8b80e99e74df39db237e09a314cab.tar.gz tdenetwork-0588836c47b8b80e99e74df39db237e09a314cab.zip | |
Fix jabber protocol compilation
This closes Bug 695
(cherry picked from commit 3acd5cf92bcf0e40e98a5735f429f2a0de6a3649)
| -rw-r--r-- | kopete/protocols/jabber/CMakeLists.txt | 2 | ||||
| -rw-r--r-- | kopete/protocols/jabber/jingle/libjingle/talk/base/sigslot.h | 1 | ||||
| -rw-r--r-- | kopete/protocols/jabber/kioslave/CMakeLists.txt | 2 |
3 files changed, 3 insertions, 2 deletions
diff --git a/kopete/protocols/jabber/CMakeLists.txt b/kopete/protocols/jabber/CMakeLists.txt index d3fb6d79..a5e53af2 100644 --- a/kopete/protocols/jabber/CMakeLists.txt +++ b/kopete/protocols/jabber/CMakeLists.txt @@ -80,6 +80,6 @@ tde_add_kpart( kopete_jabber AUTOMOC jabberclient-static kopetejabberui-static iris_jabber-static iris_xmpp_core-static iris_xmpp_im-static iris-static qca-static cutestuff_network-static cutestuff_util-static ${JINGLE_LIBRARIES} - kopete-shared + kopete-shared idn DESTINATION ${PLUGIN_INSTALL_DIR} ) diff --git a/kopete/protocols/jabber/jingle/libjingle/talk/base/sigslot.h b/kopete/protocols/jabber/jingle/libjingle/talk/base/sigslot.h index b621185b..893d6a47 100644 --- a/kopete/protocols/jabber/jingle/libjingle/talk/base/sigslot.h +++ b/kopete/protocols/jabber/jingle/libjingle/talk/base/sigslot.h @@ -80,6 +80,7 @@ #include <set> #include <list> +#include <cstddef> // On our copy of sigslot.h, we force single threading #define SIGSLOT_PURE_ISO diff --git a/kopete/protocols/jabber/kioslave/CMakeLists.txt b/kopete/protocols/jabber/kioslave/CMakeLists.txt index 12fa4173..24b4ce81 100644 --- a/kopete/protocols/jabber/kioslave/CMakeLists.txt +++ b/kopete/protocols/jabber/kioslave/CMakeLists.txt @@ -37,6 +37,6 @@ tde_add_kpart( kio_jabberdisco AUTOMOC LINK jabberclient-static iris_xmpp_core-static iris_xmpp_im-static iris_jabber-static iris-static - qca-static cutestuff_network-static cutestuff_util-static kio-shared + qca-static cutestuff_network-static cutestuff_util-static kio-shared idn DESTINATION ${PLUGIN_INSTALL_DIR} ) |