Blob Blame History Raw
diff -urN gcin-1.5.0.orig/configure gcin-1.5.0/configure
--- gcin-1.5.0.orig/configure	2010-06-13 15:41:23.000000000 +0800
+++ gcin-1.5.0/configure	2010-06-23 10:04:38.000000000 +0800
@@ -46,8 +46,8 @@
 use_tsin='Y'
 use_gcb='Y'
 use_anthy='Y'
-use_qt3='N'
-use_qt4='Y'
+use_qt3='Y'
+use_qt4='N'
 use_gtk3='Y'
 
 if [ "$GCIN_USE_XIM" ]; then
@@ -148,7 +148,7 @@
 fi
 
 QT_IM='N'
-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'
diff -urN gcin-1.5.0.orig/qt-im/Makefile gcin-1.5.0/qt-im/Makefile
--- gcin-1.5.0.orig/qt-im/Makefile	2009-12-10 07:09:17.000000000 +0800
+++ gcin-1.5.0/qt-im/Makefile	2010-06-23 10:06:15.000000000 +0800
@@ -1,8 +1,8 @@
 include ../config.mak
-QT=qt3
+QT=qt-3.3
 QTIM=$(QT)/plugins/inputmethods
 IMMODULES=$(libdir)/$(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
@@ -12,7 +12,7 @@
 .cpp.E:
 	$(CXX) -E $(CFLAGS) $(INCS) $< > $@
 .h.o:
-	/usr/lib/$(QT)/bin/moc $< -o $<_moc.cpp
+	/usr/$(LIB)/$(QT)/bin/moc $< -o $<_moc.cpp
 	$(CXX) -c -pipe $(CXXFLAGS) $(INCS) $<_moc.cpp -o $@
 
 libqgcin.so: $(OBJS)