[gcin] update patches for 1.6.1 release
paragn
paragn at fedoraproject.org
Wed Jun 8 05:35:03 UTC 2011
commit 8e387a51581da1c3996ff24ee80d6808b4eed420
Author: Parag Nemade <paragn at fedoraproject.org>
Date: Wed Jun 8 11:03:08 2011 +0530
update patches for 1.6.1 release
configure.patch | 13 +++---
gcin_gtab.patch | 12 +++---
im-client.patch | 133 ++++++++++++++++++++++++-------------------------------
newcj3.patch | 13 +++---
qt.patch | 53 ++++------------------
5 files changed, 85 insertions(+), 139 deletions(-)
---
diff --git a/configure.patch b/configure.patch
index 2a3a144..815cfea 100644
--- a/configure.patch
+++ b/configure.patch
@@ -1,7 +1,6 @@
-diff -urN gcin-1.4.6.orig/configure gcin-1.4.6/configure
---- gcin-1.4.6.orig/configure 2010-01-05 13:59:59.421672901 +0800
-+++ gcin-1.4.6/configure 2010-01-05 13:59:18.108769539 +0800
-@@ -215,9 +215,6 @@
+--- gcin-1.6.1.pre13.orig/configure 2011-04-09 13:27:40.000000000 +0530
++++ gcin-1.6.1.pre13/configure 2011-04-25 09:00:26.019028155 +0530
+@@ -242,9 +242,6 @@
OPTFLAGS="-g"
@@ -11,12 +10,12 @@ diff -urN gcin-1.4.6.orig/configure gcin-1.4.6/configure
if [ -z $CC ]; then
CC=gcc
-@@ -239,7 +239,7 @@
+@@ -266,7 +263,7 @@
echo "libdir=\$(DESTDIR)$libdir" >> config.mak
echo "gcinlibdir=\$(libdir)/gcin" >> config.mak
echo "includedir=\$(DESTDIR)$includedir" >> config.mak
--echo "LDFLAGS=$GTKLDFLAGS -lX11" >> config.mak
-+echo "LDFLAGS=$GTKLDFLAGS -lX11 -lm" >> config.mak
+-echo "LDFLAGS=$GTKLDFLAGS -lX11 -ldl" >> config.mak
++echo "LDFLAGS=$GTKLDFLAGS -lX11 -ldl -lm" >> config.mak
echo "GCIN_VERSION=$GCIN_VERSION" >> config.mak
echo "GCIN_TABLE_DIR=\$(datadir_r)/gcin/table" >> config.mak
echo "GCIN_OGG_DIR=\$(datadir_r)/gcin/ogg" >> config.mak
diff --git a/gcin_gtab.patch b/gcin_gtab.patch
index c40e191..7408399 100644
--- a/gcin_gtab.patch
+++ b/gcin_gtab.patch
@@ -1,7 +1,6 @@
-diff -urN gcin-1.4.6.orig/gtab.cpp gcin-1.4.6/gtab.cpp
---- gcin-1.4.6.orig/gtab.cpp 2009-12-19 15:40:13.000000000 +0800
-+++ gcin-1.4.6/gtab.cpp 2010-01-05 14:05:44.182712423 +0800
-@@ -154,7 +154,7 @@
+--- gcin-1.6.1.pre13.orig/gtab.cpp 2011-04-14 19:14:49.000000000 +0530
++++ gcin-1.6.1.pre13/gtab.cpp 2011-04-25 10:19:48.586399833 +0530
+@@ -175,7 +175,7 @@
out[0]=0;
@@ -10,7 +9,7 @@ diff -urN gcin-1.4.6.orig/gtab.cpp gcin-1.4.6/gtab.cpp
int i;
for(i=0; i < tinmd->DefChars; i++) {
-@@ -220,9 +220,12 @@
+@@ -241,9 +241,13 @@
for(i=0; i < tbufN; i++) {
#define MAX_DISP_MATCH 40
if (strlen(out) < MAX_DISP_MATCH) {
@@ -21,10 +20,11 @@ diff -urN gcin-1.4.6.orig/gtab.cpp gcin-1.4.6/gtab.cpp
+ strcat(out, "] ");
+ else
+ strcat(out, "]");
++
}
free(tbuf[i]);
-@@ -977,7 +980,7 @@
+@@ -1143,7 +1147,7 @@
char uu[MAX_CIN_PHR];
if (gtab_vertical_select) {
diff --git a/im-client.patch b/im-client.patch
index 827b2a7..b384201 100644
--- a/im-client.patch
+++ b/im-client.patch
@@ -1,6 +1,39 @@
-diff -urN gcin-1.5.0.orig/Makefile gcin-1.5.0/Makefile
---- gcin-1.5.0.orig/Makefile 2010-06-18 17:35:27.000000000 +0800
-+++ gcin-1.5.0/Makefile 2010-06-23 09:51:49.000000000 +0800
+diff -urN gcin-1.6.1.pre11.orig/gtk-im/Makefile gcin-1.6.1.pre11/gtk-im/Makefile
+--- gcin-1.6.1.pre11.orig/gtk-im/Makefile 2011-02-08 06:51:18.000000000 +0530
++++ gcin-1.6.1.pre11/gtk-im/Makefile 2011-04-25 10:04:35.278369392 +0530
+@@ -26,11 +26,11 @@
+
+ all: im-gcin.so im-gcin-cur.so
+
+-im-gcin.so: $(OBJS) ../im-client/libgcin-im-client.so
++im-gcin.so: $(OBJS) ../im-client/libgcin-im-client.so.1.2.3
+ $(CC) $(gcc_ld_run_path) $(SO_FLAGS) $(OBJS) -L../im-client -lgcin-im-client -o $@ $(LDFLAGS)
+ rm -f core.*
+
+-im-gcin-cur.so: $(OBJS) ../im-client/libgcin-im-client.so
++im-gcin-cur.so: $(OBJS) ../im-client/libgcin-im-client.so.1.2.3
+ $(CC) $(SO_FLAGS) $(OBJS) -L../im-client -lgcin-im-client -o $@ $(LDFLAGS)
+ rm -f core.*
+
+diff -urN gcin-1.6.1.pre11.orig/im-client/Makefile gcin-1.6.1.pre11/im-client/Makefile
+--- gcin-1.6.1.pre11.orig/im-client/Makefile 2011-03-24 08:00:20.000000000 +0530
++++ gcin-1.6.1.pre11/im-client/Makefile 2011-04-25 10:04:35.279369396 +0530
+@@ -28,9 +28,9 @@
+ LOCALLIB=/usr/local/$(LIB)
+
+ install:
+- install -d $(gcinlibdir)
+- install -m 755 $(SOFILEVER) $(gcinlibdir)
+- cd $(gcinlibdir); rm -f $(SOFILE); ln -s $(SOFILEVER) $(SOFILE); \
++ install -d $(libdir)
++ install -m 755 $(SOFILEVER) $(libdir)
++ cd $(libdir); rm -f $(SOFILE); ln -s $(SOFILEVER) $(SOFILE); \
+ ln -sf $(SOFILEVER) $(SOFILE).1
+
+ gcin-conf.o: ../gcin-conf.cpp
+diff -urN gcin-1.6.1.pre11.orig/Makefile gcin-1.6.1.pre11/Makefile
+--- gcin-1.6.1.pre11.orig/Makefile 2011-04-21 15:46:51.732155224 +0530
++++ gcin-1.6.1.pre11/Makefile 2011-04-25 10:06:15.707697181 +0530
@@ -8,7 +8,7 @@
gcin_pho_o = win-pho.o pho.o pho-util.o pho-sym.o table-update.o pho-dbg.o
gcin_gtab_o = gtab.o win-gtab.o gtab-util.o gtab-list.o gtab-buf.o
@@ -9,50 +42,49 @@ diff -urN gcin-1.5.0.orig/Makefile gcin-1.5.0/Makefile
+GCIN_SO= intcode.o win-int.o win-message.o win-sym.o win-inmd-switch.o pinyin.o win-pho-near.o win-kbm.o anthy.o
OBJS=gcin.o eve.o util.o gcin-conf.o gcin-settings.o locale.o gcin-icon.o \
- gcin-switch.o gcin-exec-script.o $(GCIN_SO) pho-play.o cache.o gtk_bug_fix.o \
+ gcin-switch.o gcin-exec-script.o $(GCIN_SO) pho-play.o cache.o \
@@ -19,7 +19,7 @@
- table-update.o locale.o gcin-settings.o gcin-common.o gcin-icon.o
+ table-update.o locale.o gcin-settings.o gcin-common.o gcin-icon.o pho-dbg.o
OBJS_JUYIN_LEARN=juyin-learn.o locale.o util.o pho-util.o pho-sym.o \
- gcin-settings.o gcin-conf.o table-update.o pinyin.o gcin-icon.o
+ gcin-settings.o gcin-conf.o table-update.o pinyin.o gcin-icon.o pho-dbg.o
-OBJS_sim2trad=sim2trad.o util.o gcin2.so locale.o gcin-conf.o gcin-icon.o
+OBJS_sim2trad=sim2trad.o util.o t2s-lookup.o locale.o gcin-conf.o gcin-icon.o
OBJS_phod2a=phod2a.o pho-util.o gcin-conf.o pho-sym.o table-update.o pho-dbg.o locale.o \
gcin-settings.o util.o
OBJS_tsa2d32=tsa2d32.o gcin-send.o util.o pho-sym.o gcin-conf.o locale.o pho-lookup.o
-@@ -125,14 +125,13 @@
- if [ $(QT4_IM) = 'Y' ]; then $(MAKE) -C qt4-im; fi
+@@ -120,12 +120,12 @@
+ #gcc_ld_run_path=-Wl,-rpath,$(gcin_ld_run_path)
gcin: $(OBJS) $(IMdkitLIB) $(OBJ_IMSRV)
-- LD_RUN_PATH=$(gcin_ld_run_path) \
-- $(CCLD) $(EXTRA_LDFLAGS) -o $@ $(OBJS) $(IMdkitLIB) $(OBJ_IMSRV) -lXtst $(LDFLAGS) -L/usr/X11R6/lib
-+ $(CCLD) $(EXTRA_LDFLAGS) -o $@ $(OBJS) $(IMdkitLIB) $(OBJ_IMSRV) -lXtst $(LDFLAGS) -L/usr/X11R6/$(LIB)
+- $(CCLD) $(EXTRA_LDFLAGS) $(gcc_ld_run_path) -o $@ $(OBJS) $(IMdkitLIB) $(OBJ_IMSRV) -lXtst $(LDFLAGS) -L/usr/X11R6/lib
++ $(CCLD) $(EXTRA_LDFLAGS) $(gcc_ld_run_path) -o $@ $(OBJS) $(IMdkitLIB) $(OBJ_IMSRV) -lXtst $(LDFLAGS) -L/usr/X11R6/$(LIB) -lanthy
rm -f core.* vgcore.*
ln -sf $@ $@.test
gcin-nocur: $(OBJS) $(IMdkitLIB) $(OBJ_IMSRV)
- LD_RUN_PATH=$(gcinlibdir) \
-- $(CCLD) $(EXTRA_LDFLAGS) -o $@ $(OBJS) $(IMdkitLIB) $(OBJ_IMSRV) -lXtst $(LDFLAGS) -L/usr/X11R6/lib
-+ $(CCLD) $(EXTRA_LDFLAGS) -o $@ $(OBJS) $(IMdkitLIB) $(OBJ_IMSRV) -lXtst $(LDFLAGS) -L/usr/X11R6/$(LIB)
+- $(CCLD) -Wl,-rpath,$(gcinlibdir) $(EXTRA_LDFLAGS) -o $@ $(OBJS) $(IMdkitLIB) $(OBJ_IMSRV) -lXtst $(LDFLAGS) -L/usr/X11R6/lib
++ $(CCLD) -Wl,-rpath,$(gcinlibdir) $(EXTRA_LDFLAGS) -o $@ $(OBJS) $(IMdkitLIB) $(OBJ_IMSRV) -lXtst $(LDFLAGS) -L/usr/X11R6/$(LIB)
rm -f core.*
tslearn: $(OBJS_TSLEARN)
-@@ -143,7 +142,6 @@
+@@ -135,7 +135,7 @@
$(CCLD) -o $@ $(OBJS_JUYIN_LEARN) $(LDFLAGS)
rm -f core.*
sim2trad: $(OBJS_sim2trad)
-- LD_RUN_PATH=$(gcin_ld_run_path) \
- $(CC) -o $@ $(OBJS_sim2trad) $(LDFLAGS)
+- $(CC) $(gcc_ld_run_path) -o $@ $(OBJS_sim2trad) $(LDFLAGS)
++ $(CC) -o $@ $(OBJS_sim2trad) $(LDFLAGS)
rm -f core.*
trad2sim: sim2trad
-@@ -202,20 +200,6 @@
- im-client/libgcin-im-client.so:
- $(MAKE) -C im-client
+ ln -sf sim2trad trad2sim
+@@ -193,20 +193,6 @@
+ gcin-version.h: VERSION.gcin
+ echo '#define GCIN_VERSION "'`cat VERSION.gcin`'"' > gcin-version.h
-gcin1_so += intcode.pico win-int.pico win-message.pico win-sym.pico \
-win-inmd-switch.pico pinyin.pico win-pho-near.pico win-kbm.pico
-
-ifeq ($(USE_ANTHY),Y)
--gcin1_so += anthy.pico
+-gcin1_so += gcin-module.pico
-endif
-
-gcin1.so: $(gcin1_so) pho.o tsin.o eve.o gtab.o win-sym.o
@@ -62,10 +94,10 @@ diff -urN gcin-1.5.0.orig/Makefile gcin-1.5.0/Makefile
-gcin2.so: $(gcin2_so) gcin-conf.o
- $(CCLD) $(SO_FLAGS) -o $@ $(gcin2_so) $(LDFLAGS)
-
- #gtk_bug_fix.so: gtk_bug_fix.pico
- # $(CC) $(SO_FLAGS) -o $@ gtk_bug_fix.pico
-
-@@ -239,14 +223,11 @@
+ anthy_module_so = anthy.pico
+ anthy-module.so: $(anthy_module_so)
+ $(CCLD) $(SO_FLAGS) -o $@ $(anthy_module_so) $(LDFLAGS) -lanthy
+@@ -222,14 +208,11 @@
install $(PROGS) $(bindir); \
cp gcin-nocur $(bindir)/gcin; \
rm -f $(bindir)/trad2sim; ln -sf sim2trad $(bindir)/trad2sim
@@ -80,60 +112,11 @@ diff -urN gcin-1.5.0.orig/Makefile gcin-1.5.0/Makefile
install -d $(bindir)
$(MAKE) -C data install
$(MAKE) -C im-client install
-@@ -256,13 +237,9 @@
- if [ $(QT4_IM) = 'Y' ]; then $(MAKE) -C qt4-im install; fi
- if [ $(prefix) = /usr/local ]; then \
- install -m 644 gcin.png /usr/share/icons; \
-- install -d $(DOC_DIR); \
-- install -m 644 README.html Changelog.html $(DOC_DIR); \
- install $(PROGS) $(bindir); \
- rm -f $(bindir)/trad2sim; ln -sf sim2trad $(bindir)/trad2sim; \
- else \
-- install -d $(DOC_DIR_i); \
-- install -m 644 README.html Changelog.html $(DOC_DIR_i); \
- install -s $(PROGS) $(bindir); \
- rm -f $(bindir)/trad2sim; ln -sf sim2trad $(bindir)/trad2sim; \
- fi
-@@ -285,7 +262,7 @@
+@@ -268,7 +251,6 @@
$(MAKE) -C qt4-im clean
$(MAKE) -C man clean
$(MAKE) -C menu clean
- $(MAKE) -C po clean
-+ #$(MAKE) -C po clean
rm -f *.o *.E *.db *.pico *.so config.mak tags $(PROGS) gcin-nocur $(PROGS_CV) \
$(DATA) .depend gcin.spec trad2sim gcin.spec.tmp gcin.log
find . '(' -name '.ted*' -o -name '*~' -o -name 'core.*' -o -name 'vgcore.*' ')' -exec rm {} \;
-diff -urN gcin-1.5.0.orig/gtk-im/Makefile gcin-1.5.0/gtk-im/Makefile
---- gcin-1.5.0.orig/gtk-im/Makefile 2010-06-06 00:50:00.000000000 +0800
-+++ gcin-1.5.0/gtk-im/Makefile 2010-06-23 09:58:17.000000000 +0800
-@@ -26,12 +26,11 @@
-
- all: im-gcin.so im-gcin-cur.so
-
--im-gcin.so: $(OBJS) ../im-client/libgcin-im-client.so
-- export LD_RUN_PATH=$(gcinlibdir) ;\
-+im-gcin.so: $(OBJS) ../im-client/libgcin-im-client.so.1.2.1
- $(CC) $(SO_FLAGS) $(OBJS) -L../im-client -lgcin-im-client -o $@ $(LDFLAGS)
- rm -f core.*
-
--im-gcin-cur.so: $(OBJS) ../im-client/libgcin-im-client.so
-+im-gcin-cur.so: $(OBJS) ../im-client/libgcin-im-client.so.1.2.1
- $(CC) $(SO_FLAGS) $(OBJS) -L../im-client -lgcin-im-client -o $@ $(LDFLAGS)
- rm -f core.*
-
-diff -urN gcin-1.5.0.orig/im-client/Makefile gcin-1.5.0/im-client/Makefile
---- gcin-1.5.0.orig/im-client/Makefile 2009-12-12 19:28:49.000000000 +0800
-+++ gcin-1.5.0/im-client/Makefile 2010-06-23 10:00:10.000000000 +0800
-@@ -28,9 +28,9 @@
- LOCALLIB=/usr/local/$(LIB)
-
- install:
-- install -d $(gcinlibdir)
-- install -m 755 $(SOFILEVER) $(gcinlibdir)
-- cd $(gcinlibdir); rm -f $(SOFILE); ln -s $(SOFILEVER) $(SOFILE); \
-+ install -d $(libdir)
-+ install -m 755 $(SOFILEVER) $(libdir)
-+ cd $(libdir); rm -f $(SOFILE); ln -s $(SOFILEVER) $(SOFILE); \
- ln -sf $(SOFILEVER) $(SOFILE).1
-
- gcin-conf.o: ../gcin-conf.cpp
diff --git a/newcj3.patch b/newcj3.patch
index aee0ffc..d6828db 100644
--- a/newcj3.patch
+++ b/newcj3.patch
@@ -1,12 +1,11 @@
-diff -urN gcin-1.5.5.orig/data/Makefile gcin-1.5.5/data/Makefile
---- gcin-1.5.5.orig/data/Makefile 2010-06-30 18:28:36.000000000 +0530
-+++ gcin-1.5.5/data/Makefile 2010-09-07 10:12:02.000000000 +0530
+--- gcin-1.6.1.pre13.orig/data/Makefile 2011-04-05 17:33:18.000000000 +0530
++++ gcin-1.6.1.pre13/data/Makefile 2011-04-25 11:14:32.080167133 +0530
@@ -4,7 +4,7 @@
CFLAGS= -DUNIX=1 $(WALL) $(OPTFLAGS) $(GTKINC) -I.. -DDEBUG="0$(GCIN_DEBUG)" \
--DATA=pho.tab tsin32.idx \
-+DATA=pho.tab tsin32.idx NewCJ3.gtab \
+-DATA=pho.tab2 tsin32.idx \
++DATA=pho.tab2 tsin32.idx NewCJ3.gtab \
cj.gtab ar30.gtab ar30-big.gtab dayi3.gtab pinyin.gtab jyutping.gtab cj5.gtab \
- et.kbm et-asdf.kbm et26.kbm et26-asdf.kbm zo.kbm zo-asdf.kbm \
- pinyin.kbm pinyin-asdf.kbm dvorak.kbm mitac.kbm \
+ et.kbm et26.kbm zo.kbm pinyin.kbm dvorak.kbm mitac.kbm colemak.kbm \
+ ibm.kbm tsin32 hsu.kbm pho-huge.tab2 simplex.gtab symbols.gtab russian.gtab \
diff --git a/qt.patch b/qt.patch
index e805191..47bc84a 100644
--- a/qt.patch
+++ b/qt.patch
@@ -1,46 +1,11 @@
-diff -urN gcin-1.5.0.orig/configure gcin-1.5.0/configure
---- gcin-1.5.0.orig/configure 2010-06-13 15:41:23.000000000 +0800
-+++ gcin-1.5.0/configure 2010-06-23 10:04:38.000000000 +0800
-@@ -46,8 +46,8 @@
- use_tsin='Y'
- use_gcb='Y'
- use_anthy='Y'
--use_qt3='N'
--use_qt4='Y'
-+use_qt3='Y'
-+use_qt4='N'
- use_gtk3='Y'
-
- if [ "$GCIN_USE_XIM" ]; then
-@@ -148,7 +148,7 @@
- fi
-
- QT_IM='N'
--QT_IM_DIR=/usr/$LIB/qt3/plugins/inputmethods
-+QT_IM_DIR=/usr/$LIB/qt-3.3/plugins/inputmethods
- echo "testing if you have qt3 support"
- if [ -d $QT_IM_DIR ]; then
- QT_IM='Y'
-diff -urN gcin-1.5.0.orig/qt-im/Makefile gcin-1.5.0/qt-im/Makefile
---- gcin-1.5.0.orig/qt-im/Makefile 2009-12-10 07:09:17.000000000 +0800
-+++ gcin-1.5.0/qt-im/Makefile 2010-06-23 10:06:15.000000000 +0800
-@@ -1,8 +1,8 @@
- include ../config.mak
--QT=qt3
-+QT=qt-3.3
- QTIM=$(QT)/plugins/inputmethods
- IMMODULES=$(libdir)/$(QTIM)
--INCS=-I../im-client -I/usr/include `pkg-config --cflags qt-mt` -I/usr/include/Xft2/X11/Xft -I/usr/include/fontconfig -I/usr/include/freetype2
-+INCS=-I../im-client -I/usr/$(LIB)/$(QT)/include -I/usr/include/Xft2/X11/Xft -I/usr/include/fontconfig -I/usr/include/freetype2
- CXXFLAGS=$(OPTFLAGS) $(INCS) -Wall -D_REENTRANT -fPIC -DQT_THREAD_SUPPORT -DQT_PLUGIN -DQT_SHARED -DQT_NO_DEBUG
- OBJS=qgcininputcontextplugin.o qgcininputcontextplugin_my.o qgcininputcontext.o qgcininputcontext_x11.o
- .SUFFIXES: .c .cpp .a .so .E .h
-@@ -12,7 +12,7 @@
- .cpp.E:
+--- gcin-1.6.1.pre13.orig/qt4-im/Makefile 2011-02-08 07:05:24.000000000 +0530
++++ gcin-1.6.1.pre13/qt4-im/Makefile 2011-04-25 11:19:50.839246421 +0530
+@@ -15,7 +15,7 @@
$(CXX) -E $(CFLAGS) $(INCS) $< > $@
- .h.o:
-- /usr/lib/$(QT)/bin/moc $< -o $<_moc.cpp
-+ /usr/$(LIB)/$(QT)/bin/moc $< -o $<_moc.cpp
- $(CXX) -c -pipe $(CXXFLAGS) $(INCS) $<_moc.cpp -o $@
- libqgcin.so: $(OBJS)
+ moc_gcin-qt.cpp: gcin-qt.h
+- /usr/lib/$(QT)/bin/moc $< -o moc_gcin-qt.cpp
++ /usr/$(LIB)/$(QT)/bin/moc $< -o moc_gcin-qt.cpp
+
+ im-gcin.so: $(OBJS)
+ export LD_RUN_PATH=$(gcinlibdir) ;\
More information about the scm-commits
mailing list