diff -Nru hime-0.9.10+git20150916+dfsg1/debian/changelog hime-0.9.10+git20170427+dfsg1/debian/changelog --- hime-0.9.10+git20150916+dfsg1/debian/changelog 2017-01-04 08:12:09.000000000 +0000 +++ hime-0.9.10+git20170427+dfsg1/debian/changelog 2017-07-09 13:11:32.000000000 +0000 @@ -1,14 +1,13 @@ -hime (0.9.10+git20150916+dfsg1-8build1~3) zesty; urgency=medium +hime (0.9.10+git20170427+dfsg1-1) unstable; urgency=medium - * No change rebuild + * Update upstream git snapshot (Closes: #867575). + * Bump Standards-Version to 4.0.0. + * Bump compat to 10. + * Update copyright. + * Use https in Format. + * Add Files-Excluded for DFSG. - -- Timo Jyrinki Wed, 04 Jan 2017 10:11:35 +0200 - -hime (0.9.10+git20150916+dfsg1-8build1~1) yakkety; urgency=medium - - * Rebuild against Qt 5.6. - - -- Timo Jyrinki Fri, 22 Jul 2016 09:00:59 +0300 + -- ChangZhuo Chen (陳昌倬) Sun, 09 Jul 2017 21:11:32 +0800 hime (0.9.10+git20150916+dfsg1-8) unstable; urgency=medium diff -Nru hime-0.9.10+git20150916+dfsg1/debian/compat hime-0.9.10+git20170427+dfsg1/debian/compat --- hime-0.9.10+git20150916+dfsg1/debian/compat 2016-07-01 16:06:03.000000000 +0000 +++ hime-0.9.10+git20170427+dfsg1/debian/compat 2017-07-09 13:10:06.000000000 +0000 @@ -1 +1 @@ -9 +10 diff -Nru hime-0.9.10+git20150916+dfsg1/debian/control hime-0.9.10+git20170427+dfsg1/debian/control --- hime-0.9.10+git20150916+dfsg1/debian/control 2017-01-04 08:11:35.000000000 +0000 +++ hime-0.9.10+git20170427+dfsg1/debian/control 2017-07-09 13:10:48.000000000 +0000 @@ -1,14 +1,13 @@ Source: hime Section: utils Priority: extra -Maintainer: Ubuntu Developers -XSBC-Original-Maintainer: IME Packaging Team +Maintainer: IME Packaging Team Uploaders: Yao Wei (魏銘廷) , ChangZhuo Chen (陳昌倬) , Shih-Yuan Lee (FourDollars) , -Standards-Version: 3.9.8 +Standards-Version: 4.0.0 Homepage: http://hime-ime.github.io -Build-Depends: debhelper (>= 9.20151219), +Build-Depends: debhelper (>= 10), autotools-dev, dpkg-dev (>= 1.16.1~), libanthy-dev, diff -Nru hime-0.9.10+git20150916+dfsg1/debian/copyright hime-0.9.10+git20170427+dfsg1/debian/copyright --- hime-0.9.10+git20150916+dfsg1/debian/copyright 2016-07-01 16:06:03.000000000 +0000 +++ hime-0.9.10+git20170427+dfsg1/debian/copyright 2017-07-09 13:05:38.000000000 +0000 @@ -1,7 +1,9 @@ -Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/ +Format: https://www.debian.org/doc/packaging-manuals/copyright-format/1.0/ Upstream-Name: hime Upstream-Contact: Wen-Yen Chuang Source: http://hime.luna.com.tw/ +Files-Excluded: + data/dayi3.cin Comment: The dayi table is packed in typical package but they generate DFSG-free package which can be downloaded from upstream (which cannot get from git source). diff -Nru hime-0.9.10+git20150916+dfsg1/debian/.git-dpm hime-0.9.10+git20170427+dfsg1/debian/.git-dpm --- hime-0.9.10+git20150916+dfsg1/debian/.git-dpm 2016-07-01 16:06:03.000000000 +0000 +++ hime-0.9.10+git20170427+dfsg1/debian/.git-dpm 2017-07-09 13:05:00.000000000 +0000 @@ -1,11 +1,11 @@ # see git-dpm(1) from git-dpm package -bd018abb45f6f115b8b11f6d2dd7a3ab1ef7cdc1 -bd018abb45f6f115b8b11f6d2dd7a3ab1ef7cdc1 -515ae87f480c29b7662fa85e359bb8ec0b2321fc -515ae87f480c29b7662fa85e359bb8ec0b2321fc -hime_0.9.10+git20150916+dfsg1.orig.tar.xz -3ede847c970a68744574663aa21e268aaba373b3 -2212136 +6891255faaa3a996a66e61fa57f83ee79aaf4cba +6891255faaa3a996a66e61fa57f83ee79aaf4cba +e7a7e7da5a4822530145d0fe6b7d6a970a5707f4 +e7a7e7da5a4822530145d0fe6b7d6a970a5707f4 +hime_0.9.10+git20170427+dfsg1.orig.tar.xz +bec8121530d88eaf573cf668739d0480e086ee82 +2223356 debianTag="debian/%f%v" patchedTag="patched/%f%v" upstreamTag="upstream/%u" diff -Nru hime-0.9.10+git20150916+dfsg1/debian/hime-gtk2-immodule.postinst hime-0.9.10+git20170427+dfsg1/debian/hime-gtk2-immodule.postinst --- hime-0.9.10+git20150916+dfsg1/debian/hime-gtk2-immodule.postinst 2016-06-30 14:43:29.000000000 +0000 +++ hime-0.9.10+git20170427+dfsg1/debian/hime-gtk2-immodule.postinst 1970-01-01 00:00:00.000000000 +0000 @@ -1,19 +0,0 @@ -#!/bin/sh -set -e -set -u - -GTK_QUERY_IMMODULES=/usr/lib/x86_64-linux-gnu/libgtk2.0-0/gtk-query-immodules-2.0 - -if [ -x $GTK_QUERY_IMMODULES ]; then - case "$1" in - configure) - $GTK_QUERY_IMMODULES --update-cache - ;; - esac -else - echo "Cannot find $GTK_QUERY_IMMODULES" >&2 -fi - -#DEBHELPER# - -exit 0 diff -Nru hime-0.9.10+git20150916+dfsg1/debian/hime-gtk2-immodule.postrm hime-0.9.10+git20170427+dfsg1/debian/hime-gtk2-immodule.postrm --- hime-0.9.10+git20150916+dfsg1/debian/hime-gtk2-immodule.postrm 2016-06-30 14:43:29.000000000 +0000 +++ hime-0.9.10+git20170427+dfsg1/debian/hime-gtk2-immodule.postrm 1970-01-01 00:00:00.000000000 +0000 @@ -1,19 +0,0 @@ -#!/bin/sh -set -e -set -u - -GTK_QUERY_IMMODULES=/usr/lib/x86_64-linux-gnu/libgtk2.0-0/gtk-query-immodules-2.0 - -if [ -x $GTK_QUERY_IMMODULES ]; then - case "$1" in - remove|purge) - $GTK_QUERY_IMMODULES --update-cache - ;; - esac -else - echo "Cannot find $GTK_QUERY_IMMODULES" >&2 -fi - -#DEBHELPER# - -exit 0 diff -Nru hime-0.9.10+git20150916+dfsg1/debian/hime-gtk3-immodule.postinst hime-0.9.10+git20170427+dfsg1/debian/hime-gtk3-immodule.postinst --- hime-0.9.10+git20150916+dfsg1/debian/hime-gtk3-immodule.postinst 2016-06-30 14:43:29.000000000 +0000 +++ hime-0.9.10+git20170427+dfsg1/debian/hime-gtk3-immodule.postinst 1970-01-01 00:00:00.000000000 +0000 @@ -1,19 +0,0 @@ -#!/bin/sh -set -e -set -u - -GTK_QUERY_IMMODULES=/usr/lib/x86_64-linux-gnu/libgtk-3-0/gtk-query-immodules-3.0 - -if [ -x $GTK_QUERY_IMMODULES ]; then - case "$1" in - configure) - $GTK_QUERY_IMMODULES --update-cache - ;; - esac -else - echo "Cannot find $GTK_QUERY_IMMODULES" >&2 -fi - -#DEBHELPER# - -exit 0 diff -Nru hime-0.9.10+git20150916+dfsg1/debian/hime-gtk3-immodule.postrm hime-0.9.10+git20170427+dfsg1/debian/hime-gtk3-immodule.postrm --- hime-0.9.10+git20150916+dfsg1/debian/hime-gtk3-immodule.postrm 2016-06-30 14:43:29.000000000 +0000 +++ hime-0.9.10+git20170427+dfsg1/debian/hime-gtk3-immodule.postrm 1970-01-01 00:00:00.000000000 +0000 @@ -1,19 +0,0 @@ -#!/bin/sh -set -e -set -u - -GTK_QUERY_IMMODULES=/usr/lib/x86_64-linux-gnu/libgtk-3-0/gtk-query-immodules-3.0 - -if [ -x $GTK_QUERY_IMMODULES ]; then - case "$1" in - remove|purge) - $GTK_QUERY_IMMODULES --update-cache - ;; - esac -else - echo "Cannot find $GTK_QUERY_IMMODULES" >&2 -fi - -#DEBHELPER# - -exit 0 diff -Nru hime-0.9.10+git20150916+dfsg1/debian/patches/0003-Remove-Qt5PlatformSupport.patch hime-0.9.10+git20170427+dfsg1/debian/patches/0003-Remove-Qt5PlatformSupport.patch --- hime-0.9.10+git20150916+dfsg1/debian/patches/0003-Remove-Qt5PlatformSupport.patch 2016-07-01 16:06:03.000000000 +0000 +++ hime-0.9.10+git20170427+dfsg1/debian/patches/0003-Remove-Qt5PlatformSupport.patch 1970-01-01 00:00:00.000000000 +0000 @@ -1,32 +0,0 @@ -From 4a57b3af26b2ac38dcd4c2cfc3bc3de1b9ef82f6 Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?ChangZhuo=20Chen=20=28=E9=99=B3=E6=98=8C=E5=80=AC=29?= - -Date: Thu, 16 Jun 2016 08:54:52 +0800 -Subject: Remove Qt5PlatformSupport - -Closes: #827332 ---- - src/qt5-im/Makefile | 4 ++-- - 1 file changed, 2 insertions(+), 2 deletions(-) - -diff --git a/src/qt5-im/Makefile b/src/qt5-im/Makefile -index 66ff6ab..5a8a6e4 100644 ---- a/src/qt5-im/Makefile -+++ b/src/qt5-im/Makefile -@@ -5,14 +5,14 @@ ifeq ($(FREEBSD), 0) - else - INCS=-I../im-client -I/usr/local/include - endif --INCS+=`pkg-config Qt5Core Qt5Gui Qt5PlatformSupport Qt5DBus --cflags` -+INCS+=`pkg-config Qt5Core Qt5Gui Qt5DBus --cflags` - INCS+=-I `pkg-config --variable=includedir Qt5Gui`/QtGui/`pkg-config --modversion Qt5Gui`/QtGui - - CXXFLAGS=$(OPTFLAGS) $(INCS) -Wall -D_REENTRANT -DUNIX=1 -fPIC -DQT5 -DQT_SHARED \ - -DQT_IMMODULE -DPIC - OBJS= moc_hime-qt.o hime-qt.o hime-imcontext-qt.o moc_hime-imcontext-qt.o - .SUFFIXES: .c .cpp .a .so .E .h --LDFLAGS=$(LDFLAGS_ENV) -L../im-client -lhime-im-client `pkg-config Qt5Core Qt5Gui Qt5PlatformSupport Qt5DBus --libs` -+LDFLAGS=$(LDFLAGS_ENV) -L../im-client -lhime-im-client `pkg-config Qt5Core Qt5Gui Qt5DBus --libs` - - - all: im-hime.so diff -Nru hime-0.9.10+git20150916+dfsg1/debian/patches/0004-Reproducible-build.patch hime-0.9.10+git20170427+dfsg1/debian/patches/0004-Reproducible-build.patch --- hime-0.9.10+git20150916+dfsg1/debian/patches/0004-Reproducible-build.patch 2016-07-01 16:06:03.000000000 +0000 +++ hime-0.9.10+git20170427+dfsg1/debian/patches/0004-Reproducible-build.patch 1970-01-01 00:00:00.000000000 +0000 @@ -1,23 +0,0 @@ -From 819eb9581078fcb53eb722445212406c49789c28 Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?ChangZhuo=20Chen=20=28=E9=99=B3=E6=98=8C=E5=80=AC=29?= - -Date: Thu, 30 Jun 2016 22:42:22 +0800 -Subject: Reproducible build - ---- - src/pin-juyin.c | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/src/pin-juyin.c b/src/pin-juyin.c -index f1fe046..0c596f1 100644 ---- a/src/pin-juyin.c -+++ b/src/pin-juyin.c -@@ -23,7 +23,7 @@ int main() - { - FILE *fp; - char fnamein[]="pin-juyin.src"; -- PIN_JUYIN pinju[1024]; -+ PIN_JUYIN pinju[1024] = { 0 }; - short pinjuN=0; - - if ((fp=fopen(fnamein, "r"))==NULL) diff -Nru hime-0.9.10+git20150916+dfsg1/debian/patches/0005-Avoid-using-locale-dependent-shell-glob.patch hime-0.9.10+git20170427+dfsg1/debian/patches/0005-Avoid-using-locale-dependent-shell-glob.patch --- hime-0.9.10+git20150916+dfsg1/debian/patches/0005-Avoid-using-locale-dependent-shell-glob.patch 2016-07-01 16:06:03.000000000 +0000 +++ hime-0.9.10+git20170427+dfsg1/debian/patches/0005-Avoid-using-locale-dependent-shell-glob.patch 1970-01-01 00:00:00.000000000 +0000 @@ -1,28 +0,0 @@ -From bd018abb45f6f115b8b11f6d2dd7a3ab1ef7cdc1 Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?ChangZhuo=20Chen=20=28=E9=99=B3=E6=98=8C=E5=80=AC=29?= - -Date: Sat, 2 Jul 2016 00:05:42 +0800 -Subject: Avoid using locale-dependent shell glob - ---- - filter/Makefile | 4 +++- - 1 file changed, 3 insertions(+), 1 deletion(-) - -diff --git a/filter/Makefile b/filter/Makefile -index af07834..5adda8f 100644 ---- a/filter/Makefile -+++ b/filter/Makefile -@@ -1,10 +1,12 @@ - include ../config.mak - -+FILTER_LIST=$(shell ls|grep -v Makefile) -+ - all: - - install: - install -d "$(filterdir)" -- install -m 755 [a-z]* "$(filterdir)" -+ install -m 755 $(FILTER_LIST) "$(filterdir)" - - clean: - @echo "clean up" diff -Nru hime-0.9.10+git20150916+dfsg1/debian/patches/himelibdir.patch hime-0.9.10+git20170427+dfsg1/debian/patches/himelibdir.patch --- hime-0.9.10+git20150916+dfsg1/debian/patches/himelibdir.patch 2016-07-01 16:06:03.000000000 +0000 +++ hime-0.9.10+git20170427+dfsg1/debian/patches/himelibdir.patch 2017-07-09 13:05:00.000000000 +0000 @@ -1,4 +1,4 @@ -From af21b2ae03ae8e007b10bac3c3d4a990bbd78902 Mon Sep 17 00:00:00 2001 +From 6891255faaa3a996a66e61fa57f83ee79aaf4cba Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?ChangZhuo=20Chen=20=28=E9=99=B3=E6=98=8C=E5=80=AC=29?= Date: Tue, 29 Sep 2015 13:53:42 +0800 diff -Nru hime-0.9.10+git20150916+dfsg1/debian/patches/keywords.patch hime-0.9.10+git20170427+dfsg1/debian/patches/keywords.patch --- hime-0.9.10+git20150916+dfsg1/debian/patches/keywords.patch 2016-07-01 16:06:03.000000000 +0000 +++ hime-0.9.10+git20170427+dfsg1/debian/patches/keywords.patch 2017-07-09 13:05:00.000000000 +0000 @@ -1,4 +1,4 @@ -From cd385d061db394c7732efd13bdde4327e3ba28bb Mon Sep 17 00:00:00 2001 +From 19ba840b8f9e99b08b2f7379080d4c1c30b44447 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?ChangZhuo=20Chen=20=28=E9=99=B3=E6=98=8C=E5=80=AC=29?= Date: Tue, 29 Sep 2015 13:53:42 +0800 diff -Nru hime-0.9.10+git20150916+dfsg1/debian/patches/series hime-0.9.10+git20170427+dfsg1/debian/patches/series --- hime-0.9.10+git20150916+dfsg1/debian/patches/series 2016-07-01 16:06:03.000000000 +0000 +++ hime-0.9.10+git20170427+dfsg1/debian/patches/series 2017-07-09 13:05:00.000000000 +0000 @@ -1,5 +1,2 @@ keywords.patch himelibdir.patch -0003-Remove-Qt5PlatformSupport.patch -0004-Reproducible-build.patch -0005-Avoid-using-locale-dependent-shell-glob.patch diff -Nru hime-0.9.10+git20150916+dfsg1/debian/rules hime-0.9.10+git20170427+dfsg1/debian/rules --- hime-0.9.10+git20150916+dfsg1/debian/rules 2016-07-01 16:06:03.000000000 +0000 +++ hime-0.9.10+git20170427+dfsg1/debian/rules 2017-07-09 13:10:27.000000000 +0000 @@ -17,7 +17,7 @@ GTK3_IMMODULES := $(shell pkg-config --variable=libdir gtk+-3.0)/libgtk-3-0/gtk-query-immodules-3.0 %: - dh $@ + dh $@ --no-parallel override_dh_auto_clean: touch config.mak # dirty hack to make Makefile thinks config.mak exists @@ -50,9 +50,6 @@ dh_makeshlibs -n override_dh_strip: - dh_strip --dbg-package=hime-dbg - -override_dh_strip: dh_strip --ddeb-migration='hime-dbg (<< 0.9.10+git20150916+dfsg1-2~)' override_dh_install: diff -Nru hime-0.9.10+git20150916+dfsg1/distro/archlinux/PKGBUILD hime-0.9.10+git20170427+dfsg1/distro/archlinux/PKGBUILD --- hime-0.9.10+git20150916+dfsg1/distro/archlinux/PKGBUILD 2015-09-16 10:07:52.000000000 +0000 +++ hime-0.9.10+git20170427+dfsg1/distro/archlinux/PKGBUILD 2017-04-27 11:04:40.000000000 +0000 @@ -1,7 +1,7 @@ # Contributor: HIME team _pkgname=hime pkgname=hime-git -pkgver=1033.b8b55c0 +pkgver=1054.fd035c9 pkgrel=1 pkgdesc="A GTK2+/GTK3+ based universal input method platform" arch=('i686' 'x86_64') diff -Nru hime-0.9.10+git20150916+dfsg1/filter/Makefile hime-0.9.10+git20170427+dfsg1/filter/Makefile --- hime-0.9.10+git20150916+dfsg1/filter/Makefile 2015-09-16 10:07:52.000000000 +0000 +++ hime-0.9.10+git20170427+dfsg1/filter/Makefile 2017-04-27 11:04:40.000000000 +0000 @@ -1,10 +1,12 @@ include ../config.mak +FILTER_LIST=$(shell ls|grep -v Makefile) + all: install: install -d "$(filterdir)" - install -m 755 [a-z]* "$(filterdir)" + install -m 755 $(FILTER_LIST) "$(filterdir)" clean: @echo "clean up" diff -Nru hime-0.9.10+git20150916+dfsg1/.gitignore hime-0.9.10+git20170427+dfsg1/.gitignore --- hime-0.9.10+git20150916+dfsg1/.gitignore 2015-09-16 10:07:52.000000000 +0000 +++ hime-0.9.10+git20170427+dfsg1/.gitignore 1970-01-01 00:00:00.000000000 +0000 @@ -1,58 +0,0 @@ -*.a -*.gmo -*.o -*.pico -*.pot -*.so -*.so.* -*~ -.depend -hime-cin2gtab -config.mak -data/ar30-big.gtab -data/ar30.gtab -data/cj-punc.gtab -data/cj.gtab -data/cj5.gtab -data/cj543.gtab -data/colemak.kbm -data/dayi3.gtab -data/dvorak.kbm -data/et.kbm -data/et26.kbm -data/extr1 -data/greek.gtab -data/hangul.gtab -data/hsu.kbm -data/ibm.kbm -data/jyutping.gtab -data/latin-letters.gtab -data/mitac.kbm -data/pho-huge.tab2 -data/pho.tab2 -data/pin-juyin.xlt -data/pinyin-no-tone.kbm -data/pinyin.gtab -data/pinyin.kbm -data/russian.gtab -data/s-pho-huge.tab2 -data/s-pho.tab2 -data/s-tsin32 -data/s-tsin32.idx -data/s2t.dat -data/simplex-punc.gtab -data/simplex.gtab -data/symbols.gtab -data/t2s-file -data/t2s.dat -data/tsin-1.src -data/tsin32 -data/tsin32.idx -data/zo.kbm -hime-gtab2cin -hime -kbmcv -pin-juyin -tmp/ -.idea/ -.gitignore diff -Nru hime-0.9.10+git20150916+dfsg1/src/eve.c hime-0.9.10+git20170427+dfsg1/src/eve.c --- hime-0.9.10+git20150916+dfsg1/src/eve.c 2015-09-16 10:07:52.000000000 +0000 +++ hime-0.9.10+git20170427+dfsg1/src/eve.c 2017-04-27 11:04:40.000000000 +0000 @@ -514,7 +514,7 @@ case method_type_MODULE: if (inmd[cs->in_method].mod_cb_funcs) module_cb1(cs)->module_move_win(x, y); - move_win_gtab(x, y); + move_win_gtab(x, y); break; default: if (!cs->in_method) diff -Nru hime-0.9.10+git20150916+dfsg1/src/gtk3-im/Makefile hime-0.9.10+git20170427+dfsg1/src/gtk3-im/Makefile --- hime-0.9.10+git20150916+dfsg1/src/gtk3-im/Makefile 2015-09-16 10:07:52.000000000 +0000 +++ hime-0.9.10+git20170427+dfsg1/src/gtk3-im/Makefile 2017-04-27 11:04:40.000000000 +0000 @@ -41,16 +41,16 @@ install: if [ "$(prefix)" = "/usr/local" -o "$(prefix)" = "/usr" ]; then \ - install -d $(MODULEDIR); \ - install -m 755 im-hime.so $(MODULEDIR); \ + install -d "$(MODULEDIR)"; \ + install -m 755 im-hime.so "$(MODULEDIR)"; \ if [ "$(prefix)" = "/usr/local" ]; then \ if [ -f "$(IMMODULES_QUERY)" -a -x "$(IMMODULES_QUERY)" ]; then \ GTK_IM_MODULE_FILE=$(IMMODULES_CACHE) $(IMMODULES_QUERY) --update-cache; \ fi \ fi \ else \ - install -d $(IMMODULES); \ - install -m 755 im-hime.so $(IMMODULES); \ + install -d "$(IMMODULES)"; \ + install -m 755 im-hime.so "$(IMMODULES)"; \ fi .depend: diff -Nru hime-0.9.10+git20150916+dfsg1/src/gtk-im/Makefile hime-0.9.10+git20170427+dfsg1/src/gtk-im/Makefile --- hime-0.9.10+git20150916+dfsg1/src/gtk-im/Makefile 2015-09-16 10:07:52.000000000 +0000 +++ hime-0.9.10+git20170427+dfsg1/src/gtk-im/Makefile 2017-04-27 11:04:40.000000000 +0000 @@ -41,16 +41,16 @@ install: if [ "$(prefix)" = "/usr/local" -o "$(prefix)" = "/usr" ]; then \ - install -d $(MODULEDIR); \ - install -m 755 im-hime.so $(MODULEDIR); \ + install -d "$(MODULEDIR)"; \ + install -m 755 im-hime.so "$(MODULEDIR)"; \ if [ "$(prefix)" = "/usr/local" ]; then \ - if [ -d $(DESTDIR)/etc/gtk-2.0 ]; then \ - cd $(DESTDIR)/etc/gtk-2.0; $(IMMODULES_QUERY) > gtk.immodules; \ + if [ -d "$(DESTDIR)/etc/gtk-2.0" ]; then \ + cd "$(DESTDIR)/etc/gtk-2.0"; $(IMMODULES_QUERY) > gtk.immodules; \ fi \ fi \ else \ - install -d $(IMMODULES); \ - install -m 755 im-hime.so $(IMMODULES); \ + install -d "$(IMMODULES)"; \ + install -m 755 im-hime.so "$(IMMODULES)"; \ fi .depend: diff -Nru hime-0.9.10+git20150916+dfsg1/src/hime-gtab-merge.c hime-0.9.10+git20170427+dfsg1/src/hime-gtab-merge.c --- hime-0.9.10+git20150916+dfsg1/src/hime-gtab-merge.c 2015-09-16 10:07:52.000000000 +0000 +++ hime-0.9.10+git20170427+dfsg1/src/hime-gtab-merge.c 2017-04-27 11:04:40.000000000 +0000 @@ -231,7 +231,7 @@ fread(idx1, sizeof(gtab_idx1_t), KeyNum+1, fr); for(i=0; i < th.KeyS; i++) { - kno[keymap[i]] = i; + kno[(int)keymap[i]] = i; } for(i=0; i < th.DefC; i++) { diff -Nru hime-0.9.10+git20150916+dfsg1/src/hime-settings.c hime-0.9.10+git20170427+dfsg1/src/hime-settings.c --- hime-0.9.10+git20150916+dfsg1/src/hime-settings.c 2015-09-16 10:07:52.000000000 +0000 +++ hime-0.9.10+git20170427+dfsg1/src/hime-settings.c 2017-04-27 11:04:40.000000000 +0000 @@ -86,6 +86,7 @@ int get_hime_conf_int(char *name, int default_value); void init_omni_config(void); +int is_kde5(void); void load_settings() { @@ -141,7 +142,7 @@ #if TRAY_ENABLED hime_status_tray = get_hime_conf_int(HIME_STATUS_TRAY, 1); #if TRAY_UNITY - if (desktop != NULL && strcmp("Unity", desktop) == 0) { + if ((desktop != NULL && strcmp("Unity", desktop) == 0) || is_kde5()) { hime_tray_display = get_hime_conf_int(HIME_TRAY_DISPLAY, HIME_TRAY_DISPLAY_APPINDICATOR); } else { @@ -263,3 +264,10 @@ free(pho_kbm_name); pho_kbm_name = strdup(phokbm_name); } + +/* FIXME only KDE5 needs to use libappindicator, but this also includes KDE4 */ +int is_kde5(void) +{ + const char* desktop = getenv("XDG_CURRENT_DESKTOP"); + return desktop && strcmp(desktop, "KDE") == 0; +} diff -Nru hime-0.9.10+git20150916+dfsg1/src/hime-setup-pho.c hime-0.9.10+git20170427+dfsg1/src/hime-setup-pho.c --- hime-0.9.10+git20150916+dfsg1/src/hime-setup-pho.c 2015-09-16 10:07:52.000000000 +0000 +++ hime-0.9.10+git20170427+dfsg1/src/hime-setup-pho.c 2017-04-27 11:04:40.000000000 +0000 @@ -303,13 +303,13 @@ return hbox; } -static update_eng_ch_opts (GtkComboBox *widget, gpointer user_data) +static void update_eng_ch_opts (GtkComboBox *widget, gpointer user_data) { gint i; gint idx = gtk_combo_box_get_active (GTK_COMBO_BOX (widget)); for (i=0; i<2; i++) { - if ((opt_eng_ch_opts[i]) && (opt_eng_ch_opts[i] != widget)) + if ((opt_eng_ch_opts[i]) && (opt_eng_ch_opts[i] != (GtkWidget*)widget)) gtk_combo_box_set_active (GTK_COMBO_BOX (opt_eng_ch_opts[i]), idx); } diff -Nru hime-0.9.10+git20150916+dfsg1/src/hime-tsd2a32.c hime-0.9.10+git20170427+dfsg1/src/hime-tsd2a32.c --- hime-0.9.10+git20150916+dfsg1/src/hime-tsd2a32.c 2015-09-16 10:07:52.000000000 +0000 +++ hime-0.9.10+git20170427+dfsg1/src/hime-tsd2a32.c 2017-04-27 11:04:40.000000000 +0000 @@ -56,8 +56,8 @@ if (!strcmp(argv[i], "-o")) { if (i==argc-1) p_err("-o need out file name"); - fname_out = argv[i+1]; - i+=2; + fname_out = argv[i+1]; + i+=2; } else fname = argv[i++]; } diff -Nru hime-0.9.10+git20150916+dfsg1/src/hime-tsin2gtab-phrase.c hime-0.9.10+git20170427+dfsg1/src/hime-tsin2gtab-phrase.c --- hime-0.9.10+git20150916+dfsg1/src/hime-tsin2gtab-phrase.c 2015-09-16 10:07:52.000000000 +0000 +++ hime-0.9.10+git20170427+dfsg1/src/hime-tsin2gtab-phrase.c 2017-04-27 11:04:40.000000000 +0000 @@ -309,10 +309,10 @@ u_int64_t k=0; if (key64) { - memcpy(&k, kk64[i].arr[vz[i]].key, 8); + memcpy(&k, kk64[i].arr[(int)vz[i]].key, 8); } else { u_int t; - memcpy(&t, kk[i].arr[vz[i]].key, 4); + memcpy(&t, kk[i].arr[(int)vz[i]].key, 4); k = t; } diff -Nru hime-0.9.10+git20150916+dfsg1/src/im-addr.c hime-0.9.10+git20170427+dfsg1/src/im-addr.c --- hime-0.9.10+git20150916+dfsg1/src/im-addr.c 2015-09-16 10:07:52.000000000 +0000 +++ hime-0.9.10+git20170427+dfsg1/src/im-addr.c 2017-04-27 11:04:40.000000000 +0000 @@ -49,7 +49,7 @@ mkdir(my_dir, 0700); else { if (st.st_uid != my_uid) { - fprintf(stderr, "please check the permision of dir %s\n", my_dir); + fprintf(stderr, "please check the permission of dir %s\n", my_dir); return; } } diff -Nru hime-0.9.10+git20150916+dfsg1/src/im-client/hime-im-client.c hime-0.9.10+git20170427+dfsg1/src/im-client/hime-im-client.c --- hime-0.9.10+git20150916+dfsg1/src/im-client/hime-im-client.c 2015-09-16 10:07:52.000000000 +0000 +++ hime-0.9.10+git20170427+dfsg1/src/im-client/hime-im-client.c 2017-04-27 11:04:40.000000000 +0000 @@ -67,7 +67,9 @@ int servlen; // char *addr; Server_IP_port srv_ip_port; +#if DEBUG u_char *pp; +#endif int uid = getuid(); if (uid > 0 && uid < 500) { @@ -227,10 +229,12 @@ goto next; } +#if DEBUG pp = (u_char *)&srv_ip_port.ip; if (dbg_msg) dbg("hime client connected to server %d.%d.%d.%d:%d\n", pp[0], pp[1], pp[2], pp[3], ntohs(srv_ip_port.port)); +#endif tcp = TRUE; diff -Nru hime-0.9.10+git20150916+dfsg1/src/im-dispatch.c hime-0.9.10+git20170427+dfsg1/src/im-dispatch.c --- hime-0.9.10+git20150916+dfsg1/src/im-dispatch.c 2015-09-16 10:07:52.000000000 +0000 +++ hime-0.9.10+git20170427+dfsg1/src/im-dispatch.c 2017-04-27 11:04:40.000000000 +0000 @@ -330,8 +330,8 @@ write_enc(fd, &attrN, sizeof(attrN)); if (attrN > 0) write_enc(fd, attr, sizeof(HIME_PREEDIT_ATTR)*attrN); - write_enc(fd, &cursor, sizeof(cursor)); - write_enc(fd, &sub_comp_len, sizeof(sub_comp_len)); + write_enc(fd, &cursor, sizeof(cursor)); + write_enc(fd, &sub_comp_len, sizeof(sub_comp_len)); // dbg("uuuuuuuuuuuuuuuuu len:%d %d cursor:%d\n", len, attrN, cursor); } break; diff -Nru hime-0.9.10+git20150916+dfsg1/src/kbmcv.c hime-0.9.10+git20170427+dfsg1/src/kbmcv.c --- hime-0.9.10+git20150916+dfsg1/src/kbmcv.c 2015-09-16 10:07:52.000000000 +0000 +++ hime-0.9.10+git20170427+dfsg1/src/kbmcv.c 2017-04-27 11:04:40.000000000 +0000 @@ -130,9 +130,10 @@ } fclose(fp); - if (strstr(fnamesrc, "pinyin")) + if (strstr(fnamesrc, "pinyin")) { phkb.phokbm[' '][0].num=0; phkb.phokbm[' '][0].typ=3; + } if ((fp=fopen(fnameout,"w"))==NULL) { printf("Cannot create %s\n", fnameout); diff -Nru hime-0.9.10+git20150916+dfsg1/src/modules/anthy.c hime-0.9.10+git20170427+dfsg1/src/modules/anthy.c --- hime-0.9.10+git20150916+dfsg1/src/modules/anthy.c 2015-09-16 10:07:52.000000000 +0000 +++ hime-0.9.10+git20170427+dfsg1/src/modules/anthy.c 2017-04-27 11:04:40.000000000 +0000 @@ -809,7 +809,6 @@ dbg("%d] sel idx:%d ofs:%d\n",i, idx, ofs); int selN = seg[i].selN = ss.nr_candidate; - char *old_str = NULL; seg[i].selidx = 0; if (idx < sel_segN && sel_seg[idx].len==len) { int j; diff -Nru hime-0.9.10+git20150916+dfsg1/src/modules/chewing.c hime-0.9.10+git20170427+dfsg1/src/modules/chewing.c --- hime-0.9.10+git20150916+dfsg1/src/modules/chewing.c 2015-09-16 10:07:52.000000000 +0000 +++ hime-0.9.10+git20170427+dfsg1/src/modules/chewing.c 2017-04-27 11:04:40.000000000 +0000 @@ -176,11 +176,6 @@ memset (pszChewingHashDir, 0x00, strlen (pszHome) + strlen ("/.chewing/") + 1); sprintf (pszChewingHashDir, "%s/.chewing", pszHome); - if (chewing_Init (CHEWING_DATADIR, pszChewingHashDir) != 0) - { - free (pszChewingHashDir); - return FALSE; - } free (pszChewingHashDir); pszHome = NULL; @@ -213,15 +208,15 @@ return !chewing_buffer_Len (g_pChewingCtx) && !nZuinLen; } -static gboolean +static gboolean hime_key_filter (int *pnKeyVal) { - if ((*pnKeyVal) > HIME_CHEWING_DEFAULT_KEY_MIN && + if ((*pnKeyVal) > HIME_CHEWING_DEFAULT_KEY_MIN && (*pnKeyVal) < HIME_CHEWING_DEFAULT_KEY_MAX) chewing_handle_Default (g_pChewingCtx, (*pnKeyVal)); else if ((*pnKeyVal) >= XK_KP_0 && (*pnKeyVal) <= XK_KP_9) chewing_handle_Numlock (g_pChewingCtx, (*pnKeyVal) - XK_KP_0 + '0'); - else if ((*pnKeyVal) < HIME_CHEWING_KEY_MAX && + else if ((*pnKeyVal) < HIME_CHEWING_KEY_MAX && (*pnKeyVal) >= HIME_CHEWING_KEY_MIN) if ((int)(g_pKeyHandler[(*pnKeyVal)] (g_pChewingCtx)) == -1) return FALSE; @@ -267,7 +262,7 @@ return TRUE; } -static gboolean +static gboolean hime_buffer_label_show (void) { char *pszTmp = NULL; @@ -276,7 +271,7 @@ char *pHead = NULL; int nIdx = 0; int nPos = 0; - int nWordSize = 0; + int nWordSize = 0; pszWord = (char *) realloc (pszWord, 8); @@ -325,8 +320,8 @@ hime_label_show (pszWord, nIdx++); } - // if chewing_buffer_Check is not zero, - // it means that the chewing_buffer_String must have val, + // if chewing_buffer_Check is not zero, + // it means that the chewing_buffer_String must have val, // so we could free the ptr here free (pszTmp); } @@ -336,8 +331,8 @@ return TRUE; } -static gboolean -hime_buffer_commit (void) +static gboolean +hime_buffer_commit (void) { char *pszTmp = NULL; @@ -349,8 +344,8 @@ // FIXME: workaround for repeated commit chewing_handle_Esc (g_pChewingCtx); - // if chewing_commit_Check is not zero, - // it means that the chewing_commit_String must have val, + // if chewing_commit_Check is not zero, + // it means that the chewing_commit_String must have val, // so we could free the ptr here free (pszTmp); } @@ -367,7 +362,7 @@ return ((void)NULL); } -static int +static int hime_chewing_wrapper_bs (ChewingContext *pCtx) { // If zuin is present, force libchewing handles Backspace for removing last zuin @@ -378,43 +373,43 @@ HIME_CHEWING_WRAPPER_FUNC (chewing_handle_Backspace); } -static int +static int hime_chewing_wrapper_enter (ChewingContext *pCtx) { HIME_CHEWING_WRAPPER_FUNC (chewing_handle_Enter); } -static int +static int hime_chewing_wrapper_home (ChewingContext *pCtx) { HIME_CHEWING_WRAPPER_FUNC (chewing_handle_Home); } -static int +static int hime_chewing_wrapper_left (ChewingContext *pCtx) { HIME_CHEWING_WRAPPER_FUNC (chewing_handle_Left); } -static int +static int hime_chewing_wrapper_up (ChewingContext *pCtx) { HIME_CHEWING_WRAPPER_FUNC (chewing_handle_Up); } -static int +static int hime_chewing_wrapper_right (ChewingContext *pCtx) { HIME_CHEWING_WRAPPER_FUNC (chewing_handle_Right); } -static int +static int hime_chewing_wrapper_down (ChewingContext *pCtx) { HIME_CHEWING_WRAPPER_FUNC (chewing_handle_Down); } -static int +static int hime_chewing_wrapper_pageup (ChewingContext *pCtx) { HIME_CHEWING_WRAPPER_FUNC (chewing_handle_PageUp); @@ -425,19 +420,19 @@ HIME_CHEWING_WRAPPER_FUNC (chewing_handle_PageDown); } -static int +static int hime_chewing_wrapper_end (ChewingContext *pCtx) { HIME_CHEWING_WRAPPER_FUNC (chewing_handle_End); } -static int +static int hime_chewing_wrapper_del (ChewingContext *pCtx) { HIME_CHEWING_WRAPPER_FUNC (chewing_handle_Del); } -static void +static void hime_chewing_cb_register (void) { int nIdx = HIME_CHEWING_KEY_MIN; diff -Nru hime-0.9.10+git20150916+dfsg1/src/modules/chewing-conf.c hime-0.9.10+git20170427+dfsg1/src/modules/chewing-conf.c --- hime-0.9.10+git20150916+dfsg1/src/modules/chewing-conf.c 2015-09-16 10:07:52.000000000 +0000 +++ hime-0.9.10+git20170427+dfsg1/src/modules/chewing-conf.c 2017-04-27 11:04:40.000000000 +0000 @@ -20,8 +20,8 @@ static ChewingConfigData g_chewingConfig; static gboolean g_bUseDefault = FALSE; static int g_nFd = -1; -static kbmapping_t g_kbMappingTable[] = -{ +static kbmapping_t g_kbMappingTable[] = +{ {"zo", "KB_DEFAULT"}, {"et", "KB_ET"}, {"et26", "KB_ET26"}, @@ -82,7 +82,6 @@ g_chewingConfig.bAutoShiftCur = 1; g_chewingConfig.bEasySymbolInput = 0; g_chewingConfig.bPhraseChoiceRearward = 1; - g_chewingConfig.hsuSelKeyType = 0; memcpy (&g_chewingConfig.selKey, &nDefaultSelKey, sizeof (g_chewingConfig.selKey)); @@ -100,8 +99,8 @@ memcpy (&g_chewingConfig.selKey, &nDefaultSelKey, sizeof (g_chewingConfig.selKey)); - chewing_set_selKey (pChewingCtx, - g_chewingConfig.selKey, + chewing_set_selKey (pChewingCtx, + g_chewingConfig.selKey, MAX_SELKEY); chewing_set_candPerPage (pChewingCtx, g_chewingConfig.candPerPage > HIME_CHEWING_DEFAULT_NUMBER_OF_SELECT_KEYS ? HIME_CHEWING_DEFAULT_NUMBER_OF_SELECT_KEYS : g_chewingConfig.candPerPage); } @@ -113,7 +112,6 @@ chewing_set_autoShiftCur (pChewingCtx, g_chewingConfig.bAutoShiftCur); chewing_set_easySymbolInput (pChewingCtx, g_chewingConfig.bEasySymbolInput); chewing_set_phraseChoiceRearward (pChewingCtx, g_chewingConfig.bPhraseChoiceRearward); - chewing_set_hsuSelKeyType (pChewingCtx, g_chewingConfig.hsuSelKeyType); } void @@ -129,7 +127,6 @@ printf ("\tbAutoShiftCur: %d\n", g_chewingConfig.bAutoShiftCur); printf ("\tbEasySymbolInput: %d\n", g_chewingConfig.bEasySymbolInput); printf ("\tbPhraseChoiceRearward: %d\n", g_chewingConfig.bPhraseChoiceRearward); - printf ("\thsuSelKeyType: %d\n", g_chewingConfig.hsuSelKeyType); printf ("\tselKey: "); for (nIdx = 0; nIdx < MAX_SELKEY; nIdx++) printf ("%c ", g_chewingConfig.selKey[nIdx]); @@ -171,8 +168,8 @@ memset (pszHimeKBConfig, 0x00, strlen (pszHome) + strlen (HIME_KB_CONFIG) + 1); sprintf (pszHimeKBConfig, "%s%s", pszHome, HIME_KB_CONFIG); - nFd = open (pszHimeKBConfig, - O_RDONLY, + nFd = open (pszHimeKBConfig, + O_RDONLY, S_IRUSR | S_IWUSR | S_IRGRP | S_IROTH); free (pszHimeKBConfig); @@ -183,7 +180,7 @@ nRead = read (nFd, szBuf, 32); if (nRead == -1) return FALSE; - + sscanf (szBuf, "%s %s ", szKbType, szKbSelKey); if (!strlen (szKbType) || !strlen (szKbSelKey)) @@ -201,7 +198,7 @@ szKbType, strlen (szKbType))) { - chewing_set_KBType (pChewingCtx, + chewing_set_KBType (pChewingCtx, chewing_KBStr2Num (g_kbMappingTable[nIdx].pszChewingKbName)); break; } @@ -216,7 +213,7 @@ { int nWriteSize; - g_chewingConfig.candPerPage = + g_chewingConfig.candPerPage = nVal[0] > MAX_SELKEY ? MAX_SELKEY : nVal[0]; g_chewingConfig.bSpaceAsSelection = nVal[1]; g_chewingConfig.bEscCleanAllBuf = nVal[2]; diff -Nru hime-0.9.10+git20150916+dfsg1/src/pho.c hime-0.9.10+git20170427+dfsg1/src/pho.c --- hime-0.9.10+git20150916+dfsg1/src/pho.c 2015-09-16 10:07:52.000000000 +0000 +++ hime-0.9.10+git20170427+dfsg1/src/pho.c 2017-04-27 11:04:40.000000000 +0000 @@ -105,7 +105,7 @@ prph(key); dbg("\n"); #endif - for (vv = hash_pho[poo.typ_pho[0]]; vv < hash_pho[poo.typ_pho[0]+1]; vv++) { + for (vv = hash_pho[(int)poo.typ_pho[0]]; vv < hash_pho[(int)poo.typ_pho[0]+1]; vv++) { phokey_t ttt=idx_pho[vv].key; if (newkey!=' ' && !poo.typ_pho[3]) @@ -673,7 +673,7 @@ pho_play(key); - vv=hash_pho[poo.typ_pho[0]]; + vv=hash_pho[(int)poo.typ_pho[0]]; phokey_t ttt; ttt=0xffff; diff -Nru hime-0.9.10+git20150916+dfsg1/src/pin-juyin.c hime-0.9.10+git20170427+dfsg1/src/pin-juyin.c --- hime-0.9.10+git20150916+dfsg1/src/pin-juyin.c 2015-09-16 10:07:52.000000000 +0000 +++ hime-0.9.10+git20170427+dfsg1/src/pin-juyin.c 2017-04-27 11:04:40.000000000 +0000 @@ -23,7 +23,7 @@ { FILE *fp; char fnamein[]="pin-juyin.src"; - PIN_JUYIN pinju[1024]; + PIN_JUYIN pinju[1024] = { 0 }; short pinjuN=0; if ((fp=fopen(fnamein, "r"))==NULL) diff -Nru hime-0.9.10+git20150916+dfsg1/src/qt4-im/hime-imcontext-qt.cpp hime-0.9.10+git20170427+dfsg1/src/qt4-im/hime-imcontext-qt.cpp --- hime-0.9.10+git20150916+dfsg1/src/qt4-im/hime-imcontext-qt.cpp 2015-09-16 10:07:52.000000000 +0000 +++ hime-0.9.10+git20170427+dfsg1/src/qt4-im/hime-imcontext-qt.cpp 2017-04-27 11:04:40.000000000 +0000 @@ -106,13 +106,10 @@ const QWidget *focused_widget = qApp->focusWidget (); if (!focused_widget || !str) { -free_mem: free(str); return; } const QPalette &palette = focused_widget->palette (); - if (&palette==NULL) - goto free_mem; const QBrush &reversed_foreground = palette.base (); const QBrush &reversed_background = palette.text (); diff -Nru hime-0.9.10+git20150916+dfsg1/src/qt5-im/hime-imcontext-qt.cpp hime-0.9.10+git20170427+dfsg1/src/qt5-im/hime-imcontext-qt.cpp --- hime-0.9.10+git20150916+dfsg1/src/qt5-im/hime-imcontext-qt.cpp 2015-09-16 10:07:52.000000000 +0000 +++ hime-0.9.10+git20170427+dfsg1/src/qt5-im/hime-imcontext-qt.cpp 2017-04-27 11:04:40.000000000 +0000 @@ -23,7 +23,7 @@ static WId focused_win; -#include +#include #if DEBUG FILE *out_fp; @@ -52,7 +52,7 @@ QPlatformNativeInterface *native = QGuiApplication::platformNativeInterface(); if(!native) return; - Display *display = static_cast(native->nativeResourceForWindow("display", NULL)); + Display *display = static_cast(native->nativeResourceForWindow("display", NULL)); if (!(hime_ch = hime_im_client_open(display))) { perror("cannot open hime_ch"); diff -Nru hime-0.9.10+git20150916+dfsg1/src/qt5-im/hime-imcontext-qt.h hime-0.9.10+git20170427+dfsg1/src/qt5-im/hime-imcontext-qt.h --- hime-0.9.10+git20150916+dfsg1/src/qt5-im/hime-imcontext-qt.h 2015-09-16 10:07:52.000000000 +0000 +++ hime-0.9.10+git20170427+dfsg1/src/qt5-im/hime-imcontext-qt.h 2017-04-27 11:04:40.000000000 +0000 @@ -1,7 +1,7 @@ #ifndef HIME_QT5_IM_H #define HIME_QT5_IM_H -#include +#include class QInputMethodEvent; struct HIME_client_handle_S; diff -Nru hime-0.9.10+git20150916+dfsg1/src/qt5-im/hime-qt.h hime-0.9.10+git20170427+dfsg1/src/qt5-im/hime-qt.h --- hime-0.9.10+git20150916+dfsg1/src/qt5-im/hime-qt.h 2015-09-16 10:07:52.000000000 +0000 +++ hime-0.9.10+git20170427+dfsg1/src/qt5-im/hime-qt.h 2017-04-27 11:04:40.000000000 +0000 @@ -2,7 +2,7 @@ #define HIME_QT5_PLUGIN_H #include -#include +#include #include "hime-imcontext-qt.h" diff -Nru hime-0.9.10+git20150916+dfsg1/src/qt5-im/Makefile hime-0.9.10+git20170427+dfsg1/src/qt5-im/Makefile --- hime-0.9.10+git20150916+dfsg1/src/qt5-im/Makefile 2015-09-16 10:07:52.000000000 +0000 +++ hime-0.9.10+git20170427+dfsg1/src/qt5-im/Makefile 2017-04-27 11:04:40.000000000 +0000 @@ -5,14 +5,19 @@ else INCS=-I../im-client -I/usr/local/include endif -INCS+=`pkg-config Qt5Core Qt5Gui Qt5PlatformSupport Qt5DBus --cflags` -INCS+=-I `pkg-config --variable=includedir Qt5Gui`/QtGui/`pkg-config --modversion Qt5Gui`/QtGui + +QTINC=`pkg-config --variable=includedir Qt5Core` +QTVER=`pkg-config --modversion Qt5Core` + +INCS+=`pkg-config Qt5Core Qt5Gui Qt5DBus --cflags` +INCS+=-I$(QTINC)/QtGui/$(QTVER) +INCS+=-I$(QTINC)/QtCore/$(QTVER) CXXFLAGS=$(OPTFLAGS) $(INCS) -Wall -D_REENTRANT -DUNIX=1 -fPIC -DQT5 -DQT_SHARED \ -DQT_IMMODULE -DPIC OBJS= moc_hime-qt.o hime-qt.o hime-imcontext-qt.o moc_hime-imcontext-qt.o .SUFFIXES: .c .cpp .a .so .E .h -LDFLAGS=$(LDFLAGS_ENV) -L../im-client -lhime-im-client `pkg-config Qt5Core Qt5Gui Qt5PlatformSupport Qt5DBus --libs` +LDFLAGS=$(LDFLAGS_ENV) -L../im-client -lhime-im-client `pkg-config Qt5Core Qt5Gui Qt5DBus --libs` all: im-hime.so diff -Nru hime-0.9.10+git20150916+dfsg1/src/tsin.c hime-0.9.10+git20170427+dfsg1/src/tsin.c --- hime-0.9.10+git20150916+dfsg1/src/tsin.c 2015-09-16 10:07:52.000000000 +0000 +++ hime-0.9.10+git20170427+dfsg1/src/tsin.c 2017-04-27 11:04:40.000000000 +0000 @@ -2011,7 +2011,7 @@ pho_play(key); - int vv=hash_pho[poo.typ_pho[0]]; + int vv=hash_pho[(int)poo.typ_pho[0]]; phokey_t ttt=0xffff; while (vv=0; sti--) { @@ -490,10 +492,10 @@ mask_tone((phokey_t *)stk, mlen, tone_mask); int v = phokey_t_seq(stk, pho, plen); +#if 0 if (!v) found = TRUE; -#if 0 int j; dbg("%d] %d*> ", sti, mlen); prphs(stk, len); @@ -573,9 +575,9 @@ mask_tone((phokey_t *)stk, mlen, tone_mask); int v = phokey_t_seq(stk, pho, plen); +#if 0 if (!v) found = TRUE; -#if 0 dbg("edi%d -> ", edi); prphs(stk, len); dbg(" v:%d\n", v); diff -Nru hime-0.9.10+git20150916+dfsg1/src/util.c hime-0.9.10+git20170427+dfsg1/src/util.c --- hime-0.9.10+git20150916+dfsg1/src/util.c 2015-09-16 10:07:52.000000000 +0000 +++ hime-0.9.10+git20170427+dfsg1/src/util.c 2017-04-27 11:04:40.000000000 +0000 @@ -18,7 +18,7 @@ #include "hime.h" #include -#if !CLIENT_LIB || DEBUG +#if !CLIENT_LIB && DEBUG static FILE *out_fp; #endif @@ -42,7 +42,7 @@ #endif } -#if !CLIENT_LIB || DEBUG +#if !CLIENT_LIB && DEBUG static void init_out_fp() { if (!out_fp) { @@ -61,6 +61,7 @@ #if !CLIENT_LIB void dbg_time(char *fmt,...) { +#if DEBUG va_list args; time_t t; @@ -74,6 +75,7 @@ vfprintf(out_fp, fmt, args); fflush(out_fp); va_end(args); +#endif } #endif