| 1 |
commit: 62491256deeecf5202c907f826293a2cd8ad949b |
| 2 |
Author: Arfrever Frehtes Taifersar Arahesis <Arfrever <AT> Apache <DOT> Org> |
| 3 |
AuthorDate: Sat Dec 26 00:00:00 2020 +0000 |
| 4 |
Commit: Mike Gilbert <floppym <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Sun Dec 27 18:39:10 2020 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=62491256 |
| 7 |
|
| 8 |
app-i18n/opencc: Update patch for parallel build failure. |
| 9 |
|
| 10 |
Signed-off-by: Arfrever Frehtes Taifersar Arahesis <Arfrever <AT> Apache.Org> |
| 11 |
Signed-off-by: Mike Gilbert <floppym <AT> gentoo.org> |
| 12 |
|
| 13 |
.../opencc/files/opencc-1.1.0-parallel_build.patch | 40 ++++++++++++++++++++++ |
| 14 |
app-i18n/opencc/opencc-9999.ebuild | 2 +- |
| 15 |
2 files changed, 41 insertions(+), 1 deletion(-) |
| 16 |
|
| 17 |
diff --git a/app-i18n/opencc/files/opencc-1.1.0-parallel_build.patch b/app-i18n/opencc/files/opencc-1.1.0-parallel_build.patch |
| 18 |
new file mode 100644 |
| 19 |
index 00000000000..3163aa0a16e |
| 20 |
--- /dev/null |
| 21 |
+++ b/app-i18n/opencc/files/opencc-1.1.0-parallel_build.patch |
| 22 |
@@ -0,0 +1,40 @@ |
| 23 |
+https://github.com/BYVoid/OpenCC/issues/322 |
| 24 |
+ |
| 25 |
+--- /data/CMakeLists.txt |
| 26 |
++++ /data/CMakeLists.txt |
| 27 |
+@@ -116,6 +116,19 @@ |
| 28 |
+ ) |
| 29 |
+ endforeach(DICT) |
| 30 |
+ |
| 31 |
++add_custom_target( |
| 32 |
++ copy_libopencc_to_dir_of_opencc_dict |
| 33 |
++ COMMENT |
| 34 |
++ "Copying libopencc to directory of opencc_dict" |
| 35 |
++ COMMAND |
| 36 |
++ ${CMAKE_COMMAND} -E copy "$<TARGET_FILE:libopencc>" "$<TARGET_FILE_DIR:${OPENCC_DICT_BIN}>" |
| 37 |
++) |
| 38 |
++if (WIN32) |
| 39 |
++ set(DICT_WIN32_DEPENDS copy_libopencc_to_dir_of_opencc_dict) |
| 40 |
++else() |
| 41 |
++ set(DICT_WIN32_DEPENDS) |
| 42 |
++endif() |
| 43 |
++ |
| 44 |
+ foreach(DICT ${DICTS}) |
| 45 |
+ add_custom_command( |
| 46 |
+ OUTPUT |
| 47 |
+@@ -123,14 +136,13 @@ |
| 48 |
+ COMMENT |
| 49 |
+ "Building ${DICT}.ocd2" |
| 50 |
+ COMMAND |
| 51 |
+- ${CMAKE_COMMAND} -E copy "$<TARGET_FILE:libopencc>" "$<TARGET_FILE_DIR:${OPENCC_DICT_BIN}>" |
| 52 |
+- COMMAND |
| 53 |
+ ${OPENCC_DICT_BIN} |
| 54 |
+ --input ${DICT_${DICT}_INPUT} |
| 55 |
+ --output ${DICT}.ocd2 |
| 56 |
+ --from text |
| 57 |
+ --to ocd2 |
| 58 |
+ DEPENDS |
| 59 |
++ ${DICT_WIN32_DEPENDS} |
| 60 |
+ ${OPENCC_DICT_BIN} |
| 61 |
+ ${DICT_${DICT}_INPUT} |
| 62 |
+ ) |
| 63 |
|
| 64 |
diff --git a/app-i18n/opencc/opencc-9999.ebuild b/app-i18n/opencc/opencc-9999.ebuild |
| 65 |
index 8a1dbc501c8..6c9c8315e90 100644 |
| 66 |
--- a/app-i18n/opencc/opencc-9999.ebuild |
| 67 |
+++ b/app-i18n/opencc/opencc-9999.ebuild |
| 68 |
@@ -42,7 +42,7 @@ if [[ "${PV}" != "9999" ]]; then |
| 69 |
fi |
| 70 |
|
| 71 |
PATCHES=( |
| 72 |
- "${FILESDIR}/${PN}-stop-copy.patch" |
| 73 |
+ "${FILESDIR}/${PN}-1.1.0-parallel_build.patch" |
| 74 |
) |
| 75 |
|
| 76 |
DOCS=(AUTHORS NEWS.md README.md) |
Archives