rpms/gcin/devel .cvsignore, 1.23, 1.24 configure.patch, 1.3, 1.4 gcin.spec, 1.50, 1.51 gcin_gtab.patch, 1.5, 1.6 im-client.patch, 1.15, 1.16 qt.patch, 1.2, 1.3 sources, 1.23, 1.24
Chung-Yen Chang
candyz at fedoraproject.org
Tue Jan 5 06:57:23 UTC 2010
- Previous message (by thread): File gcin-1.4.6.tar.bz2 uploaded to lookaside cache by candyz
- Next message (by thread): rpms/gcin/F-12 .cvsignore, 1.23, 1.24 configure.patch, 1.3, 1.4 gcin.spec, 1.49, 1.50 gcin_gtab.patch, 1.5, 1.6 im-client.patch, 1.15, 1.16 qt.patch, 1.2, 1.3 sources, 1.23, 1.24
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
Author: candyz
Update of /cvs/pkgs/rpms/gcin/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv15573
Modified Files:
.cvsignore configure.patch gcin.spec gcin_gtab.patch
im-client.patch qt.patch sources
Log Message:
update to 1.4.6
Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/gcin/devel/.cvsignore,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -p -r1.23 -r1.24
--- .cvsignore 7 May 2009 06:38:11 -0000 1.23
+++ .cvsignore 5 Jan 2010 06:57:22 -0000 1.24
@@ -1 +1 @@
-gcin-1.4.5.tar.bz2
+gcin-1.4.6.tar.bz2
configure.patch:
configure | 3 ---
1 file changed, 3 deletions(-)
Index: configure.patch
===================================================================
RCS file: /cvs/pkgs/rpms/gcin/devel/configure.patch,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- configure.patch 4 Feb 2009 02:55:38 -0000 1.3
+++ configure.patch 5 Jan 2010 06:57:23 -0000 1.4
@@ -1,7 +1,7 @@
-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 @@
+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 @@
OPTFLAGS="-g"
@@ -9,5 +9,5 @@ diff -urN gcin-1.4.3.orig/configure gcin
- OPTFLAGS="-O"
-fi
-
- echo "CC=gcc" > config.mak
+ if [ -z $CC ]; then
+ CC=gcc
Index: gcin.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gcin/devel/gcin.spec,v
retrieving revision 1.50
retrieving revision 1.51
diff -u -p -r1.50 -r1.51
--- gcin.spec 27 Nov 2009 06:45:34 -0000 1.50
+++ gcin.spec 5 Jan 2010 06:57:23 -0000 1.51
@@ -1,6 +1,6 @@
Name: gcin
-Version: 1.4.5
-Release: 6%{?dist}
+Version: 1.4.6
+Release: 1%{?dist}
Summary: Input method for Traditional Chinese
Group: System Environment/Libraries
@@ -37,7 +37,7 @@ Gcin is an input method for Traditional
%patch3 -p1 -b .configure
%patch4 -p1 -b .newcj3
%patch5 -p1 -b .gtab
-%patch6 -p1 -b .gtk-immodules
+#%patch6 -p1 -b .gtk-immodules
#cp -f gcinicon/gtab.list data/
#cp -f gcinicon/*.png icons/
find . -name \*.h -o -name \*.c | xargs chmod ugo-x
@@ -111,6 +111,9 @@ fi
%{_libdir}/libgcin-im-client.so*
%changelog
+* Tue Jan 05 2010 Chung-Yen Chang <candyz0416 at gmail.com> - 1.4.6-1
+- update to 1.4.6
+
* Fri Nov 27 2009 Chung-Yen Chang <candyz0416 at gmail.com> - 1.4.5-6
- fix No icon for im-chooser (#468829)
gcin_gtab.patch:
gtab.cpp | 9 ++++++---
1 file changed, 6 insertions(+), 3 deletions(-)
Index: gcin_gtab.patch
===================================================================
RCS file: /cvs/pkgs/rpms/gcin/devel/gcin_gtab.patch,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -p -r1.5 -r1.6
--- gcin_gtab.patch 4 Feb 2009 02:55:39 -0000 1.5
+++ gcin_gtab.patch 5 Jan 2010 06:57:23 -0000 1.6
@@ -1,7 +1,7 @@
-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 @@
+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 @@
out[0]=0;
@@ -10,7 +10,7 @@ diff -urN gcin-1.4.3.orig/gtab.c gcin-1.
int i;
for(i=0; i < tinmd->DefChars; i++) {
-@@ -213,9 +213,12 @@
+@@ -220,9 +220,12 @@
for(i=0; i < tbufN; i++) {
#define MAX_DISP_MATCH 40
if (strlen(out) < MAX_DISP_MATCH) {
@@ -18,13 +18,13 @@ diff -urN gcin-1.4.3.orig/gtab.c gcin-1.
strcat(out, tbuf[i]);
if (i < tbufN-1)
- strcat(out, " |");
-+ strcat(out, "] ");
++ strcat(out, "] ");
+ else
-+ strcat(out, "]");
++ strcat(out, "]");
}
free(tbuf[i]);
-@@ -974,7 +977,7 @@
+@@ -977,7 +980,7 @@
char uu[MAX_CIN_PHR];
if (gtab_vertical_select) {
im-client.patch:
Makefile | 31 ++++---------------------------
gtk-im/Makefile | 5 ++---
im-client/Makefile | 6 +++---
3 files changed, 9 insertions(+), 33 deletions(-)
Index: im-client.patch
===================================================================
RCS file: /cvs/pkgs/rpms/gcin/devel/im-client.patch,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -p -r1.15 -r1.16
--- im-client.patch 7 May 2009 06:53:04 -0000 1.15
+++ im-client.patch 5 Jan 2010 06:57:23 -0000 1.16
@@ -1,194 +1,79 @@
-diff -urN gcin-1.4.5.orig/Makefile gcin-1.4.5/Makefile
---- gcin-1.4.5.orig/Makefile 2009-03-29 21:32:52.000000000 +0800
-+++ gcin-1.4.5/Makefile 2009-05-07 14:50:13.000000000 +0800
+diff -urN gcin-1.4.6.orig/Makefile gcin-1.4.6/Makefile
+--- gcin-1.4.6.orig/Makefile 2009-12-10 15:16:53.000000000 +0800
++++ gcin-1.4.6/Makefile 2010-01-05 13:40:57.117730555 +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 gtk_bug_fix.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 gtk_bug_fix.o
+-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
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 \
+ gcin-switch.o gcin-exec-script.o $(GCIN_SO) pho-play.o cache.o gtk_bug_fix.o \
@@ -18,7 +18,7 @@
- table-update.o locale.o gcin-settings.o gcin-common.o
+ table-update.o locale.o gcin-settings.o gcin-common.o gcin-icon.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
+ gcin-settings.o gcin-conf.o table-update.o pinyin.o gcin-icon.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
-@@ -94,7 +94,7 @@
- PROGS_SYM=trad2sim
- PROGS_CV=kbmcv pin-juyin
-
--all: $(PROGS) trad2sim $(DATA) $(PROGS_CV) gcin.spec gtk_bug_fix.so
-+all: $(PROGS) trad2sim $(DATA) $(PROGS_CV) gcin.spec
- $(MAKE) -C data
- $(MAKE) -C im-client
- $(MAKE) -C gtk-im
-@@ -105,8 +105,7 @@
+@@ -124,8 +124,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)
+ 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)
rm -f core.*
ln -sf $@ $@.test
-@@ -117,7 +116,6 @@
- $(CC) -o $@ $(OBJS_JUYIN_LEARN) $(LDFLAGS)
+@@ -142,7 +141,6 @@
+ $(CCLD) -o $@ $(OBJS_JUYIN_LEARN) $(LDFLAGS)
rm -f core.*
sim2trad: $(OBJS_sim2trad)
-- LD_RUN_PATH=.:$(gcinlibdir) \
+- LD_RUN_PATH=$(gcin_ld_run_path) \
$(CC) -o $@ $(OBJS_sim2trad) $(LDFLAGS)
rm -f core.*
trad2sim: sim2trad
-@@ -176,22 +174,8 @@
- # $(CC) -o $@ $(OBJS_ANTHY) -lanthydic $(LDFLAGS)
- # $(CC) -o $@ $(OBJS_ANTHY) $(LDFLAGS)
+@@ -203,20 +201,6 @@
+ im-client/libgcin-im-client.so:
+ $(MAKE) -C im-client
--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
+-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
-endif
-
--gcin1.so: $(gcin1_so)
-- $(CC) $(SO_FLAGS) -o $@ $(gcin1_so) $(LDFLAGS)
+-gcin1.so: $(gcin1_so) pho.o tsin.o eve.o gtab.o win-sym.o
+- $(CCLD) $(SO_FLAGS) -o $@ $(gcin1_so) $(LDFLAGS)
-
-gcin2_so= t2s-lookup.pico
--gcin2.so: $(gcin2_so)
-- $(CC) $(SO_FLAGS) -o $@ $(gcin2_so) $(LDFLAGS)
+-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
-+#gtk_bug_fix.so: gtk_bug_fix.pico
-+# $(CC) $(SO_FLAGS) -o $@ gtk_bug_fix.pico
-
- ### making the following as .so actuall makes the RSS larger
- gcin_gtab_so = gtab.pico win-gtab.pico gtab-util.pico
-@@ -215,14 +199,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 $(GCIN_SO) $(gcinlibdir)
- install -d $(bindir)
- $(MAKE) -C data install
- $(MAKE) -C im-client install
-@@ -231,13 +212,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
-@@ -258,7 +235,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.5.orig/Makefile.gcin gcin-1.4.5/Makefile.gcin
---- gcin-1.4.5.orig/Makefile.gcin 2009-03-29 21:32:52.000000000 +0800
-+++ gcin-1.4.5/Makefile.gcin 2009-05-07 14:49: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 gtk_bug_fix.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 gtk_bug_fix.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
-@@ -105,8 +105,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
-
-@@ -117,7 +116,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
-@@ -176,22 +174,8 @@
- # $(CC) -o $@ $(OBJS_ANTHY) -lanthydic $(LDFLAGS)
- # $(CC) -o $@ $(OBJS_ANTHY) $(LDFLAGS)
+ #gtk_bug_fix.so: gtk_bug_fix.pico
+ # $(CC) $(SO_FLAGS) -o $@ gtk_bug_fix.pico
--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
--
--ifeq ($(USE_ANTHY),Y)
--gcin1_so += anthy.pico
--endif
--
--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)
--
--gtk_bug_fix.so: gtk_bug_fix.pico
-- $(CC) $(SO_FLAGS) -o $@ gtk_bug_fix.pico
-+#gtk_bug_fix.so: gtk_bug_fix.pico
-+# $(CC) $(SO_FLAGS) -o $@ gtk_bug_fix.pico
-
- ### making the following as .so actuall makes the RSS larger
- gcin_gtab_so = gtab.pico win-gtab.pico gtab-util.pico
-@@ -215,14 +199,11 @@
- ibin:
+@@ -240,14 +224,11 @@
install $(PROGS) $(bindir); \
+ cp gcin-nocur $(bindir)/gcin; \
rm -f $(bindir)/trad2sim; ln -sf sim2trad $(bindir)/trad2sim
- install $(GCIN_SO) $(gcinlibdir)
install:
install -d $(datadir)/icons
- install gcin.png $(datadir)/icons
+ install -m 644 gcin.png $(datadir)/icons
$(MAKE) -C icons install
- install -d $(gcinlibdir)
- install $(GCIN_SO) $(gcinlibdir)
install -d $(bindir)
$(MAKE) -C data install
$(MAKE) -C im-client install
-@@ -231,13 +212,9 @@
+@@ -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; \
@@ -202,37 +87,37 @@ diff -urN gcin-1.4.5.orig/Makefile.gcin
install -s $(PROGS) $(bindir); \
rm -f $(bindir)/trad2sim; ln -sf sim2trad $(bindir)/trad2sim; \
fi
-@@ -258,7 +235,7 @@
+@@ -282,7 +259,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) \
+ 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.4.5.orig/gtk-im/Makefile gcin-1.4.5/gtk-im/Makefile
---- gcin-1.4.5.orig/gtk-im/Makefile 2009-04-13 10:47:24.000000000 +0800
-+++ gcin-1.4.5/gtk-im/Makefile 2009-05-07 14:49:23.000000000 +0800
+diff -urN gcin-1.4.6.orig/gtk-im/Makefile gcin-1.4.6/gtk-im/Makefile
+--- gcin-1.4.6.orig/gtk-im/Makefile 2009-04-13 10:47:24.000000000 +0800
++++ gcin-1.4.6/gtk-im/Makefile 2010-01-05 13:46:38.384468466 +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.0
++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.0
++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.4.5.orig/im-client/Makefile gcin-1.4.5/im-client/Makefile
---- gcin-1.4.5.orig/im-client/Makefile 2009-04-16 23:39:50.000000000 +0800
-+++ gcin-1.4.5/im-client/Makefile 2009-05-07 14:49:23.000000000 +0800
-@@ -27,9 +27,9 @@
+diff -urN gcin-1.4.6.orig/im-client/Makefile gcin-1.4.6/im-client/Makefile
+--- gcin-1.4.6.orig/im-client/Makefile 2009-12-12 19:28:49.000000000 +0800
++++ gcin-1.4.6/im-client/Makefile 2010-01-05 13:47:36.262424168 +0800
+@@ -28,9 +28,9 @@
LOCALLIB=/usr/local/$(LIB)
install:
@@ -243,5 +128,5 @@ diff -urN gcin-1.4.5.orig/im-client/Make
+ 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)
+
+ gcin-conf.o: ../gcin-conf.cpp
qt.patch:
configure | 6 +++---
qt-im/Makefile | 6 +++---
2 files changed, 6 insertions(+), 6 deletions(-)
Index: qt.patch
===================================================================
RCS file: /cvs/pkgs/rpms/gcin/devel/qt.patch,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- qt.patch 4 Feb 2009 02:55:39 -0000 1.2
+++ qt.patch 5 Jan 2010 06:57:23 -0000 1.3
@@ -1,50 +1,41 @@
-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 @@
+diff -urN gcin-1.4.6.orig/configure gcin-1.4.6/configure
+--- gcin-1.4.6.orig/configure 2009-12-17 17:29:46.000000000 +0800
++++ gcin-1.4.6/configure 2010-01-05 13:50:40.071953951 +0800
+@@ -45,8 +45,8 @@
+ use_tsin='Y'
+ use_gcb='Y'
+ use_anthy='Y'
+-use_qt3='N'
+-use_qt4='Y'
++use_qt3='Y'
++use_qt4='N'
+
+ if [ "$GCIN_USE_XIM" ]; then
+ use_xim=$GCIN_USE_XIM
+@@ -145,7 +145,7 @@
fi
QT_IM='N'
--QT_IM_DIR=/usr/lib/qt3/plugins/lib/inputmethods
+-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'
-@@ -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 @@
+diff -urN gcin-1.4.6.orig/qt-im/Makefile gcin-1.4.6/qt-im/Makefile
+--- gcin-1.4.6.orig/qt-im/Makefile 2009-12-10 07:09:17.000000000 +0800
++++ gcin-1.4.6/qt-im/Makefile 2010-01-05 13:56:56.962786725 +0800
+@@ -1,8 +1,8 @@
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
--else
-- 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)
+-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
--LDFLAGS=-L/usr/lib/$(QT)/$(LIB) -L/usr/X11R6/$(LIB) -L../im-client -lqt-mt -lmng -ljpeg -lpng -lz \
-+LDFLAGS=-L/usr/$(LIB)/$(QT)/lib -L/usr/X11R6/$(LIB) -L../im-client -lqt-mt -lmng -ljpeg -lpng -lz \
- -lXrender -lXrandr -lXft -lfontconfig -lgcin-im-client \
- -lXext -lX11 -lm -lSM -lICE -ldl -lpthread
- all: libqgcin.so
-@@ -19,7 +15,7 @@
+@@ -12,7 +12,7 @@
.cpp.E:
$(CXX) -E $(CFLAGS) $(INCS) $< > $@
.h.o:
Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/gcin/devel/sources,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -p -r1.23 -r1.24
--- sources 7 May 2009 06:38:11 -0000 1.23
+++ sources 5 Jan 2010 06:57:23 -0000 1.24
@@ -1 +1 @@
-b7e5e40804b2a645ae64f4dedb2b3985 gcin-1.4.5.tar.bz2
+64f5ded6404d9091560c2316e9207158 gcin-1.4.6.tar.bz2
- Previous message (by thread): File gcin-1.4.6.tar.bz2 uploaded to lookaside cache by candyz
- Next message (by thread): rpms/gcin/F-12 .cvsignore, 1.23, 1.24 configure.patch, 1.3, 1.4 gcin.spec, 1.49, 1.50 gcin_gtab.patch, 1.5, 1.6 im-client.patch, 1.15, 1.16 qt.patch, 1.2, 1.3 sources, 1.23, 1.24
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
More information about the fedora-extras-commits
mailing list