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
```
15 lines
591 B
Diff
15 lines
591 B
Diff
Avoid `mips' as a parameter name. It is a reserved name for mips* targets.
|
|
|
|
--- a/Cbc/src/CbcModel.hpp 2015-07-07 22:44:40.000000000 +0200
|
|
+++ b/Cbc/src/CbcModel.hpp 2018-01-14 13:49:12.277278333 +0100
|
|
@@ -2394,8 +2394,8 @@
|
|
void redoWalkBack();
|
|
//@}
|
|
|
|
- void setMIPStart( const std::vector< std::pair< std::string, double > > &mips ) {
|
|
- this->mipStart_ = mips;
|
|
+ void setMIPStart( const std::vector< std::pair< std::string, double > > &start ) {
|
|
+ this->mipStart_ = start;
|
|
}
|
|
|
|
const std::vector< std::pair< std::string, double > > &getMIPStart() {
|