diff options
| author | bsiegert <bsiegert> | 2015-04-25 19:28:44 +0000 |
|---|---|---|
| committer | bsiegert <bsiegert> | 2015-04-25 19:28:44 +0000 |
| commit | 0d7dd0795d06670a595a1877523c1882844c3499 (patch) | |
| tree | 9ecf7188e95ccbe27e6f8b8f2201acdae74e6d81 | |
| parent | bfcefd6e45f779e0989e5da1a83cfe70e8064434 (diff) | |
| download | pkgsrc-0d7dd0795d06670a595a1877523c1882844c3499.tar.gz | |
Pullup ticket #4682 - requested by hiramatsu
inputmethod/librime: build fix
Revisions pulled up:
- inputmethod/librime/distinfo 1.3
- inputmethod/librime/patches/patch-src_dict_table.cc 1.2
---
Module Name: pkgsrc
Committed By: hiramatsu
Date: Tue Apr 21 13:59:31 UTC 2015
Modified Files:
pkgsrc/inputmethod/librime: distinfo
pkgsrc/inputmethod/librime/patches: patch-src_dict_table.cc
Log Message:
Fix build break with gcc.
| -rw-r--r-- | inputmethod/librime/distinfo | 4 | ||||
| -rw-r--r-- | inputmethod/librime/patches/patch-src_dict_table.cc | 14 |
2 files changed, 11 insertions, 7 deletions
diff --git a/inputmethod/librime/distinfo b/inputmethod/librime/distinfo index de37ee4f788..ae6fff20670 100644 --- a/inputmethod/librime/distinfo +++ b/inputmethod/librime/distinfo @@ -1,7 +1,7 @@ -$NetBSD: distinfo,v 1.1.4.1 2015/04/18 12:02:41 bsiegert Exp $ +$NetBSD: distinfo,v 1.1.4.2 2015/04/25 19:28:44 bsiegert 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 3220b423670..456233b1981 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.2.2 2015/04/18 12:02:41 bsiegert Exp $ +$NetBSD: patch-src_dict_table.cc,v 1.1.2.3 2015/04/25 19:28:44 bsiegert 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)) { |