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
```
23 lines
828 B
Diff
23 lines
828 B
Diff
From f4cc905c69ca69c68cb95674cefce4abc37ce046 Mon Sep 17 00:00:00 2001
|
|
From: wangqr <wangqr@wangqr.tk>
|
|
Date: Mon, 17 Feb 2020 14:42:07 +0800
|
|
Subject: [PATCH] Use target name without directory in $*_OBJ macro
|
|
|
|
Fix Aegisub/Aegisub#171
|
|
---
|
|
Makefile.target | 2 +-
|
|
1 file changed, 1 insertion(+), 1 deletion(-)
|
|
|
|
diff --git a/Makefile.target b/Makefile.target
|
|
index 516ef3c24..5c4c5d259 100644
|
|
--- a/Makefile.target
|
|
+++ b/Makefile.target
|
|
@@ -112,7 +112,7 @@ POST_FLAGS = $($@_FLAGS) -c -o $@ $<
|
|
# Libraries contain all object files they depend on (but they may depend on other files)
|
|
# Not using libtool on OS X because it has an unsilenceable warning about a
|
|
# compatibility issue with BSD 4.3 (wtf)
|
|
-lib%.a: $$($$*_OBJ)
|
|
+lib%.a: $$($$(*F)_OBJ)
|
|
@$(BIN_MKDIR_P) $(dir $@)
|
|
$(BIN_AR) cru $@ $(filter %.o,$^)
|
|
$(BIN_RANLIB) $@
|