rpms/gcin/F-10 .cvsignore, 1.21, 1.22 configure.patch, 1.2, 1.3 gcin.spec, 1.38, 1.39 gcin_gtab.patch, 1.4, 1.5 im-client.patch, 1.12, 1.13 newcj3.patch, 1.2, 1.3 qt.patch, 1.1, 1.2 sources, 1.21, 1.22
Chung-Yen Chang
candyz at fedoraproject.org
Wed Feb 4 05:40:34 UTC 2009
Author: candyz
Update of /cvs/extras/rpms/gcin/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv28259
Modified Files:
.cvsignore configure.patch gcin.spec gcin_gtab.patch
im-client.patch newcj3.patch qt.patch sources
Log Message:
update to 1.4.4
Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/gcin/F-10/.cvsignore,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -r1.21 -r1.22
--- .cvsignore 26 Jun 2008 06:06:43 -0000 1.21
+++ .cvsignore 4 Feb 2009 05:40:03 -0000 1.22
@@ -1 +1 @@
-gcin-1.4.2.tar.bz2
+gcin-1.4.4.tar.bz2
configure.patch:
Index: configure.patch
===================================================================
RCS file: /cvs/extras/rpms/gcin/F-10/configure.patch,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- configure.patch 26 Sep 2006 14:36:38 -0000 1.2
+++ configure.patch 4 Feb 2009 05:40:03 -0000 1.3
@@ -1,15 +1,13 @@
---- gcin-1.2.1/configure.orig 2006-08-17 09:09:27.000000000 +0800
-+++ gcin-1.2.1/configure 2006-08-17 11:02:18.000000000 +0800
-@@ -125,9 +125,9 @@
+diff -urN gcin-1.4.3.orig/configure gcin-1.4.3/configure
+--- gcin-1.4.3.orig/configure 2009-01-23 09:57:51.000000000 +0800
++++ gcin-1.4.3/configure 2009-01-23 10:03:31.000000000 +0800
+@@ -172,9 +172,6 @@
OPTFLAGS="-g"
-if [ $prefix = /usr ]; then
- OPTFLAGS="-O"
-fi
-+#if [ $prefix = /usr ]; then
-+# OPTFLAGS="-O"
-+#fi
echo "CC=gcc" > config.mak
Index: gcin.spec
===================================================================
RCS file: /cvs/extras/rpms/gcin/F-10/gcin.spec,v
retrieving revision 1.38
retrieving revision 1.39
diff -u -r1.38 -r1.39
--- gcin.spec 21 Oct 2008 04:10:41 -0000 1.38
+++ gcin.spec 4 Feb 2009 05:40:03 -0000 1.39
@@ -1,6 +1,6 @@
Name: gcin
-Version: 1.4.2
-Release: 4%{?dist}
+Version: 1.4.4
+Release: 3%{?dist}
Summary: Input method for Traditional Chinese
Group: System Environment/Libraries
@@ -21,6 +21,7 @@
BuildRequires: qt3-devel, gtk2-devel, desktop-file-utils
BuildRequires: libXtst-devel
+BuildRequires: anthy-devel
Requires: gtk2, im-chooser, imsettings, /bin/sh, /bin/bash
Requires(post): %{_sbindir}/alternatives, desktop-file-utils
Requires(preun): %{_sbindir}/alternatives
@@ -89,7 +90,7 @@
%files
%defattr(-,root,root,-)
-%doc AUTHORS COPYING Changelog README
+%doc AUTHORS COPYING Changelog.html README.html
%config(noreplace) %{_sysconfdir}/X11/xinit/xinput.d/gcin.conf
%{_bindir}/gcin*
%{_bindir}/gtab*
@@ -109,6 +110,15 @@
%{_libdir}/libgcin-im-client.so*
%changelog
+* Wed Feb 04 2009 Chung-Yen Chang <candyz0416 at gmail.com> - 1.4.4-3
+- rename Changelog to Changelog.html
+
+* Wed Feb 04 2009 Chung-Yen Chang <candyz0416 at gmail.com> - 1.4.4-2
+- rename README to README.html
+
+* Wed Feb 04 2009 Chung-Yen Chang <candyz0416 at gmail.com> - 1.4.4-1
+- update to 1.4.4
+
* Tue Oct 21 2008 Jens Petersen <petersen at redhat.com> - 1.4.2-4
- add gcin-1.4.2-gtk-immodules-lang.patch to not enable gcin gtk immodule for all
langs (#453093)
gcin_gtab.patch:
Index: gcin_gtab.patch
===================================================================
RCS file: /cvs/extras/rpms/gcin/F-10/gcin_gtab.patch,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- gcin_gtab.patch 23 Jan 2008 04:09:17 -0000 1.4
+++ gcin_gtab.patch 4 Feb 2009 05:40:03 -0000 1.5
@@ -1,7 +1,16 @@
-diff -urN gcin-1.3.8.orig/gtab.c gcin-1.3.8/gtab.c
---- gcin-1.3.8.orig/gtab.c 2008-01-11 09:36:52.000000000 +0800
-+++ gcin-1.3.8/gtab.c 2008-01-22 11:36:28.000000000 +0800
-@@ -205,9 +205,12 @@
+diff -urN gcin-1.4.3.orig/gtab.c gcin-1.4.3/gtab.c
+--- gcin-1.4.3.orig/gtab.c 2008-11-02 08:30:11.000000000 +0800
++++ gcin-1.4.3/gtab.c 2009-01-23 10:09:14.000000000 +0800
+@@ -147,7 +147,7 @@
+
+ out[0]=0;
+
+- int min_klen = 100;
++ int min_klen = 200;
+
+ int i;
+ for(i=0; i < tinmd->DefChars; i++) {
+@@ -213,9 +213,12 @@
for(i=0; i < tbufN; i++) {
#define MAX_DISP_MATCH 40
if (strlen(out) < MAX_DISP_MATCH) {
@@ -9,13 +18,13 @@
strcat(out, tbuf[i]);
if (i < tbufN-1)
- strcat(out, " |");
-+ strcat(out, "] ");
++ strcat(out, "] ");
+ else
-+ strcat(out, "]");
++ strcat(out, "]");
}
free(tbuf[i]);
-@@ -942,7 +945,7 @@
+@@ -974,7 +977,7 @@
char uu[MAX_CIN_PHR];
if (gtab_vertical_select) {
@@ -24,30 +33,3 @@
strcat(tt, uu);
} else {
char *p = selback;
-@@ -1258,6 +1261,8 @@
- return 0;
- }
- case XK_Prior:
-+ case XK_Left:
-+ case XK_Up:
- case XK_KP_Subtract:
- if (wild_mode) {
- if (wild_page >= cur_inmd->M_DUP_SEL) wild_page-=cur_inmd->M_DUP_SEL;
-@@ -1273,6 +1278,8 @@
- }
- return 0;
- case XK_Next:
-+ case XK_Right:
-+ case XK_Down:
- case XK_KP_Add:
- if (more_pg) {
- next_page:
-diff -urN gcin-1.3.8.orig/gtab.h gcin-1.3.8/gtab.h
---- gcin-1.3.8.orig/gtab.h 2007-12-24 11:32:12.000000000 +0800
-+++ gcin-1.3.8/gtab.h 2008-01-22 11:36:28.000000000 +0800
-@@ -1,4 +1,4 @@
--#define MAX_CIN_PHR (100*CH_SZ + 1)
-+#define MAX_CIN_PHR (200*CH_SZ + 1)
-
-
-
im-client.patch:
Index: im-client.patch
===================================================================
RCS file: /cvs/extras/rpms/gcin/F-10/im-client.patch,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- im-client.patch 29 Sep 2008 01:53:56 -0000 1.12
+++ im-client.patch 4 Feb 2009 05:40:03 -0000 1.13
@@ -1,45 +1,110 @@
-diff -up gcin-1.4.2/gtk-im/Makefile.im-client gcin-1.4.2/gtk-im/Makefile
---- gcin-1.4.2/gtk-im/Makefile.im-client 2007-03-01 12:04:07.000000000 +1000
-+++ gcin-1.4.2/gtk-im/Makefile 2008-09-29 11:46:33.000000000 +1000
-@@ -24,8 +24,7 @@ endif
- .c.E:
- $(CC) -E $(CFLAGS) -o $@ $<
+diff -urN gcin-1.4.3.orig/Makefile gcin-1.4.3/Makefile
+--- gcin-1.4.3.orig/Makefile 2009-01-12 22:48:43.000000000 +0800
++++ gcin-1.4.3/Makefile 2009-01-23 09:42:23.000000000 +0800
+@@ -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
--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.0.2
- $(CC) $(SO_FLAGS) $(OBJS) -L../im-client -lgcin-im-client -o $@ $(LDFLAGS)
+-GCIN_SO= gcin1.so gcin2.so
++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 tsin-char.o anthy.o t2s-lookup.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 \
+@@ -18,7 +18,7 @@
+ table-update.o locale.o gcin-settings.o gcin-common.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
+-OBJS_sim2trad=sim2trad.o util.o gcin2.so locale.o gcin-conf.o
++OBJS_sim2trad=sim2trad.o util.o t2s-lookup.o locale.o gcin-conf.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
+@@ -96,8 +96,7 @@
+ if [ $(QT4_IM) = 'Y' ]; then $(MAKE) -C qt4-im; fi
+
+ gcin: $(OBJS) $(IMdkitLIB) $(im-srv)
+- LD_RUN_PATH=.:$(gcinlibdir) \
+- $(CC) $(EXTRA_LDFLAGS) -o $@ $(OBJS) $(IMdkitLIB) $(im-srv) -lXtst $(LDFLAGS) -L/usr/X11R6/lib
++ $(CC) $(EXTRA_LDFLAGS) -o $@ $(OBJS) $(IMdkitLIB) $(im-srv) -lXtst $(LDFLAGS) -L/usr/X11R6/$(LIB)
rm -f core.*
+ ln -sf $@ $@.test
-diff -up gcin-1.4.2/im-client/Makefile.im-client gcin-1.4.2/im-client/Makefile
---- gcin-1.4.2/im-client/Makefile.im-client 2007-03-01 12:04:36.000000000 +1000
-+++ gcin-1.4.2/im-client/Makefile 2008-09-29 11:46:33.000000000 +1000
-@@ -27,9 +27,9 @@ $(SOFILEVER): $(OBJS)
- LOCALLIB=/usr/local/$(LIB)
+@@ -108,7 +107,6 @@
+ $(CC) -o $@ $(OBJS_JUYIN_LEARN) $(LDFLAGS)
+ rm -f core.*
+ sim2trad: $(OBJS_sim2trad)
+- LD_RUN_PATH=.:$(gcinlibdir) \
+ $(CC) -o $@ $(OBJS_sim2trad) $(LDFLAGS)
+ rm -f core.*
+ trad2sim: sim2trad
+@@ -167,16 +165,6 @@
+ # $(CC) -o $@ $(OBJS_ANTHY) -lanthydic $(LDFLAGS)
+ # $(CC) -o $@ $(OBJS_ANTHY) $(LDFLAGS)
+
+-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 tsin-char.pico \
+-anthy.pico
+-gcin1.so: $(gcin1_so)
+- $(CC) $(SO_FLAGS) -o $@ $(gcin1_so) $(LDFLAGS)
+-
+-gcin2_so= t2s-lookup.pico
+-gcin2.so: $(gcin2_so)
+- $(CC) $(SO_FLAGS) -o $@ $(gcin2_so) $(LDFLAGS)
+-
+ ### making the following as .so actuall makes the RSS larger
+ gcin_gtab_so = gtab.pico win-gtab.pico gtab-util.pico
+ gcin-gtab.so: $(gcin_gtab_so)
+@@ -199,14 +187,11 @@
+ ibin:
+ install $(PROGS) $(bindir); \
+ rm -f $(bindir)/trad2sim; ln -sf sim2trad $(bindir)/trad2sim
+- install $(GCIN_SO) $(gcinlibdir)
install:
+ install -d $(datadir)/icons
+ install gcin.png $(datadir)/icons
+ $(MAKE) -C icons 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
- install -d $(includedir)
- install -m 444 gcin-im-client.h $(includedir)
-diff -up gcin-1.4.2/Makefile.im-client gcin-1.4.2/Makefile
---- gcin-1.4.2/Makefile.im-client 2008-05-31 14:19:16.000000000 +1000
-+++ gcin-1.4.2/Makefile 2008-09-29 11:46:33.000000000 +1000
-@@ -8,7 +8,7 @@ gcin_tsin_o = tsin.o tsin-util.o win0.o
+- install $(GCIN_SO) $(gcinlibdir)
+ install -d $(bindir)
+ $(MAKE) -C data install
+ $(MAKE) -C im-client install
+@@ -215,13 +200,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
+@@ -242,7 +223,7 @@
+ $(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) $(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.4.3.orig/Makefile.gcin gcin-1.4.3/Makefile.gcin
+--- gcin-1.4.3.orig/Makefile.gcin 2009-01-12 22:48:43.000000000 +0800
++++ gcin-1.4.3/Makefile.gcin 2009-01-23 09:42:23.000000000 +0800
+@@ -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
-GCIN_SO= gcin1.so gcin2.so
-+GCIN_SO= intcode.o win-int.o win-message.o phrase.o win-sym.o win-inmd-switch.o pinyin.o win-pho-near.o win-kbm.o t2s-lookup.o
++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 tsin-char.o anthy.o t2s-lookup.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 \
-@@ -18,7 +18,7 @@ OBJS_TSLEARN=tslearn.o util.o gcin-conf.
+ gcin-switch.o gcin-exec-script.o $(GCIN_SO) pho-play.o cache.o \
+@@ -18,7 +18,7 @@
table-update.o locale.o gcin-settings.o gcin-common.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
@@ -48,8 +113,8 @@
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
-@@ -95,8 +95,7 @@ endif
- if [ $(QT_IM) = 'Y' ]; then $(MAKE) -C qt-im; fi
+@@ -96,8 +96,7 @@
+ if [ $(QT4_IM) = 'Y' ]; then $(MAKE) -C qt4-im; fi
gcin: $(OBJS) $(IMdkitLIB) $(im-srv)
- LD_RUN_PATH=.:$(gcinlibdir) \
@@ -58,7 +123,7 @@
rm -f core.*
ln -sf $@ $@.test
-@@ -107,7 +106,6 @@ juyin-learn: $(OBJS_JUYIN_LEARN)
+@@ -108,7 +107,6 @@
$(CC) -o $@ $(OBJS_JUYIN_LEARN) $(LDFLAGS)
rm -f core.*
sim2trad: $(OBJS_sim2trad)
@@ -66,28 +131,24 @@
$(CC) -o $@ $(OBJS_sim2trad) $(LDFLAGS)
rm -f core.*
trad2sim: sim2trad
-@@ -161,13 +159,13 @@ gcin-message: $(OBJS_gcin_message)
- pin-juyin: $(OBJS_pin_juyin)
- $(CC) -o $@ $(OBJS_pin_juyin) $(LDFLAGS)
-
--gcin1_so= intcode.pico win-int.pico win-message.pico phrase.pico win-sym.pico win-inmd-switch.pico pinyin.pico win-pho-near.pico win-kbm.pico
+@@ -167,16 +165,6 @@
+ # $(CC) -o $@ $(OBJS_ANTHY) -lanthydic $(LDFLAGS)
+ # $(CC) -o $@ $(OBJS_ANTHY) $(LDFLAGS)
+
+-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 tsin-char.pico \
+-anthy.pico
-gcin1.so: $(gcin1_so)
- $(CC) $(SO_FLAGS) -o $@ $(gcin1_so) $(LDFLAGS)
-
-gcin2_so= t2s-lookup.pico
-gcin2.so: $(gcin2_so)
- $(CC) $(SO_FLAGS) -o $@ $(gcin2_so) $(LDFLAGS)
-+#gcin1_so= intcode.pico win-int.pico win-message.pico phrase.pico win-sym.pico win-inmd-switch.pico pinyin.pico win-pho-near.pico win-kbm.pico
-+#gcin1.so: $(gcin1_so)
-+# $(CC) $(SO_FLAGS) -o $@ $(gcin1_so) $(LDFLAGS)
-+
-+#gcin2_so= t2s-lookup.pico
-+#gcin2.so: $(gcin2_so)
-+# $(CC) $(SO_FLAGS) -o $@ $(gcin2_so) $(LDFLAGS)
-
+-
### making the following as .so actuall makes the RSS larger
gcin_gtab_so = gtab.pico win-gtab.pico gtab-util.pico
-@@ -192,14 +190,11 @@ $(im-srv):
+ gcin-gtab.so: $(gcin_gtab_so)
+@@ -199,14 +187,11 @@
ibin:
install $(PROGS) $(bindir); \
rm -f $(bindir)/trad2sim; ln -sf sim2trad $(bindir)/trad2sim
@@ -102,22 +163,22 @@
install -d $(bindir)
$(MAKE) -C data install
$(MAKE) -C im-client install
-@@ -207,13 +202,9 @@ install:
- if [ $(QT_IM) = 'Y' ]; then $(MAKE) -C qt-im install; fi
+@@ -215,13 +200,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 Changelog $(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 Changelog $(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
-@@ -233,7 +224,7 @@ clean:
- $(MAKE) -C qt-im clean
+@@ -242,7 +223,7 @@
+ $(MAKE) -C qt4-im clean
$(MAKE) -C man clean
$(MAKE) -C menu clean
- $(MAKE) -C po clean
@@ -125,3 +186,32 @@
rm -f *.o *.E *.db *.pico *.so config.mak tags $(PROGS) $(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.4.3.orig/gtk-im/Makefile gcin-1.4.3/gtk-im/Makefile
+--- gcin-1.4.3.orig/gtk-im/Makefile 2007-03-01 10:04:07.000000000 +0800
++++ gcin-1.4.3/gtk-im/Makefile 2009-01-23 09:34:06.000000000 +0800
+@@ -24,8 +24,7 @@
+ .c.E:
+ $(CC) -E $(CFLAGS) -o $@ $<
+
+-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.1.0
+ $(CC) $(SO_FLAGS) $(OBJS) -L../im-client -lgcin-im-client -o $@ $(LDFLAGS)
+ rm -f core.*
+
+diff -urN gcin-1.4.3.orig/im-client/Makefile gcin-1.4.3/im-client/Makefile
+--- gcin-1.4.3.orig/im-client/Makefile 2008-08-25 21:27:08.000000000 +0800
++++ gcin-1.4.3/im-client/Makefile 2009-01-23 09:35:10.000000000 +0800
+@@ -27,9 +27,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
+ install -d $(includedir)
+ install -m 444 gcin-im-client.h $(includedir)
newcj3.patch:
Index: newcj3.patch
===================================================================
RCS file: /cvs/extras/rpms/gcin/F-10/newcj3.patch,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- newcj3.patch 15 Oct 2007 02:21:17 -0000 1.2
+++ newcj3.patch 4 Feb 2009 05:40:03 -0000 1.3
@@ -1,12 +1,12 @@
-diff -urN gcin-1.3.5.orig/data/Makefile gcin-1.3.5/data/Makefile
---- gcin-1.3.5.orig/data/Makefile 2007-06-30 23:50:56.000000000 +0800
-+++ gcin-1.3.5/data/Makefile 2007-10-15 10:13:08.000000000 +0800
+diff -urN gcin-1.4.3.orig/data/Makefile gcin-1.4.3/data/Makefile
+--- gcin-1.4.3.orig/data/Makefile 2009-01-12 15:05:35.000000000 +0800
++++ gcin-1.4.3/data/Makefile 2009-01-23 10:05:04.000000000 +0800
@@ -2,7 +2,7 @@
.SUFFIXES: .kbmsrc .kbm .cin .gtab
-DATA=pho.tab tsin32.idx \
+DATA=pho.tab tsin32.idx NewCJ3.gtab \
- cj.gtab ar30.gtab dayi3.gtab pinyin.gtab jyutping.gtab cj5.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 \
qt.patch:
Index: qt.patch
===================================================================
RCS file: /cvs/extras/rpms/gcin/F-10/qt.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- qt.patch 24 Aug 2006 07:54:11 -0000 1.1
+++ qt.patch 4 Feb 2009 05:40:03 -0000 1.2
@@ -1,27 +1,37 @@
---- gcin-1.2.2/configure.orig 2006-05-03 10:40:12.000000000 +0800
-+++ gcin-1.2.2/configure 2006-08-16 23:03:15.000000000 +0800
-@@ -80,9 +80,9 @@
+diff -urN gcin-1.4.4.orig/configure gcin-1.4.4/configure
+--- gcin-1.4.4.orig/configure 2008-11-28 20:26:55.000000000 +0800
++++ gcin-1.4.4/configure 2009-02-04 10:25:27.000000000 +0800
+@@ -112,7 +112,7 @@
fi
QT_IM='N'
--for i in qt3 qt4
-+for i in qt3 qt-3.3 qt-4
- do
-- QT_IM_DIR=/usr/lib/$i/plugins/$LIB/inputmethods
-+ QT_IM_DIR=/usr/$LIB/$i/plugins/inputmethods
- echo "testing if you have QT_IM_MODULE dir:$QT_IM_DIR support"
- if [ -d $QT_IM_DIR ]; then
- QT_IM='Y'
---- gcin-1.2.2/qt-im/Makefile.orig 2006-08-02 15:36:52.000000000 +0800
-+++ gcin-1.2.2/qt-im/Makefile 2006-08-17 13:07:26.000000000 +0800
-@@ -1,16 +1,12 @@
+-QT_IM_DIR=/usr/lib/qt3/plugins/lib/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'
+@@ -126,7 +126,7 @@
+
+
+ QT4_IM='N'
+-QT4_IM_DIR=/usr/lib/qt4/plugins/lib/inputmethods
++QT4_IM_DIR=/usr/$LIB/qt4/plugins/inputmethods
+ echo "testing if you have qt4 support"
+ if [ -d $QT4_IM_DIR ]; then
+ QT4_IM='Y'
+diff -urN gcin-1.4.4.orig/qt-im/Makefile gcin-1.4.4/qt-im/Makefile
+--- gcin-1.4.4.orig/qt-im/Makefile 2009-01-27 19:43:08.000000000 +0800
++++ gcin-1.4.4/qt-im/Makefile 2009-02-04 10:38:19.000000000 +0800
+@@ -1,17 +1,13 @@
include ../config.mak
+-QT=qt3
++QT=qt-3.3
QTIM=$(QT)/plugins/inputmethods
IMMODULES=$(libdir)/$(QTIM)
-ifeq ($(LIB), lib64)
-- IMMODULES_LOCAL=/usr/lib/$(QT)/plugins/lib64/inputmethods
+- IMMODULES_LOCAL=/usr/$(LIB)/$(QT)/plugins/lib64/inputmethods
-else
-- IMMODULES_LOCAL=/usr/lib/$(QTIM)
+- IMMODULES_LOCAL=/usr/$(LIB)/$(QTIM)
-endif
-INCS=-I../im-client -I/usr/lib/$(QT)/include -I/usr/include/Xft2/X11/Xft -I/usr/include/fontconfig -I/usr/include/freetype2
+IMMODULES_LOCAL=/usr/$(LIB)/$(QTIM)
@@ -34,7 +44,7 @@
-lXrender -lXrandr -lXft -lfontconfig -lgcin-im-client \
-lXext -lX11 -lm -lSM -lICE -ldl -lpthread
all: libqgcin.so
-@@ -18,7 +14,7 @@
+@@ -19,7 +15,7 @@
.cpp.E:
$(CXX) -E $(CFLAGS) $(INCS) $< > $@
.h.o:
Index: sources
===================================================================
RCS file: /cvs/extras/rpms/gcin/F-10/sources,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -r1.21 -r1.22
--- sources 26 Jun 2008 06:06:43 -0000 1.21
+++ sources 4 Feb 2009 05:40:03 -0000 1.22
@@ -1 +1 @@
-86367f1408bcf0a0428e4130003d2174 gcin-1.4.2.tar.bz2
+917874510ebdb8b28bf6a63251600493 gcin-1.4.4.tar.bz2
More information about the scm-commits
mailing list