diff options
| author | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2011-11-30 11:31:35 -0600 |
|---|---|---|
| committer | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2011-11-30 11:31:35 -0600 |
| commit | a46db2a2d768b06acb462858c8925c411f8616ee (patch) | |
| tree | a23959ecbf1802c15c204257f17f855c27b9f232 /redhat/kdenetwork/kdenetwork-3.5.13-kopete_jabber_protocol.patch | |
| parent | 68d88671e2193517a9087ffdf326b81068dfee6a (diff) | |
| parent | 184f44c7e7a1039bb209e3c6a5abd079bcae8e98 (diff) | |
| download | tde-packaging-a46db2a2d768b06acb462858c8925c411f8616ee.tar.gz tde-packaging-a46db2a2d768b06acb462858c8925c411f8616ee.zip | |
Merge branch 'master' of http://scm.trinitydesktop.org/scm/git/tde-packaging
Diffstat (limited to 'redhat/kdenetwork/kdenetwork-3.5.13-kopete_jabber_protocol.patch')
| -rw-r--r-- | redhat/kdenetwork/kdenetwork-3.5.13-kopete_jabber_protocol.patch | 30 |
1 files changed, 30 insertions, 0 deletions
diff --git a/redhat/kdenetwork/kdenetwork-3.5.13-kopete_jabber_protocol.patch b/redhat/kdenetwork/kdenetwork-3.5.13-kopete_jabber_protocol.patch new file mode 100644 index 000000000..a01c8ab81 --- /dev/null +++ b/redhat/kdenetwork/kdenetwork-3.5.13-kopete_jabber_protocol.patch @@ -0,0 +1,30 @@ +--- kdenetwork/kopete/protocols/jabber/jingle/libjingle/talk/base/sigslot.h.ORI 2011-11-27 05:38:43.500726484 -0500 ++++ kdenetwork/kopete/protocols/jabber/jingle/libjingle/talk/base/sigslot.h 2011-11-27 05:39:19.901925857 -0500 +@@ -80,6 +80,7 @@ + + #include <set> + #include <list> ++#include <cstddef> + + // On our copy of sigslot.h, we force single threading + #define SIGSLOT_PURE_ISO +--- kdenetwork/kopete/protocols/jabber/CMakeLists.txt.ORI 2011-11-27 05:55:08.369780670 -0500 ++++ kdenetwork/kopete/protocols/jabber/CMakeLists.txt 2011-11-27 05:55:12.350662883 -0500 +@@ -80,6 +80,6 @@ + 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} + ) +--- kdenetwork/kopete/protocols/jabber/kioslave/CMakeLists.txt.ORI 2011-11-27 06:01:44.412062605 -0500 ++++ kdenetwork/kopete/protocols/jabber/kioslave/CMakeLists.txt 2011-11-27 06:01:56.658700254 -0500 +@@ -37,6 +37,6 @@ + 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} + ) |