rpms/fldigi/devel fldigi-gcc44.patch, NONE, 1.1 fldigi.spec, 1.10, 1.11

[Miloš Jakubíček]

Author: mjakubicek

Update of /cvs/pkgs/rpms/fldigi/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv10448/devel

Modified Files:
	fldigi.spec 
Added Files:
	fldigi-gcc44.patch 
Log Message:
- Fix FTBFS: added fldigi-gcc44.patch



fldigi-gcc44.patch:

--- NEW FILE fldigi-gcc44.patch ---
--- src/dialogs/font_browser.cxx.orig	2009-04-25 00:03:42.000000000 +0200
+++ src/dialogs/font_browser.cxx	2009-04-25 00:03:49.000000000 +0200
@@ -32,6 +32,7 @@
 #include <string>
 #include <cstdlib>
 #include <cstring>
+#include <cstdio>
 
 #include "font_browser.h"
 
--- src/misc/qrzlib.cxx.orig	2009-04-25 00:11:54.000000000 +0200
+++ src/misc/qrzlib.cxx	2009-04-25 00:13:06.000000000 +0200
@@ -775,44 +775,44 @@
   
   if( found == 1 ) {
     Qcall = recbuffer;
-    comma = strchr( Qcall, ',' );
+    comma = (char *) strchr( Qcall, ',' );
     *comma = 0;
     Qlname = comma + 1;
-    comma = strchr( Qlname, ',' );
+    comma = (char *) strchr( Qlname, ',' );
     *comma = 0;
     Qfname = comma + 1;
-    comma = strchr( Qfname, ',' );
+    comma = (char *) strchr( Qfname, ',' );
     Qfname = comma + 1;      // skip JR field
-    comma = strchr( Qfname, ',' );
+    comma = (char *) strchr( Qfname, ',' );
     *comma = 0;
     Qdob = comma + 1;
-    comma = strchr( Qdob, ',' );
+    comma = (char *) strchr( Qdob, ',' );
     Qdob = comma + 1;        // skip MI field
-    comma = strchr( Qdob, ',' );
+    comma = (char *) strchr( Qdob, ',' );
     *comma = 0;
     Qefdate = comma + 1;
-    comma = strchr( Qefdate, ',' );
+    comma = (char *) strchr( Qefdate, ',' );
     *comma = 0;
     Qexpdate = comma + 1;
-    comma = strchr( Qexpdate, ',' );
+    comma = (char *) strchr( Qexpdate, ',' );
     *comma = 0;
     Qmail_str = comma + 1;
-    comma = strchr( Qmail_str, ',' );
+    comma = (char *) strchr( Qmail_str, ',' );
     *comma = 0;
     Qmail_city = comma + 1;
-    comma = strchr( Qmail_city, ',' );
+    comma = (char *) strchr( Qmail_city, ',' );
     *comma = 0;
     Qmail_st = comma + 1;
-    comma = strchr( Qmail_st, ',' );
+    comma = (char *) strchr( Qmail_st, ',' );
     *comma = 0;
     Qmail_zip = comma + 1;
-    comma = strchr( Qmail_zip, ',' );
+    comma = (char *) strchr( Qmail_zip, ',' );
     *comma = 0;
     Qopclass = comma + 1;
-    comma = strchr( Qopclass, ',' );
+    comma = (char *) strchr( Qopclass, ',' );
     *comma = 0;
     Qp_call = comma + 1;
-    comma = strchr( Qp_call, ',' );
+    comma = (char *) strchr( Qp_call, ',' );
     *comma = 0;
     Qp_class = comma + 1;
     //Qp_class[1] = 0;
--- src/widgets/picture.cxx.orig	2009-04-25 00:17:36.000000000 +0200
+++ src/widgets/picture.cxx	2009-04-25 00:17:51.000000000 +0200
@@ -384,7 +384,7 @@
 	if (strstr(text, "file://"))
 		text += strlen("file://");
 	char* p;
-	if ((p = strchr(text, '\r')))
+	if ((p = (char *) strchr(text, '\r')))
 		*p = '\0';
 
 	struct stat st;
--- src/misc/socket.cxx.orig	2009-04-25 00:13:57.000000000 +0200
+++ src/misc/socket.cxx	2009-04-25 00:19:03.000000000 +0200
@@ -39,6 +39,7 @@
 #include <cstring>
 #include <cstdlib>
 #include <cmath>
+#include <stdio.h>
 
 #ifndef NDEBUG
   #include "debug.h"


Index: fldigi.spec
===================================================================
RCS file: /cvs/pkgs/rpms/fldigi/devel/fldigi.spec,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- fldigi.spec	24 Feb 2009 17:28:01 -0000	1.10
+++ fldigi.spec	24 Apr 2009 22:32:20 -0000	1.11
@@ -1,12 +1,14 @@
 Name:		fldigi
 Version:	3.10
-Release:	2%{?dist}
+Release:	3%{?dist}
 Summary:	Digital modem program for Linux
 
 Group:		Applications/Communications
 License:	GPLv2+	
 URL:		http://www.w1hkj.com/fldigi-distro/
 Source0:	http://www.w1hkj.com/fldigi-distro/%{name}-%{version}.tar.gz
+# The package should be updated to current, patch re-diffed and send upstream!
+Patch0:		%{name}-gcc44.patch
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  hamlib-devel, fltk-devel, libjpeg-devel, libpng-devel
@@ -22,10 +24,11 @@
 
 %prep
 %setup -q
+%patch0
 
 %build
 %configure
-make %{?_smp_mflags} CFLAGS="$RPM_OPT_FLAGS"
+make -k %{?_smp_mflags} CFLAGS="$RPM_OPT_FLAGS"
 
 %install
 rm -rf $RPM_BUILD_ROOT
@@ -48,6 +51,9 @@
 %attr(0644,root,root) %{_datadir}/applications/%{name}.desktop
 
 %changelog
+* Sat Apr 25 2009 Milos Jakubicek <xjakub at fi.muni.cz> - 3.10-3
+- Fix FTBFS: added fldigi-gcc44.patch
+
 * Tue Feb 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 3.10-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild