diff options
Diffstat (limited to 'chinese/gcin/files/patch-Makefile')
| -rw-r--r-- | chinese/gcin/files/patch-Makefile | 35 |
1 files changed, 14 insertions, 21 deletions
diff --git a/chinese/gcin/files/patch-Makefile b/chinese/gcin/files/patch-Makefile index f97b3bc273c4..d6e214df358e 100644 --- a/chinese/gcin/files/patch-Makefile +++ b/chinese/gcin/files/patch-Makefile @@ -1,5 +1,5 @@ ---- Makefile.orig 2014-01-26 14:41:39.000000000 +0800 -+++ Makefile 2014-04-12 10:55:35.584554559 +0800 +--- Makefile.orig 2016-10-20 22:43:16 UTC ++++ Makefile @@ -4,8 +4,11 @@ include config.mak include suffixes-rule @@ -12,10 +12,11 @@ GCIN_SO= gcin1.so gcin2.so -@@ -15,6 +18,11 @@ OBJS=gcin.o eve.o util.o gcin-conf.o gci +@@ -14,7 +17,11 @@ OBJS=gcin.o eve.o util.o gcin-conf.o gci + $(gcin_pho_o) $(gcin_gtab_o) gcin-common.o phrase.o t2s-lookup.o gtab-use-count.o \ win-save-phrase.o unix-exec.o pho-kbm-name.o statistic.o tsin-scan.o gcin-module.o lang.o \ gcin-module-cb.o gtab-init.o fullchar.o gtab-tsin-fname.o win-screen-status.o - +- +SOURCES=gcin.cpp eve.cpp util.cpp gcin-conf.cpp gcin-settings.cpp locale.cpp gcin-icon.cpp about.cpp html-browser.cpp \ + gcin-exec-script.cpp pho-play.cpp cache.cpp gtk_bug_fix.c phrase-save-menu.cpp \ + $(SOURCES_gcin_pho) $(SOURCES_gcin_gtab) gcin-common.cpp phrase.cpp t2s-lookup.cpp gtab-use-count.cpp \ @@ -24,7 +25,7 @@ OBJS_TSLEARN=tslearn.o util.o gcin-conf.o pho-util.o tsin-util.o gcin-send.o pho-sym.o \ table-update.o locale.o gcin-settings.o gcin-common.o gcin-icon.o pho-dbg.o \ -@@ -101,7 +109,7 @@ PROGS_CV=kbmcv pin-juyin +@@ -103,7 +110,7 @@ PROGS_CV=kbmcv pin-juyin all: $(PROGS) trad2sim $(GCIN_SO) $(DATA) $(PROGS_CV) gcin.spec gcin-fedora.spec $(MAKE) -C data $(MAKE) -C gtk-im @@ -33,12 +34,12 @@ if [ $(USE_I18N) = 'Y' ]; then $(MAKE) -C po; fi if [ $(GTK3_IM) = 'Y' ]; then $(MAKE) -C gtk3-im; fi if [ $(QT_IM) = 'Y' ]; then $(MAKE) -C qt-im; fi -@@ -110,18 +118,18 @@ all: $(PROGS) trad2sim $(GCIN_SO) $(DATA +@@ -113,18 +120,18 @@ all: $(PROGS) trad2sim $(GCIN_SO) $(DATA #gcc_ld_run_path=-Wl,-rpath,$(gcin_ld_run_path) gcin: $(OBJS) $(IMdkitLIB) $(OBJ_IMSRV) -- $(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%%PREFIX%%/$(LIB) +- $(CCLD) $(EXTRA_LDFLAGS) $(gcc_ld_run_path) -o $@ $(OBJS) $(IMdkitLIB) $(OBJ_IMSRV) -lXtst $(GCIN_LDFLAGS) -L/usr/X11R6/$(LIB) ++ $(CCLD) $(EXTRA_LDFLAGS) $(gcc_ld_run_path) -o $@ $(OBJS) $(IMdkitLIB) $(OBJ_IMSRV) -lXtst $(GCIN_LDFLAGS) -L%%PREFIX%%/$(LIB) rm -f core.* vgcore.* ln -sf $@ $@.test @@ -56,16 +57,7 @@ $(CCLD) $(gcc_ld_run_path) -o $@ $(OBJS_TS_EDIT) -L./im-client -lgcin-im-client $(LDFLAGS) ts-contribute: ts-edit -@@ -143,7 +151,7 @@ gcin-tools: $(OBJS_gcin_tools) im-cl - phoa2d: $(OBJS_phoa2d) im-client/libgcin-im-client.so - $(CCLD) $(gcc_ld_run_path) -o $@ $(OBJS_phoa2d) -L./im-client -lgcin-im-client $(LDFLAGS) - --phod2a: $(OBJS_phod2a) -+phod2a: $(OBJS_phod2a) im-client/libgcin-im-client.so - $(CCLD) -lX11 -o $@ $(OBJS_phod2a) $(LDFLAGS) - - tsa2d32: $(OBJS_tsa2d32) im-client/libgcin-im-client.so -@@ -165,16 +173,16 @@ gtab-merge: $(OBJS_gtab_merge) +@@ -171,16 +178,16 @@ gtab-merge: $(OBJS_gtab_merge) kbmcv: $(OBJS_kbmcv) $(CCLD) -o $@ $(OBJS_kbmcv) $(LDFLAGS) @@ -86,7 +78,7 @@ $(CCLD) $(gcc_ld_run_path) -o $@ $(OBJS_gcin_message) -L./im-client -lgcin-im-client $(LDFLAGS) pin-juyin: $(OBJS_pin_juyin) -@@ -223,12 +231,12 @@ install: +@@ -229,13 +236,13 @@ install: $(MAKE) -C data install $(MAKE) -C im-client install $(MAKE) -C gtk-im install @@ -95,6 +87,7 @@ if [ $(GTK3_IM) = 'Y' ]; then $(MAKE) -C gtk3-im install; fi if [ $(QT_IM) = 'Y' ]; then $(MAKE) -C qt-im install; fi if [ $(QT4_IM) = 'Y' ]; then $(MAKE) -C qt4-im install; fi + if [ $(QT5_IM) = 'Y' ]; then $(MAKE) -C qt5-im install; fi - if [ $(prefix) = /usr/local ]; then \ - install -m 644 gcin.png /usr/share/icons/hicolor/64x64/apps; \ + if [ $(prefix) = /nonstaged ]; then \ @@ -102,7 +95,7 @@ install -d $(DOC_DIR); \ install -m 644 README.html Changelog.html $(DOC_DIR); \ install $(PROGS) $(bindir); \ -@@ -246,6 +254,7 @@ install: +@@ -253,6 +260,7 @@ install: rm -f $(bindir)/ts-edit-en; ln -sf ts-edit $(bindir)/ts-edit-en; \ fi $(MAKE) -C scripts install @@ -110,7 +103,7 @@ $(MAKE) -C menu install if [ $(USE_I18N) = 'Y' ]; then $(MAKE) -C po install; fi -@@ -279,4 +288,4 @@ gcin-fedora.spec: gcin-fedora.spec.in VE +@@ -287,4 +295,4 @@ gcin-fedora.spec: gcin-fedora.spec.in VE rm -f $@ sed -e "s/__gcin_version__/$(GCIN_VERSION)/" < $< > $@ |