rpms / gcin

Clone
Source Code
GIT

Files

  1.   f5e9ba96cf5d372615a1d8104980db63e3a18321
  2.   im-client.patch
Blob Blame History Raw 
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
@@ -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
@@ -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 @@
 	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)
 
-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:
 	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)
 
-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:
 	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/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
@@ -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
 	$(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
 	$(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 @@
 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)
Powered by Pagure 5.14.1
Documentation • File an Issue • About this Instance • SSH Hostkey/Fingerprint
© Red Hat, Inc. and others.