2021-06-07 23:46:45 +00:00
|
|
|
Index: rig/rigcontrol.cpp
|
|
|
|
|
===================================================================
|
srcpkgs/q*: convert patches to -Np1
* par is kept at -Np0
```sh
git grep -l '^patch_args=-Np0' "srcpkgs/$1*/template" |
while read template; do
for p in ${template%/template}/patches/*; do
sed -i '
\,^[+-][+-][+-] /dev/null,b
/^[*-]\+ [0-9]\+\(,[0-9]\+\)\? [*-]\+$/b
s,^[*][*][*] ,&a/,
/^--- /{
s,\(^--- \)\(./\)*,\1a/,
s,[.-][Oo][Rr][Ii][Gg]\([ /]\),\1,
s/[.-][Oo][Rr][Ii][Gg]$//
s/[.]patched[.]\([^.]\)/.\1/
h
}
/^+++ -/{
g
s/^--- a/+++ b/
b
}
s,\(^+++ \)\(./\)*,\1b/,
' "$p"
done
sed -i '/^patch_args=/d' $template
done
```
2021-06-19 03:03:21 +00:00
|
|
|
--- a/rig/rigcontrol.cpp
|
|
|
|
|
+++ b/rig/rigcontrol.cpp
|
2021-06-07 23:46:45 +00:00
|
|
|
@@ -34,6 +34,10 @@
|
|
|
|
|
|
|
|
|
|
#define MAXCONFLEN 128
|
|
|
|
|
|
|
|
|
|
+#ifndef HAMLIB_FILPATHLEN
|
|
|
|
|
+#define HAMLIB_FILPATHLEN FILEPATHLEN
|
|
|
|
|
+#endif
|
|
|
|
|
+
|
|
|
|
|
|
|
|
|
|
QList<const rig_caps *> capsList;
|
|
|
|
|
bool radiolistLoaded=false;
|
|
|
|
|
@@ -87,7 +91,7 @@ bool rigControl::init()
|
|
|
|
|
}
|
|
|
|
|
if(!catParams.serialPort.isEmpty())
|
|
|
|
|
{
|
|
|
|
|
- strncpy(my_rig->state.rigport.pathname,(const char *)catParams.serialPort.toLatin1().data(),FILPATHLEN-1);
|
|
|
|
|
+ strncpy(my_rig->state.rigport.pathname,(const char *)catParams.serialPort.toLatin1().data(),HAMLIB_FILPATHLEN-1);
|
|
|
|
|
}
|
|
|
|
|
// strncpy(my_rig->state.pttport.pathname,(const char *)catParams.serialPort.toLatin1().data(),FILPATHLEN);
|
|
|
|
|
my_rig->state.rigport.parm.serial.rate = catParams.baudrate;
|
