nacl/libchewing: Sync to upstream, and remove the libsqlite hacks.

google · Jan 7, 2014 · e1a4442 · e1a4442
1 parent 8c718e5
commit e1a4442
Show file tree

Hide file tree

Showing 6 changed files with 8 additions and 227 deletions.
diff --git a/src/nacl/libchewing/Makefile b/src/nacl/libchewing/Makefile
@@ -16,11 +16,6 @@ LIBCHEWING_HOME ?= libchewing
 LIBCHEWING_URL ?= https://github.com/chewing/libchewing.git
 LIBCHEWING_BRANCH ?=
 
-# The user data (via sqlite) is currently broken due to nacl_io html5fs issue.
-# Before that is fixed, we want to fake the library.
-LIBCHEWING_USERDATA ?= 0
-LIBCHEWING_SQLITE ?= 0
-
 NACL_SDK_ROOT ?= $(abspath $(CURDIR)/../../../../nacl_sdk)
 include $(NACL_SDK_ROOT)/tools/common.mk
 CFLAGS += -DHAVE_CONFIG_H -I. -I$(LIBCHEWING_HOME)/src
@@ -45,22 +40,10 @@ SOURCES = \
 	$(LIBCHEWING_HOME)/src/porting_layer/src/plat_path.c \
 	nacl.cc
 
-ifeq ($(LIBCHEWING_USERDATA), 1)
-
-SOURCES += $(LIBCHEWING_HOME)/src/chewing-sql.c
+# User data (hash)
 SOURCES += $(LIBCHEWING_HOME)/src/userphrase.c
-
-ifeq ($(LIBCHEWING_SQLITE), 1)
-SOURCES += $(LIBCHEWING_HOME)/thirdparty/sqlite-amalgamation/sqlite3.c
-CFLAGS += -I$(LIBCHEWING_HOME)/thirdparty/sqlite-amalgamation
-CFLAGS += -D_HAVE_SQLITE_CONFIG_H
-else   # LIBCHEWING_SQLITE
-LIBS += sqlite3
-endif  # LIBCHEWING_SQLITE
-
-else   # LIBCHEWING_USERDATA
-SOURCES += fake-chewing-sql.c fake-userphrase.c
-endif  # LIBCHEWING_USERDATA
+SOURCES += $(LIBCHEWING_HOME)/src/hash.c
+SOURCES += $(LIBCHEWING_HOME)/src/userphrase-hash.c
 
 ifneq ($(CONFIG),Release)
 CFLAGS+=-DDEBUG

diff --git a/src/nacl/libchewing/README b/src/nacl/libchewing/README
@@ -3,13 +3,11 @@ A sample NaCl based input module for jscin - using libchewing.
 To build this:
 
   1. Create a "libchewing" subfolder and fetch libchewing source code in it.
-     Currently verified version: cbf479a01392cdc3febb53439dddbef57d1010c6
+     Currently verified version: abda34fd542ddbb0f264fdc9d9f3ac3e696e4304
   2. Enter libchewing, ./configure && make
   3. Get your Native Client SDK ready, and set NACL_SDK_ROOT properly.
      Currently verified SDK version is pepper_31.
-  4. (optional) Install Nacl Ports https://code.google.com/p/naclports/
-     and run "./make_all.sh sqlite" inside Nacl Ports folder.
-  5. make
+  4. make
 
 To test:
   1. $NACL_SDK_ROOT/tools/httpd.py --no_dir_check &

diff --git a/src/nacl/libchewing/config.h b/src/nacl/libchewing/config.h
@@ -2,20 +2,9 @@
 #define CONFIG_H
 
 #define UNDER_POSIX
+#define HAVE_INTTYPES_H
 #define HAVE_STRTOK_R
-#define LIBDIR "/data"
 
-// Hacks for sqlite3.
-#define SQLITE_OMIT_LOAD_EXTENSION
-#if !defined __GLIBC__
-#include <stdio.h>
-struct flock {
-       short   l_type;
-       short   l_whence;
-       off_t   l_start;
-       off_t   l_len;
-       pid_t   l_pid;
-};
-#endif
+#define LIBDIR "/data"
 
 #endif /* CONFIG_H */
diff --git a/src/nacl/libchewing/fake-chewing-sql.c b/src/nacl/libchewing/fake-chewing-sql.c
diff --git a/src/nacl/libchewing/fake-userphrase.c b/src/nacl/libchewing/fake-userphrase.c
diff --git a/src/nacl/libchewing/nacl.cc b/src/nacl/libchewing/nacl.cc
@@ -89,19 +89,12 @@ class ChewingInstance: public pp::Instance {
       return;
     }
 
-    // TODO(hungte) Change memfs to html5fs once we've figured out why it does
-    // not work.
-    if (mount("", USER_DATA_DIR, "memfs", 0,
+    if (mount("", USER_DATA_DIR, "html5fs", 0,
               "type=PERSISTENT,expected_size=1048576") != 0) {
       PostMessage(pp::Var("can't mount user data"));
       return;
     }
 
-    // Blank out USER, LOGNAME and set HOME so sqlite won't go crazy.
-    setenv("HOME", USER_DATA_DIR, 1);
-    setenv("USER", "", 1);
-    setenv("LOGNAME", "", 1);
-
     // Note currently chewing_Init does not do anything. DATA_DIR and
     // USER_DATA_DIR must be specified again in chewing_new2.
     chewing_Init(DATA_DIR, USER_DATA_DIR);