[qtcurve-kde4] fix 4.8.90+ api change FTBFS for KWin (#831958)

[Jaroslav Reznik]

commit 586fa9c08a92b9e6ebc121eafe3f950562efd894
Author: Jaroslav Reznik <jreznik at redhat.com>
Date:   Mon Jul 23 12:08:24 2012 +0200

    fix 4.8.90+ api change FTBFS for KWin (#831958)

 ...-KDE4-1.8.12-fix-4.8.90-api-changes-ftbfs.patch |   60 ++++++++++++++++++++
 qtcurve-kde4.spec                                  |    9 +++-
 2 files changed, 68 insertions(+), 1 deletions(-)
---
diff --git a/QtCurve-KDE4-1.8.12-fix-4.8.90-api-changes-ftbfs.patch b/QtCurve-KDE4-1.8.12-fix-4.8.90-api-changes-ftbfs.patch
new file mode 100644
index 0000000..a8f56ff
--- /dev/null
+++ b/QtCurve-KDE4-1.8.12-fix-4.8.90-api-changes-ftbfs.patch
@@ -0,0 +1,60 @@
+diff -ru a/kwin/qtcurveclient.cpp b/kwin/qtcurveclient.cpp
+--- a/kwin/qtcurveclient.cpp	2012-04-24 17:20:01.000000000 -0400
++++ b/kwin/qtcurveclient.cpp	2012-06-09 23:52:15.049850728 -0400
+@@ -852,7 +852,7 @@
+     bool showIcon=TITLEBAR_ICON_NEXT_TO_TITLE==Handler()->wStyle()->pixelMetric((QStyle::PixelMetric)QtC_TitleBarIcon,  0L, 0L);
+     int  iconSize=showIcon ? Handler()->wStyle()->pixelMetric(QStyle::PM_SmallIconSize) : 0;
+ 
+-#if KDE_IS_VERSION(4, 3, 85)
++#if KDE_IS_VERSION(4, 3, 85) && !KDE_IS_VERSION(4, 8, 80)
+     QList<ClientGroupItem> tabList  = clientGroupItems();
+     const int              tabCount = tabList.count();
+ 
+@@ -922,7 +922,7 @@
+                                                    rectX2-(titleEdgeRight+rectX+titleEdgeLeft),
+                                                    itsCaptionRect.height()),
+                    itsCaption, showIcon ? icon().pixmap(iconSize) : QPixmap(), shadowSize);
+-#if KDE_IS_VERSION(4, 3, 85)
++#if KDE_IS_VERSION(4, 3, 85) && !KDE_IS_VERSION(4, 8, 80)
+ 
+         if(constAddToEmpty==itsTargetTab)
+         {
+@@ -947,7 +947,7 @@
+     //     if(itsHover)
+         {
+             if(
+-#if KDE_IS_VERSION(4, 3, 85)
++#if KDE_IS_VERSION(4, 3, 85) && !KDE_IS_VERSION(4, 8, 80)
+                 1==tabCount &&
+ #endif
+                 active && (itsToggleMenuBarButton||itsToggleStatusBarButton))
+@@ -1322,7 +1322,7 @@
+ //         return true;
+ //     }
+     
+-#if KDE_IS_VERSION(4, 3, 85)
++#if KDE_IS_VERSION(4, 3, 85) && !KDE_IS_VERSION(4, 8, 80)
+     if(Handler()->grouping())
+     {
+         if(QtCurveButton *btn = dynamic_cast<QtCurveButton *>(o))
+@@ -1360,7 +1360,7 @@
+     return KCommonDecoration::eventFilter(o, e);
+ }
+ 
+-#if KDE_IS_VERSION(4, 3, 85)
++#if KDE_IS_VERSION(4, 3, 85) && !KDE_IS_VERSION(4, 8, 80)
+ bool QtCurveClient::mouseButtonPressEvent(QMouseEvent *e)
+ {
+     itsClickPoint = widget()->mapToParent(e->pos());
+diff -ru a/kwin/qtcurvehandler.cpp b/kwin/qtcurvehandler.cpp
+--- a/kwin/qtcurvehandler.cpp	2012-04-24 17:20:01.000000000 -0400
++++ b/kwin/qtcurvehandler.cpp	2012-06-09 23:48:56.669671970 -0400
+@@ -254,7 +254,7 @@
+         case AbilityProvidesShadow:
+             return customShadows();
+ #endif
+-#if KDE_IS_VERSION(4, 3, 85)
++#if KDE_IS_VERSION(4, 3, 85) && !KDE_IS_VERSION(4, 8, 80)
+         case AbilityClientGrouping:
+             return grouping();
+ #endif
diff --git a/qtcurve-kde4.spec b/qtcurve-kde4.spec
index 12f1a18..0867bad 100644
--- a/qtcurve-kde4.spec
+++ b/qtcurve-kde4.spec
@@ -1,12 +1,14 @@
 Name:		qtcurve-kde4
 Version:	1.8.12
-Release:	2%{?dist}
+Release:	3%{?dist}
 Summary:	This is a set of widget styles for Qt4/KDE4 based apps
 
 Group:		User Interface/Desktops
 License:	GPLv2+
 URL:		http://www.kde-look.org/content/show.php?content=40492
 Source0:	http://craigd.wikispaces.com/file/view/QtCurve-KDE4-%{version}.tar.bz2
+Patch0:		QtCurve-KDE4-1.8.12-fix-4.8.90-api-changes-ftbfs.patch
+
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:	kdebase-workspace-devel
@@ -21,6 +23,8 @@ allowing users to achieve a uniform look between these widget toolkits.
 %prep
 %setup -q -n QtCurve-KDE4-%{version}
 
+%patch0 -p1 -b .fix-4.8.90-api-changes-ftbfs
+
 %build
 mkdir -p %{_target_platform}
 pushd %{_target_platform}
@@ -53,6 +57,9 @@ rm -rf %{buildroot}
 
 
 %changelog
+* Mon Jul 23 2012 Jaroslav Reznik <jreznik at redhat.com> - 1.8.12-3
+- fix 4.8.90+ api change FTBFS for KWin (#831958)
+
 * Sat Jul 21 2012 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.8.12-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild