Il 18/05/23 11:53, Marco Calistri via wsjt-devel ha scritto:
Il 18/05/23 11:42, Marco Calistri via wsjt-devel ha scritto:
Il 18/05/23 07:52, Brian Morrison via wsjt-devel ha scritto:
diff -Naur wsjtx.orig/qmap/astro.cpp wsjtx/qmap/astro.cpp
--- wsjtx.orig/qmap/astro.cpp   2023-05-12 13:55:48
+++ wsjtx/qmap/astro.cpp        2023-05-12 13:57:23
@@ -72,7 +72,7 @@
datcom_.ndop00=ndop00; //Send self Doppler to decoder, via datcom
  //  qDebug() << "aa" << isec << datcom_.fcenter << nfreq << ndop00;
-  sprintf(cc,
+  snprintf(cc, sizeof(cc),
            "Az:    %6.1f\n"
            "El:    %6.1f\n"
            "MyDop: %6d\n"
@@ -140,7 +140,7 @@
        if(f.open(QIODevice::WriteOnly | QIODevice::Append)) {
          QTextStream out(&f);
          out << t.toString("yyyy-MMM-dd hh:mm:ss");
-        sprintf(cc,"%7.1f %7.1f   %d %7.1f %7.1f %10.1f %7.2f\n",
+        snprintf(cc,sizeof(cc),"%7.1f %7.1f   %d %7.1f %7.1f %10.1f %7.2f\n",
                  azsun,elsun,iCycle,azOffset,elOffset,xavg,10.0*log10(xavg));
          out << cc;
          f.close();
@@ -168,7 +168,7 @@
    if(ntxFreq != ntxFreq0) ndiff=1;
    ntxFreq0=ntxFreq;
    QTextStream out(&f);
-  sprintf(cc,"%2.2d:%2.2d:%2.2d,%5.1f,%5.1f,Moon\n"
+  snprintf(cc,sizeof(cc),"%2.2d:%2.2d:%2.2d,%5.1f,%5.1f,Moon\n"
            "%2.2d:%2.2d:%2.2d,%5.1f,%5.1f,Sun\n"
            "%2.2d:%2.2d:%2.2d,%5.1f,%5.1f,Source\n"
            "%4d,%6d,%6d,Doppler\n"
diff -Naur wsjtx.orig/qmap/libqmap/q65c.f90 wsjtx/qmap/libqmap/q65c.f90
--- wsjtx.orig/qmap/libqmap/q65c.f90    2023-05-12 13:55:48
+++ wsjtx/qmap/libqmap/q65c.f90 2023-05-12 13:56:41
@@ -20,9 +20,9 @@
!### REMEMBER that/npar/ is not updated until nparams=nparams0 is executed. ###
    common/npar/fcenter,nutc,fselected,mousedf,mousefqso,nagain,                
&
-       ndepth,ndiskdat,neme,newdat,nfa,nfb,nfcal,nfshift,                 &
+       ndepth,ndiskdat,neme,newdat,nfcal,nfshift,                 &
         mcall3,nkeep,ntol,nxant,nrxlog,nfsample,nxpol,nmode,               &
-       ndop00,nsave,max_drift,nhsym,mycall,mygrid,hiscall,hisgrid,        &
+       ndop00,nsave,nhsym,mycall,mygrid,hiscall,hisgrid,        &
         datetime,junk1,junk2
    equivalence (nparams,fcenter)
    data first/.true./
diff -Naur wsjtx.orig/qmap/soundin.cpp wsjtx/qmap/soundin.cpp
--- wsjtx.orig/qmap/soundin.cpp 2023-05-12 13:55:48
+++ wsjtx/qmap/soundin.cpp      2023-05-12 13:57:57
@@ -173,7 +173,7 @@
    int ntr;
    int nhsym0=0;
    int iz=174;
-  int nBusy=0;
+//  int nBusy=0;
// Main loop for input of UDP packets over the network:
    while (!qe) {
@@ -217,7 +217,7 @@
          m_hsym=(k-2048)*11025.0/(2048.0*m_rate);
          if(m_hsym != nhsym0) {
            if(m_dataSinkBusy) {
-            nBusy++;
+ //           nBusy++;
            } else {
              m_dataSinkBusy=true;
              emit readyForFFT(k);         //Signal to compute new FFTs

Thanks a lot Brian!

I'm goind to test it.

Best regards!

I got this error, I know it is related to the patch file format (LF,CR,Tabs...) but I've not been to resolve it:


[ 78%] Performing patch step for 'wsjtx'
patching file qmap/astro.cpp
Hunk #1 FAILED at 72 (different line endings).
Hunk #2 FAILED at 140 (different line endings).
Hunk #3 FAILED at 168 (different line endings).
3 out of 3 hunks FAILED -- saving rejects to file qmap/astro.cpp.rej
patching file qmap/libqmap/q65c.f90
Hunk #1 FAILED at 20 (different line endings).
1 out of 1 hunk FAILED -- saving rejects to file qmap/libqmap/q65c.f90.rej
patching file qmap/soundin.cpp
Hunk #1 FAILED at 173 (different line endings).
Hunk #2 FAILED at 217 (different line endings).
2 out of 2 hunks FAILED -- saving rejects to file qmap/soundin.cpp.rej
gmake[3]: *** [CMakeFiles/wsjtx-install.dir/build.make:89: wsjtx-prefix/src/wsjtx-stamp/wsjtx-patch] Error 1 gmake[2]: *** [CMakeFiles/Makefile2:305: CMakeFiles/wsjtx-install.dir/all] Error 2 gmake[1]: *** [CMakeFiles/Makefile2:390: CMakeFiles/install.dir/rule] Error 2
gmake: *** [Makefile:267: install] Error 2

Sorry.

Regards,

I succeeded to built the code now, but I had to apply the patch by hand on each single file, by using this commands:

patch  --binary < wsjtx.patch and selecting: wsjtx-prefix/src/wsjtx/qmap/astro.cpp, q65c.f90 and soundin.cpp.

Thanks a lot to (in order of received support):

1. Hitashi T Fujinaka
2. Brian Morrison, G8SEZ
3. K7FU


Cheers!
---
*73 de Marco, PY1ZRJ (former IK5BCU)*
**
_______________________________________________
wsjt-devel mailing list
wsjt-devel@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/wsjt-devel

Reply via email to