Bug#672044: add patch, uploaded to delayed/5
tags 672044 + patch pending
thanks
add patch, uploaded to delayed/5
diff -Nru kdenetwork-4.7.4/debian/changelog kdenetwork-4.7.4/debian/changelog
--- kdenetwork-4.7.4/debian/changelog 2012-03-07 10:02:05.000000000 +0100
+++ kdenetwork-4.7.4/debian/changelog 2012-05-22 10:45:29.000000000 +0200
@@ -1,3 +1,11 @@
+kdenetwork (4:4.7.4-2.1) unstable; urgency=low
+
+ * Non maintainer upload.
+ * Fix build failure with GCC 4.7. Closes: #672044.
+ * Build with -fpermissive.
+
+ -- Matthias Klose <doko@debian.org> Tue, 22 May 2012 00:26:33 +0000
+
kdenetwork (4:4.7.4-2) unstable; urgency=low
* Team upload. Upload to unstable.
diff -Nru kdenetwork-4.7.4/debian/patches/ftbfs-gcc-4.7.diff kdenetwork-4.7.4/debian/patches/ftbfs-gcc-4.7.diff
--- kdenetwork-4.7.4/debian/patches/ftbfs-gcc-4.7.diff 1970-01-01 01:00:00.000000000 +0100
+++ kdenetwork-4.7.4/debian/patches/ftbfs-gcc-4.7.diff 2012-05-22 12:03:59.000000000 +0200
@@ -0,0 +1,24 @@
+Index: kdenetwork-4.7.4/kopete/protocols/jabber/googletalk/libjingle/talk/base/socketaddress.cc
+===================================================================
+--- kdenetwork-4.7.4.orig/kopete/protocols/jabber/googletalk/libjingle/talk/base/socketaddress.cc 2011-06-24 13:03:56.000000000 +0200
++++ kdenetwork-4.7.4/kopete/protocols/jabber/googletalk/libjingle/talk/base/socketaddress.cc 2012-05-22 02:29:18.956065866 +0200
+@@ -35,6 +35,7 @@
+
+ #include <cstring>
+ #include <sstream>
++#include <unistd.h>
+
+ #include "talk/base/byteorder.h"
+ #include "talk/base/common.h"
+Index: kdenetwork-4.7.4/kopete/protocols/jabber/googletalk/libjingle/talk/base/ssladapter.cc
+===================================================================
+--- kdenetwork-4.7.4.orig/kopete/protocols/jabber/googletalk/libjingle/talk/base/ssladapter.cc 2011-06-24 13:03:56.000000000 +0200
++++ kdenetwork-4.7.4/kopete/protocols/jabber/googletalk/libjingle/talk/base/ssladapter.cc 2012-05-22 12:03:49.552844812 +0200
+@@ -26,6 +26,7 @@
+ */
+
+ #include "talk/base/ssladapter.h"
++#include <unistd.h>
+
+ #if !defined(SSL_USE_SCHANNEL) && !defined(SSL_USE_OPENSSL)
+ #ifdef WIN32
diff -Nru kdenetwork-4.7.4/debian/patches/series kdenetwork-4.7.4/debian/patches/series
--- kdenetwork-4.7.4/debian/patches/series 2012-03-07 09:44:17.000000000 +0100
+++ kdenetwork-4.7.4/debian/patches/series 2012-05-22 02:27:52.000000000 +0200
@@ -1,3 +1,4 @@
no_home_set.diff
protocols_namespaces.diff
libgadu_pthread_check.diff
+ftbfs-gcc-4.7.diff
diff -Nru kdenetwork-4.7.4/debian/rules kdenetwork-4.7.4/debian/rules
--- kdenetwork-4.7.4/debian/rules 2012-03-07 09:44:17.000000000 +0100
+++ kdenetwork-4.7.4/debian/rules 2012-05-22 11:01:29.000000000 +0200
@@ -4,6 +4,11 @@
.PHONY: override_dh_auto_test
+CXXFLAGS := $(shell dpkg-buildflags --get CXXFLAGS) -fpermissive
+
+override_dh_auto_configure:
+ CXXFLAGS="$(CXXFLAGS)" dh_auto_configure
+
override_dh_install:
$(overridden_command)
if [ -d debian/kppp ]; then \
Reply to: