2021-02-14 08:00:45 +01:00
|
|
|
# workaround for https://sourceforge.net/p/graphicsmagick/bugs/580/
|
|
|
|
|
|
srcpkgs/[A-Z]*: convert patches to -Np1
```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
```
2021-06-19 05:03:21 +02:00
|
|
|
--- a/Makefile.am.orig 2021-02-14 00:46:02.239418403 -0800
|
|
|
|
|
+++ b/Makefile.am 2021-02-14 00:46:48.431547444 -0800
|
2021-02-14 08:00:45 +01:00
|
|
|
@@ -79,7 +79,6 @@
|
|
|
|
|
|
|
|
|
|
# Tests to run
|
|
|
|
|
TESTS = \
|
|
|
|
|
- $(PERLMAGICK_TESTS) \
|
|
|
|
|
$(TESTS_TESTS) \
|
|
|
|
|
$(MAGICKPP_TESTS) \
|
|
|
|
|
$(WAND_TESTS) \
|
|
|
|
|
|
srcpkgs/[A-Z]*: convert patches to -Np1
```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
```
2021-06-19 05:03:21 +02:00
|
|
|
--- a/Makefile.in.orig 2021-02-14 00:49:51.414058625 -0800
|
|
|
|
|
+++ b/Makefile.in 2021-02-14 00:50:19.996138472 -0800
|
2021-02-14 08:00:45 +01:00
|
|
|
@@ -4767,7 +4767,7 @@
|
|
|
|
|
@WITH_PERL_TRUE@PERLMAGICK_DISTCLEAN_LOCAL_TARGETS = clean-perl
|
|
|
|
|
@WITH_PERL_TRUE@PERLMAGICK_MAINTAINER_CLEAN_LOCAL_TARGETS = distclean-local
|
|
|
|
|
#PERLMAGICK_CHECK_LOCAL_TARGETS = check-perl
|
|
|
|
|
-@WITH_PERL_TRUE@PERLMAGICK_TESTS = PerlMagick/PerlMagickCheck.sh
|
|
|
|
|
+#@WITH_PERL_TRUE@PERLMAGICK_TESTS = PerlMagick/PerlMagickCheck.sh
|
|
|
|
|
@WITH_PERL_DYNAMIC_FALSE@@WITH_PERL_STATIC_TRUE@@WITH_PERL_TRUE@PERLMAGICK_CHECKSCRIPTS = perl-build
|
|
|
|
|
|
|
|
|
|
#PERLMAGICK_CHECKSCRIPTS = perl-build
|
