765e304c4b
```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
```
43 lines
1.6 KiB
Diff
43 lines
1.6 KiB
Diff
Index: mozc/src/gyp/common.gypi
|
|
===================================================================
|
|
--- a/mozc/src/gyp/common.gypi
|
|
+++ b/mozc/src/gyp/common.gypi
|
|
@@ -409,12 +409,12 @@
|
|
'conditions': [
|
|
['target_platform=="Linux"', {
|
|
'make_global_settings': [
|
|
- ['AR', '<!(which ar)'],
|
|
- ['CC', '<!(which clang)'],
|
|
- ['CXX', '<!(which clang++)'],
|
|
- ['LD', '<!(which ld)'],
|
|
- ['NM', '<!(which nm)'],
|
|
- ['READELF', '<!(which readelf)'],
|
|
+ ['AR', '<!(which ${AR_target:-ar})'],
|
|
+ ['CC', '<!(which ${CC_target:-cc})'],
|
|
+ ['CXX', '<!(which ${CXX_target:-c++})'],
|
|
+ ['LD', '<!(which ${LD_target:-ld})'],
|
|
+ ['NM', '<!(which ${NM_target:-nm})'],
|
|
+ ['READELF', '<!(which ${READELF_target:-readelf})'],
|
|
],
|
|
}],
|
|
['target_platform=="Android"', {
|
|
@@ -459,12 +459,12 @@
|
|
['LD', '<(ndk_bin_dir)/<(toolchain_prefix)-ld'],
|
|
['NM', '<(ndk_bin_dir)/<(toolchain_prefix)-nm'],
|
|
['READELF', '<(ndk_bin_dir)/<(toolchain_prefix)-readelf'],
|
|
- ['AR.host', '<!(which ar)'],
|
|
- ['CC.host', '<!(which clang)'],
|
|
- ['CXX.host', '<!(which clang++)'],
|
|
- ['LD.host', '<!(which ld)'],
|
|
- ['NM.host', '<!(which nm)'],
|
|
- ['READELF.host', '<!(which readelf)'],
|
|
+ ['AR.host', '<!(which ${AR:-ar})'],
|
|
+ ['CC.host', '<!(which ${CC:-cc})'],
|
|
+ ['CXX.host', '<!(which ${CXX:-c++})'],
|
|
+ ['LD.host', '<!(which ${LD:-ld})'],
|
|
+ ['NM.host', '<!(which ${NM:-nm})'],
|
|
+ ['READELF.host', '<!(which ${READELF:-readelf})'],
|
|
],
|
|
}],
|
|
],
|