[packages/kde4-kdenetwork] - /usr/include/ortp/stun.h has the same include guard as kdenetwork-4.10.4/kopete/protocols/jabber

[baggins]

commit 99c21a9571f88930daa2d6e307e65bf3ef44fbb4
Author: Jan Rękorajski <baggins at pld-linux.org>
Date:   Thu Jun 20 15:22:12 2013 +0200

    - /usr/include/ortp/stun.h has the same include guard as
      kdenetwork-4.10.4/kopete/protocols/jabber/googletalk/libjingle/talk/p2p/base/stun.h
      which makes g++ not include the later and kdenetwork build fail
      (thanks pluto)

 include-guard.patch  | 13 +++++++++++++
 kde4-kdenetwork.spec |  2 ++
 2 files changed, 15 insertions(+)
---
diff --git a/kde4-kdenetwork.spec b/kde4-kdenetwork.spec
index b52d01b..8c9aae2 100644
--- a/kde4-kdenetwork.spec
+++ b/kde4-kdenetwork.spec
@@ -25,6 +25,7 @@ Patch0:		%{name}-FindLibgadu.patch
 Patch1:		%{name}-gcc.patch
 Patch2:		kdenetwork-4.7.97-fix-for-g++47.patch
 Patch3:		linphone-fix.patch
+Patch4:		include-guard.patch
 URL:		http://www.kde.org/
 BuildRequires:	Qt3Support-devel >= %{qtver}
 BuildRequires:	QtOpenGL-devel >= %{qtver}
@@ -752,6 +753,7 @@ specjalnych możliwości Remote Desktop Connection.
 %patch1 -p1
 %patch2 -p1
 %patch3 -p1
+%patch4 -p1
 
 %build
 install -d build
diff --git a/include-guard.patch b/include-guard.patch
new file mode 100644
index 0000000..0408d08
--- /dev/null
+++ b/include-guard.patch
@@ -0,0 +1,13 @@
+--- kdenetwork-4.10.4/kopete/protocols/jabber/googletalk/libjingle/talk/p2p/base/stun.h~	2013-05-28 22:39:28.000000000 +0200
++++ kdenetwork-4.10.4/kopete/protocols/jabber/googletalk/libjingle/talk/p2p/base/stun.h	2013-06-20 15:18:55.279966306 +0200
+@@ -25,8 +25,8 @@
+  * ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+  */
+ 
+-#ifndef __STUN_H__
+-#define __STUN_H__
++#ifndef __BASE_STUN_H__
++#define __BASE_STUN_H__
+ 
+ // This file contains classes for dealing with the STUN and TURN protocols.
+ // Both protocols use the same wire format.
================================================================

---- gitweb:

http://git.pld-linux.org/gitweb.cgi/packages/kde4-kdenetwork.git/commitdiff/99c21a9571f88930daa2d6e307e65bf3ef44fbb4