RHEL/Fedora: add kdenetwork patches to build protocols

6 files changed, 177 insertions, 0 deletions

diff --git a/redhat/kdenetwork/kdenetwork-3.5.13-dummy.cpp b/redhat/kdenetwork/kdenetwork-3.5.13-dummy.cpp
new file mode 100644
index 000000000..6edd39faa
--- /dev/null
+++ b/redhat/kdenetwork/kdenetwork-3.5.13-dummy.cpp
@@ -0,0 +1,3 @@
+#include "kdemacros.h"
+extern "C" KDE_EXPORT void *init_libkopete_msn_shared();
+extern "C" KDE_EXPORT void *init_kopete_msn() { return init_libkopete_msn_shared(); }
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}
+ )
diff --git a/redhat/kdenetwork/kdenetwork-3.5.13-kopete_motionawayplugin_ftbfs.patch b/redhat/kdenetwork/kdenetwork-3.5.13-kopete_motionawayplugin_ftbfs.patch
new file mode 100644
index 000000000..a7e39357b
--- /dev/null
+++ b/redhat/kdenetwork/kdenetwork-3.5.13-kopete_motionawayplugin_ftbfs.patch
@@ -0,0 +1,15 @@
+--- kdenetwork/kopete/plugins/motionautoaway/motionawayplugin.cpp.ORI	2011-11-27 13:27:13.236739020 -0500
++++ kdenetwork/kopete/plugins/motionautoaway/motionawayplugin.cpp	2011-11-27 13:28:48.217257573 -0500
+@@ -75,7 +75,12 @@
+ #if LINUX_VERSION_CODE >= KERNEL_VERSION(2,5,50)
+ #define _LINUX_TIME_H
+ #endif
++
++#ifdef HAVE_LIBV4L1_VIDEODEV_H
++#include <libv4l1-videodev.h>
++#else
+ #include <linux/videodev.h>
++#endif
+ 
+ #define DEF_WIDTH			352
+ #define DEF_HEIGHT		288
diff --git a/redhat/kdenetwork/kdenetwork-3.5.13-kopete_msn_protocol.patch b/redhat/kdenetwork/kdenetwork-3.5.13-kopete_msn_protocol.patch
new file mode 100644
index 000000000..160efd367
--- /dev/null
+++ b/redhat/kdenetwork/kdenetwork-3.5.13-kopete_msn_protocol.patch
@@ -0,0 +1,10 @@
+--- kdenetwork/kopete/protocols/msn/CMakeLists.txt.ORI	2011-11-27 05:05:56.814440165 -0500
++++ kdenetwork/kopete/protocols/msn/CMakeLists.txt	2011-11-27 05:10:21.605900492 -0500
+@@ -28,6 +28,7 @@
+   ${CMAKE_BINARY_DIR}
+   ${CMAKE_SOURCE_DIR}/kopete/libkopete
+   ${CMAKE_SOURCE_DIR}/kopete/libkopete/ui
++  ${CMAKE_SOURCE_DIR}/kopete/libkopete/private
+   ${TDE_INCLUDE_DIR}
+   ${TQT_INCLUDE_DIRS}
+ )
diff --git a/redhat/kdenetwork/kdenetwork-3.5.13-kopete_sms_protocol.patch b/redhat/kdenetwork/kdenetwork-3.5.13-kopete_sms_protocol.patch
new file mode 100644
index 000000000..b338236f8
--- /dev/null
+++ b/redhat/kdenetwork/kdenetwork-3.5.13-kopete_sms_protocol.patch
@@ -0,0 +1,11 @@
+--- kdenetwork/kopete/protocols/sms/services/smsclient.cpp.ORI	2011-11-27 05:22:47.001212554 -0500
++++ kdenetwork/kopete/protocols/sms/services/smsclient.cpp	2011-11-27 05:22:58.253085350 -0500
+@@ -67,7 +67,7 @@
+ 		return;
+ 	}
+ 
+-	TQString programName = c->readEntry(TQString("%1:%2").tqarg("SMSClient").tqarg("ProgramName"). TQString());
++	TQString programName = c->readEntry(TQString("%1:%2").tqarg("SMSClient").tqarg("ProgramName"), TQString());
+ 	if (programName.isNull())
+ 		programName = "/usr/bin/sms_client";
+ 
diff --git a/redhat/kdenetwork/kdenetwork-3.5.13-reference_to_qmake_h.patch b/redhat/kdenetwork/kdenetwork-3.5.13-reference_to_qmake_h.patch
new file mode 100644
index 000000000..727b0967f
--- /dev/null
+++ b/redhat/kdenetwork/kdenetwork-3.5.13-reference_to_qmake_h.patch
@@ -0,0 +1,108 @@
+diff -urN /dev/shm/kdenetwork/kopete/protocols/jabber/jingle/libjingle/talk/p2p/client/sessionclient.cc /dev/shm/kdenetwork.new/kopete/protocols/jabber/jingle/libjingle/talk/p2p/client/sessionclient.cc
+--- /dev/shm/kdenetwork/kopete/protocols/jabber/jingle/libjingle/talk/p2p/client/sessionclient.cc	2011-06-21 20:37:08.000000000 -0500
++++ /dev/shm/kdenetwork.new/kopete/protocols/jabber/jingle/libjingle/talk/p2p/client/sessionclient.cc	2011-11-28 18:20:03.852267846 -0600
+@@ -31,7 +31,7 @@
+ #include "talk/p2p/client/sessionclient.h"
+ #include "talk/p2p/base/helpers.h"
+ #include "talk/base/logging.h"
+-#include "talk/xmllite/tqname.h"
++#include "talk/xmllite/qname.h"
+ #include "talk/xmpp/constants.h"
+ #include "talk/xmllite/xmlprinter.h"
+ #include <iostream>
+diff -urN /dev/shm/kdenetwork/kopete/protocols/jabber/jingle/libjingle/talk/session/phone/phonesessionclient.cc /dev/shm/kdenetwork.new/kopete/protocols/jabber/jingle/libjingle/talk/session/phone/phonesessionclient.cc
+--- /dev/shm/kdenetwork/kopete/protocols/jabber/jingle/libjingle/talk/session/phone/phonesessionclient.cc	2011-08-12 15:11:23.000000000 -0500
++++ /dev/shm/kdenetwork.new/kopete/protocols/jabber/jingle/libjingle/talk/session/phone/phonesessionclient.cc	2011-11-28 18:20:03.813268480 -0600
+@@ -30,7 +30,7 @@
+ #include "talk/base/logging.h"
+ #include "talk/session/receiver.h"
+ #include "talk/session/phone/phonesessionclient.h"
+-#include "talk/xmllite/tqname.h"
++#include "talk/xmllite/qname.h"
+ namespace {
+ 
+ const std::string NS_PHONE("http://www.google.com/session/phone");
+diff -urN /dev/shm/kdenetwork/kopete/protocols/jabber/jingle/libjingle/talk/xmllite/qname.cc /dev/shm/kdenetwork.new/kopete/protocols/jabber/jingle/libjingle/talk/xmllite/qname.cc
+--- /dev/shm/kdenetwork/kopete/protocols/jabber/jingle/libjingle/talk/xmllite/qname.cc	2011-06-21 20:37:11.000000000 -0500
++++ /dev/shm/kdenetwork.new/kopete/protocols/jabber/jingle/libjingle/talk/xmllite/qname.cc	2011-11-28 18:20:04.262270904 -0600
+@@ -28,7 +28,7 @@
+ #include <string>
+ #include "talk/base/common.h"
+ #include "talk/xmllite/xmlelement.h"
+-#include "talk/xmllite/tqname.h"
++#include "talk/xmllite/qname.h"
+ #include "talk/xmllite/xmlconstants.h"
+ 
+ //#define new TRACK_NEW
+diff -urN /dev/shm/kdenetwork/kopete/protocols/jabber/jingle/libjingle/talk/xmllite/xmlelement.cc /dev/shm/kdenetwork.new/kopete/protocols/jabber/jingle/libjingle/talk/xmllite/xmlelement.cc
+--- /dev/shm/kdenetwork/kopete/protocols/jabber/jingle/libjingle/talk/xmllite/xmlelement.cc	2011-06-21 20:37:11.000000000 -0500
++++ /dev/shm/kdenetwork.new/kopete/protocols/jabber/jingle/libjingle/talk/xmllite/xmlelement.cc	2011-11-28 18:20:04.268270508 -0600
+@@ -32,7 +32,7 @@
+ 
+ #include "talk/base/common.h"
+ #include "talk/xmllite/xmlelement.h"
+-#include "talk/xmllite/tqname.h"
++#include "talk/xmllite/qname.h"
+ #include "talk/xmllite/xmlparser.h"
+ #include "talk/xmllite/xmlbuilder.h"
+ #include "talk/xmllite/xmlprinter.h"
+diff -urN /dev/shm/kdenetwork/kopete/protocols/jabber/jingle/libjingle/talk/xmllite/xmlelement.h /dev/shm/kdenetwork.new/kopete/protocols/jabber/jingle/libjingle/talk/xmllite/xmlelement.h
+--- /dev/shm/kdenetwork/kopete/protocols/jabber/jingle/libjingle/talk/xmllite/xmlelement.h	2011-06-21 20:37:11.000000000 -0500
++++ /dev/shm/kdenetwork.new/kopete/protocols/jabber/jingle/libjingle/talk/xmllite/xmlelement.h	2011-11-28 18:20:04.288018707 -0600
+@@ -31,7 +31,7 @@
+ #include <iosfwd>
+ #include <string>
+ #include "talk/base/scoped_ptr.h"
+-#include "talk/xmllite/tqname.h"
++#include "talk/xmllite/qname.h"
+ 
+ namespace buzz {
+ 
+diff -urN /dev/shm/kdenetwork/kopete/protocols/jabber/jingle/libjingle/talk/xmllite/xmlnsstack.h /dev/shm/kdenetwork.new/kopete/protocols/jabber/jingle/libjingle/talk/xmllite/xmlnsstack.h
+--- /dev/shm/kdenetwork/kopete/protocols/jabber/jingle/libjingle/talk/xmllite/xmlnsstack.h	2011-06-21 20:37:11.000000000 -0500
++++ /dev/shm/kdenetwork.new/kopete/protocols/jabber/jingle/libjingle/talk/xmllite/xmlnsstack.h	2011-11-28 18:20:04.245270846 -0600
+@@ -31,7 +31,7 @@
+ #include <string>
+ #include "talk/base/scoped_ptr.h"
+ #include "talk/base/stl_decl.h"
+-#include "talk/xmllite/tqname.h"
++#include "talk/xmllite/qname.h"
+ 
+ namespace buzz {
+ 
+diff -urN /dev/shm/kdenetwork/kopete/protocols/jabber/jingle/libjingle/talk/xmpp/constants.cc /dev/shm/kdenetwork.new/kopete/protocols/jabber/jingle/libjingle/talk/xmpp/constants.cc
+--- /dev/shm/kdenetwork/kopete/protocols/jabber/jingle/libjingle/talk/xmpp/constants.cc	2011-06-21 20:37:09.000000000 -0500
++++ /dev/shm/kdenetwork.new/kopete/protocols/jabber/jingle/libjingle/talk/xmpp/constants.cc	2011-11-28 18:20:03.076020148 -0600
+@@ -29,7 +29,7 @@
+ #include "talk/base/basicdefs.h"
+ #include "talk/xmllite/xmlconstants.h"
+ #include "talk/xmllite/xmlelement.h"
+-#include "talk/xmllite/tqname.h"
++#include "talk/xmllite/qname.h"
+ #include "talk/xmpp/jid.h"
+ #include "talk/xmpp/constants.h"
+ namespace buzz {
+diff -urN /dev/shm/kdenetwork/kopete/protocols/jabber/jingle/libjingle/talk/xmpp/constants.h /dev/shm/kdenetwork.new/kopete/protocols/jabber/jingle/libjingle/talk/xmpp/constants.h
+--- /dev/shm/kdenetwork/kopete/protocols/jabber/jingle/libjingle/talk/xmpp/constants.h	2011-06-21 20:37:09.000000000 -0500
++++ /dev/shm/kdenetwork.new/kopete/protocols/jabber/jingle/libjingle/talk/xmpp/constants.h	2011-11-28 18:20:03.139020370 -0600
+@@ -29,7 +29,7 @@
+ #define _CRICKET_XMPP_XMPPLIB_BUZZ_CONSTANTS_H_
+ 
+ #include <string>
+-#include "talk/xmllite/tqname.h"
++#include "talk/xmllite/qname.h"
+ #include "talk/xmpp/jid.h"
+ 
+ 
+diff -urN /dev/shm/kdenetwork/kopete/protocols/jabber/jingle/libjingle/talk/xmpp/xmppengine.h /dev/shm/kdenetwork.new/kopete/protocols/jabber/jingle/libjingle/talk/xmpp/xmppengine.h
+--- /dev/shm/kdenetwork/kopete/protocols/jabber/jingle/libjingle/talk/xmpp/xmppengine.h	2011-06-21 20:37:09.000000000 -0500
++++ /dev/shm/kdenetwork.new/kopete/protocols/jabber/jingle/libjingle/talk/xmpp/xmppengine.h	2011-11-28 18:20:03.059020250 -0600
+@@ -30,7 +30,7 @@
+ 
+ // also part of the API
+ #include "talk/xmpp/jid.h"
+-#include "talk/xmllite/tqname.h"
++#include "talk/xmllite/qname.h"
+ #include "talk/xmllite/xmlelement.h"
+ 
+