[psi] fix compile with gcc 4.7.0
Sven Lankes
slankes at fedoraproject.org
Sat Jan 7 19:00:58 UTC 2012
commit 91f10dc3eaefd609c9bd67a2f97c2037d0b438ca
Author: Sven Lankes <sven at lank.es>
Date: Sat Jan 7 20:00:53 2012 +0100
fix compile with gcc 4.7.0
psi-0.14-gcc-47.patch | 10 ++++++++++
psi.spec | 8 +++++++-
2 files changed, 17 insertions(+), 1 deletions(-)
---
diff --git a/psi-0.14-gcc-47.patch b/psi-0.14-gcc-47.patch
new file mode 100644
index 0000000..64cb83f
--- /dev/null
+++ b/psi-0.14-gcc-47.patch
@@ -0,0 +1,10 @@
+--- iris/src/irisnet/corelib/netinterface_unix.cpp.orig 2012-01-07 19:46:39.493999646 +0100
++++ iris/src/irisnet/corelib/netinterface_unix.cpp 2012-01-07 19:46:57.251002321 +0100
+@@ -33,6 +33,7 @@
+ #include <net/route.h>
+ #include <netinet/in.h>
+ #include <errno.h>
++#include <unistd.h>
+
+ // for solaris
+ #ifndef SIOCGIFCONF
diff --git a/psi.spec b/psi.spec
index 02b0a9e..29c2b3c 100644
--- a/psi.spec
+++ b/psi.spec
@@ -1,6 +1,6 @@
Name: psi
Version: 0.14
-Release: 7%{?dist}
+Release: 8%{?dist}
Summary: Jabber client based on Qt
License: GPLv2+
Group: Applications/Internet
@@ -13,6 +13,8 @@ Patch1: psi-0.14-configureroomcrash.patch
Patch2: psi-0.14-affiliationlistconfigmuc.patch
# Fix QLabel CVE - rhbz 746877
Patch3: psi-0.14-input-validation.patch
+# Fix build with gcc 4.7 - patch is already in upstream git
+Patch4: psi-0.14-gcc-47.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -79,6 +81,7 @@ More icons can be found on http://jisp.netflint.net
%patch1 -p1 -b .configureroom
%patch2 -p1 -b .affiliationlistmuc
%patch3 -p0 -b .qlabelcve
+%patch4 -p0 -b .gccbuild
%build
unset QTDIR
@@ -167,6 +170,9 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &> /dev/null || :
%changelog
+* Sat Jan 07 2012 Sven Lankes <sven at lank.es> 0.14-8
+- fix compile with gcc 4.7.0
+
* Sun Nov 27 2011 Sven Lankes <sven at lank.es> 0.14-7
- Change certificate ui to use plain-text fields to avoid security
issue with qlabel. rhbz #746877
More information about the scm-commits
mailing list