rpms/guitone/devel guitone-0.7-gcc43.patch, NONE, 1.1 guitone.spec, 1.2, 1.3

[Thomas Moschny (thm)]

Author: thm

Update of /cvs/pkgs/rpms/guitone/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv27188/devel

Modified Files:
	guitone.spec 
Added Files:
	guitone-0.7-gcc43.patch 
Log Message:
Add patch to fix GCC 4.3 build.

guitone-0.7-gcc43.patch:

--- NEW FILE guitone-0.7-gcc43.patch ---
--- src/vocab.h	4e71a34556bdba331e84d2e13221f1d6220c8832
+++ src/vocab.h	7f21cf44b67083fb6101067d98ae4be51b44fea9
@@ -24,6 +24,9 @@ class Guitone;
         .arg(__FILE__).arg(__FUNCTION__).arg(__LINE__).arg(QString(msg)))
 #define C(msg) DebugLog::critical(QString("%1:%2:%3: %4") \
         .arg(__FILE__).arg(__FUNCTION__).arg(__LINE__).arg(QString(msg)))
+
+// for abort()
+#include <stdlib.h>
 #define F(msg) { \
           DebugLog::fatal(QString("%1:%2:%3: %4") \
           .arg(__FILE__).arg(__FUNCTION__).arg(__LINE__).arg(QString(msg))); \


Index: guitone.spec
===================================================================
RCS file: /cvs/pkgs/rpms/guitone/devel/guitone.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- guitone.spec	20 Feb 2008 04:56:44 -0000	1.2
+++ guitone.spec	22 Feb 2008 15:16:33 -0000	1.3
@@ -1,6 +1,6 @@
 Name:		guitone
 Version:	0.7
-Release:	3%{?dist}
+Release:	4%{?dist}
 
 Summary:	A frontend for Monotone
 Group:		Development/Tools
@@ -10,6 +10,7 @@
 Source0:	%{url}releases/%{version}/%{name}-%{version}.tgz
 
 Patch0:		guitone-0.7-qt-svg.patch
+Patch1:		guitone-0.7-gcc43.patch
 
 BuildRequires:	qt4-devel
 BuildRequires:	desktop-file-utils
@@ -39,7 +40,8 @@
 
 %prep
 %setup -q
-%patch0 -p0
+%patch0 -p0 -b .qt-svg
+%patch1 -p0 -b .gcc43
 
 cat >%{name}.desktop <<EOF
 [Desktop Entry]
@@ -87,6 +89,9 @@
 %{_datadir}/applications/guitone.desktop
 
 %changelog
+* Fri Feb 22 2008 Thomas Moschny <thomas.moschny at gmx.de> - 0.7-4
+- Add patch to fix GCC 4.3 build.
+
 * Tue Feb 19 2008 Fedora Release Engineering <rel-eng at fedoraproject.org> - 0.7-3
 - Autorebuild for GCC 4.3