[fldigi] Fix failure to build on rawhide

[Randall 'Randy' Berry]

commit db151ced6e223aeeec3d879ca168397f154613ae
Author: dp67 <dp67 at fedoraproject.org>
Date:   Mon Jan 16 10:26:39 2012 -0500

    Fix failure to build on rawhide

 .gitignore              |    1 +
 flarq.cxx-unistd.patch  |   12 ++++++++++++
 fldigi-rx_extract.patch |   11 +++++++++++
 fldigi-wefax-pic.patch  |   13 +++++++++++++
 fldigi-wefax.patch      |   11 +++++++++++
 fldigi.spec             |   19 ++++++++++++++++---
 sources                 |    2 +-
 7 files changed, 65 insertions(+), 4 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 3bdf1ab..9fad1bb 100644
--- a/.gitignore
+++ b/.gitignore
@@ -9,3 +9,4 @@ fldigi-3.20.20.tar.gz
 /fldigi-3.21.11.tar.gz
 /fldigi-3.21.16.tar.gz
 /fldigi-3.21.34.tar.gz
+/fldigi-3.21.35.tar.gz
diff --git a/flarq.cxx-unistd.patch b/flarq.cxx-unistd.patch
new file mode 100644
index 0000000..24a2999
--- /dev/null
+++ b/flarq.cxx-unistd.patch
@@ -0,0 +1,12 @@
+diff -up ./src/flarq-src/flarq.cxx.orig ./src/flarq-src/flarq.cxx
+--- ./src/flarq-src/flarq.cxx.orig	2012-01-12 10:53:53.000000000 -0500
++++ ./src/flarq-src/flarq.cxx	2012-01-16 08:00:41.755770552 -0500
+@@ -21,7 +21,7 @@
+ // ----------------------------------------------------------------------------
+ 
+ #include <config.h>
+-
++#include <unistd.h>
+ #include <stdlib.h>
+ #include <iostream>
+ #include <fstream>
diff --git a/fldigi-rx_extract.patch b/fldigi-rx_extract.patch
new file mode 100644
index 0000000..3641cab
--- /dev/null
+++ b/fldigi-rx_extract.patch
@@ -0,0 +1,11 @@
+diff -up ./src/logger/rx_extract.cxx.bac ./src/logger/rx_extract.cxx
+--- ./src/logger/rx_extract.cxx.bac	2012-01-12 10:53:53.000000000 -0500
++++ ./src/logger/rx_extract.cxx	2012-01-16 09:31:48.289795449 -0500
+@@ -21,6 +21,7 @@
+ 
+ #include <config.h>
+ 
++#include <unistd.h>
+ #include <iostream>
+ #include <fstream>
+ #include <string>
diff --git a/fldigi-wefax-pic.patch b/fldigi-wefax-pic.patch
new file mode 100644
index 0000000..4d4546c
--- /dev/null
+++ b/fldigi-wefax-pic.patch
@@ -0,0 +1,13 @@
+diff -up ./src/wefax/wefax-pic.cxx.old ./src/wefax/wefax-pic.cxx
+--- ./src/wefax/wefax-pic.cxx.old	2012-01-12 10:53:53.000000000 -0500
++++ ./src/wefax/wefax-pic.cxx	2012-01-16 10:06:56.351312369 -0500
+@@ -30,7 +30,9 @@
+ #include <sstream>
+ #include <iomanip>
+ 
++
+ #include <time.h>
++#include <unistd.h>
+ 
+ #include <FL/Fl_Widget.H>
+ #include <FL/Fl_Button.H>
diff --git a/fldigi-wefax.patch b/fldigi-wefax.patch
new file mode 100644
index 0000000..e5b2eee
--- /dev/null
+++ b/fldigi-wefax.patch
@@ -0,0 +1,11 @@
+diff -up ./src/wefax/wefax.cxx.diff ./src/wefax/wefax.cxx
+--- ./src/wefax/wefax.cxx.diff	2012-01-12 10:53:53.000000000 -0500
++++ ./src/wefax/wefax.cxx	2012-01-16 09:41:59.159764618 -0500
+@@ -25,6 +25,7 @@
+ 
+ #include <config.h>
+ 
++#include <unistd.h>
+ #include <cstdlib>
+ #include <sstream>
+ #include <iostream>
diff --git a/fldigi.spec b/fldigi.spec
index b60310b..a5b60f0 100755
--- a/fldigi.spec
+++ b/fldigi.spec
@@ -1,11 +1,15 @@
 Name:		fldigi
-Version:	3.21.34
-Release:	3%{?dist}
+Version:	3.21.35
+Release:	2%{?dist}
 Summary:	Digital modem program for Linux
 Group:		Applications/Communications
 License:	GPLv3+	
 URL:		http://www.w1hkj.com/Fldigi.html
 Source0:	http://www.w1hkj.com/alpha/%{name}/%{name}-%{version}.tar.gz
+Patch0:		flarq.cxx-unistd.patch
+Patch1:		fldigi-rx_extract.patch
+Patch2:		fldigi-wefax.patch
+Patch3:		fldigi-wefax-pic.patch
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:	hamlib-devel
@@ -41,6 +45,10 @@ exported by fldigi, and also defines some useful commands of its own.
 
 %prep
 %setup -q -n %{name}-%{version}
+%patch0 -p1 -b flarq.cxx-unistd.patch
+%patch1	-p1 -b fldigi-rx_extract.patch
+%patch2	-p1 -b fldigi-wefax.patch
+%patch3	-p1 -b fldigi-wefax-pic.patch
 
 # Fix spurious executeable
 chmod 644 ./src/olivia/olivia.cxx
@@ -82,9 +90,14 @@ rm -rf $RPM_BUILD_ROOT
 %attr(0644,root,root) %{_datadir}/applications/flarq.desktop
 
 %changelog
+* Sun Jan 15 2012 Randall J. Berry, N3LRX <dp67 at fedoraproject.org> - 3.21.35-2
+- Add patches for testing error correction
+- Update rawhide builds
+* Sun Jan 15 2012 Randall J. Berry, N3LRX <dp67 at fedoraproject.org> - 3.21.35-1
+- Upstream upddate to 3.21.35
+- Rebuild against gcc 4.7
 * Fri Jan 13 2012 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 3.21.34-3
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild
-
 * Mon Jan 2 2012 Randall J. Berry, N3LRX <dp67 at fedoraproject.org> - 3.21.34-2
 - Test Build Against FLTK 1.3
 * Thu Dec 28 2011 Randall J. Berry <dp67 at fedoraproject.org> - 3.21.34-1
diff --git a/sources b/sources
index c65d314..127f444 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-a10705cd68c3f0a58f73bab3fc2492fb  fldigi-3.21.34.tar.gz
+301a3459affe5229260df27df2f0ab5c  fldigi-3.21.35.tar.gz