diff options
Diffstat (limited to 'ham/linpsk/patches')
| -rw-r--r-- | ham/linpsk/patches/patch-aa | 37 | ||||
| -rw-r--r-- | ham/linpsk/patches/patch-ab | 10 | ||||
| -rw-r--r-- | ham/linpsk/patches/patch-ac | 10 | ||||
| -rw-r--r-- | ham/linpsk/patches/patch-ad | 49 | ||||
| -rw-r--r-- | ham/linpsk/patches/patch-ae | 23 | ||||
| -rw-r--r-- | ham/linpsk/patches/patch-af | 16 | ||||
| -rw-r--r-- | ham/linpsk/patches/patch-ah | 17 | ||||
| -rw-r--r-- | ham/linpsk/patches/patch-ai | 10 |
8 files changed, 44 insertions, 128 deletions
diff --git a/ham/linpsk/patches/patch-aa b/ham/linpsk/patches/patch-aa deleted file mode 100644 index 88eab3185e4..00000000000 --- a/ham/linpsk/patches/patch-aa +++ /dev/null @@ -1,37 +0,0 @@ -$NetBSD: patch-aa,v 1.1.1.1 2005/01/23 20:32:42 wulf Exp $ - ---- configure.orig 2004-07-27 04:51:41.000000000 +0930 -+++ configure 2004-10-01 23:57:19.000000000 +0930 -@@ -1047,7 +1047,7 @@ - include additional configurations [automatic] - --with-x use the X Window System - --with-qtdir=DIR Qt installation directory default=$QTDIR -- --with-fftw-base=DIR Base directory for fftw include and library -+ --with-fftw-dir=DIR Base directory for fftw include and library - - Some influential environment variables: - CC C compiler command -@@ -19136,7 +19136,7 @@ - { echo "$as_me:$LINENO: WARNING: output file \`$ofile' does not exist" >&5 - echo "$as_me: WARNING: output file \`$ofile' does not exist" >&2;} - fi -- if test -z `grep -e 'shared_ext.*shrext' $ofile`; then -+ if test -z "`grep -e 'shared_ext.*shrext' $ofile`"; then - # Make sure $shared_ext gets set to $shrext - if sed -e 's/shared_ext/shrext/g' "$ofile" > "${ofile}T"; then - mv "${ofile}T" "$ofile" -@@ -19795,10 +19795,10 @@ - echo "$as_me:$LINENO: checking FFTW lib" >&5 - echo $ECHO_N "checking FFTW lib... $ECHO_C" >&6 - --# Check whether --with-FFTW_BASE_DIR or --without-FFTW_BASE_DIR was given. --if test "${with_FFTW_BASE_DIR+set}" = set; then -- withval="$with_FFTW_BASE_DIR" -- -+# Check whether --with-fftw-dir or --without-fftw-base-dir was given. -+if test "${with_fftw_dir+set}" = set; then -+ withval="$with_fftw_dir" -+ FFTW_BASE_DIR=$withval - fi; - if test x"$FFTW_BASE_DIR" = x ; then - FFTW_SEARCH="/usr /usr/local /usr/lib/ /sw /sw/lib qt" diff --git a/ham/linpsk/patches/patch-ab b/ham/linpsk/patches/patch-ab index e9e5b158a0c..6a87bf086d8 100644 --- a/ham/linpsk/patches/patch-ab +++ b/ham/linpsk/patches/patch-ab @@ -1,10 +1,8 @@ -$NetBSD: patch-ab,v 1.1 2005/03/16 15:32:12 rillig Exp $ +$NetBSD: patch-ab,v 1.2 2005/08/15 14:03:53 wulf Exp $ -Needed for g++-2.95.3. - ---- src/cpskdemodulator.cpp.orig Sun Jul 4 17:50:45 2004 -+++ src/cpskdemodulator.cpp Wed Mar 16 03:02:48 2005 -@@ -559,7 +559,7 @@ if ( UseAfc ) +--- src/cpskdemodulator.cpp.orig 2005-03-13 21:42:44.000000000 +1030 ++++ src/cpskdemodulator.cpp 2005-08-15 05:35:35.000000000 +0930 +@@ -551,7 +551,7 @@ { Phase_Vector=m_BitSignal*conj(Prev_Sample); Prev_Sample = m_BitSignal; diff --git a/ham/linpsk/patches/patch-ac b/ham/linpsk/patches/patch-ac index 3e26a4c190f..e028f57fc6f 100644 --- a/ham/linpsk/patches/patch-ac +++ b/ham/linpsk/patches/patch-ac @@ -1,9 +1,7 @@ -$NetBSD: patch-ac,v 1.1 2005/03/16 15:32:12 rillig Exp $ +$NetBSD: patch-ac,v 1.2 2005/08/15 14:03:53 wulf Exp $ -Needed for g++-2.95.3. - ---- src/crxdisplay.cpp.orig Sun Jul 4 17:50:45 2004 -+++ src/crxdisplay.cpp Wed Mar 16 03:28:45 2005 +--- src/crxdisplay.cpp.orig 2005-03-12 03:49:18.000000000 +1030 ++++ src/crxdisplay.cpp 2005-08-15 05:36:46.000000000 +0930 @@ -27,7 +27,7 @@ #include <qstyle.h> #include <qpalette.h> @@ -13,7 +11,7 @@ Needed for g++-2.95.3. #include "crecording.h" #include "crxchannel.h" -@@ -69,7 +69,7 @@ void MyTabBar::paintLabel ( QPainter *p, +@@ -68,7 +68,7 @@ { int position=t->identifier(); if ( position >= 0 && position < Farbe->size() ) diff --git a/ham/linpsk/patches/patch-ad b/ham/linpsk/patches/patch-ad index b8e3277a9ac..d0aeb211a72 100644 --- a/ham/linpsk/patches/patch-ad +++ b/ham/linpsk/patches/patch-ad @@ -1,29 +1,30 @@ -$NetBSD: patch-ad,v 1.1 2005/03/16 15:32:12 rillig Exp $ +$NetBSD: patch-ad,v 1.2 2005/08/15 14:03:53 wulf Exp $ -Needed for g++-2.95.3. - ---- src/interfaces/editmacro.ui.h.orig Sun Jul 4 17:50:45 2004 -+++ src/interfaces/editmacro.ui.h Wed Mar 16 02:37:57 2005 -@@ -7,9 +7,10 @@ - ** place of a destructor. - *****************************************************************************/ - +--- src/macros.cpp.orig 2005-08-15 06:57:24.000000000 +0930 ++++ src/macros.cpp 2005-08-15 07:10:05.000000000 +0930 +@@ -13,7 +13,7 @@ + * the Free Software Foundation; either version 2 of the License, or * + * (at your option) any later version. * + ***************************************************************************/ - ++#include "pkgsrc_fixes.h" #include "macros.h" - #include <vector> -+#include <pkgsrc_fixes.h> -+ - using namespace std; - void EditMacro::init( Macros *k) + #include "parameter.h" + #include "ctxbuffer.h" +@@ -220,13 +220,13 @@ + } + void Macros::setDefinition(QString s,int position) + { +-MacroText.at(position)=s; ++at_replacement(MacroText, position)=s; + } + void Macros::setAccelerator(QString s,int position) { -@@ -44,8 +45,8 @@ void EditMacro::accept() +-Accelerator.at(position)=s; ++at_replacement(Accelerator,position)=s; + } + void Macros::setMacroName(QString s,int MacroNumber) { - int AktPosition, NewPosition; - AktPosition=SelectMacro->currentItem()-1; --AllMacros->MacroText.at(AktPosition)=Definition->text(); --AllMacros->Accelerator.at(AktPosition)=Accelerator->text(); -+at_replacement(AllMacros->MacroText, AktPosition)=Definition->text(); -+at_replacement(AllMacros->Accelerator, AktPosition)=Accelerator->text(); - /** Position Change to be done later - NewPosition=Position->value(); - if (AktPosition != NewPosition ) +-MacroNames.at(MacroNumber)=s; ++at_replacement(MacroNames,MacroNumber)=s; + } diff --git a/ham/linpsk/patches/patch-ae b/ham/linpsk/patches/patch-ae deleted file mode 100644 index 9adfa9fa0b6..00000000000 --- a/ham/linpsk/patches/patch-ae +++ /dev/null @@ -1,23 +0,0 @@ -$NetBSD: patch-ae,v 1.1 2005/03/16 15:32:12 rillig Exp $ - -Needed for g++-2.95.3. - ---- src/interfaces/renamemacro.ui.h.orig Sun Jul 4 17:50:45 2004 -+++ src/interfaces/renamemacro.ui.h Wed Mar 16 02:28:54 2005 -@@ -12,6 +12,7 @@ - - #include <qmessagebox.h> - -+#include <pkgsrc_fixes.h> - - //using namespace std; - -@@ -41,7 +42,7 @@ if (NewName->text().length() ==0 ) - return; - } - else -- AllMacros->MacroNames.at(MacroNumber)=NewName->text(); -+ at_replacement(AllMacros->MacroNames, MacroNumber)=NewName->text(); - QDialog::accept(); - - } diff --git a/ham/linpsk/patches/patch-af b/ham/linpsk/patches/patch-af index 9976f57e772..c0362c49cf3 100644 --- a/ham/linpsk/patches/patch-af +++ b/ham/linpsk/patches/patch-af @@ -1,9 +1,7 @@ -$NetBSD: patch-af,v 1.1 2005/03/16 15:32:12 rillig Exp $ +$NetBSD: patch-af,v 1.2 2005/08/15 14:03:53 wulf Exp $ -Needed for g++-2.95.3. - ---- src/linpsk.cpp.orig Fri Jul 23 16:41:47 2004 -+++ src/linpsk.cpp Wed Mar 16 03:01:04 2005 +--- src/linpsk.cpp.orig 2005-03-12 03:51:20.000000000 +1030 ++++ src/linpsk.cpp 2005-08-15 07:14:45.000000000 +0930 @@ -44,6 +44,8 @@ #include <vector> @@ -13,12 +11,12 @@ Needed for g++-2.95.3. #include "controlpanel.h" #include "crxdisplay.h" #include "ctxdisplay.h" -@@ -421,7 +423,7 @@ if ( Channel->exec() != 0) - (Mode) Channel->RxMode->currentItem(), +@@ -416,7 +418,7 @@ + rxmode, Channel->TitleText->text()); - settings.ActChannel->setWindowColor(WindowColors.at(settings.RxChannels)); + settings.ActChannel->setWindowColor(at_replacement(WindowColors,settings.RxChannels)); settings.RxChannels++; - RxDisplay->RxFreq->setAFCWide(settings.ActChannel->getAFCWide()); - + RxDisplay->RxFreq->setAfcDisplayMode(settings.ActChannel->AfcProperties()); + } diff --git a/ham/linpsk/patches/patch-ah b/ham/linpsk/patches/patch-ah deleted file mode 100644 index 5a23b4cbe01..00000000000 --- a/ham/linpsk/patches/patch-ah +++ /dev/null @@ -1,17 +0,0 @@ -$NetBSD: patch-ah,v 1.1 2005/03/16 15:32:12 rillig Exp $ - -g++-2.95.3 does not know the min() and max() macros/functions. - ---- src/rtty2demodulator.cpp.orig Sun Jul 4 17:50:45 2004 -+++ src/rtty2demodulator.cpp Wed Mar 16 03:34:16 2005 -@@ -149,8 +149,8 @@ while ( actSample < NxSamples ) - { - j=(ThresholdPointer+i)%SampleBufferLength; - float x=ThresholdBuffer[j]; -- xmax=max(xmax,x); -- xmin=min(xmin,x); -+ xmax= xmax > x ? xmax : x; -+ xmin= xmin < x ? xmin : x; - } - DiscriminatorThreshold=(xmax+xmin)/2.; - diff --git a/ham/linpsk/patches/patch-ai b/ham/linpsk/patches/patch-ai index 85815cf7a4c..4c0fc74b14b 100644 --- a/ham/linpsk/patches/patch-ai +++ b/ham/linpsk/patches/patch-ai @@ -1,9 +1,7 @@ -$NetBSD: patch-ai,v 1.1 2005/03/16 15:32:12 rillig Exp $ +$NetBSD: patch-ai,v 1.2 2005/08/15 14:03:53 wulf Exp $ -Needed for g++-2.95.3. - ---- src/spectrumdisplay.cpp.orig Sun Jul 25 18:00:51 2004 -+++ src/spectrumdisplay.cpp Wed Mar 16 03:25:07 2005 +--- src/spectrumdisplay.cpp.orig 2005-03-13 20:32:03.000000000 +1030 ++++ src/spectrumdisplay.cpp 2005-08-15 07:24:05.000000000 +0930 @@ -21,6 +21,8 @@ #include <qpainter.h> #include <qsplitter.h> @@ -13,7 +11,7 @@ Needed for g++-2.95.3. #include "spectrumdisplay.h" #include "crxchannel.h" #include "parameter.h" -@@ -181,7 +183,7 @@ paintLineal(&p,xmax,ymax); +@@ -178,7 +180,7 @@ { int ID = pRx->getID(); if ( ID >= 0 && ID < Farbe->size() ) |