[taxipilot] - Fix building with gcc 4.5 (#631436)

[Hans de Goede]

commit 16bae128eb4aeaa9fabe938c5a3ad8bdf0705332
Author: Hans de Goede <hdegoede at redhat.com>
Date:   Fri Sep 10 10:08:08 2010 +0200

    - Fix building with gcc 4.5 (#631436)

 taxipilot-0.9.2-gcc45.patch |   24 ++++++++++++++++++++++++
 taxipilot.spec              |    7 ++++++-
 2 files changed, 30 insertions(+), 1 deletions(-)
---
diff --git a/taxipilot-0.9.2-gcc45.patch b/taxipilot-0.9.2-gcc45.patch
new file mode 100644
index 0000000..a103f33
--- /dev/null
+++ b/taxipilot-0.9.2-gcc45.patch
@@ -0,0 +1,24 @@
+diff -up taxipilot-0.9.2/taxipilot/cdp.cpp~ taxipilot-0.9.2/taxipilot/cdp.cpp
+--- taxipilot-0.9.2/taxipilot/cdp.cpp~	2007-05-27 19:53:17.000000000 +0200
++++ taxipilot-0.9.2/taxipilot/cdp.cpp	2010-09-10 10:01:47.570574002 +0200
+@@ -572,7 +572,7 @@ CachablePixmapArray * Cdp::createTextPix
+ 		do {
+ 			fnt.setPointSize(point_size - i);
+ 			i++;
+-		} while ( (((point_size - i) / (float) point_size) > 0.5) && (!QFontInfo::QFontInfo(fnt).exactMatch()));		// don't go below half the optimal point size
++		} while ( (((point_size - i) / (float) point_size) > 0.5) && (!QFontInfo(fnt).exactMatch()));		// don't go below half the optimal point size
+ 		if ( ((point_size - i) / (float) point_size) >= 0.5) {		// if we found something reasonable, use that
+ 			point_size -= i;
+ 		}
+diff -up taxipilot-0.9.2/taxipilot/taxipilot.cpp~ taxipilot-0.9.2/taxipilot/taxipilot.cpp
+--- taxipilot-0.9.2/taxipilot/taxipilot.cpp~	2007-05-27 16:53:29.000000000 +0200
++++ taxipilot-0.9.2/taxipilot/taxipilot.cpp	2010-09-10 10:02:17.568574001 +0200
+@@ -98,7 +98,7 @@ Taxipilot::Taxipilot (TaxipilotApp * par
+ 
+ 	fader = new QCanvasRectangle(canvas);
+ 	fader->setPen(NoPen);
+-	fader->setBrush(QBrush::QBrush(Dense4Pattern));
++	fader->setBrush(QBrush(Dense4Pattern));
+ 	fader->setZ(FADER_Z);		// second topmost
+ 
+ 	mainvbox->addWidget(view);
diff --git a/taxipilot.spec b/taxipilot.spec
index 6124a16..59ea882 100644
--- a/taxipilot.spec
+++ b/taxipilot.spec
@@ -1,6 +1,6 @@
 Name:           taxipilot
 Version:        0.9.2
-Release:        9%{?dist}
+Release:        10%{?dist}
 Summary:        Game where you pilot a taxi in space
 Group:          Amusements/Games
 License:        GPLv2+
@@ -10,6 +10,7 @@ Patch1:         taxipilot-0.9.1-desktop.patch
 Patch2:         taxipilot-0.9.1-weaksym.patch
 Patch3:         taxipilot-0.9.2-kdemm.patch
 Patch4:         taxipilot-0.9.2-arts-startup.patch
+Patch5:         taxipilot-0.9.2-gcc45.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires:  kdelibs3-devel arts-devel desktop-file-utils
 Requires:       hicolor-icon-theme
@@ -26,6 +27,7 @@ That's basically it.
 %patch2 -p1 -b .weaksym
 %patch3 -p1 -b .kdemm
 %patch4 -p1 -b .start-arts
+%patch5 -p1
 
 
 %build
@@ -77,6 +79,9 @@ fi
 
 
 %changelog
+* Fri Sep 10 2010 Hans de Goede <hdegoede at redhat.com> 0.9.2-10
+- Fix building with gcc 4.5 (#631436)
+
 * Sun Jul 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.9.2-9
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild