[kvirc] fix build with gcc-4.7.0

[nucleo]

commit e34a539a80a5d500a74870ff0d2676f8cce72c2d
Author: nucleo <nucleo at fedoraproject.org>
Date:   Thu Jan 5 17:05:08 2012 +0200

    fix build with gcc-4.7.0

 kvirc-4.0.4-gcc-4.7.0.patch |   62 +++++++++++++++++++++++++++++++++++++++++++
 kvirc.spec                  |   11 +++++++-
 2 files changed, 72 insertions(+), 1 deletions(-)
---
diff --git a/kvirc-4.0.4-gcc-4.7.0.patch b/kvirc-4.0.4-gcc-4.7.0.patch
new file mode 100644
index 0000000..f122a29
--- /dev/null
+++ b/kvirc-4.0.4-gcc-4.7.0.patch
@@ -0,0 +1,62 @@
+Index: /branches/kvirc/4.0/src/modules/mediaplayer/mp_mprisinterface.cpp
+===================================================================
+--- /branches/kvirc/4.0/src/modules/mediaplayer/mp_mprisinterface.cpp	(revision 4667)
++++ /branches/kvirc/4.0/src/modules/mediaplayer/mp_mprisinterface.cpp	(revision 6024)
+@@ -190,6 +190,6 @@
+ 	QString artist;
+ 	QString title;
+-	foreach (QVariant v, reply.arguments()) {
+-		QDBusArgument arg = qvariant_cast<QDBusArgument>(v);
++	foreach (QVariant w, reply.arguments()) {
++		QDBusArgument arg = qvariant_cast<QDBusArgument>(w);
+ 		QVariant v = qdbus_cast<QVariantMap>(arg);
+ 		if (v.userType() == QVariant::Map) {
+Index: /branches/kvirc/4.0/src/modules/mediaplayer/mp_mprisinterface.cpp
+===================================================================
+--- /branches/kvirc/4.0/src/modules/mediaplayer/mp_mprisinterface.cpp	(revision 6024)
++++ /branches/kvirc/4.0/src/modules/mediaplayer/mp_mprisinterface.cpp	(revision 6025)
+@@ -139,6 +139,6 @@
+ 		return __return_if_fail; \
+ 	MPRIS_CALL_METHOD("GetMetadata", __return_if_fail) \
+-	foreach (QVariant v, reply.arguments()) { \
+-		QDBusArgument arg = qvariant_cast<QDBusArgument>(v); \
++	foreach (QVariant w, reply.arguments()) { \
++		QDBusArgument arg = qvariant_cast<QDBusArgument>(w); \
+ 		QVariant v = qdbus_cast<QVariantMap>(arg); \
+ 		if (v.userType() == QVariant::Map) { \
+@@ -214,6 +214,6 @@
+ 	MPRIS_CALL_METHOD("GetMetadata", "")
+ 
+-	foreach (QVariant v, reply.arguments()) {
+-		QDBusArgument arg = qvariant_cast<QDBusArgument>(v);
++	foreach (QVariant w, reply.arguments()) {
++		QDBusArgument arg = qvariant_cast<QDBusArgument>(w);
+ 		QVariant v = qdbus_cast<QVariantMap>(arg);
+ 		if (v.userType() == QVariant::Map) {
+@@ -292,6 +292,6 @@
+ 	MPRIS_CALL_METHOD("GetMetadata", -1)
+ 
+-	foreach (QVariant v, reply.arguments()) {
+-		QDBusArgument arg = qvariant_cast<QDBusArgument>(v);
++	foreach (QVariant w, reply.arguments()) {
++		QDBusArgument arg = qvariant_cast<QDBusArgument>(w);
+ 		QVariant v = qdbus_cast<QVariantMap>(arg);
+ 		if (v.userType() == QVariant::Map) {
+@@ -353,6 +353,6 @@
+ 	MPRIS_CALL_METHOD("GetMetadata", "")
+ 
+-	foreach (QVariant v, reply.arguments()) {
+-		QDBusArgument arg = qvariant_cast<QDBusArgument>(v);
++	foreach (QVariant w, reply.arguments()) {
++		QDBusArgument arg = qvariant_cast<QDBusArgument>(w);
+ 		QVariant v = qdbus_cast<QVariantMap>(arg);
+ 		if (v.userType() == QVariant::Map) {
+@@ -404,6 +404,6 @@
+ 	MPRIS_CALL_METHOD("GetMetadata", -1)
+ 
+-	foreach (QVariant v, reply.arguments()) {
+-		QDBusArgument arg = qvariant_cast<QDBusArgument>(v);
++	foreach (QVariant w, reply.arguments()) {
++		QDBusArgument arg = qvariant_cast<QDBusArgument>(w);
+ 		QVariant v = qdbus_cast<QVariantMap>(arg);
+ 		if (v.userType() == QVariant::Map) {
diff --git a/kvirc.spec b/kvirc.spec
index a900e57..3a61ac2 100644
--- a/kvirc.spec
+++ b/kvirc.spec
@@ -1,6 +1,6 @@
 Name:             kvirc
 Version:          4.0.4
-Release:          2%{?dist}
+Release:          3%{?dist}
 Summary:          Free portable IRC client
 Group:            Applications/Internet
 License:          GPLv2+ with exceptions
@@ -9,6 +9,10 @@ Source0:          ftp://ftp.kvirc.de/pub/kvirc/%{version}/source/%{name}-%{versi
 # V4L1 was removed in kernel 2.6.38
 # https://svn.kvirc.de/kvirc/changeset/5441
 Patch0:           kvirc-remove-v4l1.patch
+# fix build with gcc-4.7.0
+# https://svn.kvirc.de/kvirc/changeset/6024
+# https://svn.kvirc.de/kvirc/changeset/6025
+Patch1:           kvirc-4.0.4-gcc-4.7.0.patch
 BuildRoot:        %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires:    kdelibs4-devel audiofile-devel esound-devel glib2-devel
 BuildRequires:    python-devel perl-ExtUtils-Embed dbus-devel
@@ -34,6 +38,8 @@ many IRC addicted developers around the world.
 %patch0
 %endif
 
+%patch1 -p3
+
 %build
 %{cmake}  \
 %ifarch %{ix86}
@@ -139,6 +145,9 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
 %exclude %{_datadir}/%{name}/4.0/doc/README
 
 %changelog
+* Thu Jan  5 2012 Alexey Kurov <nucleo at fedoraproject.org> - 4.0.4-3
+- fix build with gcc-4.7.0
+
 * Tue Jul 12 2011 Alexey Kurov <nucleo at fedoraproject.org> - 4.0.4-2
 - BR: qt-webkit-devel