[kdeplasma-addons] add patch that fix shadowning variable

[Radek Novacek]

commit 10018828f9188345c368478adc68de97602e72c3
Author: Radek Novacek <rnovacek at redhat.com>
Date:   Thu Jan 5 09:59:38 2012 +0100

    add patch that fix shadowning variable

 ...asma-addons-4.7.97-fix-shadowing-variable.patch |   41 ++++++++++++++++++++
 kdeplasma-addons.spec                              |    4 ++
 2 files changed, 45 insertions(+), 0 deletions(-)
---
diff --git a/kdeplasma-addons-4.7.97-fix-shadowing-variable.patch b/kdeplasma-addons-4.7.97-fix-shadowing-variable.patch
new file mode 100644
index 0000000..31b5394
--- /dev/null
+++ b/kdeplasma-addons-4.7.97-fix-shadowing-variable.patch
@@ -0,0 +1,41 @@
+From: Raphael Kubo da Costa <rakuco at FreeBSD.org>
+Date: Tue, 03 Jan 2012 02:39:50 +0000
+Subject: Do not shadow the `property' variable.
+X-Git-Url: http://quickgit.kde.org/?p=kdeplasma-addons.git&amp;a=commitdiff&amp;h=fd62cd062a5824e4ff1f050bfa7b41b8d42c2fc2
+---
+Do not shadow the `property' variable.
+
+It was being used as both a QVariant and a KimpanelProperty, which made
+gcc issue a warning with -Wshadow and clang actually refuse to build.
+
+(cherry picked from commit 1b3dec1b812acaee26f2c2b676cc5363f0072c22)
+---
+
+
+--- a/applets/kimpanel/src/kimpanelstatusbargraphics.cpp
++++ b/applets/kimpanel/src/kimpanelstatusbargraphics.cpp
+@@ -95,9 +95,9 @@ void KimpanelStatusBarGraphics::updatePr
+         QString tip = map["tip"].toString();
+         int state = map["states"].toInt();
+ 
+-        KimpanelProperty property(key, label, icon, tip, state);
++        KimpanelProperty newProperty(key, label, icon, tip, state);
+ 
+-        m_props << property;
++        m_props << newProperty;
+         keyset.insert(key);
+     }
+ 
+@@ -214,9 +214,9 @@ void KimpanelStatusBarGraphics::execMenu
+         QString tip = map["tip"].toString();
+         int state = map["states"].toInt();
+ 
+-        KimpanelProperty property(key, label, icon, tip, state);
++        KimpanelProperty newProperty(key, label, icon, tip, state);
+ 
+-        propList << property;
++        propList << newProperty;
+     }
+ 
+     if (propList.length() == 0)
+
diff --git a/kdeplasma-addons.spec b/kdeplasma-addons.spec
index 284ff68..da5e169 100644
--- a/kdeplasma-addons.spec
+++ b/kdeplasma-addons.spec
@@ -19,6 +19,8 @@ BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 ## upstreamable patches
 
 ## upstream patches
+# Do not shadow the `property' variable.
+Patch0:  kdeplasma-addons-4.7.97-fix-shadowing-variable.patch
 
 BuildRequires: boost-devel
 BuildRequires: gettext
@@ -94,6 +96,7 @@ Requires: marble%{?_kde4_version: >= 1:%{_kde4_version}}
 
 %prep
 %setup -q -n kdeplasma-addons-%{version}%{?alphatag}
+%patch0 -p1
 
 %build
 
@@ -387,6 +390,7 @@ fi
 * Wed Jan 04 2012 Rex Dieter <rdieter at fedoraproject.org> - 4.7.97-1
 - 4.7.97
 - kimpanel: omit ibus backend on f17+ FTBFS (#771115)
+- add patch that fix shadowning variable
 
 * Sat Dec 31 2011 Rex Dieter <rdieter at fedoraproject.org> 4.7.95-3
 - rebuild (attica)