2fd8d4df94
```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
```
56 lines
1.6 KiB
Diff
56 lines
1.6 KiB
Diff
--- a/acinclude.m4 2003-05-04 11:41:26.000000000 +0200
|
|
+++ b/acinclude.m4 2015-08-30 14:11:25.882425946 +0200
|
|
@@ -1,7 +1,7 @@
|
|
dnl PATH_AVILIB([ACTION-IF-FOUND [, ACTION-IF-NOT-FOUND]])
|
|
dnl Test for avilib, and define AVILIB_CFLAGS and AVILIB_LIBS
|
|
dnl
|
|
-AC_DEFUN(PATH_AVILIB,
|
|
+AC_DEFUN([PATH_AVILIB],
|
|
[dnl
|
|
dnl Get the cflags and libraries
|
|
dnl
|
|
@@ -23,7 +23,7 @@
|
|
dnl XIPH_PATH_OGG([ACTION-IF-FOUND [, ACTION-IF-NOT-FOUND]])
|
|
dnl Test for libogg, and define OGG_CFLAGS and OGG_LIBS
|
|
dnl
|
|
-AC_DEFUN(XIPH_PATH_OGG,
|
|
+AC_DEFUN([XIPH_PATH_OGG],
|
|
[dnl
|
|
dnl Get the cflags and libraries
|
|
dnl
|
|
@@ -118,7 +118,7 @@
|
|
dnl XIPH_PATH_VORBIS([ACTION-IF-FOUND [, ACTION-IF-NOT-FOUND]])
|
|
dnl Test for libvorbis, and define VORBIS_CFLAGS and VORBIS_LIBS
|
|
dnl
|
|
-AC_DEFUN(XIPH_PATH_VORBIS,
|
|
+AC_DEFUN([XIPH_PATH_VORBIS],
|
|
[dnl
|
|
dnl Get the cflags and libraries
|
|
dnl
|
|
@@ -227,7 +227,7 @@
|
|
ifelse([$3],[],[:],[$3])
|
|
fi])
|
|
|
|
-AC_DEFUN(PATH_DEBUG,[
|
|
+AC_DEFUN([PATH_DEBUG],[
|
|
AC_ARG_ENABLE([debug],
|
|
[ --enable-debug compile with debug information])
|
|
if test x"$enable_debug" = x"yes"; then
|
|
@@ -239,7 +239,7 @@
|
|
AC_SUBST(DEBUG_CFLAGS)
|
|
])
|
|
|
|
-AC_DEFUN(PATH_PROFILING,[
|
|
+AC_DEFUN([PATH_PROFILING],[
|
|
AC_ARG_ENABLE([profiling],
|
|
[ --enable-profiling compile with profiling information])
|
|
if test x"$enable_profiling" = x"yes"; then
|
|
@@ -258,7 +258,7 @@
|
|
dnl Test for LIBDVDREAD, and define LIBDVDREAD_CFLAGS and LIBDVDREAD_LIBS
|
|
dnl
|
|
|
|
-AC_DEFUN(AM_PATH_LIBDVDREAD,
|
|
+AC_DEFUN([AM_PATH_LIBDVDREAD],
|
|
[
|
|
|
|
AC_ARG_WITH(dvdread,[ --with-dvdread use installed libdvdread library (default=yes)],[case "${withval}" in
|