letoh: Big landing from letoh branch

Makefile

@@ -0,0 +1,45 @@
+include config.mak
+
+VERSION_FILE = VERSION.hime
+
+DIR    = src data scripts icons man menu
+
+ifeq ($(USE_I18N),Y)
+DIR   += po
+endif
+
+
+all:
+	@for d in $(DIR); do echo -e "\x1b[1;33m** processing $$d\x1b[0m"; \
+	   $(MAKE) -C $$d; \
+	done
+
+install:
+	@for d in $(DIR); do echo -e "\x1b[1;32m** installing $$d\x1b[0m"; \
+	   $(MAKE) -C $$d install; \
+	done
+	@if [ $(prefix) = /usr/local ]; then \
+	   install -m 644 icons/hime.png /usr/share/pixmaps; \
+	   install -d $(DOC_DIR); \
+	   install -m 644 README.html ChangeLog $(DOC_DIR); \
+	else \
+	   install -d $(DOC_DIR_i); \
+	   install -m 644 README.html ChangeLog $(DOC_DIR_i); \
+	fi
+
+clean:
+	@touch src/.depend
+	@for d in $(DIR); do echo -e "\x1b[1;31m** cleanup $$d\x1b[0m"; \
+	   $(MAKE) -C $$d clean; \
+	done
+
+distclean:
+	@$(MAKE) clean
+	@rm -f config.mak
+
+config.mak: $(VERSION_FILE) configure
+	@echo "regenerate $@ ..."
+	./configure
+
+
+

configure

@@ -349,7 +349,7 @@ if [ -z $CC ]; then
 fi
 
 echo "CC=$CC" > config.mak
-echo "CCX=$CC -x c" >> config.mak
+echo "CCX=$CC" >> config.mak
 echo "CXX=$CC" >> config.mak
 echo "CCLD=$CC" >> config.mak
 echo "MAKE=$MAKE" >> config.mak
@@ -399,11 +399,11 @@ echo "USE_ANTHY=$USE_ANTHY" >> config.mak
 echo "USE_CHEWING=$USE_CHEWING" >> config.mak
 echo "BUILD_MODULE=$BUILD_MODULE" >> config.mak
 
-if [ $prefix = /usr/local ]; then
-  echo "hime_ld_run_path=$PWD:\$(himelibdir)" >> config.mak
-  echo "HIME_DEBUG=${HIME_DEBUG}" >> config.mak
-else
+#if [ $prefix = /usr/local ]; then
+#  echo "hime_ld_run_path=$PWD:\$(himelibdir)" >> config.mak
+#  echo "HIME_DEBUG=${HIME_DEBUG}" >> config.mak
+#else
   echo "hime_ld_run_path=\$(himelibdir)" >> config.mak
-fi
+#fi
 
 echo "gcc_ld_run_path=-Wl,-rpath,\$(hime_ld_run_path)" >> config.mak

data/Makefile

@@ -1,7 +1,10 @@
 include ../config.mak
 
+SRC_DIR       = ../src
+IM_CLIENT_DIR = ../src/im-client
+
 .SUFFIXES:	.kbmsrc .kbm .cin .gtab
-CFLAGS= -DUNIX=1 $(WALL) $(OPTFLAGS) $(GTKINC) -I..
+CFLAGS= -DUNIX=1 $(WALL) $(OPTFLAGS) $(GTKINC) -I$(SRC_DIR)
 export NO_GTK_INIT=
 export HIME_NO_RELOAD=
 
@@ -13,57 +16,68 @@ DATA=pho.tab2 tsin32.idx NewCJ3.gtab \
      t2s.dat s2t.dat cj543.gtab s-tsin32 s-tsin32.idx s-pho.tab2 s-pho-huge.tab2 \
      pinyin-no-tone.kbm simplex-punc.gtab hangul.gtab
 
-DATAKEEP=symbol-table gtab.list phrase.table phrase-ctrl.table
+DATAKEEP = symbol-table gtab.list phrase.table phrase-ctrl.table
+
+PHO_A2D    = ../src/hime-phoa2d
+TS_A2D     = ../src/hime-tsa2d32
+CIN2GTAB   = ../src/cin2gtab
+KBMCV      = ../src/kbmcv
+PIN_JUYIN  = ../src/pin-juyin
+
 
 all:	$(DATA)
 
-tsin32:	tsin.src ../hime-tsa2d32
-	export LD_LIBRARY_PATH=../im-client;../hime-tsa2d32 $<
+tsin32:	tsin.src  $(TS_A2D)
+	export LD_LIBRARY_PATH=$(IM_CLIENT_DIR); $(TS_A2D) $<
 tsin32.idx:	tsin32
 
 
-s-tsin32:	s-tsin.src ../hime-tsa2d32
-	export LD_LIBRARY_PATH=../im-client;../hime-tsa2d32 $< $@
+s-tsin32:	s-tsin.src  $(TS_A2D)
+	export LD_LIBRARY_PATH=$(IM_CLIENT_DIR); $(TS_A2D) $< $@
 s-tsin32.idx:	s-tsin32
 
 
-pho.tab2:	 pho.tab2.src ../hime-phoa2d
-	export LD_LIBRARY_PATH=../im-client;../hime-phoa2d $<
+pho.tab2:	 pho.tab2.src $(PHO_A2D)
+	export LD_LIBRARY_PATH=$(IM_CLIENT_DIR); $(PHO_A2D) $<
 
-s-pho.tab2:	 s-pho.tab2.src ../hime-phoa2d
-	export LD_LIBRARY_PATH=../im-client;../hime-phoa2d $<
+s-pho.tab2:	 s-pho.tab2.src $(PHO_A2D)
+	export LD_LIBRARY_PATH=$(IM_CLIENT_DIR); $(PHO_A2D) $<
 
-pho-huge.tab2:	 pho-huge.tab2.src ../hime-phoa2d
-	export LD_LIBRARY_PATH=../im-client;../hime-phoa2d $<
+pho-huge.tab2:	 pho-huge.tab2.src $(PHO_A2D)
+	export LD_LIBRARY_PATH=$(IM_CLIENT_DIR); $(PHO_A2D) $<
 
-s-pho-huge.tab2:	 s-pho-huge.tab2.src ../hime-phoa2d
-	export LD_LIBRARY_PATH=../im-client;../hime-phoa2d $<
+s-pho-huge.tab2:	 s-pho-huge.tab2.src $(PHO_A2D)
+	export LD_LIBRARY_PATH=$(IM_CLIENT_DIR); $(PHO_A2D) $<
 
 t2s.dat:	t2s-file t2s-file.table
 	./t2s-file
 s2t.dat:	t2s-file
 
-pin-juyin.xlt:	../pin-juyin pin-juyin.src
-	../pin-juyin
+pin-juyin.xlt: $(PIN_JUYIN) pin-juyin.src
+	$(PIN_JUYIN)
 
 extr1:	extr1.c
-	$(CC) $(CFLAGS) $< ../util.o ../locale.o -o $@ $(LDFLAGS)
+	@echo "building $@ ..."
+	@$(CC) $(CFLAGS) $< $(SRC_DIR)/util.o $(SRC_DIR)/locale.o -o $@ $(LDFLAGS)
 
 t2s-file:	t2s-file.c
-	$(CC) $(CFLAGS) $< ../util.o ../locale.o -o $@ $(LDFLAGS)
+	@echo "building $@ ..."
+	@$(CC) $(CFLAGS) $< $(SRC_DIR)/util.o $(SRC_DIR)/locale.o -o $@ $(LDFLAGS)
 
 tsin-1.src:	extr1
 	./extr1 > $@
 
-.cin.gtab:      ../cin2gtab
-	../cin2gtab $<
+.cin.gtab: $(CIN2GTAB)
+	$(CIN2GTAB) $<
 
-.kbmsrc.kbm:	../kbmcv
-	../kbmcv $<
+.kbmsrc.kbm: $(KBMCV)
+	$(KBMCV) $<
 
 install:
 	install -d $(HIME_TABLE_DIR_i)
 	install -m 644 $(DATA) $(DATAKEEP) $(HIME_TABLE_DIR_i)
 #	cd $(HIME_TABLE_DIR_i); bzip2 -f *.gtab
+
 clean:
-	rm -f *~ tags core.* $(DATA) *.gtab extr1 t2s-file tsin-1.src tsin-gtabidx* tsin-ch-idx
+	@echo "clean up"
+	@rm -f *~ tags core.* $(DATA) *.gtab extr1 t2s-file tsin-1.src tsin-gtabidx* tsin-ch-idx

data/extr1.c

@@ -17,7 +17,7 @@
 
 #include <stdio.h>
 #include <string.h>
-#include "../util.h"
+#include "util.h"
 int utf8_str_N(char *str);
 
 

data/t2s-file.c

@@ -19,8 +19,8 @@
 #include <stdlib.h>
 #include <string.h>
 #include <sys/types.h>
-#include "../t2s-file.h"
-#include "../util.h"
+#include "t2s-file.h"
+#include "util.h"
 
 T2S t2s[3000],s2t[3000];
 int t2sn;

distro/debian/changelog

@@ -0,0 +1,5 @@
+hime (9-9) experimental; urgency=low
+
+  * New snapshot.
+
+ -- Kan-Ru Chen <koster@debian.org>  Mon, 28 Feb 2011 18:07:18 +0800

distro/debian/ckqt.sh

@@ -0,0 +1,20 @@
+#!/bin/sh
+[ ! -e debian/hime/usr/lib/qt4/plugins/inputmethods/im-hime.so ] && sed -i 's/, hime-qt4-immodule//' debian/hime/DEBIAN/control
+[ ! -e debian/hime/usr/lib/qt3/plugins/inputmethods/im-hime.so ] && sed -i 's/, hime-qt3-immodule//' debian/hime/DEBIAN/control
+[ ! -e debian/hime/usr/lib/hime/chewing-module.so ] && sed -i 's/, libchewing3//' debian/hime/DEBIAN/control
+if [ ! -e debian/hime/usr/lib/hime/anthy-module.so ]; then
+  grep -v 'Suggests: kasumi' debian/hime/DEBIAN/control | sed 's/, anthy//' > debian/hime/DEBIAN/control.in
+  mv debian/hime/DEBIAN/control.in debian/hime/DEBIAN/control
+fi
+if [ -d debian/hime/usr/lib/gtk-3.0/immodules ]; then
+  mkdir -p debian/hime/usr/lib/gtk-3.0/3.0.0
+  mv debian/hime/usr/lib/gtk-3.0/immodules debian/hime/usr/lib/gtk-3.0/3.0.0/
+fi
+mkdir -p debian/hime/usr/lib/gtk-2.0/2.10.0
+mv debian/hime/usr/lib/gtk-2.0/immodules debian/hime/usr/lib/gtk-2.0/2.10.0/
+if [ -x /usr/lib/libgtk2.0-0/gtk-query-immodules-2.0 ]; then
+  /usr/lib/libgtk2.0-0/gtk-query-immodules-2.0 debian/hime/usr/lib/gtk-2.0/2.10.0/immodules/im-hime.so | grep hime | tail -n 1 >> debian/hime/usr/lib/gtk-2.0/2.10.0/immodule-files.d/hime.immodules
+else
+  rm -fr debian/hime/usr/lib/gtk-2.0/2.10.0/immodule-files.d
+fi
+true

distro/debian/compat

@@ -0,0 +1 @@
+7

distro/debian/control

@@ -0,0 +1,24 @@
+Source: hime
+Section: utils
+Priority: optional
+Maintainer: Kan-Ru Chen <koster@debian.org>
+Build-Depends: debhelper (>= 7.0.50~), libgtk2.0-dev (>= 2.10.0), libxtst-dev, dpkg | libgtk-3-dev | libqt4-dev | libqt3-mt-dev | libanthy-dev | libchewing3-dev
+Standards-Version: 3.9.1
+
+Package: hime
+Architecture: any
+Depends: ${shlibs:Depends}, ${misc:Depends}
+Recommends: im-switch | im-config, anthy, libchewing3
+Suggests: kasumi
+Conflicts: hime-dev, hime-qt4-immodule, hime-qt3-immodule
+Replaces: hime-dev, hime-qt4-immodule, hime-qt3-immodule
+Provides: hime-dev, hime-qt4-immodule, hime-qt3-immodule
+Description: an GTK+ based input method platform for Chinese users
+ Hime is an input method platform, which supports GTK+/QT immodule and XIM.
+ Hime is focused mainly on Traditional Chinese. However, it is also very useful
+ for Simplified Chinese, Japanese, and many other languages.
+ .
+ Input method table format of hime is almost as same as those of xcin and scim.
+ .
+ This package contains an GTK+ immodule. If you want to use QT immodule, please
+ install hime-qt3-immodule package.