ec4c2d75fa
```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
```
37 lines
1.3 KiB
Diff
37 lines
1.3 KiB
Diff
Index: external/hamlib/hamlib/rig.h
|
|
===================================================================
|
|
--- a/external/hamlib/hamlib/rig.h
|
|
+++ b/external/hamlib/hamlib/rig.h
|
|
@@ -147,7 +147,7 @@ typedef struct rig RIG;
|
|
|
|
#define RIGNAMSIZ 30
|
|
#define RIGVERSIZ 8
|
|
-#define FILPATHLEN 100
|
|
+#define HAMLIB_FILPATHLEN 100
|
|
#define FRQRANGESIZ 30
|
|
#define MAXCHANDESC 30 /* describe channel eg: "WWV 5Mhz" */
|
|
#define TSLSTSIZ 20 /* max tuning step list size, zero ended */
|
|
@@ -1479,7 +1479,7 @@ typedef struct hamlib_port {
|
|
int timeout; /*!< Timeout, in mS */
|
|
int retry; /*!< Maximum number of retries, 0 to disable */
|
|
|
|
- char pathname[FILPATHLEN]; /*!< Port pathname */
|
|
+ char pathname[HAMLIB_FILPATHLEN]; /*!< Port pathname */
|
|
|
|
union {
|
|
struct {
|
|
|
|
Index: src/rig/RigThread.cpp
|
|
===================================================================
|
|
--- a/src/rig/RigThread.cpp
|
|
+++ b/src/rig/RigThread.cpp
|
|
@@ -114,7 +114,7 @@ void RigThread::run() {
|
|
std::cout << "Rig thread starting." << std::endl;
|
|
|
|
rig = rig_init(rigModel);
|
|
- strncpy(rig->state.rigport.pathname, rigFile.c_str(), FILPATHLEN - 1);
|
|
+ strncpy(rig->state.rigport.pathname, rigFile.c_str(), HAMLIB_FILPATHLEN - 1);
|
|
rig->state.rigport.parm.serial.rate = serialRate;
|
|
retcode = rig_open(rig);
|
|
|