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
```
20 lines
1 KiB
Diff
20 lines
1 KiB
Diff
make compatible with libgit2 >= 0.24.0
|
|
https://github.com/fritzing/fritzing-app/commit/4cb5185d464bf98e9da5ceca72d5af907ff824ef
|
|
https://github.com/fritzing/fritzing-app/commit/472951243d70eeb40a53b1f7e16e6eab0588d079
|
|
|
|
--- a/src/version/partschecker.cpp 2016-06-01 21:48:27.000000000 +0200
|
|
+++ b/src/version/partschecker.cpp 2018-01-13 11:30:34.895137270 +0100
|
|
@@ -121,7 +121,13 @@
|
|
/**
|
|
* Connect to the remote.
|
|
*/
|
|
+#if LIBGIT2_VER_MAJOR > 0 || (LIBGIT2_VER_MAJOR == 0 && LIBGIT2_VER_MINOR > 24)
|
|
+ error = git_remote_connect(remote, GIT_DIRECTION_FETCH, &callbacks, NULL, NULL);
|
|
+#elif LIBGIT2_VER_MINOR == 24
|
|
+ error = git_remote_connect(remote, GIT_DIRECTION_FETCH, &callbacks, NULL);
|
|
+#else
|
|
error = git_remote_connect(remote, GIT_DIRECTION_FETCH, &callbacks);
|
|
+#endif
|
|
if (error) {
|
|
partsCheckerResult.partsCheckerError = PARTS_CHECKER_ERROR_REMOTE;
|
|
partsCheckerResult.errorMessage = QObject::tr("Unable to access network site for '%1'. %2").arg(repoPath).arg(sBoilerPlate1);
|