[pkgsrc/pkgsrc-2015Q1]: pkgsrc/inputmethod/librime Pullup ticket #4682 - requ...

[bsiegert <bsiegert%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/5fd4030a3216
branches:  pkgsrc-2015Q1
changeset: 649192:5fd4030a3216
user:      bsiegert <bsiegert%pkgsrc.org@localhost>
date:      Sat Apr 25 19:28:44 2015 +0000

description:
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.

diffstat:

 inputmethod/librime/distinfo                        |   4 ++--
 inputmethod/librime/patches/patch-src_dict_table.cc |  14 +++++++++-----
 2 files changed, 11 insertions(+), 7 deletions(-)

diffs (39 lines):

diff -r 9772a125bdc2 -r 5fd4030a3216 inputmethod/librime/distinfo
--- a/inputmethod/librime/distinfo      Sat Apr 25 04:06:02 2015 +0000
+++ b/inputmethod/librime/distinfo      Sat Apr 25 19:28:44 2015 +0000
@@ -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 -r 9772a125bdc2 -r 5fd4030a3216 inputmethod/librime/patches/patch-src_dict_table.cc
--- a/inputmethod/librime/patches/patch-src_dict_table.cc       Sat Apr 25 04:06:02 2015 +0000
+++ b/inputmethod/librime/patches/patch-src_dict_table.cc       Sat Apr 25 19:28:44 2015 +0000
@@ -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)) {