From 88db50add5e446dc8379029daafc7f9354e25861 Mon Sep 17 00:00:00 2001
From: joerg <joerg>
Date: Fri, 20 Nov 2015 14:29:17 +0000
Subject: Regenerate patch to fix context.

---
 ham/fldigi/distinfo                      |  4 ++--
 ham/fldigi/patches/patch-src_fsq_fsq.cxx | 12 ++++++------
 2 files changed, 8 insertions(+), 8 deletions(-)

(limited to 'ham')

diff --git a/ham/fldigi/distinfo b/ham/fldigi/distinfo
index 1f7e33db380..5227b6a51a3 100644
--- a/ham/fldigi/distinfo
+++ b/ham/fldigi/distinfo
@@ -1,11 +1,11 @@
-$NetBSD: distinfo,v 1.33 2015/11/03 19:03:27 joerg Exp $
+$NetBSD: distinfo,v 1.34 2015/11/20 14:29:17 joerg Exp $
 
 SHA1 (fldigi-3.23.04.tar.gz) = 6f34c107c4dd86bc3291a24a74693dfc7a3e86e0
 RMD160 (fldigi-3.23.04.tar.gz) = 89e6ce57379015289d06b0f70a9189002996f3f1
 SHA512 (fldigi-3.23.04.tar.gz) = af332e0da86300e5a18adec8841dabad3ceaea8cf0352b49a88a3387bf53422b4d19e73894352eb0f454f47f6612f37a5476f32dd25ddc49a80f287e345aeb3b
 Size (fldigi-3.23.04.tar.gz) = 2959610 bytes
 SHA1 (patch-src_dominoex_dominoex.cxx) = 4c9a36896ee18562c2dee044f61301abde4f9a30
-SHA1 (patch-src_fsq_fsq.cxx) = 1356667cd19baa746014916bd7536c246bac91db
+SHA1 (patch-src_fsq_fsq.cxx) = 6c9aa1b7c28bbc8218b471794e5a670005cfc795
 SHA1 (patch-src_ifkp_ifkp.cxx) = 22ce623ca24491a6ea9efb063851b1f04b7a7317
 SHA1 (patch-src_include_qrunner.h) = c395684f676bcd06e0d0f8a95a9c22dc92667879
 SHA1 (patch-src_misc_configuration.cxx) = 4ebf0c46913f73047ad5b858f6d4ae9def82ec60
diff --git a/ham/fldigi/patches/patch-src_fsq_fsq.cxx b/ham/fldigi/patches/patch-src_fsq_fsq.cxx
index 54c40a252ce..148dc0185f2 100644
--- a/ham/fldigi/patches/patch-src_fsq_fsq.cxx
+++ b/ham/fldigi/patches/patch-src_fsq_fsq.cxx
@@ -1,11 +1,11 @@
-$NetBSD: patch-src_fsq_fsq.cxx,v 1.3 2015/11/03 19:03:27 joerg Exp $
+$NetBSD: patch-src_fsq_fsq.cxx,v 1.4 2015/11/20 14:29:17 joerg Exp $
 
 Resolve conflict between std::next and the local variable of the same name.
 std::complex::imag() and std::complex::real() are not lvalues.
 
 --- src/fsq/fsq.cxx.orig	2015-09-28 18:24:41.000000000 +0000
 +++ src/fsq/fsq.cxx
-@@ -1193,9 +1193,12 @@ int fsq::rx_process(const double *buf, i
+@@ -1195,9 +1195,12 @@ int fsq::rx_process(const double *buf, i
  						&rx_stream[SHIFT_SIZE],				// from
  						BLOCK_SIZE*sizeof(*rx_stream));	// # bytes
  				memset(fft_data, 0, sizeof(fft_data));
@@ -21,16 +21,16 @@ std::complex::imag() and std::complex::real() are not lvalues.
  				fft->ComplexFFT(fft_data);
  				process_tones();
  			}
-@@ -1423,7 +1426,7 @@ static string tx_text_queue = "";
+@@ -1426,7 +1429,7 @@ static string tx_text_queue = "";
  
  static vector<string> commands;
  #define NUMCOMMANDS 10
 -static size_t next = 0;
 +static size_t nextidx = 0;
  
- double fsq_xmtdelay() // in seconds
+ void  clear_xmt_arrays()
  {
-@@ -1440,9 +1443,9 @@ double fsq_xmtdelay() // in seconds
+@@ -1450,9 +1453,9 @@ double fsq_xmtdelay() // in seconds
  void fsq_repeat_last_command()
  {
  	fsq_tx_text->clear();
@@ -43,7 +43,7 @@ std::complex::imag() and std::complex::real() are not lvalues.
  }
  
  int get_fsq_tx_char(void)
-@@ -1484,7 +1487,7 @@ void try_transmit(void *)
+@@ -1494,7 +1497,7 @@ void try_transmit(void *)
  	if (active_modem != fsq_modem) return;
  
  	if (!active_modem->fsq_squelch_open() && trx_state == STATE_RX) {
-- 
cgit v1.2.3