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
```
151 lines
4.1 KiB
Diff
151 lines
4.1 KiB
Diff
Index: mozc/src/gui/gui.gyp
|
|
===================================================================
|
|
--- a/mozc/src/gui/gui.gyp
|
|
+++ b/mozc/src/gui/gui.gyp
|
|
@@ -790,6 +790,13 @@
|
|
'tool/mozc_tool_main_noqt.cc',
|
|
],
|
|
}],
|
|
+ ['use_libatomic==1', {
|
|
+ 'link_settings': {
|
|
+ 'libraries': [
|
|
+ '-latomic',
|
|
+ ],
|
|
+ },
|
|
+ }],
|
|
# For Mac, ConfigDialog is the host app for necessary frameworks.
|
|
['OS=="win"', {
|
|
'product_name': '<(tool_product_name_win)',
|
|
Index: mozc/src/gyp/defines.gypi
|
|
===================================================================
|
|
--- a/mozc/src/gyp/defines.gypi
|
|
+++ b/mozc/src/gyp/defines.gypi
|
|
@@ -68,6 +68,9 @@
|
|
# use_libibus represents if ibus library is used or not.
|
|
# This option is only for Linux.
|
|
'use_libibus%': '0',
|
|
+
|
|
+ # use_libatomic represents if libatomic is required or not
|
|
+ 'use_libatomic%': '0',
|
|
},
|
|
'target_defaults': {
|
|
'defines': [
|
|
Index: mozc/src/renderer/renderer.gyp
|
|
===================================================================
|
|
--- a/mozc/src/renderer/renderer.gyp
|
|
+++ b/mozc/src/renderer/renderer.gyp
|
|
@@ -592,6 +592,15 @@
|
|
'../base/base.gyp:crash_report_handler',
|
|
'mozc_renderer_lib',
|
|
],
|
|
+ 'conditions': [
|
|
+ ['use_libatomic==1', {
|
|
+ 'link_settings': {
|
|
+ 'libraries': [
|
|
+ '-latomic',
|
|
+ ],
|
|
+ },
|
|
+ }],
|
|
+ ],
|
|
},
|
|
{
|
|
'target_name': 'gtk_renderer_test',
|
|
Index: mozc/src/server/server.gyp
|
|
===================================================================
|
|
--- a/mozc/src/server/server.gyp
|
|
+++ b/mozc/src/server/server.gyp
|
|
@@ -55,6 +55,13 @@
|
|
'mozc_server_lib',
|
|
],
|
|
'conditions': [
|
|
+ ['use_libatomic==1', {
|
|
+ 'link_settings': {
|
|
+ 'libraries': [
|
|
+ '-latomic',
|
|
+ ],
|
|
+ },
|
|
+ }],
|
|
['OS=="mac"', {
|
|
'product_name': '<(branding)Converter',
|
|
'sources': [
|
|
Index: mozc/src/unix/emacs/emacs.gyp
|
|
===================================================================
|
|
--- a/mozc/src/unix/emacs/emacs.gyp
|
|
+++ b/mozc/src/unix/emacs/emacs.gyp
|
|
@@ -46,6 +46,15 @@
|
|
'../../protocol/protocol.gyp:config_proto',
|
|
'mozc_emacs_helper_lib',
|
|
],
|
|
+ 'conditions': [
|
|
+ ['use_libatomic==1', {
|
|
+ 'link_settings': {
|
|
+ 'libraries': [
|
|
+ '-latomic',
|
|
+ ],
|
|
+ },
|
|
+ }],
|
|
+ ],
|
|
},
|
|
{
|
|
'target_name': 'mozc_emacs_helper_lib',
|
|
Index: mozc/src/unix/fcitx/fcitx.gyp
|
|
===================================================================
|
|
--- a/mozc/src/unix/fcitx/fcitx.gyp
|
|
+++ b/mozc/src/unix/fcitx/fcitx.gyp
|
|
@@ -98,6 +98,15 @@
|
|
'defines': [
|
|
'LOCALEDIR="/usr/share/locale/"',
|
|
],
|
|
+ 'conditions': [
|
|
+ ['use_libatomic==1', {
|
|
+ 'link_settings': {
|
|
+ 'libraries': [
|
|
+ '-latomic',
|
|
+ ],
|
|
+ },
|
|
+ }],
|
|
+ ],
|
|
},
|
|
],
|
|
}, {
|
|
Index: mozc/src/unix/fcitx5/fcitx5.gyp
|
|
===================================================================
|
|
--- a/mozc/src/unix/fcitx5/fcitx5.gyp
|
|
+++ b/mozc/src/unix/fcitx5/fcitx5.gyp
|
|
@@ -105,6 +105,15 @@
|
|
'defines': [
|
|
'FCITX_GETTEXT_DOMAIN="fcitx5-mozc"',
|
|
],
|
|
+ 'conditions': [
|
|
+ ['use_libatomic==1', {
|
|
+ 'link_settings': {
|
|
+ 'libraries': [
|
|
+ '-latomic',
|
|
+ ],
|
|
+ },
|
|
+ }],
|
|
+ ],
|
|
},
|
|
],
|
|
}, {
|
|
Index: mozc/src/unix/ibus/ibus.gyp
|
|
===================================================================
|
|
--- a/mozc/src/unix/ibus/ibus.gyp
|
|
+++ b/mozc/src/unix/ibus/ibus.gyp
|
|
@@ -239,6 +239,15 @@
|
|
'ibus_mozc_lib',
|
|
'ibus_mozc_metadata',
|
|
],
|
|
+ 'conditions': [
|
|
+ ['use_libatomic==1', {
|
|
+ 'link_settings': {
|
|
+ 'libraries': [
|
|
+ '-latomic',
|
|
+ ],
|
|
+ },
|
|
+ }],
|
|
+ ],
|
|
},
|
|
{
|
|
'target_name': 'ibus_mozc_test',
|