[kdenetwork] Fix build failure with g++ 4.7
Radek Novacek
rnovacek at fedoraproject.org
Thu Jan 5 12:30:46 UTC 2012
commit acb57c7c7305115b78aeadcefa3434459b0b79e7
Author: Radek Novacek <rnovacek at redhat.com>
Date: Thu Jan 5 13:30:36 2012 +0100
Fix build failure with g++ 4.7
kdenetwork-4.7.97-fix-for-g++47.patch | 13 +++++++++++++
kdenetwork.spec | 4 ++++
2 files changed, 17 insertions(+), 0 deletions(-)
---
diff --git a/kdenetwork-4.7.97-fix-for-g++47.patch b/kdenetwork-4.7.97-fix-for-g++47.patch
new file mode 100644
index 0000000..d9827e0
--- /dev/null
+++ b/kdenetwork-4.7.97-fix-for-g++47.patch
@@ -0,0 +1,13 @@
+diff -up kdenetwork-4.7.97/kopete/protocols/qq/evautil.cpp.fix-for-g++47 kdenetwork-4.7.97/kopete/protocols/qq/evautil.cpp
+--- kdenetwork-4.7.97/kopete/protocols/qq/evautil.cpp.fix-for-g++47 2012-01-05 13:17:30.244588267 +0100
++++ kdenetwork-4.7.97/kopete/protocols/qq/evautil.cpp 2012-01-05 13:20:30.503771296 +0100
+@@ -78,7 +78,8 @@ namespace Eva {
+ plain[0] = ( rand() & 0xf8 ) | pos;
+ memset( plain_pre, 0, 8 );
+ memset( crypted_pre, 0, 8 );
+- memset( plain+1, rand()& 0xff, pos++ );
++ if( pos )
++ memset( plain+1, rand()& 0xff, pos++ );
+
+ // pad 2 bytes
+ for( i = 0; i< 2; i++ )
diff --git a/kdenetwork.spec b/kdenetwork.spec
index 1dcca74..a497322 100644
--- a/kdenetwork.spec
+++ b/kdenetwork.spec
@@ -19,6 +19,8 @@ Patch1: kdenetwork-4.2.98-kdrc-icon.patch
# rhbz#540433 - KPPP is unable to add DNS entries to /etc/resolv.conf
Patch2: kdenetwork-4.3.3-resolv-conf-path.patch
+# Fix build failure with g++4.7
+Patch3: kdenetwork-4.7.97-fix-for-g++47.patch
## upstream patches
## security patches
@@ -211,6 +213,7 @@ Requires: %{name}-krfb = %{epoch}:%{version}-%{release}
%setup -q -a 1 -n kdenetwork-%{version}%{?alphatag}
%patch1 -p1 -b .icon
%patch2 -p1 -b .resolv-conf-path
+%patch3 -p1 -b .fix-for-g++47
%build
@@ -474,6 +477,7 @@ fi
%changelog
* Wed Jan 04 2012 Rex Dieter <rdieter at fedoraproject.org> - 7:4.7.97-1
- 4.7.97
+- Fix build failure with g++ 4.7
* Wed Dec 21 2011 Radek Novacek <rnovacek at redhat.com> - 7:4.7.95-1
- 4.7.95
More information about the scm-commits
mailing list