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

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

details:   https://anonhg.NetBSD.org/pkgsrc/rev/f751324c50d4
branches:  pkgsrc-2015Q1
changeset: 649166:f751324c50d4
user:      bsiegert <bsiegert%pkgsrc.org@localhost>
date:      Sat Apr 18 12:02:41 2015 +0000

description:
Pullup ticket #4665 - requested by joerg
inputmethod/librime - build fix

Revisions pulled up:
- inputmethod/librime/Makefile                                  1.4
- inputmethod/librime/distinfo                                  1.2
- inputmethod/librime/patches/patch-src_dict_table.cc           1.1

---
   Module Name: pkgsrc
   Committed By:        joerg
   Date:                Tue Apr 14 14:38:05 UTC 2015

   Modified Files:
        pkgsrc/inputmethod/librime: Makefile distinfo
   Added Files:
        pkgsrc/inputmethod/librime/patches: patch-src_dict_table.cc

   Log Message:
   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. Bump revision.

diffstat:

 inputmethod/librime/Makefile                        |   3 +-
 inputmethod/librime/distinfo                        |   3 +-
 inputmethod/librime/patches/patch-src_dict_table.cc |  22 +++++++++++++++++++++
 3 files changed, 26 insertions(+), 2 deletions(-)

diffs (50 lines):

diff -r c1fe5f5c4d39 -r f751324c50d4 inputmethod/librime/Makefile
--- a/inputmethod/librime/Makefile      Wed Apr 15 21:14:52 2015 +0000
+++ b/inputmethod/librime/Makefile      Sat Apr 18 12:02:41 2015 +0000
@@ -1,6 +1,7 @@
-# $NetBSD: Makefile,v 1.3 2015/03/15 20:03:24 hiramatsu Exp $
+# $NetBSD: Makefile,v 1.3.2.1 2015/04/18 12:02:41 bsiegert Exp $
 
 DISTNAME=      librime-1.0
+PKGREVISION=   1
 CATEGORIES=    inputmethod chinese
 MASTER_SITES=  http://rimeime.googlecode.com/files/
 #MASTER_SITES= http://dl.bintray.com/lotem/rime/
diff -r c1fe5f5c4d39 -r f751324c50d4 inputmethod/librime/distinfo
--- a/inputmethod/librime/distinfo      Wed Apr 15 21:14:52 2015 +0000
+++ b/inputmethod/librime/distinfo      Sat Apr 18 12:02:41 2015 +0000
@@ -1,6 +1,7 @@
-$NetBSD: distinfo,v 1.1 2014/11/29 09:31:49 obache Exp $
+$NetBSD: distinfo,v 1.1.4.1 2015/04/18 12:02:41 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
diff -r c1fe5f5c4d39 -r f751324c50d4 inputmethod/librime/patches/patch-src_dict_table.cc
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/inputmethod/librime/patches/patch-src_dict_table.cc       Sat Apr 18 12:02:41 2015 +0000
@@ -0,0 +1,22 @@
+$NetBSD: patch-src_dict_table.cc,v 1.1.2.2 2015/04/18 12:02:41 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
+   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) {
+   if (!entry)
+     return false;
+   if (!CopyString(dict_entry.text, &entry->text)) {
+     LOG(ERROR) << "Error creating table entry '" << dict_entry.text << "'; file size: " << file_size();
+     return false;
+   }
+-  entry->weight = static_cast<float>(dict_entry.weight);
++  float weight = static_cast<float>(dict_entry.weight);
++  memcpy(&entry->weight, &weight, sizeof(weight));
+   return true;
+ }
+