Attachment #141379 for bug #188156

View | Details | Raw Unified | Return to bug 188156
Collapse All | Expand All

Lines 22-28 Link Here

(-)gcin/Makefile (-1 lines)
22	USE_XORG= x11 xtst xext	22	USE_XORG= x11 xtst xext
23	INSTALLS_ICONS= YES	23	INSTALLS_ICONS= YES
24	USE_LDCONFIG= YES	24	USE_LDCONFIG= YES
25	MAKE_JOBS_UNSAFE= yes
26	OPTIONS_DEFINE= ANTHY QT_IM_MODULE	25	OPTIONS_DEFINE= ANTHY QT_IM_MODULE
27	ANTHY_DESC= Japanese anthy IM module	26	ANTHY_DESC= Japanese anthy IM module
28	QT_IM_MODULE_DESC= QT IM module	27	QT_IM_MODULE_DESC= QT IM module




--- ./Makefile.orig	2012-12-08 08:32:13.000000000 +0800
+++ ./Makefile	2014-03-28 20:46:01.000000000 +0800
@@ -94,7 +94,7 @@
 all:	$(PROGS) trad2sim $(GCIN_SO) $(DATA) $(PROGS_CV) gcin.spec gcin-fedora.spec
 	$(MAKE) -C data

 	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
@@ -103,18 +103,18 @@
 #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/usr/local/$(LIB)
 	rm -f core.* vgcore.*
 	ln -sf $@ $@.test
 
 gcin-nocur:   $(OBJS) $(IMdkitLIB) $(OBJ_IMSRV)
-	$(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/local/$(LIB)
 	rm -f core.*
 
-tslearn:        $(OBJS_TSLEARN)
+tslearn:        $(OBJS_TSLEARN) im-client/libgcin-im-client.so
 	$(CCLD) $(gcc_ld_run_path) -o $@ $(OBJS_TSLEARN) -L./im-client -lgcin-im-client $(LDFLAGS)
 
-ts-edit:        $(OBJS_TS_EDIT)
+ts-edit:        $(OBJS_TS_EDIT) im-client/libgcin-im-client.so
 	$(CCLD) $(gcc_ld_run_path) -o $@ $(OBJS_TS_EDIT) -L./im-client -lgcin-im-client $(LDFLAGS)
 
 ts-contribute:	ts-edit
@@ -158,16 +158,16 @@
 kbmcv:  $(OBJS_kbmcv)
 	$(CCLD) -o $@ $(OBJS_kbmcv) $(LDFLAGS)
 
-gcin-gb-toggle:	$(OBJS_gcin_gb_toggle)
+gcin-gb-toggle:	$(OBJS_gcin_gb_toggle) im-client/libgcin-im-client.so
 	$(CCLD) $(gcc_ld_run_path) -o $@ $(OBJS_gcin_gb_toggle) -L./im-client -lgcin-im-client $(LDFLAGS)
 
-gcin-kbm-toggle:	$(OBJS_gcin_kbm_toggle)
+gcin-kbm-toggle:	$(OBJS_gcin_kbm_toggle) im-client/libgcin-im-client.so
 	$(CCLD) $(gcc_ld_run_path) -o $@ $(OBJS_gcin_kbm_toggle) -L./im-client -lgcin-im-client $(LDFLAGS)
 
-gcin-exit:	$(OBJS_gcin_exit)
+gcin-exit:	$(OBJS_gcin_exit) im-client/libgcin-im-client.so
 	$(CCLD) $(gcc_ld_run_path) -o $@ $(OBJS_gcin_exit) -L./im-client -lgcin-im-client $(LDFLAGS)
 
-gcin-message:	$(OBJS_gcin_message)
+gcin-message:	$(OBJS_gcin_message) im-client/libgcin-im-client.so
 	$(CCLD) $(gcc_ld_run_path) -o $@ $(OBJS_gcin_message) -L./im-client -lgcin-im-client $(LDFLAGS)
 
 pin-juyin:	$(OBJS_pin_juyin)
@@ -215,12 +215,12 @@
 	$(MAKE) -C data install
 	$(MAKE) -C im-client install
 	$(MAKE) -C gtk-im install

 	if [ $(QT_IM) = 'Y' ]; then $(MAKE) -C qt-im install; fi
 	if [ $(QT4_IM) = 'Y' ]; then $(MAKE) -C qt4-im install; fi
-	if [ $(prefix) = /usr/local ]; then \
-	   install -m 644 gcin.png /usr/share/icons; \
+	if [ $(prefix) = /nonstaged ]; then \
+	   install -m 644 gcin.png $(prefix)/share/icons; \
 	   install -d $(DOC_DIR); \
 	   install -m 644 README.html Changelog.html $(DOC_DIR); \
 	   install $(PROGS) $(bindir); \
@@ -234,6 +234,7 @@
 	   rm -f $(bindir)/ts-contribute; ln -sf ts-edit $(bindir)/ts-contribute; \
 	fi




--- modules/Makefile.orig	2012-09-05 15:46:26.000000000 +0800
+++ modules/Makefile	2012-09-05 15:49:16.000000000 +0800
@@ -3,15 +3,18 @@ include ../suffixes-rule
 
 CFLAGS+=-I.. -I../IMdkit/include
 GCIN_MODULE=intcode-module.so
+SOURCES=intcode.cpp win-int.cpp
 
 ifeq ($(USE_ANTHY),Y)
 GCIN_MODULE+=anthy-module.so
+SOURCES+=anthy.cpp
 endif
 
 ifeq ($(USE_CHEWING),Y)
 GCIN_MODULE+=chewing-module.so
 CHEWING_DATADIR=$(shell pkg-config --variable=datadir chewing)
 CFLAGS += -DCHEWING_DATADIR=\"$(CHEWING_DATADIR)\"
+SOURCES+=chewing-conf.cpp chewing.cpp gcin-setup-chewing.cpp
 endif
 
 all:	$(GCIN_MODULE)
@@ -35,6 +38,6 @@ install:
 clean:
 	rm -f *.pico *.so *.o .depend
 .depend:
-	$(CCX) $(CFLAGS) -MM *.cpp > $@
+	$(CCX) $(CFLAGS) -MM $(SOURCES) > $@
 
 include .depend




--- ./modules/Makefile.orig	2012-04-10 13:50:44.000000000 +0800
+++ ./modules/Makefile	2014-03-28 20:45:33.000000000 +0800
@@ -3,15 +3,18 @@
 
 CFLAGS+=-I.. -I../IMdkit/include
 GCIN_MODULE=intcode-module.so
+SOURCES=intcode.cpp win-int.cpp
 
 ifeq ($(USE_ANTHY),Y)
 GCIN_MODULE+=anthy-module.so
+SOURCES+=anthy.cpp
 endif
 
 ifeq ($(USE_CHEWING),Y)
 GCIN_MODULE+=chewing-module.so
 CHEWING_DATADIR=$(shell pkg-config --variable=datadir chewing)
 CFLAGS += -DCHEWING_DATADIR=\"$(CHEWING_DATADIR)\"
+SOURCES+=chewing-conf.cpp chewing.cpp gcin-setup-chewing.cpp
 endif
 
 all:	$(GCIN_MODULE)
@@ -35,6 +38,6 @@
 clean:
 	rm -f *.pico *.so *.o .depend
 .depend:
-	$(CCX) $(CFLAGS) -MM *.cpp > $@
+	$(CCX) $(CFLAGS) -MM $(SOURCES) > $@
 
 include .depend

Lines 1-11 Link Here

(-)gcin/files/patch-qt4-im-Makefile (-11 lines)
1	--- qt4-im/Makefile.orig 2012-01-08 01:45:14.000000000 +0800
2	+++ qt4-im/Makefile 2012-01-08 01:47:10.000000000 +0800
3	@@ -3,7 +3,7 @@ QT=qt4
4	QTIM=$(QT)/plugins/inputmethods
5	IMMODULES=$(libdir)/$(QTIM)
6
7	-INCS=-I../im-client -I/usr/include/X11 `pkg-config QtCore QtGui --cflags`
8	+INCS=-I../im-client -I$(prefix)/include/X11 -I$(prefix)/include `pkg-config QtCore QtGui --cflags`
9	CXXFLAGS=$(OPTFLAGS) $(INCS) -Wall -D_REENTRANT -DUNIX=1 -fPIC -DQT4 -DQT_SHARED \
10	-DQT_IMMODULE -DPIC
11	OBJS= moc_gcin-qt.o gcin-qt.o im-gcin-qt.o gcin-imcontext-qt.o

Line 0 Link Here

(-)gcin/files/patch-qt4-im__Makefile (+11 lines)
	1	--- ./qt4-im/Makefile.orig 2012-03-05 20:26:54.000000000 +0800
	2	+++ ./qt4-im/Makefile 2014-03-28 20:45:33.000000000 +0800
	3	@@ -3,7 +3,7 @@
	4	QTIM=$(QT)/plugins/inputmethods
	5	IMMODULES=$(libdir)/$(DEB_BUILD_MULTIARCH)/$(QTIM)
	6
	7	-INCS=-I../im-client -I/usr/include/X11 `pkg-config QtCore QtGui --cflags`
	8	+INCS=-I../im-client -I$(prefix)/include/X11 -I$(prefix)/include `pkg-config QtCore QtGui --cflags`
	9	CXXFLAGS=$(OPTFLAGS) $(INCS) -Wall -D_REENTRANT -DUNIX=1 -fPIC -DQT4 -DQT_SHARED \
	10	-DQT_IMMODULE -DPIC
	11	OBJS= moc_gcin-qt.o gcin-qt.o im-gcin-qt.o gcin-imcontext-qt.o

Return to bug 188156

Lines 1-5 Link Here

(-)gcin/files/patch-Makefile (-4 / +50 lines)
1	--- ./Makefile.orig 2012-12-08 00:32:13.000000000 +0000	1	--- ./Makefile.orig 2012-12-08 08:32:13.000000000 +0800
2	+++ ./Makefile 2014-01-04 22:34:02.000000000 +0000	2	+++ ./Makefile 2014-03-28 20:46:01.000000000 +0800
3	@@ -94,7 +94,7 @@	3	@@ -94,7 +94,7 @@
4	all: $(PROGS) trad2sim $(GCIN_SO) $(DATA) $(PROGS_CV) gcin.spec gcin-fedora.spec	4	all: $(PROGS) trad2sim $(GCIN_SO) $(DATA) $(PROGS_CV) gcin.spec gcin-fedora.spec
5	$(MAKE) -C data	5	$(MAKE) -C data
Lines 9-15 Link Here
9	if [ $(USE_I18N) = 'Y' ]; then $(MAKE) -C po; fi	9	if [ $(USE_I18N) = 'Y' ]; then $(MAKE) -C po; fi
10	if [ $(GTK3_IM) = 'Y' ]; then $(MAKE) -C gtk3-im; fi	10	if [ $(GTK3_IM) = 'Y' ]; then $(MAKE) -C gtk3-im; fi
11	if [ $(QT_IM) = 'Y' ]; then $(MAKE) -C qt-im; fi	11	if [ $(QT_IM) = 'Y' ]; then $(MAKE) -C qt-im; fi
12	@@ -215,11 +215,11 @@	12	@@ -103,18 +103,18 @@
		13	#gcc_ld_run_path=-Wl,-rpath,$(gcin_ld_run_path)
		14
		15	gcin: $(OBJS) $(IMdkitLIB) $(OBJ_IMSRV)
		16	- $(CCLD) $(EXTRA_LDFLAGS) $(gcc_ld_run_path) -o $@ $(OBJS) $(IMdkitLIB) $(OBJ_IMSRV) -lXtst $(LDFLAGS) -L/usr/X11R6/$(LIB)
		17	+ $(CCLD) $(EXTRA_LDFLAGS) $(gcc_ld_run_path) -o $@ $(OBJS) $(IMdkitLIB) $(OBJ_IMSRV) -lXtst $(LDFLAGS) -L/usr/local/$(LIB)
		18	rm -f core.* vgcore.*
		19	ln -sf $@ $@.test
		20
		21	gcin-nocur: $(OBJS) $(IMdkitLIB) $(OBJ_IMSRV)
		22	- $(CCLD) -Wl,-rpath,$(gcinlibdir) $(EXTRA_LDFLAGS) -o $@ $(OBJS) $(IMdkitLIB) $(OBJ_IMSRV) -lXtst $(LDFLAGS) -L/usr/X11R6/$(LIB)
		23	+ $(CCLD) -Wl,-rpath,$(gcinlibdir) $(EXTRA_LDFLAGS) -o $@ $(OBJS) $(IMdkitLIB) $(OBJ_IMSRV) -lXtst $(LDFLAGS) -L/usr/local/$(LIB)
		24	rm -f core.*
		25
		26	-tslearn: $(OBJS_TSLEARN)
		27	+tslearn: $(OBJS_TSLEARN) im-client/libgcin-im-client.so
		28	$(CCLD) $(gcc_ld_run_path) -o $@ $(OBJS_TSLEARN) -L./im-client -lgcin-im-client $(LDFLAGS)
		29
		30	-ts-edit: $(OBJS_TS_EDIT)
		31	+ts-edit: $(OBJS_TS_EDIT) im-client/libgcin-im-client.so
		32	$(CCLD) $(gcc_ld_run_path) -o $@ $(OBJS_TS_EDIT) -L./im-client -lgcin-im-client $(LDFLAGS)
		33
		34	ts-contribute: ts-edit
		35	@@ -158,16 +158,16 @@
		36	kbmcv: $(OBJS_kbmcv)
		37	$(CCLD) -o $@ $(OBJS_kbmcv) $(LDFLAGS)
		38
		39	-gcin-gb-toggle: $(OBJS_gcin_gb_toggle)
		40	+gcin-gb-toggle: $(OBJS_gcin_gb_toggle) im-client/libgcin-im-client.so
		41	$(CCLD) $(gcc_ld_run_path) -o $@ $(OBJS_gcin_gb_toggle) -L./im-client -lgcin-im-client $(LDFLAGS)
		42
		43	-gcin-kbm-toggle: $(OBJS_gcin_kbm_toggle)
		44	+gcin-kbm-toggle: $(OBJS_gcin_kbm_toggle) im-client/libgcin-im-client.so
		45	$(CCLD) $(gcc_ld_run_path) -o $@ $(OBJS_gcin_kbm_toggle) -L./im-client -lgcin-im-client $(LDFLAGS)
		46
		47	-gcin-exit: $(OBJS_gcin_exit)
		48	+gcin-exit: $(OBJS_gcin_exit) im-client/libgcin-im-client.so
		49	$(CCLD) $(gcc_ld_run_path) -o $@ $(OBJS_gcin_exit) -L./im-client -lgcin-im-client $(LDFLAGS)
		50
		51	-gcin-message: $(OBJS_gcin_message)
		52	+gcin-message: $(OBJS_gcin_message) im-client/libgcin-im-client.so
		53	$(CCLD) $(gcc_ld_run_path) -o $@ $(OBJS_gcin_message) -L./im-client -lgcin-im-client $(LDFLAGS)
		54
		55	pin-juyin: $(OBJS_pin_juyin)
		56	@@ -215,12 +215,12 @@
13	$(MAKE) -C data install	57	$(MAKE) -C data install
14	$(MAKE) -C im-client install	58	$(MAKE) -C im-client install
15	$(MAKE) -C gtk-im install	59	$(MAKE) -C gtk-im install
Lines 19-28 Link Here
19	if [ $(QT_IM) = 'Y' ]; then $(MAKE) -C qt-im install; fi	63	if [ $(QT_IM) = 'Y' ]; then $(MAKE) -C qt-im install; fi
20	if [ $(QT4_IM) = 'Y' ]; then $(MAKE) -C qt4-im install; fi	64	if [ $(QT4_IM) = 'Y' ]; then $(MAKE) -C qt4-im install; fi
21	- if [ $(prefix) = /usr/local ]; then \	65	- if [ $(prefix) = /usr/local ]; then \
		66	- install -m 644 gcin.png /usr/share/icons; \
22	+ if [ $(prefix) = /nonstaged ]; then \	67	+ if [ $(prefix) = /nonstaged ]; then \
23	install -m 644 gcin.png /usr/share/icons; \	68	+ install -m 644 gcin.png $(prefix)/share/icons; \
24	install -d $(DOC_DIR); \	69	install -d $(DOC_DIR); \
25	install -m 644 README.html Changelog.html $(DOC_DIR); \	70	install -m 644 README.html Changelog.html $(DOC_DIR); \
		71	install $(PROGS) $(bindir); \
26	@@ -234,6 +234,7 @@	72	@@ -234,6 +234,7 @@
27	rm -f $(bindir)/ts-contribute; ln -sf ts-edit $(bindir)/ts-contribute; \	73	rm -f $(bindir)/ts-contribute; ln -sf ts-edit $(bindir)/ts-contribute; \
28	fi	74	fi

Lines 1-29 Link Here

(-)gcin/files/patch-modules_Makefile (-29 lines)
1	--- modules/Makefile.orig 2012-09-05 15:46:26.000000000 +0800
2	+++ modules/Makefile 2012-09-05 15:49:16.000000000 +0800
3	@@ -3,15 +3,18 @@ include ../suffixes-rule
4
5	CFLAGS+=-I.. -I../IMdkit/include
6	GCIN_MODULE=intcode-module.so
7	+SOURCES=intcode.cpp win-int.cpp
8
9	ifeq ($(USE_ANTHY),Y)
10	GCIN_MODULE+=anthy-module.so
11	+SOURCES+=anthy.cpp
12	endif
13
14	ifeq ($(USE_CHEWING),Y)
15	GCIN_MODULE+=chewing-module.so
16	CHEWING_DATADIR=$(shell pkg-config --variable=datadir chewing)
17	CFLAGS += -DCHEWING_DATADIR=\"$(CHEWING_DATADIR)\"
18	+SOURCES+=chewing-conf.cpp chewing.cpp gcin-setup-chewing.cpp
19	endif
20
21	all: $(GCIN_MODULE)
22	@@ -35,6 +38,6 @@ install:
23	clean:
24	rm -f .pico .so *.o .depend
25	.depend:
26	- $(CCX) $(CFLAGS) -MM *.cpp > $@
27	+ $(CCX) $(CFLAGS) -MM $(SOURCES) > $@
28
29	include .depend

Line 0 Link Here

(-)gcin/files/patch-modules__Makefile (+29 lines)
	1	--- ./modules/Makefile.orig 2012-04-10 13:50:44.000000000 +0800
	2	+++ ./modules/Makefile 2014-03-28 20:45:33.000000000 +0800
	3	@@ -3,15 +3,18 @@
	4
	5	CFLAGS+=-I.. -I../IMdkit/include
	6	GCIN_MODULE=intcode-module.so
	7	+SOURCES=intcode.cpp win-int.cpp
	8
	9	ifeq ($(USE_ANTHY),Y)
	10	GCIN_MODULE+=anthy-module.so
	11	+SOURCES+=anthy.cpp
	12	endif
	13
	14	ifeq ($(USE_CHEWING),Y)
	15	GCIN_MODULE+=chewing-module.so
	16	CHEWING_DATADIR=$(shell pkg-config --variable=datadir chewing)
	17	CFLAGS += -DCHEWING_DATADIR=\"$(CHEWING_DATADIR)\"
	18	+SOURCES+=chewing-conf.cpp chewing.cpp gcin-setup-chewing.cpp
	19	endif
	20
	21	all: $(GCIN_MODULE)
	22	@@ -35,6 +38,6 @@
	23	clean:
	24	rm -f .pico .so *.o .depend
	25	.depend:
	26	- $(CCX) $(CFLAGS) -MM *.cpp > $@
	27	+ $(CCX) $(CFLAGS) -MM $(SOURCES) > $@
	28
	29	include .depend