XMPP Patches

--nextPart2586198.yg4HMCqrXd
Content-Transfer-Encoding: 7Bit
Content-Type: text/plain; charset="us-ascii"

Hi,
My mail to kde.org keeps getting bounced, but I would like to have this on 
record anyway. I found some issues with Jabber in kopetes build scripts. Im 
including the patches to fix them.

find_qjson.diff: Xmpp was missing a required dependency in its build script - I 
added it.

disable-libjingle: Unfortunately fixing the xmpp issue also enabled libjingle, 
which caused the compiler to error out, so I set the default to disabled.

XMPP Now builds! Vive open chat protocols!


--nextPart2586198.yg4HMCqrXd
Content-Disposition: attachment; filename="disable-libjingle.diff"
Content-Transfer-Encoding: 7Bit
Content-Type: text/x-patch; charset="UTF-8"; name="disable-libjingle.diff"

--- a/protocols/CMakeLists.txt
+++ b/protocols/CMakeLists.txt
@@ -7,7 +7,7 @@
 option(WITH_winpopup "Enable Kopete winpopup protocol" ON)
 option(WITH_gadu "Enable Kopete Gadu-Gadu protocol" ON)
 option(WITH_jabber "Enable Kopete Jabber protocol" ON)
-option(WITH_libjingle "Enable Kopete Jabber libjingle support" ON)
+option(WITH_libjingle "Enable Kopete Jabber libjingle support" OFF)
 option(WITH_bonjour "Enable Kopete Bonjour protocol" ON)
 option(WITH_wlm "Enable Window Live Messenger support" ON)
 option(WITH_WLM_MEDIASTREAMER "Enable Windows Live Messenger voice clip support" ON)

--nextPart2586198.yg4HMCqrXd
Content-Disposition: attachment; filename="find_qjson.diff"
Content-Transfer-Encoding: 7Bit
Content-Type: text/x-patch; charset="UTF-8"; name="find_qjson.diff"

--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -145,6 +145,8 @@
 find_package(Xmms QUIET)
 set_package_properties(Xmms PROPERTIES DESCRIPTION "X Multimedia System development libraries" URL "http://www.xmms.org/" TYPE OPTIONAL PURPOSE "Required for the Nowlistening plugin with XMMS player support")
 
+find_package(QJSON QUIET)
+
 find_package(ZLIB QUIET)
 set_package_properties(ZLIB PROPERTIES DESCRIPTION "Zlib is a library implementing the deflate compression method" URL "http://zlib.net/" TYPE OPTIONAL PURPOSE "Required for the GroupWise and Jabber protocols")
 

--nextPart2586198.yg4HMCqrXd--