635e9da391
* 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 ```
24 lines
845 B
Diff
24 lines
845 B
Diff
Index: rig/rigcontrol.cpp
|
|
===================================================================
|
|
--- a/rig/rigcontrol.cpp
|
|
+++ b/rig/rigcontrol.cpp
|
|
@@ -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;
|