summaryrefslogtreecommitdiff
path: root/inputmethod
diff options
context:
space:
mode:
authorhiramatsu <hiramatsu@pkgsrc.org>2015-04-21 13:59:31 +0000
committerhiramatsu <hiramatsu@pkgsrc.org>2015-04-21 13:59:31 +0000
commit0763efb9a742227ccd763370ff9b66145fbc3bb5 (patch)
treeceba993e54cb78ac122b3b50ed533af7d7db1814 /inputmethod
parentf3a76cdbd49730db7ed8a76aa30f9bf5b39222e5 (diff)
downloadpkgsrc-0763efb9a742227ccd763370ff9b66145fbc3bb5.tar.gz
Fix build break with gcc.
Diffstat (limited to 'inputmethod')
-rw-r--r--inputmethod/librime/distinfo4
-rw-r--r--inputmethod/librime/patches/patch-src_dict_table.cc14
2 files changed, 11 insertions, 7 deletions
diff --git a/inputmethod/librime/distinfo b/inputmethod/librime/distinfo
index 26a50826944..22e6fcb0191 100644
--- a/inputmethod/librime/distinfo
+++ b/inputmethod/librime/distinfo
@@ -1,7 +1,7 @@
-$NetBSD: distinfo,v 1.2 2015/04/14 14:38:05 joerg Exp $
+$NetBSD: distinfo,v 1.3 2015/04/21 13:59:31 hiramatsu Exp $
SHA1 (librime-1.0.tar.gz) = 5fd6db95b039e08dadfe547e3e63962aeaa97d8c
RMD160 (librime-1.0.tar.gz) = 0e5972bfcf179d464a8e58f9ddce3bf55708865b
Size (librime-1.0.tar.gz) = 2576401 bytes
SHA1 (patch-CMakeLists.txt) = 3e478dda0da10ecfc31f1cb7849a5fd0bd21a065
-SHA1 (patch-src_dict_table.cc) = 259704b015c1f6cffd7a5918c1a93c77384e4be7
+SHA1 (patch-src_dict_table.cc) = d8c952bd5b897d8d05b86b6c515daa3d19b2ba6d
diff --git a/inputmethod/librime/patches/patch-src_dict_table.cc b/inputmethod/librime/patches/patch-src_dict_table.cc
index 1668deba828..f740ce6e02e 100644
--- a/inputmethod/librime/patches/patch-src_dict_table.cc
+++ b/inputmethod/librime/patches/patch-src_dict_table.cc
@@ -1,13 +1,17 @@
-$NetBSD: patch-src_dict_table.cc,v 1.1 2015/04/14 14:38:05 joerg Exp $
+$NetBSD: patch-src_dict_table.cc,v 1.2 2015/04/21 13:59:31 hiramatsu Exp $
---- src/dict/table.cc.orig 2013-11-10 10:20:21.000000000 +0000
-+++ src/dict/table.cc
-@@ -403,14 +403,15 @@ bool Table::BuildEntryList(const DictEnt
+Entries in the output file are generally not correctly aligned,
+so tell the compiler explicitly about this fact and use memcpy
+for writing the data.
+
+--- src/dict/table.cc.orig 2013-11-10 19:20:21.000000000 +0900
++++ src/dict/table.cc 2015-04-18 12:14:33.000000000 +0900
+@@ -403,14 +403,15 @@
return true;
}
-bool Table::BuildEntry(const DictEntry &dict_entry, table::Entry *entry) {
-+bool Table::BuildEntry(const DictEntry &dict_entry, __attribute__((aligned(1))) table::Entry *entry) {
++bool Table::BuildEntry(const DictEntry &dict_entry, table::Entry * __attribute__((aligned(1))) entry) {
if (!entry)
return false;
if (!CopyString(dict_entry.text, &entry->text)) {