49cb564d14
* 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
```
31 lines
570 B
Diff
31 lines
570 B
Diff
fix building with libpng-1.5
|
|
|
|
--- a/libplot/z_write.c
|
|
+++ b/libplot/z_write.c
|
|
@@ -164,7 +164,7 @@
|
|
}
|
|
|
|
/* cleanup after libpng errors (error handler does a longjmp) */
|
|
- if (setjmp (png_ptr->jmpbuf))
|
|
+ if (setjmp (png_jmpbuf (png_ptr)))
|
|
{
|
|
png_destroy_write_struct (&png_ptr, (png_info **)NULL);
|
|
return -1;
|
|
@@ -444,7 +444,7 @@
|
|
#endif
|
|
}
|
|
|
|
- longjmp (png_ptr->jmpbuf, 1);
|
|
+ png_longjmp (png_ptr, 1);
|
|
}
|
|
|
|
static void
|
|
@@ -515,7 +515,7 @@
|
|
#endif
|
|
}
|
|
|
|
- longjmp (png_ptr->jmpbuf, 1);
|
|
+ png_longjmp (png_ptr, 1);
|
|
}
|
|
|
|
static void
|