- Update to 1.2.2 which is compatible with libchewing >= 0.3.2

- oxim-setup is now removed

4 files changed, 20 insertions, 34 deletions

diff --git a/chinese/oxim/files/patch-Makefile.in b/chinese/oxim/files/patch-Makefile.in
index cf909cf258f1..f24f222e9a52 100644
--- a/chinese/oxim/files/patch-Makefile.in
+++ b/chinese/oxim/files/patch-Makefile.in
@@ -1,11 +1,11 @@
---- Makefile.in.orig	2008-02-22 10:48:20.000000000 +0800
-+++ Makefile.in	2008-02-22 10:48:24.000000000 +0800
-@@ -677,8 +677,6 @@
+--- Makefile.in.orig	2009-03-25 08:36:20.000000000 +0800
++++ Makefile.in	2009-12-27 14:41:45.000000000 +0800
+@@ -707,8 +707,6 @@
  
  
  install-exec-local:
 -	$(mkinstalldirs) $(DESTDIR)/$(input_d_dir)
 -	sed 's|@OXIM_IM_MODULE_DIR@|$(IM_MODULES_DIR)|' oxim-start.sh.in > $(DESTDIR)/$(input_d_dir)/oxim
- @ENABLE_SETUP_TOOL_TRUE@	$(mkinstalldirs) $(DESTDIR)/$(datadir)/applications
- @ENABLE_SETUP_TOOL_TRUE@	$(INSTALL_DATA) oxim-setup.desktop $(DESTDIR)/$(datadir)/applications
- @ENABLE_SETUP_TOOL_TRUE@	$(mkinstalldirs) $(DESTDIR)/$(datadir)/pixmaps
+ 	$(mkinstalldirs) $(DESTDIR)/$(mandir)/man1/
+ 	$(INSTALL_DATA) oxim.1 $(DESTDIR)/$(mandir)/man1/oxim.1
+ @ENABLE_EEEPC_TRUE@	$(mkinstalldirs) $(DESTDIR)/$(xsession_d_dir)
diff --git a/chinese/oxim/files/patch-configure b/chinese/oxim/files/patch-configure
index 96ee881818dc..52bccf2b3b3e 100644
--- a/chinese/oxim/files/patch-configure
+++ b/chinese/oxim/files/patch-configure
@@ -1,15 +1,15 @@
---- ./configure.orig	Fri Sep 22 17:19:58 2006
-+++ ./configure	Mon Oct  9 09:38:36 2006
-@@ -29055,9 +29055,9 @@
+--- configure.orig	2009-03-25 08:36:16.000000000 +0800
++++ configure	2009-12-27 14:42:27.000000000 +0800
+@@ -30785,9 +30785,9 @@
  
-     echo "$as_me:$LINENO: checking for qmake" >&5
- echo $ECHO_N "checking for qmake... $ECHO_C" >&6
+     { $as_echo "$as_me:$LINENO: checking for qmake" >&5
+ $as_echo_n "checking for qmake... " >&6; }
 -    if test -f ${qt_dir}/bin/qmake ; then
--	echo "$as_me:$LINENO: result: ${qt_dir}/bin/qmake" >&5
--echo "${ECHO_T}${qt_dir}/bin/qmake" >&6
+-	{ $as_echo "$as_me:$LINENO: result: ${qt_dir}/bin/qmake" >&5
+-$as_echo "${qt_dir}/bin/qmake" >&6; }
 +    if test -f ${LOCALBASE}/bin/qmake ; then
-+	echo "$as_me:$LINENO: result: ${LOCALBASE}/bin/qmake" >&5
-+echo "${ECHO_T}${LOCALBASE}/bin/qmake" >&6
++	{ $as_echo "$as_me:$LINENO: result: ${LOCALBASE}/bin/qmake" >&5
++$as_echo "${LOCALBASE}/bin/qmake" >&6; }
  	have_qmake="yes"
      else
- 	echo "$as_me:$LINENO: result: not found!" >&5
+ 	{ $as_echo "$as_me:$LINENO: result: not found!" >&5
diff --git a/chinese/oxim/files/patch-gtk-immodule-gtkintl.h b/chinese/oxim/files/patch-gtk-immodule-gtkintl.h
index da511fe67491..96cc4bba2fde 100644
--- a/chinese/oxim/files/patch-gtk-immodule-gtkintl.h
+++ b/chinese/oxim/files/patch-gtk-immodule-gtkintl.h
@@ -1,11 +1,10 @@
---- src/gtk-immodule/gtkintl.h.orig	Thu Mar 23 08:43:55 2006
-+++ src/gtk-immodule/gtkintl.h	Thu Mar 23 08:46:33 2006
-@@ -1,7 +1,7 @@
+--- src/gtk-immodule/gtkintl.h.orig	2009-01-07 11:32:19.000000000 +0800
++++ src/gtk-immodule/gtkintl.h	2009-12-27 14:43:18.000000000 +0800
+@@ -1,6 +1,6 @@
  #ifndef __GTKINTL_H__
  #define __GTKINTL_H__
- #define ENABLE_NLS 1
 -#define GTK_LOCALEDIR "/usr/share/locale"
 +#define GTK_LOCALEDIR "%%PREFIX%%/share/locale"
  #define GETTEXT_PACKAGE "gtk20"
  
- #ifdef ENABLE_NLS
+ #include <langinfo.h>
diff --git a/chinese/oxim/files/patch-src__util__oxim-setup__Makefile.in b/chinese/oxim/files/patch-src__util__oxim-setup__Makefile.in
deleted file mode 100644
index a4613597a9e3..000000000000
--- a/chinese/oxim/files/patch-src__util__oxim-setup__Makefile.in
+++ /dev/null
@@ -1,13 +0,0 @@
---- ./src/util/oxim-setup/Makefile.in.orig	Fri Sep 22 17:20:09 2006
-+++ ./src/util/oxim-setup/Makefile.in	Mon Oct  9 09:39:52 2006
-@@ -474,8 +474,8 @@
- @ENABLE_SETUP_TOOL_TRUE@		    main.cpp 
- 
- @ENABLE_SETUP_TOOL_TRUE@oxim-setup: oxim-setup.pro
--@ENABLE_SETUP_TOOL_TRUE@	$(QTDIR)/bin/qmake oxim-setup.pro -o Makefile.qt
--@ENABLE_SETUP_TOOL_TRUE@	QTDIR=$(QTDIR) make -f Makefile.qt
-+@ENABLE_SETUP_TOOL_TRUE@	QMAKESPEC=$(QMAKESPEC) $(LOCALBASE)/bin/qmake oxim-setup.pro -o Makefile.qt
-+@ENABLE_SETUP_TOOL_TRUE@	QTDIR=$(QTDIR) $(MAKE) -f Makefile.qt
- # Tell versions [3.59,3.63) of GNU make to not export all variables.
- # Otherwise a system limit (for SysV at least) may be exceeded.
- .NOEXPORT: