The package rpms/kinput2.git has added or updated architecture specific content in its
spec file (ExclusiveArch/ExcludeArch or %ifarch/%ifnarch) in commit(s):
https://src.fedoraproject.org/cgit/rpms/kinput2.git/commit/?id=d55e5039d7....
Change:
-%ifarch ppc
Thanks.
Full change:
============
commit d55e5039d72a321170534c3cb72a102b827f16d1
Author: Miro Hronok <miro(a)hroncok.cz>
Date: Mon Dec 24 12:20:57 2018 +0100
Orphaned for 6+ weeks
diff --git a/.gitignore b/.gitignore
deleted file mode 100644
index 3c37370..0000000
--- a/.gitignore
+++ /dev/null
@@ -1,4 +0,0 @@
-*bz2
-*gz
-*rpm
-kinput2-v3.1.tar.gz
diff --git a/Kinput2.ad.patch b/Kinput2.ad.patch
deleted file mode 100644
index 19a5124..0000000
--- a/Kinput2.ad.patch
+++ /dev/null
@@ -1,73 +0,0 @@
-diff -ruN kinput2-v3.1.orig/cmd/Kinput2.ad kinput2-v3.1/cmd/Kinput2.ad
---- kinput2-v3.1.orig/cmd/Kinput2.ad 2003-04-22 18:05:50.000000000 +0900
-+++ kinput2-v3.1/cmd/Kinput2.ad 2003-04-22 18:18:04.000000000 +0900
-@@ -32,15 +32,16 @@
- !!
- !! Wnn setup
- !!
--!*CcWnn.Jserver: "primary-jserver-host"
--!*CcWnn.jserver2nd: "secondary-jserver-host-if-any"
--*CcWnn.ccdef: ccdef.kinput2
-+*CcWnn.Jserver: unix
-+!*CcWnn.jserver2nd: localhost
-+*CcWnn.ccdef: ccdef.kinput2.egg
-+*CcWnn.wnnEnvrc: /etc/FreeWnn/ja/wnnenvrc
- !*CcWnn.wnnEnvrc4: "wnenvrc-file-for-Wnn4"
- !*CcWnn.wnnEnvrc6: "wnenvrc-file-for-Wnn6"
- !!
- !! Canna setup for version 2.x, 3.x
- !!
--!*Canna.Cannahost: "canna-host"
-+*Canna.Cannahost: localhost
- !*Canna.Cannafile: "canna-initialization-file"
- !!
- !! Sj3 setup
-@@ -92,16 +93,16 @@
- !!
- ! KinputProtocol
- *KinputProtocol.BackwardCompatible: true
--*KinputProtocol.XlcConversionStartKey: Shift<Key>space
-+!*KinputProtocol.XlcConversionStartKey: Shift<Key>space
- ! XimpProtocol
- *XimpProtocol.ForceDefaultServer: true
- ! X Input Method Protocol
--*IMProtocol.locales: ja_JP.SJIS, ja_JP.EUC, ja_JP, japanese, japan, ja
-+*IMProtocol.locales: ja_JP.SJIS, ja_JP.EUC, ja_JP.UTF-8, ja_JP, japanese, japan, ja,
en_US.UTF-8
- ! common to XimpProtocol and IMProtocol
- *defaultFontList: -misc-fixed-medium-r-normal--14-*-*-*-c-*
--*ConversionStartKeys: \
-- Shift<Key>space \n\
-- Ctrl<Key>Kanji
-+*ConversionStartKeys: Shift<Key>space
-+! Shift<Key>space \n\
-+! Ctrl<Key>Kanji
- !!
- !! sending back unused keypress events
- !!
-@@ -118,4 +119,25 @@
- ! the following resource. This phenomenon is caused by the incorrent
- ! focus management of your window manager, and this resource avoids
- ! it by making the window manager totally ignore the mode window.
--!*OverTheSpotConversion.UseOverrideShellForMode: True
-+*OverTheSpotConversion.UseOverrideShellForMode: True
-+!!
-+!! Don't give input focus to the windows of kinput2, they don't need input
focus
-+!! it just causes problems if they get input focus.
-+!!
-+!! For example, if you use kinput2 with Canna and open the 'auxShell' window
-+!! by pressing the 'insert' key a window pops up where special symbols
-+!! can be selected. If this window gets focus, the selected symbol will not
-+!! appear in the application until the application gets focus again. This is
-+!! quite confusing.
-+!! And there are even some applications where the selected symbol will never appear,
-+!! not even when the application gets focus again, Gvim currently behaves
-+!! like that and XIM in Gvim may even become completely unusable after one of
-+!! the kinput2 windows got focus, making it necessary to restart Gvim to be able
-+!! to use XIM again.
-+!!
-+!! I found no reason why one of kinput2's windows should need input focus.
-+!!
-+*SeparateConversion.input: false
-+*selectionShell.input: false
-+*auxShell.input: false
-+
diff --git a/Kinput2.conf.canna b/Kinput2.conf.canna
deleted file mode 100644
index 8941a9a..0000000
--- a/Kinput2.conf.canna
+++ /dev/null
@@ -1,140 +0,0 @@
-XCOMM
-XCOMM Kinput2 global configuration parameters
-XCOMM
-/*
- * Before editing following parameters, you should read
- * README file.
- */
-
-/**
- ** Conversion system configuration:
- ** Kinput2 supports 3 conversion systems, Wnn, Canna and Sj3.
- ** In order to install and use kinput2, you have to compile and
- ** install at least one of them. If you select more than one
- ** conversion system, you can choose one at run time with a
- ** command line option.
- **/
-
-/* #define UseWnn */ /* define if you are going to use Wnn (v4 or v6) */
-/* #define UseWnn6 */ /* define if you are going to use Wnn6 */
-#define UseCanna /* define if you are going to use Canna */
-/* #define UseSj3 */ /* define if you are going to use Sj3 */
-
-
-XCOMM Wnn configuration
-/*
- * If you define UseWnn, set following 3 variables:
- *
- * WNNINCDIR: Wnn include file directory
- * WNNLIB: Wnn client-side library
- * CCDEF_DIR: directory where character conversion rule
- * definition files are to be installed
- *
- * You have to define WnnLibDir if Wnn4 configuration files
- * are not installed in /usr/local/lib/wnn (which is the default).
- */
-/* #define WnnLibDir /some/peculiar/directory/wnn */
-
-/* for convenience.. */
-#if defined(UseWnn6) && !defined(UseWnn)
-#define UseWnn
-#endif
-
-CCDEF_DIR = $(LIBDIR)/ccdef
-
-/*
- * If you have installed Wnn..
- *
- * First check the directory where Wnn header files has been installed.
- * Note that if you installed Wnn4 configuration files in a directory
- * other than the default (/usr/local/lib/wnn), you have to define
- * WnnLibDir above.
- */
-XCOMM use installed header files
-XCOMM WNNINCDIR = /usr/X11R6/include/wnn
-XCOMM use installed library
-XCOMM WNNLIB = -lwnn
-
-/*
- * Or, use library in the source tree..
- */
-XCOMM use library in the source tree
-WNNSRC = $(CONTRIBSRC)/programs/Xsi/Wnn
-WNNINCDIR = $(WNNSRC)/include
-WNNLIB = $(WNNSRC)/jlib/libwnn.a
-
-
-XCOMM Canna configuration
-/*
- * If you define UseCanna, set following 2 variables:
- * CANNASRC: Canna source directory (or directory of installed headers)
- * CANNALIB: Canna user library
- * Note that kinput2 no longer supports Canna version 1.x,
- * which came with X11R5. Use the new version in R6 contrib.
- */
-
-/*
- * If you have already installed Canna header files and libraries..
- */
-XCOMM use installed headers/libraries
-CANNAINSTDIR = /usr
-CANNASRC = $(CANNAINSTDIR)/include
-CANNALIB = -lcanna16
-
-/*
- * If you have compiled Canna that came with X11R6 (contrib/programs/Canna),
- * but not installed yet..
- */
-XCOMM use headers/libraries in the source tree
-CANNASRC = $(CONTRIBSRC)/programs/Canna32
-CANNALIB = -L$(CANNASRC)/lib/canna16 -lcanna16
-
-
-XCOMM SJ3 configuration
-/*
- * If you define UseSj3, set following 3 variables:
- * SJ3SRC: Sj3 source directory
- * SJ3LIB: Sj3 user library
- * SJ3DEF_DIR: directory where conversion rule
- * definition files are to be installed
- */
-
-SJ3DEF_DIR = $(LIBDIR)/sj3def
-
-/*
- * If you have installed SJ3 library and header file,
- * or your machine is Sony NEWS, on which SJ3 is
- * already installed..
- * (in this case, you don't have to care about SJ3SRC)
- */
-XCOMM use installed header/library
-XCOMM specify the directory where libsj3.h resides as SJ3SRC.
-XCOMM SJ3SRC = /usr/local/include
-XCOMM SJ3LIB = -lsj3lib
-
-/*
- * Use compiled library in the source tree..
- */
-XCOMM use library in the source tree
-SJ3SRC = $(CONTRIBSRC)/programs/sj3
-SJ3LIB = $(SJ3SRC)/sj3lib/libsj3lib.a
-
-
-/**
- ** Transport configuration:
- ** Kinput2 X Input Method Protocol handler supports
- ** 3 transports, X, TCP and local (UNIX domain).
- ** If your system does not support any of these,
- ** add appropriate flag(s) to TRANSPORTDEFS.
- **
- ** -DNO_UNIX_TRANSPORT -- if UNIX domain transport is not available
- ** -DNO_TCP_TRANSPORT -- if TCP/IP transport is not available
- ** -DNO_X_TRANSPORT -- if X transport is not available (unlikely)
- **/
-XCOMM transport configuration
-
-TRANSPORTDEFS =
-
-XCOMM
-XCOMM End of global configuration parameters
-XCOMM
diff --git a/Kinput2.conf.canna-wnn4 b/Kinput2.conf.canna-wnn4
deleted file mode 100644
index f232a10..0000000
--- a/Kinput2.conf.canna-wnn4
+++ /dev/null
@@ -1,142 +0,0 @@
-XCOMM
-XCOMM Kinput2 global configuration parameters
-XCOMM
-/*
- * Before editing following parameters, you should read
- * README file.
- */
-
-/**
- ** Conversion system configuration:
- ** Kinput2 supports 3 conversion systems, Wnn, Canna and Sj3.
- ** In order to install and use kinput2, you have to compile and
- ** install at least one of them. If you select more than one
- ** conversion system, you can choose one at run time with a
- ** command line option.
- **/
-
-#define UseWnn /* define if you are going to use Wnn (v4 or v6) */
-/* #define UseWnn6 */ /* define if you are going to use Wnn6 */
-#define UseCanna /* define if you are going to use Canna */
-/* #define UseSj3 */ /* define if you are going to use Sj3 */
-
-
-XCOMM Wnn configuration
-/*
- * If you define UseWnn, set following 3 variables:
- *
- * WNNINCDIR: Wnn include file directory
- * WNNLIB: Wnn client-side library
- * CCDEF_DIR: directory where character conversion rule
- * definition files are to be installed
- *
- * You have to define WnnLibDir if Wnn4 configuration files
- * are not installed in /usr/local/lib/wnn (which is the default).
- */
-/* #define WnnLibDir /some/peculiar/directory/wnn */
-
-/* for convenience.. */
-#if defined(UseWnn6) && !defined(UseWnn)
-#define UseWnn
-#endif
-
-CCDEF_DIR = $(LIBDIR)/ccdef
-
-/*
- * If you have installed Wnn..
- *
- * First check the directory where Wnn header files has been installed.
- * Note that if you installed Wnn4 configuration files in a directory
- * other than the default (/usr/local/lib/wnn), you have to define
- * WnnLibDir above.
- */
-XCOMM use installed header files
-WNNINCDIR = /usr/include/wnn
-XCOMM use installed library
-WNNLIB = -lwnn
-
-/*
- * Or, use library in the source tree..
- */
-XCOMM use library in the source tree
-XCOMM WNNSRC = $(CONTRIBSRC)/programs/Xsi/Wnn
-XCOMM WNNINCDIR = $(WNNSRC)/include
-XCOMM WNNLIB = $(WNNSRC)/jlib/libwnn.a
-
-
-XCOMM Canna configuration
-/*
- * If you define UseCanna, set following 2 variables:
- * CANNASRC: Canna source directory (or directory of installed headers)
- * CANNALIB: Canna user library
- * Note that kinput2 no longer supports Canna version 1.x,
- * which came with X11R5. Use the new version in R6 contrib.
-X:
-X
- */
-
-/*
- * If you have already installed Canna header files and libraries..
- */
-XCOMM use installed headers/libraries
-CANNAINSTDIR = /usr
-CANNASRC = $(CANNAINSTDIR)/include
-CANNALIB = -lcanna16
-
-/*
- * If you have compiled Canna that came with X11R6 (contrib/programs/Canna),
- * but not installed yet..
- */
-XCOMM use headers/libraries in the source tree
-CANNASRC = $(CONTRIBSRC)/programs/Canna32
-CANNALIB = -L$(CANNASRC)/lib/canna16 -lcanna16
-
-
-XCOMM SJ3 configuration
-/*
- * If you define UseSj3, set following 3 variables:
- * SJ3SRC: Sj3 source directory
- * SJ3LIB: Sj3 user library
- * SJ3DEF_DIR: directory where conversion rule
- * definition files are to be installed
- */
-
-SJ3DEF_DIR = $(LIBDIR)/sj3def
-
-/*
- * If you have installed SJ3 library and header file,
- * or your machine is Sony NEWS, on which SJ3 is
- * already installed..
- * (in this case, you don't have to care about SJ3SRC)
- */
-XCOMM use installed header/library
-XCOMM specify the directory where libsj3.h resides as SJ3SRC.
-XCOMM SJ3SRC = /usr/local/include
-XCOMM SJ3LIB = -lsj3lib
-
-/*
- * Use compiled library in the source tree..
- */
-XCOMM use library in the source tree
-SJ3SRC = $(CONTRIBSRC)/programs/sj3
-SJ3LIB = $(SJ3SRC)/sj3lib/libsj3lib.a
-
-
-/**
- ** Transport configuration:
- ** Kinput2 X Input Method Protocol handler supports
- ** 3 transports, X, TCP and local (UNIX domain).
- ** If your system does not support any of these,
- ** add appropriate flag(s) to TRANSPORTDEFS.
- **
- ** -DNO_UNIX_TRANSPORT -- if UNIX domain transport is not available
- ** -DNO_TCP_TRANSPORT -- if TCP/IP transport is not available
- ** -DNO_X_TRANSPORT -- if X transport is not available (unlikely)
- **/
-XCOMM transport configuration
-
-TRANSPORTDEFS =
-
-XCOMM
-XCOMM End of global configuration parameters
-XCOMM
diff --git a/Kinput2.conf.canna-wnn6 b/Kinput2.conf.canna-wnn6
deleted file mode 100644
index a3f7565..0000000
--- a/Kinput2.conf.canna-wnn6
+++ /dev/null
@@ -1,140 +0,0 @@
-XCOMM
-XCOMM Kinput2 global configuration parameters
-XCOMM
-/*
- * Before editing following parameters, you should read
- * README file.
- */
-
-/**
- ** Conversion system configuration:
- ** Kinput2 supports 3 conversion systems, Wnn, Canna and Sj3.
- ** In order to install and use kinput2, you have to compile and
- ** install at least one of them. If you select more than one
- ** conversion system, you can choose one at run time with a
- ** command line option.
- **/
-
-/* #define UseWnn */ /* define if you are going to use Wnn (v4 or v6) */
-#define UseWnn6 /* define if you are going to use Wnn6 */
-#define UseCanna /* define if you are going to use Canna */
-/* #define UseSj3 */ /* define if you are going to use Sj3 */
-
-
-XCOMM Wnn configuration
-/*
- * If you define UseWnn, set following 3 variables:
- *
- * WNNINCDIR: Wnn include file directory
- * WNNLIB: Wnn client-side library
- * CCDEF_DIR: directory where character conversion rule
- * definition files are to be installed
- *
- * You have to define WnnLibDir if Wnn4 configuration files
- * are not installed in /usr/local/lib/wnn (which is the default).
- */
-/* #define WnnLibDir /some/peculiar/directory/wnn */
-
-/* for convenience.. */
-#if defined(UseWnn6) && !defined(UseWnn)
-#define UseWnn
-#endif
-
-CCDEF_DIR = $(LIBDIR)/ccdef
-
-/*
- * If you have installed Wnn..
- *
- * First check the directory where Wnn header files has been installed.
- * Note that if you installed Wnn4 configuration files in a directory
- * other than the default (/usr/local/lib/wnn), you have to define
- * WnnLibDir above.
- */
-XCOMM use installed header files
-WNNINCDIR = /usr/include/wnn6
-XCOMM use installed library
-WNNLIB = -lwnn6
-
-/*
- * Or, use library in the source tree..
- */
-XCOMM use library in the source tree
-XCOMM WNNSRC = $(CONTRIBSRC)/programs/Xsi/Wnn
-XCOMM WNNINCDIR = $(WNNSRC)/include
-XCOMM WNNLIB = $(WNNSRC)/jlib/libwnn.a
-
-
-XCOMM Canna configuration
-/*
- * If you define UseCanna, set following 2 variables:
- * CANNASRC: Canna source directory (or directory of installed headers)
- * CANNALIB: Canna user library
- * Note that kinput2 no longer supports Canna version 1.x,
- * which came with X11R5. Use the new version in R6 contrib.
- */
-
-/*
- * If you have already installed Canna header files and libraries..
- */
-XCOMM use installed headers/libraries
-CANNAINSTDIR = /usr
-CANNASRC = $(CANNAINSTDIR)/include
-CANNALIB = -lcanna16
-
-/*
- * If you have compiled Canna that came with X11R6 (contrib/programs/Canna),
- * but not installed yet..
- */
-XCOMM use headers/libraries in the source tree
-CANNASRC = $(CONTRIBSRC)/programs/Canna32
-CANNALIB = -L$(CANNASRC)/lib/canna16 -lcanna16
-
-
-XCOMM SJ3 configuration
-/*
- * If you define UseSj3, set following 3 variables:
- * SJ3SRC: Sj3 source directory
- * SJ3LIB: Sj3 user library
- * SJ3DEF_DIR: directory where conversion rule
- * definition files are to be installed
- */
-
-SJ3DEF_DIR = $(LIBDIR)/sj3def
-
-/*
- * If you have installed SJ3 library and header file,
- * or your machine is Sony NEWS, on which SJ3 is
- * already installed..
- * (in this case, you don't have to care about SJ3SRC)
- */
-XCOMM use installed header/library
-XCOMM specify the directory where libsj3.h resides as SJ3SRC.
-XCOMM SJ3SRC = /usr/local/include
-XCOMM SJ3LIB = -lsj3lib
-
-/*
- * Use compiled library in the source tree..
- */
-XCOMM use library in the source tree
-SJ3SRC = $(CONTRIBSRC)/programs/sj3
-SJ3LIB = $(SJ3SRC)/sj3lib/libsj3lib.a
-
-
-/**
- ** Transport configuration:
- ** Kinput2 X Input Method Protocol handler supports
- ** 3 transports, X, TCP and local (UNIX domain).
- ** If your system does not support any of these,
- ** add appropriate flag(s) to TRANSPORTDEFS.
- **
- ** -DNO_UNIX_TRANSPORT -- if UNIX domain transport is not available
- ** -DNO_TCP_TRANSPORT -- if TCP/IP transport is not available
- ** -DNO_X_TRANSPORT -- if X transport is not available (unlikely)
- **/
-XCOMM transport configuration
-
-TRANSPORTDEFS =
-
-XCOMM
-XCOMM End of global configuration parameters
-XCOMM
diff --git a/Kinput2.conf.wnn4 b/Kinput2.conf.wnn4
deleted file mode 100644
index 51923bd..0000000
--- a/Kinput2.conf.wnn4
+++ /dev/null
@@ -1,140 +0,0 @@
-XCOMM
-XCOMM Kinput2 global configuration parameters
-XCOMM
-/*
- * Before editing following parameters, you should read
- * README file.
- */
-
-/**
- ** Conversion system configuration:
- ** Kinput2 supports 3 conversion systems, Wnn, Canna and Sj3.
- ** In order to install and use kinput2, you have to compile and
- ** install at least one of them. If you select more than one
- ** conversion system, you can choose one at run time with a
- ** command line option.
- **/
-
-#define UseWnn /* define if you are going to use Wnn (v4 or v6) */
-/* #define UseWnn6 */ /* define if you are going to use Wnn6 */
-/* #define UseCanna */ /* define if you are going to use Canna */
-/* #define UseSj3 */ /* define if you are going to use Sj3 */
-
-
-XCOMM Wnn configuration
-/*
- * If you define UseWnn, set following 3 variables:
- *
- * WNNINCDIR: Wnn include file directory
- * WNNLIB: Wnn client-side library
- * CCDEF_DIR: directory where character conversion rule
- * definition files are to be installed
- *
- * You have to define WnnLibDir if Wnn4 configuration files
- * are not installed in /usr/local/lib/wnn (which is the default).
- */
-/* #define WnnLibDir /some/peculiar/directory/wnn */
-
-/* for convenience.. */
-#if defined(UseWnn6) && !defined(UseWnn)
-#define UseWnn
-#endif
-
-CCDEF_DIR = $(LIBDIR)/ccdef
-
-/*
- * If you have installed Wnn..
- *
- * First check the directory where Wnn header files has been installed.
- * Note that if you installed Wnn4 configuration files in a directory
- * other than the default (/usr/local/lib/wnn), you have to define
- * WnnLibDir above.
- */
-XCOMM use installed header files
-WNNINCDIR = /usr/include/wnn
-XCOMM use installed library
-WNNLIB = -lwnn
-
-/*
- * Or, use library in the source tree..
- */
-XCOMM use library in the source tree
-XCOMM WNNSRC = $(CONTRIBSRC)/programs/Xsi/Wnn
-XCOMM WNNINCDIR = $(WNNSRC)/include
-XCOMM WNNLIB = $(WNNSRC)/jlib/libwnn.a
-
-
-XCOMM Canna configuration
-/*
- * If you define UseCanna, set following 2 variables:
- * CANNASRC: Canna source directory (or directory of installed headers)
- * CANNALIB: Canna user library
- * Note that kinput2 no longer supports Canna version 1.x,
- * which came with X11R5. Use the new version in R6 contrib.
- */
-
-/*
- * If you have already installed Canna header files and libraries..
- */
-XCOMM use installed headers/libraries
-XCOMM CANNAINSTDIR = /usr/local/canna
-XCOMM CANNASRC = $(CANNAINSTDIR)/include
-XCOMM CANNALIB = -lcanna16
-
-/*
- * If you have compiled Canna that came with X11R6 (contrib/programs/Canna),
- * but not installed yet..
- */
-XCOMM use headers/libraries in the source tree
-CANNASRC = $(CONTRIBSRC)/programs/Canna32
-CANNALIB = -L$(CANNASRC)/lib/canna16 -lcanna16
-
-
-XCOMM SJ3 configuration
-/*
- * If you define UseSj3, set following 3 variables:
- * SJ3SRC: Sj3 source directory
- * SJ3LIB: Sj3 user library
- * SJ3DEF_DIR: directory where conversion rule
- * definition files are to be installed
- */
-
-SJ3DEF_DIR = $(LIBDIR)/sj3def
-
-/*
- * If you have installed SJ3 library and header file,
- * or your machine is Sony NEWS, on which SJ3 is
- * already installed..
- * (in this case, you don't have to care about SJ3SRC)
- */
-XCOMM use installed header/library
-XCOMM specify the directory where libsj3.h resides as SJ3SRC.
-XCOMM SJ3SRC = /usr/local/include
-XCOMM SJ3LIB = -lsj3lib
-
-/*
- * Use compiled library in the source tree..
- */
-XCOMM use library in the source tree
-SJ3SRC = $(CONTRIBSRC)/programs/sj3
-SJ3LIB = $(SJ3SRC)/sj3lib/libsj3lib.a
-
-
-/**
- ** Transport configuration:
- ** Kinput2 X Input Method Protocol handler supports
- ** 3 transports, X, TCP and local (UNIX domain).
- ** If your system does not support any of these,
- ** add appropriate flag(s) to TRANSPORTDEFS.
- **
- ** -DNO_UNIX_TRANSPORT -- if UNIX domain transport is not available
- ** -DNO_TCP_TRANSPORT -- if TCP/IP transport is not available
- ** -DNO_X_TRANSPORT -- if X transport is not available (unlikely)
- **/
-XCOMM transport configuration
-
-TRANSPORTDEFS =
-
-XCOMM
-XCOMM End of global configuration parameters
-XCOMM
diff --git a/Kinput2.conf.wnn6 b/Kinput2.conf.wnn6
deleted file mode 100644
index 7e7e824..0000000
--- a/Kinput2.conf.wnn6
+++ /dev/null
@@ -1,140 +0,0 @@
-XCOMM
-XCOMM Kinput2 global configuration parameters
-XCOMM
-/*
- * Before editing following parameters, you should read
- * README file.
- */
-
-/**
- ** Conversion system configuration:
- ** Kinput2 supports 3 conversion systems, Wnn, Canna and Sj3.
- ** In order to install and use kinput2, you have to compile and
- ** install at least one of them. If you select more than one
- ** conversion system, you can choose one at run time with a
- ** command line option.
- **/
-
-/* #define UseWnn */ /* define if you are going to use Wnn (v4 or v6) */
-#define UseWnn6 /* define if you are going to use Wnn6 */
-/* #define UseCanna */ /* define if you are going to use Canna */
-/* #define UseSj3 */ /* define if you are going to use Sj3 */
-
-
-XCOMM Wnn configuration
-/*
- * If you define UseWnn, set following 3 variables:
- *
- * WNNINCDIR: Wnn include file directory
- * WNNLIB: Wnn client-side library
- * CCDEF_DIR: directory where character conversion rule
- * definition files are to be installed
- *
- * You have to define WnnLibDir if Wnn4 configuration files
- * are not installed in /usr/local/lib/wnn (which is the default).
- */
-/* #define WnnLibDir /some/peculiar/directory/wnn */
-
-/* for convenience.. */
-#if defined(UseWnn6) && !defined(UseWnn)
-#define UseWnn
-#endif
-
-CCDEF_DIR = $(LIBDIR)/ccdef
-
-/*
- * If you have installed Wnn..
- *
- * First check the directory where Wnn header files has been installed.
- * Note that if you installed Wnn4 configuration files in a directory
- * other than the default (/usr/local/lib/wnn), you have to define
- * WnnLibDir above.
- */
-XCOMM use installed header files
-WNNINCDIR = /usr/include/wnn6
-XCOMM use installed library
-WNNLIB = -lwnn6
-
-/*
- * Or, use library in the source tree..
- */
-XCOMM use library in the source tree
-XCOMM WNNSRC = $(CONTRIBSRC)/programs/Xsi/Wnn
-XCOMM WNNINCDIR = $(WNNSRC)/include
-XCOMM WNNLIB = $(WNNSRC)/jlib/libwnn.a
-
-
-XCOMM Canna configuration
-/*
- * If you define UseCanna, set following 2 variables:
- * CANNASRC: Canna source directory (or directory of installed headers)
- * CANNALIB: Canna user library
- * Note that kinput2 no longer supports Canna version 1.x,
- * which came with X11R5. Use the new version in R6 contrib.
- */
-
-/*
- * If you have already installed Canna header files and libraries..
- */
-XCOMM use installed headers/libraries
-XCOMM CANNAINSTDIR = /usr/local/canna
-XCOMM CANNASRC = $(CANNAINSTDIR)/include
-XCOMM CANNALIB = -lcanna16
-
-/*
- * If you have compiled Canna that came with X11R6 (contrib/programs/Canna),
- * but not installed yet..
- */
-XCOMM use headers/libraries in the source tree
-CANNASRC = $(CONTRIBSRC)/programs/Canna32
-CANNALIB = -L$(CANNASRC)/lib/canna16 -lcanna16
-
-
-XCOMM SJ3 configuration
-/*
- * If you define UseSj3, set following 3 variables:
- * SJ3SRC: Sj3 source directory
- * SJ3LIB: Sj3 user library
- * SJ3DEF_DIR: directory where conversion rule
- * definition files are to be installed
- */
-
-SJ3DEF_DIR = $(LIBDIR)/sj3def
-
-/*
- * If you have installed SJ3 library and header file,
- * or your machine is Sony NEWS, on which SJ3 is
- * already installed..
- * (in this case, you don't have to care about SJ3SRC)
- */
-XCOMM use installed header/library
-XCOMM specify the directory where libsj3.h resides as SJ3SRC.
-XCOMM SJ3SRC = /usr/local/include
-XCOMM SJ3LIB = -lsj3lib
-
-/*
- * Use compiled library in the source tree..
- */
-XCOMM use library in the source tree
-SJ3SRC = $(CONTRIBSRC)/programs/sj3
-SJ3LIB = $(SJ3SRC)/sj3lib/libsj3lib.a
-
-
-/**
- ** Transport configuration:
- ** Kinput2 X Input Method Protocol handler supports
- ** 3 transports, X, TCP and local (UNIX domain).
- ** If your system does not support any of these,
- ** add appropriate flag(s) to TRANSPORTDEFS.
- **
- ** -DNO_UNIX_TRANSPORT -- if UNIX domain transport is not available
- ** -DNO_TCP_TRANSPORT -- if TCP/IP transport is not available
- ** -DNO_X_TRANSPORT -- if X transport is not available (unlikely)
- **/
-XCOMM transport configuration
-
-TRANSPORTDEFS =
-
-XCOMM
-XCOMM End of global configuration parameters
-XCOMM
diff --git a/dead.package b/dead.package
new file mode 100644
index 0000000..5204a84
--- /dev/null
+++ b/dead.package
@@ -0,0 +1 @@
+Orphaned for 6+ weeks
diff --git a/kinput2-v3.1-Xsji3clib-fix-typo.patch
b/kinput2-v3.1-Xsji3clib-fix-typo.patch
deleted file mode 100644
index 01aeb44..0000000
--- a/kinput2-v3.1-Xsji3clib-fix-typo.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -ruN kinput2-v3.1.orig/lib/Xsj3clib/table.c kinput2-v3.1/lib/Xsj3clib/table.c
---- kinput2-v3.1.orig/lib/Xsj3clib/table.c 2002-10-03 18:35:30.000000000 +0900
-+++ kinput2-v3.1/lib/Xsj3clib/table.c 2004-01-08 17:49:24.000000000 +0900
-@@ -170,7 +170,7 @@
- kana++;
- break;
- case '\\':
-- if (!kanji & !kana) {
-+ if ((!kanji) && (!kana)) {
- *dest++ = *src++;
- i++;
- break;
diff --git a/kinput2-v3.1-activate_im_with_kanji.patch
b/kinput2-v3.1-activate_im_with_kanji.patch
deleted file mode 100644
index 7221013..0000000
--- a/kinput2-v3.1-activate_im_with_kanji.patch
+++ /dev/null
@@ -1,16 +0,0 @@
-diff -ruN kinput2-v3.1.orig/cmd/Kinput2.ad kinput2-v3.1/cmd/Kinput2.ad
---- kinput2-v3.1.orig/cmd/Kinput2.ad 2004-02-17 11:23:46.000000000 +0900
-+++ kinput2-v3.1/cmd/Kinput2.ad 2004-02-17 11:25:06.325300228 +0900
-@@ -100,9 +100,9 @@
- *IMProtocol.locales: ja_JP.SJIS, ja_JP.EUC, ja_JP.UTF-8, ja_JP, japanese, japan, ja,
en_US.UTF-8
- ! common to XimpProtocol and IMProtocol
- *defaultFontList: -misc-fixed-medium-r-normal--14-*-*-*-c-*
--*ConversionStartKeys: Shift<Key>space
--! Shift<Key>space \n\
--! Ctrl<Key>Kanji
-+*ConversionStartKeys: \
-+ Shift<Key>space \n\
-+ <Key>Kanji
- !!
- !! sending back unused keypress events
- !!
diff --git a/kinput2-v3.1-fix-gcc-warning.patch b/kinput2-v3.1-fix-gcc-warning.patch
deleted file mode 100644
index 4720272..0000000
--- a/kinput2-v3.1-fix-gcc-warning.patch
+++ /dev/null
@@ -1,127 +0,0 @@
-diff -ruN kinput2-v3.1.orig/lib/Canna.c kinput2-v3.1/lib/Canna.c
---- kinput2-v3.1.orig/lib/Canna.c 2004-02-12 16:15:50.000000000 +0900
-+++ kinput2-v3.1/lib/Canna.c 2004-02-12 16:33:34.049631376 +0900
-@@ -98,14 +98,17 @@
- static int PreeditString();
- static int StatusString();
-
--static initializeCannaConnection();
--static toJapaneseMode();
-+static void initializeCannaConnection();
-+static void toJapaneseMode();
- static void convend();
--static changeTextForCanna();
--static copyInWchar();
--static fixProcForCanna();
--static shiftRight(), shiftLeft(), shiftLeftAll();
--static ibufInitialize(), freeIBuf();
-+static void changeTextForCanna();
-+static int copyInWchar();
-+static void fixProcForCanna();
-+static void shiftRight();
-+static void shiftLeft();
-+static void shiftLeftAll();
-+static void ibufInitialize();
-+static int freeIBuf();
-
- #ifdef KC_SETLISTCALLBACK
- #ifdef CANNA_LIST_Convert
-@@ -639,7 +642,7 @@
-
- static int nCannaContexts = 0;
-
--static
-+static void
- initializeCannaConnection(obj)
- CannaObject obj;
- {
-@@ -845,7 +848,7 @@
-
- */
-
--static
-+static void
- changeTextForCanna(cldata, ksp)
- caddr_t cldata;
- wcKanjiStatus *ksp;
-@@ -1063,7 +1066,7 @@
-
- */
-
--static
-+static void
- fixProcForCanna(cldata, fixedstr, fixedlen)
- caddr_t cldata;
- wchar *fixedstr;
-@@ -1091,7 +1094,7 @@
-
- */
-
--static
-+static void
- shiftRight(ib)
- iBuf *ib;
- {
-@@ -1120,7 +1123,7 @@
-
- */
-
--static
-+static void
- shiftLeft(ib)
- iBuf *ib;
- {
-@@ -1146,7 +1149,7 @@
-
- */
-
--static
-+static void
- shiftLeftAll(ib)
- iBuf *ib;
- {
-@@ -1174,7 +1177,7 @@
- ibufInitialize -- ibuf $B$N=i4|2==hM}(B
- */
-
--static
-+static void
- ibufInitialize(obj)
- CannaObject obj;
- {
-@@ -1205,7 +1208,7 @@
-
- */
-
--static
-+static int
- freeIBuf(ib)
- iBuf *ib;
- {
-@@ -1231,7 +1234,7 @@
- return 0;
- }
-
--static
-+static void
- toJapaneseMode(obj)
- CannaObject obj;
- {
-diff -ruN kinput2-v3.1.orig/lib/XimpProto.c kinput2-v3.1/lib/XimpProto.c
---- kinput2-v3.1.orig/lib/XimpProto.c 2004-02-12 16:15:50.000000000 +0900
-+++ kinput2-v3.1/lib/XimpProto.c 2004-02-12 16:33:16.879911095 +0900
-@@ -1692,10 +1692,10 @@
-
- /* data[0]-data[3]: Area.{x,y,width,height} */
- if (mask & XIMP_STS_AREA_MASK) {
-- data[0] = xsattr->areax = data[0];
-- data[1] = xsattr->areay = data[1];
-- data[2] = xsattr->areawidth = data[2];
-- data[3] = xsattr->areaheight = data[3];
-+ data[0] = xsattr->areax;
-+ data[1] = xsattr->areay;
-+ data[2] = xsattr->areawidth;
-+ data[3] = xsattr->areaheight;
- }
- /* data[4]: Foreground */
- if (mask & XIMP_STS_FG_MASK) {
diff --git a/kinput2-v3.1-ia64.patch b/kinput2-v3.1-ia64.patch
deleted file mode 100644
index c288610..0000000
--- a/kinput2-v3.1-ia64.patch
+++ /dev/null
@@ -1,299 +0,0 @@
-diff -ruN kinput2-v3.1.orig/lib/CandPanel.c kinput2-v3.1/lib/CandPanel.c
---- kinput2-v3.1.orig/lib/CandPanel.c 2003-10-16 18:12:59.000000000 +0900
-+++ kinput2-v3.1/lib/CandPanel.c 2003-10-16 18:08:58.000000000 +0900
-@@ -18,6 +18,7 @@
- * Author: Makoto Ishisone, Software Research Associates, Inc., Japan
- */
-
-+#include <inttypes.h>
- #include <X11/IntrinsicP.h>
- #include <X11/StringDefs.h>
- #include "CandPanelP.h"
-@@ -469,7 +470,7 @@
- CandidatePanelWidget cpw = (CandidatePanelWidget)w;
-
- XtCallCallbackList(w, cpw->cpanel.callback,
-- (XtPointer)cpw->cpanel.current);
-+ (XtPointer)(intptr_t)cpw->cpanel.current);
- }
-
- static int
-diff -ruN kinput2-v3.1.orig/lib/Canna.c kinput2-v3.1/lib/Canna.c
---- kinput2-v3.1.orig/lib/Canna.c 2003-10-16 18:12:59.000000000 +0900
-+++ kinput2-v3.1/lib/Canna.c 2003-10-16 18:08:59.000000000 +0900
-@@ -50,6 +50,8 @@
- static char *rcsid = "$Id: Canna.c,v 1.55 1999/05/25 08:13:03 ishisone Exp
$";
- #endif
-
-+#include <stdlib.h>
-+#include <inttypes.h>
- #include <X11/IntrinsicP.h>
- #include <X11/StringDefs.h>
- #include <X11/Xmu/Atoms.h>
-@@ -270,8 +272,8 @@
- displaybell = XtDisplayOfObject((Widget)obj);
-
- /* $B$+$J4A;zJQ49$9$k(B */
-- len = wcKanjiString((int)obj, (int)buf[0],
-- (wchar_t *)buf, 1024, &kanji_status);
-+ len = wcKanjiString((intptr_t)obj, buf[0],
-+ (wchar_t *)(intptr_t)buf, 1024, &kanji_status);
-
- displayPreEdit(obj, len, buf, &kanji_status);
- return (kanji_status.info & KanjiThroughInfo) ? 1 : 0;
-@@ -342,9 +344,9 @@
- if (ks->info & KanjiModeInfo) {
- wchar modeinfo[4];
-
-- wcKanjiControl((int)obj, KC_SETMODEINFOSTYLE, (char *)1);
-- wcKanjiControl((int)obj, KC_QUERYMODE, (char *)modeinfo);
-- wcKanjiControl((int)obj, KC_SETMODEINFOSTYLE, (char *)0);
-+ wcKanjiControl((int)obj, KC_SETMODEINFOSTYLE, (char *)(intptr_t)1);
-+ wcKanjiControl((int)obj, KC_QUERYMODE, (char *)(intptr_t)modeinfo);
-+ wcKanjiControl((int)obj, KC_SETMODEINFOSTYLE, (char *)(intptr_t)0);
- if (modeinfo[0] - '@' == CANNA_MODE_AlphaMode) {
- toJapaneseMode(obj);
- convend(obj);
-diff -ruN kinput2-v3.1.orig/lib/ConvCtrl.c kinput2-v3.1/lib/ConvCtrl.c
---- kinput2-v3.1.orig/lib/ConvCtrl.c 2003-10-16 18:13:00.000000000 +0900
-+++ kinput2-v3.1/lib/ConvCtrl.c 2003-10-16 18:08:59.000000000 +0900
-@@ -18,6 +18,8 @@
- * Author: Makoto Ishisone, Software Research Associates, Inc., Japan
- */
-
-+#include <stdio.h>
-+#include <stdlib.h>
- #include <X11/IntrinsicP.h>
- #include <X11/StringDefs.h>
- #include <X11/Xmu/CharSet.h>
-diff -ruN kinput2-v3.1.orig/lib/IMProto.c kinput2-v3.1/lib/IMProto.c
---- kinput2-v3.1.orig/lib/IMProto.c 2003-10-16 18:13:00.000000000 +0900
-+++ kinput2-v3.1/lib/IMProto.c 2003-10-16 18:08:59.000000000 +0900
-@@ -31,6 +31,8 @@
-
- #define DEBUG_VAR debug_IMProtocol
-
-+#include <stdio.h>
-+#include <stdlib.h>
- #include <ctype.h>
- #include <X11/Xos.h>
- #include <sys/stat.h>
-diff -ruN kinput2-v3.1.orig/lib/KIProto.c kinput2-v3.1/lib/KIProto.c
---- kinput2-v3.1.orig/lib/KIProto.c 2003-10-16 18:13:01.000000000 +0900
-+++ kinput2-v3.1/lib/KIProto.c 2003-10-16 18:09:00.000000000 +0900
-@@ -18,6 +18,9 @@
- * Author: Makoto Ishisone, Software Research Associates, Inc., Japan
- */
-
-+#include <stdio.h>
-+#include <stdlib.h>
-+#include <inttypes.h>
- #include <X11/IntrinsicP.h>
- #include <X11/StringDefs.h>
- #include <X11/Xatom.h>
-@@ -1584,7 +1587,7 @@
- XtPointer call_data;
- {
- ConvClient *ccp = (ConvClient *)client_data;
-- int abort = (int)call_data;
-+ intptr_t abort = (intptr_t)call_data;
-
- TRACE(("endCallback(reqwin=0x%lx,abort=%s)\n", ccp->reqwin,
abort?"True":"False"));
- endProc(ccp, abort);
-diff -ruN kinput2-v3.1.orig/lib/OffConv.c kinput2-v3.1/lib/OffConv.c
---- kinput2-v3.1.orig/lib/OffConv.c 2003-10-16 18:13:01.000000000 +0900
-+++ kinput2-v3.1/lib/OffConv.c 2003-10-16 18:09:02.000000000 +0900
-@@ -23,6 +23,7 @@
- * and its subclass SeparateConversionWidget.
- */
-
-+#include <inttypes.h>
- #include <X11/IntrinsicP.h>
- #include <X11/StringDefs.h>
- #if XtSpecificationRelease > 4
-@@ -1399,7 +1400,7 @@
- XtPointer call_data;
- {
- OffTheSpotConversionWidget ocw = (OffTheSpotConversionWidget)client_data;
-- int current = (int)call_data;
-+ intptr_t current = (intptr_t)call_data;
-
- TRACE(("OffTheSpotConversion:SelectionSelected()\n"));
- XtPopdown(ocw->offthespot.selectionshell);
-diff -ruN kinput2-v3.1.orig/lib/OnConv.c kinput2-v3.1/lib/OnConv.c
---- kinput2-v3.1.orig/lib/OnConv.c 2003-10-16 18:13:01.000000000 +0900
-+++ kinput2-v3.1/lib/OnConv.c 2003-10-16 18:09:03.000000000 +0900
-@@ -21,6 +21,7 @@
- */
-
-
-+#include <inttypes.h>
- #include <X11/IntrinsicP.h>
- #include <X11/StringDefs.h>
- #include <X11/Xmu/Atoms.h>
-@@ -1051,7 +1052,7 @@
- XtPointer call_data;
- {
- OnTheSpotConversionWidget ocw = (OnTheSpotConversionWidget)client_data;
-- int current = (int)call_data;
-+ intptr_t current = (intptr_t)call_data;
-
- TRACE(("OnTheSpotConversion:SelectionSelected()\n"));
- XtPopdown(ocw->onthespot.selectionshell);
-@@ -1379,7 +1380,7 @@
- TRACE(("OnTheSpot:CBPreeditCaret()\n"));
-
- XtCallCallbackList((Widget)ocw, ocw->onthespot.preeditcaretcallback,
-- (XtPointer)caret);
-+ (XtPointer)(intptr_t)caret);
- }
-
- /*- CBStatusStart: callback status start -*/
-diff -ruN kinput2-v3.1.orig/lib/OverConv.c kinput2-v3.1/lib/OverConv.c
---- kinput2-v3.1.orig/lib/OverConv.c 2003-10-16 18:13:02.000000000 +0900
-+++ kinput2-v3.1/lib/OverConv.c 2003-10-16 18:09:03.000000000 +0900
-@@ -18,6 +18,7 @@
- * Author: Makoto Ishisone, Software Research Associates, Inc., Japan
- */
-
-+#include <inttypes.h>
- #include <X11/IntrinsicP.h>
- #include <X11/StringDefs.h>
- #include <X11/Xmu/CharSet.h>
-@@ -1654,7 +1655,7 @@
- XtPointer call_data;
- {
- OverTheSpotConversionWidget ocw = (OverTheSpotConversionWidget)client_data;
-- int current = (int)call_data;
-+ intptr_t current = (intptr_t)call_data;
-
- TRACE(("OverTheSpotConversion:SelectionSelected()\n"));
- XtPopdown(ocw->overthespot.selectionshell);
-diff -ruN kinput2-v3.1.orig/lib/XimpProto.c kinput2-v3.1/lib/XimpProto.c
---- kinput2-v3.1.orig/lib/XimpProto.c 2003-10-16 18:13:02.000000000 +0900
-+++ kinput2-v3.1/lib/XimpProto.c 2003-10-16 18:09:01.000000000 +0900
-@@ -18,6 +18,9 @@
- * Author: Makoto Ishisone, Software Research Associates, Inc., Japan
- */
-
-+#include <stdio.h>
-+#include <stdlib.h>
-+#include <inttypes.h>
- #include <X11/Xos.h>
- #include <X11/IntrinsicP.h>
-
-@@ -1940,7 +1943,7 @@
- XtPointer call_data;
- {
- ConvClient *ccp = (ConvClient *)client_data;
-- int abort = (int)call_data;
-+ intptr_t abort = (intptr_t)call_data;
-
- TRACE(("endCallback(reqwin=0x%lx,abort=%s)\n", ccp->reqwin,
abort?"True":"False"));
- endProc(ccp, abort);
-@@ -2714,7 +2717,7 @@
- XtPointer call_data;
- {
- ConvClient *ccp = (ConvClient *)client_data;
-- int caret = (int)call_data;
-+ intptr_t caret = (intptr_t)call_data;
- TRACE(("preeditCaretCallback(reqwin=0x%lx,
caret=%d)\n",ccp->reqwin,caret));
- preeditCaret(ccp, caret);
- }
-diff -ruN kinput2-v3.1.orig/lib/cconv.c kinput2-v3.1/lib/cconv.c
---- kinput2-v3.1.orig/lib/cconv.c 2002-10-03 18:35:28.000000000 +0900
-+++ kinput2-v3.1/lib/cconv.c 2003-10-16 18:11:08.000000000 +0900
-@@ -604,6 +604,7 @@
- #endif
-
- #include <stdio.h>
-+#include <stdlib.h>
- #include <X11/Xlib.h>
- #include <X11/keysym.h>
- #include <X11/Xutil.h>
-diff -ruN kinput2-v3.1.orig/lib/ctext.c kinput2-v3.1/lib/ctext.c
---- kinput2-v3.1.orig/lib/ctext.c 2003-10-16 18:13:02.000000000 +0900
-+++ kinput2-v3.1/lib/ctext.c 2003-10-16 18:09:01.000000000 +0900
-@@ -71,6 +71,8 @@
- static char *rcsid = "$Id: ctext.c,v 2.6 1999/03/10 08:55:15 ishisone Exp $";
- #endif
-
-+#include <string.h>
-+
- typedef unsigned short wchar;
-
- #define NULL 0
-@@ -248,7 +250,7 @@
- int
- convCTtoJWS(xstr, len, wstr)
- register unsigned char *xstr;
--int len;
-+size_t len;
- wchar *wstr;
- /* COMPOUND_TEXT xstr $B$r(B Wide Character string wstr $B$KJQ49$7!"(B
- * $BJQ498e$NJ8;z?t$rJV$9(B($B:G8e$N(B null $BJ8;z$O4^$^$J$$(B)$B!#$b$7(B wstr
$B$,(B
-diff -ruN kinput2-v3.1.orig/lib/imlib/imconv.c kinput2-v3.1/lib/imlib/imconv.c
---- kinput2-v3.1.orig/lib/imlib/imconv.c 2003-10-16 18:13:03.000000000 +0900
-+++ kinput2-v3.1/lib/imlib/imconv.c 2003-10-16 18:09:02.000000000 +0900
-@@ -20,6 +20,8 @@
-
- #define COMMIT_SYNC
- #define STATUS_SYNC
-+#include <stdio.h>
-+#include <inttypes.h>
- #include "im.h"
- #include "ConvMgr.h"
- #include "OverConv.h"
-@@ -401,7 +403,7 @@
- XtPointer call_data;
- {
- IMIC *icp = (IMIC *)client_data;
-- int caret = (int)call_data;
-+ intptr_t caret = (intptr_t)call_data;
-
- TRACE(("preeditCaretCallback(icp=0x%lx, caret=%d)\n", icp, caret));
-
-diff -ruN kinput2-v3.1.orig/lib/imlib/imrequest.c kinput2-v3.1/lib/imlib/imrequest.c
---- kinput2-v3.1.orig/lib/imlib/imrequest.c 2003-10-16 18:13:03.000000000 +0900
-+++ kinput2-v3.1/lib/imlib/imrequest.c 2003-10-16 18:09:01.000000000 +0900
-@@ -22,6 +22,7 @@
- #define NEED_EVENTS
- #include <X11/Xproto.h>
-
-+#include <stdio.h>
- #include "im.h"
- #include "imreq.h"
-
-diff -ruN kinput2-v3.1.orig/lib/imlib/imxport.c kinput2-v3.1/lib/imlib/imxport.c
---- kinput2-v3.1.orig/lib/imlib/imxport.c 2003-10-16 18:13:03.000000000 +0900
-+++ kinput2-v3.1/lib/imlib/imxport.c 2003-10-16 18:09:02.000000000 +0900
-@@ -18,6 +18,7 @@
- * Author: Makoto Ishisone, Software Research Associates, Inc., Japan
- */
-
-+#include <stdio.h>
- #include "im.h"
-
- #include "MyDispatch.h"
-diff -ruN kinput2-v3.1.orig/lib/ioecall.c kinput2-v3.1/lib/ioecall.c
---- kinput2-v3.1.orig/lib/ioecall.c 2003-10-16 18:13:03.000000000 +0900
-+++ kinput2-v3.1/lib/ioecall.c 2003-10-16 18:09:02.000000000 +0900
-@@ -23,6 +23,7 @@
- */
-
- #include <stdio.h>
-+#include <stdlib.h>
- #include <X11/Xlib.h>
- #include <X11/Xfuncproto.h>
- #include "IOECall.h"
-diff -ruN kinput2-v3.1.orig/lib/wnnlib.c kinput2-v3.1/lib/wnnlib.c
---- kinput2-v3.1.orig/lib/wnnlib.c 2003-10-16 18:08:58.000000000 +0900
-+++ kinput2-v3.1/lib/wnnlib.c 2003-10-16 18:11:32.000000000 +0900
-@@ -578,6 +578,7 @@
- #ifdef DEBUG_WNNLIB
- #include <stdio.h>
- #endif
-+#include <stdlib.h>
- #include "wnnlib.h"
- #include "WStr.h"
- #include <string.h>
diff --git a/kinput2-v3.1-jp106_xfer.patch b/kinput2-v3.1-jp106_xfer.patch
deleted file mode 100644
index 93e9c65..0000000
--- a/kinput2-v3.1-jp106_xfer.patch
+++ /dev/null
@@ -1,44 +0,0 @@
-diff -ruN kinput2-v3.1.orig/lib/Canna.c kinput2-v3.1/lib/Canna.c
---- kinput2-v3.1.orig/lib/Canna.c 2004-02-17 19:09:22.000000000 +0900
-+++ kinput2-v3.1/lib/Canna.c 2004-02-17 19:13:45.541953814 +0900
-@@ -1320,6 +1320,15 @@
- *buffer_return = CANNA_KEY_Nfer;
- functionalChar = 1;
- break;
-+ case XK_Henkan_Mode:
-+ if (event_struct->state & 4 /* control-shifted */)
-+ *buffer_return = CANNA_KEY_Cntrl_Xfer;
-+ else if (event_struct->state & 1 /* shifted */)
-+ *buffer_return = CANNA_KEY_Shift_Xfer;
-+ else
-+ *buffer_return = CANNA_KEY_Xfer;
-+ functionalChar = 1;
-+ break;
- case XK_Kanji:
- if (event_struct->state & 4 /* control-shifted */)
- *buffer_return = CANNA_KEY_Cntrl_Xfer;
-@@ -1610,7 +1619,7 @@
- {(unsigned char)'\024', XK_Scroll_Lock, 0},
- {(unsigned char)'\e', XK_Escape, 0},
- {(unsigned char)CANNA_KEY_Nfer, XK_Muhenkan, 0},
-- {(unsigned char)CANNA_KEY_Xfer, XK_Kanji, 0},
-+ {(unsigned char)CANNA_KEY_Xfer, XK_Henkan_Mode, 0},
- {(unsigned char)CANNA_KEY_Up, XK_Up, 0},
- {(unsigned char)CANNA_KEY_Left, XK_Left, 0},
- {(unsigned char)CANNA_KEY_Right, XK_Right, 0},
-@@ -1622,13 +1631,13 @@
- {(unsigned char)CANNA_KEY_Help, XK_Help, 0},
- {(unsigned char)CANNA_KEY_KP_Key, XK_KP_Space, 0}, /* ? */
- {(unsigned char)CANNA_KEY_Shift_Nfer, XK_Muhenkan, ShiftMask},
-- {(unsigned char)CANNA_KEY_Shift_Xfer, XK_Kanji, ShiftMask},
-+ {(unsigned char)CANNA_KEY_Shift_Xfer, XK_Henkan_Mode, ShiftMask},
- {(unsigned char)CANNA_KEY_Shift_Up, XK_Up, ShiftMask},
- {(unsigned char)CANNA_KEY_Shift_Left, XK_Left, ShiftMask},
- {(unsigned char)CANNA_KEY_Shift_Right, XK_Right, ShiftMask},
- {(unsigned char)CANNA_KEY_Shift_Down, XK_Down, ShiftMask},
- {(unsigned char)CANNA_KEY_Cntrl_Nfer, XK_Muhenkan, ControlMask},
-- {(unsigned char)CANNA_KEY_Cntrl_Xfer, XK_Kanji, ControlMask},
-+ {(unsigned char)CANNA_KEY_Cntrl_Xfer, XK_Henkan_Mode, ControlMask},
- {(unsigned char)CANNA_KEY_Cntrl_Up, XK_Up, ControlMask},
- {(unsigned char)CANNA_KEY_Cntrl_Left, XK_Left, ControlMask},
- {(unsigned char)CANNA_KEY_Cntrl_Right, XK_Right, ControlMask},
diff --git a/kinput2-v3.1-linespace.patch b/kinput2-v3.1-linespace.patch
deleted file mode 100644
index f16abcd..0000000
--- a/kinput2-v3.1-linespace.patch
+++ /dev/null
@@ -1,29 +0,0 @@
-diff -pruN kinput2-v3.1.orig/lib/imlib/imattr.c kinput2-v3.1/lib/imlib/imattr.c
---- kinput2-v3.1.orig/lib/imlib/imattr.c 2008-09-02 14:44:15.000000000 +0900
-+++ kinput2-v3.1/lib/imlib/imattr.c 2008-09-02 15:33:53.000000000 +0900
-@@ -179,7 +179,7 @@ static ICAttribute icAttributes[] = {
- setBgPixmap, getBgPixmap },
- { XNFontSet, TYPE_XFONTSET, OP_C|OP_S|OP_G,
- setFontSet, getFontSet },
-- { XNLineSpace, TYPE_CARD16, OP_C|OP_S|OP_G, /* should be TYPE_INT16 */
-+ { XNLineSpace, TYPE_CARD32, OP_C|OP_S|OP_G, /* should be TYPE_INT32 */
- setLineSpace, getLineSpace },
- { XNCursor, TYPE_CARD32, OP_C|OP_S|OP_G,
- setCursor, getCursor },
-@@ -832,14 +832,14 @@ int op;
-
- TRACE(("imlib:setLineSpace()\n"));
-
-- CHECK_ICATTR_SIZE(2, IMBadSomething);
-+ CHECK_ICATTR_SIZE(4, IMBadSomething);
-
- if ((ap = getPSPtr(icp, nest)) == NULL) {
- unnestedError(icp);
- return -1;
- }
-
-- line_space = getI16(value, order); /* ??? linespacing is 'int' */
-+ line_space = getC32(value, order); /* ??? linespacing is 'int' */
- TRACE(("\tline space: %d\n", line_space));
-
- if (!(ap->set_mask & ATTR_MASK_LINESPACE) ||
diff --git a/kinput2-v3.1-status-update-204892.patch
b/kinput2-v3.1-status-update-204892.patch
deleted file mode 100644
index 1da4312..0000000
--- a/kinput2-v3.1-status-update-204892.patch
+++ /dev/null
@@ -1,115 +0,0 @@
-diff -ur kinput2-v3.1.orig/lib/imlib/imattr.c kinput2-v3.1/lib/imlib/imattr.c
---- kinput2-v3.1.orig/lib/imlib/imattr.c 2006-07-13 18:26:54.000000000 +0900
-+++ kinput2-v3.1/lib/imlib/imattr.c 2006-07-13 18:28:12.000000000 +0900
-@@ -1851,7 +1851,7 @@
- if (mask & ATTR_MASK_PREEDIT_STATE) {
- /* unless the client specified, we should start with disabled state. */
- ap->set_mask |= ATTR_MASK_PREEDIT_STATE;
-- ap->reset_state = XIMPreeditDisable;
-+ ap->preedit_state = XIMPreeditDisable;
- }
- if (mask & ATTR_MASK_RESET_STATE) {
- /* the default reset state must be the initial state. */
-diff -ur kinput2-v3.1.orig/lib/imlib/imconv.c kinput2-v3.1/lib/imlib/imconv.c
---- kinput2-v3.1.orig/lib/imlib/imconv.c 2006-07-13 18:26:54.000000000 +0900
-+++ kinput2-v3.1/lib/imlib/imconv.c 2006-07-13 18:28:12.000000000 +0900
-@@ -911,11 +911,20 @@
- ICClearConversion(input_obj);
- TRACE(("\twas converting. %d bytes left\n", num_bytes));
-
-+#if 0
-+ /*
-+ * IMStopConversion() seems to not work correctly while
-+ * resetting IC. So this block was moved to ximResetICProc().
-+ * If calling IMResetIC() is required in other functions,
-+ * the following block is also used in it.
-+ */
- if (icp->common_attr.reset_state == XIMInitialState) {
- /* Force to end the conversion. */
- TRACE(("\tback to the initial state\n"));
- IMStopConversion(icp);
- }
-+#endif
-+
- }
- return num_bytes;
- }
-@@ -967,6 +976,42 @@
-
- /* ARGSUSED */
- void
-+IMStatusDraw(icp)
-+IMIC *icp;
-+{
-+ Widget input_obj;
-+ OCCPreeditDrawArg arg;
-+
-+ TRACE(("IMStatusDraw(ic%d)\n", icp->id));
-+ if (!(icp->common_attr.input_style & XIMStatusCallbacks))
-+ return;
-+
-+
-+ arg.caret = 0; /* ignored */
-+ arg.chg_first = 0; /* ignored */
-+ arg.chg_length = 0; /* ignored */
-+ arg.encoding = IMCtextAtom(icp->im->connection->proto_widget);
-+ arg.format = 0; /* set by ICGetStatusString */
-+ arg.text_length = 0; /* set by ICGetStatusString */
-+ arg.text = NULL; /* set by ICGetStatusString */
-+ arg.attrs_length = 0; /* ignored */
-+ arg.attrs = NULL; /* ignored */
-+
-+ if (icp->conversion) {
-+ XtVaGetValues(icp->conversion, XtNinputObject, &input_obj, NULL);
-+ if (ICGetStatusString(input_obj, &arg.encoding, &arg.format,
-+ &arg.text_length, &arg.text,
-+ &arg.attrs_length) == -1)
-+ return;
-+ }
-+
-+ statusDraw(icp, &arg);
-+
-+ XtFree((char *)arg.text);
-+}
-+
-+/* ARGSUSED */
-+void
- IMStatusDone(icp)
- IMIC *icp;
- {
-diff -ur kinput2-v3.1.orig/lib/imlib/imfuncs.h kinput2-v3.1/lib/imlib/imfuncs.h
---- kinput2-v3.1.orig/lib/imlib/imfuncs.h 2006-07-13 18:26:54.000000000 +0900
-+++ kinput2-v3.1/lib/imlib/imfuncs.h 2006-07-13 18:28:12.000000000 +0900
-@@ -102,6 +102,7 @@
- extern void IMSetFocus _Pt_((IMIC *icp));
- extern void IMUnsetFocus _Pt_((IMIC *icp));
- extern void IMStatusStart _Pt_((IMIC *icp));
-+extern void IMStatusDraw _Pt_((IMIC *icp));
- extern void IMStatusDone _Pt_((IMIC *icp));
- extern void IMStartForwarding _Pt_((IMIC *icp));
- extern void IMStopForwarding _Pt_((IMIC *icp));
-diff -ur kinput2-v3.1.orig/lib/imlib/imrequest.c kinput2-v3.1/lib/imlib/imrequest.c
---- kinput2-v3.1.orig/lib/imlib/imrequest.c 2006-07-13 18:26:54.000000000 +0900
-+++ kinput2-v3.1/lib/imlib/imrequest.c 2006-07-13 18:28:16.000000000 +0900
-@@ -1352,8 +1352,20 @@
- IMPutC16(conn, (unsigned int)text_length);
- if (text_length > 0) IMPutString(conn, text, text_length);
- IMFinishRequest(conn, offset);
-+ /*
-+ * Send RESET_IC_REPLY
-+ */
-+ IMFlush(conn);
- if (text != NULL) XtFree(text);
- icp->state &= ~IC_RESETTING;
-+
-+ IMStatusDraw(icp);
-+ /* moved from IMResetIC() */
-+ if (icp->common_attr.reset_state == XIMInitialState) {
-+ /* Force to end the conversion. */
-+ TRACE(("\tback to the initial state\n"));
-+ IMStopConversion(icp);
-+ }
- }
-
- /*- ximExtMoveProc: handle XIM_EXT_MOVE request -*/
-Only in kinput2-v3.1/lib/imlib: imrequest.c.orig
diff --git a/kinput2-v3.1-wm_delete_window.patch b/kinput2-v3.1-wm_delete_window.patch
deleted file mode 100644
index 54adb45..0000000
--- a/kinput2-v3.1-wm_delete_window.patch
+++ /dev/null
@@ -1,63 +0,0 @@
-diff -ruN kinput2-v3.1.orig/lib/OffConv.c kinput2-v3.1.new/lib/OffConv.c
---- kinput2-v3.1.orig/lib/OffConv.c 2003-10-01 20:13:10.000000000 +0900
-+++ kinput2-v3.1.new/lib/OffConv.c 2003-10-23 15:09:50.000000000 +0900
-@@ -1071,7 +1071,7 @@
- int kind;
- {
- Cardinal ncand;
-- Atom wm_state, atom;
-+ Atom wm_state, atom, protocols[1];
- unsigned long data[2];
- Display *dpy;
-
-@@ -1102,6 +1102,8 @@
- atom = CachedInternAtom (dpy, "_NET_WM_STATE_ABOVE", True);
- data[0] = atom;
- XChangeProperty (dpy, XtWindow (ocw->offthespot.selectionshell), wm_state,
XA_ATOM, 32, PropModeAppend, data, 1);
-+ protocols[0] = CachedInternAtom (dpy, "WM_DELETE_WINDOW", True);
-+ XSetWMProtocols (dpy, XtWindow (ocw->offthespot.selectionshell), protocols, 1);
- }
-
- static void
-diff -ruN kinput2-v3.1.orig/lib/OnConv.c kinput2-v3.1.new/lib/OnConv.c
---- kinput2-v3.1.orig/lib/OnConv.c 2003-10-01 20:13:10.000000000 +0900
-+++ kinput2-v3.1.new/lib/OnConv.c 2003-10-23 15:10:56.000000000 +0900
-@@ -763,7 +763,7 @@
- int kind;
- {
- Cardinal ncand;
-- Atom wm_state, atom;
-+ Atom wm_state, atom, protocols[1];
- unsigned long data[2];
- Display *dpy;
-
-@@ -792,6 +792,8 @@
- atom = CachedInternAtom (dpy, "_NET_WM_STATE_ABOVE", True);
- data[0] = atom;
- XChangeProperty (dpy, XtWindow (ocw->onthespot.selectionshell), wm_state,
XA_ATOM, 32, PropModeAppend, data, 1);
-+ protocols[0] = CachedInternAtom (dpy, "WM_DELETE_WINDOW", True);
-+ XSetWMProtocols (dpy, XtWindow (ocw->onthespot.selectionshell), protocols, 1);
- }
-
- /*- LocateSelectionPopup: put selection popup at an appropriate position -*/
-diff -ruN kinput2-v3.1.orig/lib/OverConv.c kinput2-v3.1.new/lib/OverConv.c
---- kinput2-v3.1.orig/lib/OverConv.c 2003-10-01 20:13:10.000000000 +0900
-+++ kinput2-v3.1.new/lib/OverConv.c 2003-10-23 15:12:14.000000000 +0900
-@@ -1280,7 +1280,7 @@
- int kind;
- {
- Cardinal ncand;
-- Atom wm_state, atom;
-+ Atom wm_state, atom, protocols[1];
- unsigned long data[2];
- Display *dpy;
-
-@@ -1309,6 +1309,8 @@
- atom = CachedInternAtom (dpy, "_NET_WM_STATE_ABOVE", True);
- data[0] = atom;
- XChangeProperty (dpy, XtWindow (ocw->overthespot.selectionshell), wm_state,
XA_ATOM, 32, PropModeAppend, data, 1);
-+ protocols[0] = CachedInternAtom (dpy, "WM_DELETE_WINDOW", True);
-+ XSetWMProtocols (dpy, XtWindow (ocw->overthespot.selectionshell), protocols, 1);
- }
-
- /*- locateSelectionPopup: put selection popup at an appropriate position -*/
diff --git a/kinput2-v3.1-wm_state_above.patch b/kinput2-v3.1-wm_state_above.patch
deleted file mode 100644
index 202d39a..0000000
--- a/kinput2-v3.1-wm_state_above.patch
+++ /dev/null
@@ -1,108 +0,0 @@
-diff -ruN kinput2-v3.1.orig/lib/OffConv.c kinput2-v3.1/lib/OffConv.c
---- kinput2-v3.1.orig/lib/OffConv.c 2003-02-24 16:30:17.000000000 +0900
-+++ kinput2-v3.1/lib/OffConv.c 2003-02-24 19:40:27.000000000 +0900
-@@ -29,6 +29,7 @@
- #if XtSpecificationRelease > 4
- #include <X11/Xfuncs.h>
- #endif
-+#include <X11/Xatom.h>
- #include "CachedAtom.h"
- #include "AsyncErr.h"
- #include "OffConvP.h"
-@@ -1070,6 +1071,9 @@
- int kind;
- {
- Cardinal ncand;
-+ Atom wm_state, atom;
-+ unsigned long data[2];
-+ Display *dpy;
-
- TRACE(("OffTheSpotConversion:SelectionStart()\n"));
- if (ocw->offthespot.selectionpoppedup) {
-@@ -1090,6 +1094,14 @@
-
- XtPopup(ocw->offthespot.selectionshell, XtGrabNone);
- ocw->offthespot.selectionpoppedup = True;
-+ /* force to be set _NET_WM_STATE_ABOVE, because the candidate window
-+ * always should be shown above anything window.
-+ */
-+ dpy = XtDisplay ((Widget) ocw);
-+ wm_state = CachedInternAtom (dpy, "_NET_WM_STATE", True);
-+ atom = CachedInternAtom (dpy, "_NET_WM_STATE_ABOVE", True);
-+ data[0] = atom;
-+ XChangeProperty (dpy, XtWindow (ocw->offthespot.selectionshell), wm_state,
XA_ATOM, 32, PropModeAppend, data, 1);
- }
-
- static void
-diff -ruN kinput2-v3.1.orig/lib/OnConv.c kinput2-v3.1/lib/OnConv.c
---- kinput2-v3.1.orig/lib/OnConv.c 2003-02-24 16:30:17.000000000 +0900
-+++ kinput2-v3.1/lib/OnConv.c 2003-02-24 19:40:04.000000000 +0900
-@@ -28,6 +28,7 @@
- #if XtSpecificationRelease > 4
- #include <X11/Xfuncs.h>
- #endif
-+#include <X11/Xatom.h>
- #include "CachedAtom.h"
- #include "AsyncErr.h"
- #include "OnConvP.h"
-@@ -762,6 +763,9 @@
- int kind;
- {
- Cardinal ncand;
-+ Atom wm_state, atom;
-+ unsigned long data[2];
-+ Display *dpy;
-
- TRACE(("OnTheSpotConversion:SelectionStart()\n"));
- if (ocw->onthespot.selectionpoppedup) {
-@@ -780,6 +784,14 @@
- LocateSelectionPopup(ocw);
- XtPopup(ocw->onthespot.selectionshell, XtGrabNone);
- ocw->onthespot.selectionpoppedup = True;
-+ /* force to be set _NET_WM_STATE_ABOVE, because the candidate window
-+ * always should be shown above anything window.
-+ */
-+ dpy = XtDisplay ((Widget) ocw);
-+ wm_state = CachedInternAtom (dpy, "_NET_WM_STATE", True);
-+ atom = CachedInternAtom (dpy, "_NET_WM_STATE_ABOVE", True);
-+ data[0] = atom;
-+ XChangeProperty (dpy, XtWindow (ocw->onthespot.selectionshell), wm_state,
XA_ATOM, 32, PropModeAppend, data, 1);
- }
-
- /*- LocateSelectionPopup: put selection popup at an appropriate position -*/
-diff -ruN kinput2-v3.1.orig/lib/OverConv.c kinput2-v3.1/lib/OverConv.c
---- kinput2-v3.1.orig/lib/OverConv.c 2003-02-24 16:30:17.000000000 +0900
-+++ kinput2-v3.1/lib/OverConv.c 2003-02-24 19:40:50.000000000 +0900
-@@ -25,6 +25,7 @@
- #if XtSpecificationRelease > 4
- #include <X11/Xfuncs.h>
- #endif
-+#include <X11/Xatom.h>
- #include "CachedAtom.h"
- #include "AsyncErr.h"
- #include "OverConvP.h"
-@@ -1279,6 +1280,9 @@
- int kind;
- {
- Cardinal ncand;
-+ Atom wm_state, atom;
-+ unsigned long data[2];
-+ Display *dpy;
-
- TRACE(("OverTheSpotConversion:SelectionStart()\n"));
- if (ocw->overthespot.selectionpoppedup) {
-@@ -1297,6 +1301,14 @@
- locateSelectionPopup(ocw);
- XtPopup(ocw->overthespot.selectionshell, XtGrabNone);
- ocw->overthespot.selectionpoppedup = True;
-+ /* force to be set _NET_WM_STATE_ABOVE, because the candidate window
-+ * always should be shown above anything window.
-+ */
-+ dpy = XtDisplay ((Widget) ocw);
-+ wm_state = CachedInternAtom (dpy, "_NET_WM_STATE", True);
-+ atom = CachedInternAtom (dpy, "_NET_WM_STATE_ABOVE", True);
-+ data[0] = atom;
-+ XChangeProperty (dpy, XtWindow (ocw->overthespot.selectionshell), wm_state,
XA_ATOM, 32, PropModeAppend, data, 1);
- }
-
- /*- locateSelectionPopup: put selection popup at an appropriate position -*/
diff --git a/kinput2-v3.libdir.patch b/kinput2-v3.libdir.patch
deleted file mode 100644
index 494f5a4..0000000
--- a/kinput2-v3.libdir.patch
+++ /dev/null
@@ -1,11 +0,0 @@
----
kinput2-v3/lib/wnnlib.c.org Thu May 27 08:55:26 1999
-+++ kinput2-v3/lib/wnnlib.c Mon Jun 28 11:57:28 1999
-@@ -579,7 +579,7 @@
- #include <X11/Xos.h>
-
- #ifndef LIBDIR
--#define LIBDIR "/usr/local/lib/wnn"
-+#define LIBDIR "/var/lib/wnn"
- #endif
-
- #ifndef NULL
diff --git a/kinput2.ppc.patch b/kinput2.ppc.patch
deleted file mode 100644
index 0fd232b..0000000
--- a/kinput2.ppc.patch
+++ /dev/null
@@ -1,11 +0,0 @@
----
kinput2-v2-fix5-alpha5/cmd/kinput2.c.org Wed Jan 13 17:57:14 1999
-+++ kinput2-v2-fix5-alpha5/cmd/kinput2.c Mon Jan 25 16:40:04 1999
-@@ -608,3 +608,8 @@
- return n;
- }
- #endif
-+
-+#if defined(linux) && defined(PPC)
-+/* avoid nusty gcc bug */
-+void _XtInherit() {}
-+#endif
diff --git a/kinput2.spec b/kinput2.spec
deleted file mode 100644
index dd1c2d8..0000000
--- a/kinput2.spec
+++ /dev/null
@@ -1,563 +0,0 @@
-# Since only kinput2 package is made, no more advantage to have multiple kinput2-*
binary.
-# you can choose from the bolow options which binary goes to the package.
-# build_with_wnn4 ... only support wnn4
-# build_with_wnn6 ... only support wnn4 and/or wnn6
-# build_with_canna ... only support canna
-# build_with_canna_wnn4 ... support canna and wnn4
-# build_with_canna_wnn6 ... support canna and wnn4 and/or wnn6
-# if you switch on the multiple option, the symlink to kinput2 will be made in order of
this list.
-# I mean build_canna_wnn6 is prior than build_wnn4.
-%global build_with_wnn4 0
-%global build_with_wnn6 0
-%global build_with_canna 1
-%global build_with_canna_wnn4 0
-%global build_with_canna_wnn6 0
-
-%global inst_alternatives_canna alternatives --install
%{_sysconfdir}/X11/xinit/xinput.d/ja_JP xinput-ja_JP
%{_sysconfdir}/X11/xinit/xinput.d/%{name}-canna 40
-%global inst_alternatives_wnn alternatives --install
%{_sysconfdir}/X11/xinit/xinput.d/ja_JP xinput-ja_JP
%{_sysconfdir}/X11/xinit/xinput.d/%{name}-wnn 30
-%global uninst_alternatives_canna alternatives --remove xinput-ja_JP
%{_sysconfdir}/X11/xinit/xinput.d/%{name}-canna
-%global uninst_alternatives_wnn alternatives --remove xinput-ja_JP
%{_sysconfdir}/X11/xinit/xinput.d/%{name}-wnn
-
-%global is_canna_used %([ '%{build_with_canna}' -eq '1' -o
'%{build_with_canna_wnn4}' -eq '1' -o '%{build_with_canna_wnn6}'
-eq '1' ] && echo 1 || echo 0)
-%global is_wnn4_used %([ '%{build_with_wnn4}' -eq '1' -o
'%{build_with_canna_wnn4}' -eq '1' ] && echo 1 || echo 0)
-%global is_wnn6_used %([ '%{build_with_wnn6}' -eq '1' -o
'%{build_with_canna_wnn6}' -eq '1' ] && echo 1 || echo 0)
-%global is_wnn_used %([ '%{is_wnn4_used}' -eq '1' -o
'%{is_wnn6_used}' -eq '1' ] && echo 1 || echo 0)
-
-Name: kinput2
-Version: v3.1
-Release: 60%{?dist}
-License: MIT
-BuildRequires: libICE-devel libSM-devel libX11-devel libXaw-devel libXext-devel
libXmu-devel libXpm-devel libXt-devel libXp-devel
-BuildRequires: imake >= 1.0.1-3
-BuildRequires: gcc
-%if %{is_canna_used}
-BuildRequires: Canna-devel >= 3.7p1-6
-%endif
-%if %{is_wnn4_used}
-BuildRequires: FreeWnn-devel
-%endif
-%if %{is_wnn6_used}
-BuildRequires: Wnn6-SDK-devel
-%endif
-
-Source0: ftp://ftp.sra.co.jp/pub/x11/kinput2/%{name}-%{version}.tar.gz
-Source1: Kinput2.conf.canna
-Source2: Kinput2.conf.wnn4
-Source3: Kinput2.conf.canna-wnn4
-Source4: Kinput2.conf.wnn6
-Source5: Kinput2.conf.canna-wnn6
-Source6: xinput.d-kinput2-canna
-Source7: xinput.d-kinput2-wnn
-Patch0: Kinput2.ad.patch
-Patch1: kinput2.ppc.patch
-Patch2: %{name}-v3.libdir.patch
-# ia64 patch (but not complete)
-Patch3: kinput2-v3.1-ia64.patch
-Patch4: kinput2-v3.1-wm_state_above.patch
-Patch5: kinput2-v3.1-wm_delete_window.patch
-Patch6: kinput2-v3.1-Xsji3clib-fix-typo.patch
-Patch7: kinput2-v3.1-fix-gcc-warning.patch
-Patch8: kinput2-v3.1-activate_im_with_kanji.patch
-Patch9: kinput2-v3.1-jp106_xfer.patch
-Patch10: kinput2-v3.1-status-update-204892.patch
-Patch11: kinput2-v3.1-linespace.patch
-
-Summary: kinput2 - kanji input server for X11
-Group: User Interface/X
-Requires(post): %{_sbindir}/alternatives
-Requires(preun): %{_sbindir}/alternatives
-Requires: im-chooser >= 0.4.1-2.fc8
-%if %{is_canna_used}
-Requires: Canna
-%endif
-
-%description
-Kinput2 is an input server for X11 applications that want Japanese text input.
-
-%prep
-%setup -q
-cp -a ${RPM_SOURCE_DIR}/Kinput2.conf.* .
-%patch0 -p1
-%ifarch ppc
-%patch1 -p1
-%endif
-%patch2 -p1
-%patch3 -p1 -b .ia64
-%patch4 -p1
-%patch5 -p1
-%patch6 -p1
-%patch7 -p1
-%patch8 -p1
-%patch9 -p1
-%patch10 -p1
-%patch11 -p1
-
-head -21 cmd/kinput2.c >Copyright
-
-%build
-
-fixoptflags() {
- find . -name Makefile \
- | xargs sed -i -e 's/^\(\s*CDEBUGFLAGS\s*=.*\)/\1 $(RPM_OPT_FLAGS)/'
-}
-
-%if %{build_with_wnn4}
-ln -sf Kinput2.conf.wnn4 Kinput2.conf
-xmkmf -a
-fixoptflags
-make %{?_smp_mflags}
-mv cmd/kinput2 kinput2.wnn4
-make clean
-%endif
-
-%if %{build_with_wnn6}
-ln -sf Kinput2.conf.wnn6 Kinput2.conf
-xmkmf -a
-fixoptflags
-make %{?_smp_mflags}
-mv cmd/kinput2 kinput2.wnn6
-make clean
-%endif
-
-%if %{build_with_canna}
-rm -f Kinput2.conf
-ln -sf Kinput2.conf.canna Kinput2.conf
-xmkmf -a
-fixoptflags
-make %{?_smp_mflags}
-mv cmd/kinput2 kinput2.canna
-make clean
-%endif
-
-%if %{build_with_canna_wnn4}
-ln -sf Kinput2.conf.canna-wnn4 Kinput2.conf
-xmkmf -a
-fixoptflags
-make %{?_smp_mflags}
-mv cmd/kinput2 kinput2.canna-wnn4
-make clean
-%endif
-
-%if %{build_with_canna_wnn6}
-ln -sf Kinput2.conf.canna-wnn6 Kinput2.conf
-xmkmf -a
-fixoptflags
-make %{?_smp_mflags}
-mv cmd/kinput2 kinput2.canna-wnn6
-%endif
-
-%install
-rm -rf $RPM_BUILD_ROOT
-mkdir -p $RPM_BUILD_ROOT%{_bindir}
-
-%if %{build_with_wnn4}
-install -p -m 0755 kinput2.wnn4 $RPM_BUILD_ROOT%{_bindir}
-%endif
-%if %{build_with_wnn6}
-install -p -m 0755 kinput2.wnn6 $RPM_BUILD_ROOT%{_bindir}
-%endif
-%if %{build_with_canna}
-install -p -m 0755 kinput2.canna $RPM_BUILD_ROOT%{_bindir}
-%endif
-%if %{build_with_canna_wnn4}
-install -p -m 0755 kinput2.canna-wnn4 $RPM_BUILD_ROOT%{_bindir}
-%endif
-%if %{build_with_canna_wnn6}
-install -p -m 0755 kinput2.canna-wnn6 $RPM_BUILD_ROOT%{_bindir}
-%endif
-
-mkdir -p $RPM_BUILD_ROOT%{_datadir}/X11/app-defaults
-install -p -m 0444 cmd/Kinput2.ad $RPM_BUILD_ROOT%{_datadir}/X11/app-defaults/Kinput2
-
-%if %{is_wnn_used}
-mkdir -p $RPM_BUILD_ROOT/usr/lib/X11/ccdef
-install -p -m 0444 ccdef/ccdef.* $RPM_BUILD_ROOT/usr/lib/X11/ccdef
-install -p -m 0444 ccdef/rule.* $RPM_BUILD_ROOT/usr/lib/X11/ccdef
-%endif
-
-make install.man DESTDIR=$RPM_BUILD_ROOT
-
-%if %{is_canna_used}
-install -D -m 0644 -p %{SOURCE6}
$RPM_BUILD_ROOT%{_sysconfdir}/X11/xinit/xinput.d/%{name}-canna
-%endif
-%if %{is_wnn_used}
-install -D -m 0644 -p %{SOURCE7}
$RPM_BUILD_ROOT%{_sysconfdir}/X11/xinit/xinput.d/%{name}-wnn
-%endif
-
-%post
-%if %([ '%{build_with_wnn4}' -eq '1' -a '%{build_with_wnn6}' -eq
'0' -a '%{build_with_canna}' -eq '0' -a
'%{build_with_canna_wnn4}' -eq '0' -a '%{build_with_canna_wnn6}'
-eq '0' ] && echo 1 || echo 0)
-ln -sf kinput2.wnn4 %{_bindir}/kinput2
-%endif
-%if %([ '%{build_with_wnn6}' -eq '1' -a '%{build_with_canna}' -eq
'0' -a '%{build_with_canna_wnn4}' -eq '0' -a
'%{build_with_canna_wnn6}' -eq '0' ] && echo 1 || echo 0)
-ln -sf kinput2.wnn6 %{_bindir}/kinput2
-%endif
-%if %([ '%{build_with_canna}' -eq '1' -a
'%{build_with_canna_wnn4}' -eq '0' -a '%{build_with_canna_wnn6}'
-eq '0' ] && echo 1 || echo 0)
-ln -sf kinput2.canna %{_bindir}/kinput2
-%endif
-%if %([ '%{build_with_canna_wnn4}' -eq '1' -a
'%{build_with_canna_wnn6}' -eq '0' ] && echo 1 || echo 0)
-ln -sf kinput2.canna-wnn4 %{_bindir}/kinput2
-%endif
-%if %{build_with_canna_wnn6}
-ln -sf kinput2.canna-wnn6 %{_bindir}/kinput2
-%endif
-%if %{is_canna_used}
-%{inst_alternatives_canna}
-%endif
-%if %{is_wnn_used}
-%{inst_alternatives_wnn}
-%endif
-
-%preun
-if [ "$1" = 0 ]; then
- rm -rf %{_bindir}/kinput2
-%if %{is_canna_used}
- %{uninst_alternatives_canna}
-%endif
-%if %{is_wnn_used}
- %{uninst_alternatives_wnn}
-%endif
-fi
-
-%triggerpostun -- kinput2-canna-wnn6
-%if %([ '%{build_with_wnn4}' -eq '1' -a '%{build_with_wnn6}' -eq
'0' -a '%{build_with_canna}' -eq '0' -a
'%{build_with_canna_wnn4}' -eq '0' -a '%{build_with_canna_wnn6}'
-eq '0' ] && echo 1 || echo 0)
-ln -sf kinput2.wnn4 %{_bindir}/kinput2
-%endif
-%if %([ '%{build_with_wnn6}' -eq '1' -a '%{build_with_canna}' -eq
'0' -a '%{build_with_canna_wnn4}' -eq '0' -a
'%{build_with_canna_wnn6}' -eq '0' ] && echo 1 || echo 0)
-ln -sf kinput2.wnn6 %{_bindir}/kinput2
-%endif
-%if %([ '%{build_with_canna}' -eq '1' -a
'%{build_with_canna_wnn4}' -eq '0' -a '%{build_with_canna_wnn6}'
-eq '0' ] && echo 1 || echo 0)
-ln -sf kinput2.canna %{_bindir}/kinput2
-%endif
-%if %([ '%{build_with_canna_wnn4}' -eq '1' -a
'%{build_with_canna_wnn6}' -eq '0' ] && echo 1 || echo 0)
-ln -sf kinput2.canna-wnn4 %{_bindir}/kinput2
-%endif
-%if %{build_with_canna_wnn6}
-ln -sf kinput2.canna-wnn6 %{_bindir}/kinput2
-%endif
-%if %{is_canna_used}
-%{inst_alternatives_canna}
-%endif
-%if %{is_wnn_used}
-%{inst_alternatives_wnn}
-%endif
-
-%files
-%doc NEWS README doc
-%license Copyright
-%config %{_datadir}/X11/app-defaults/Kinput2
-%if %{is_wnn_used}
-/usr/lib/X11/ccdef
-%endif
-%{_bindir}/kinput2*
-%{_mandir}/man1/kinput2.1x*
-%{_sysconfdir}/X11/xinit/xinput.d
-
-%changelog
-* Fri Jul 13 2018 Fedora Release Engineering <releng(a)fedoraproject.org> - v3.1-60
-- Rebuilt for
https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild
-
-* Wed Mar 07 2018 Adam Williamson <awilliam(a)redhat.com> - v3.1-59
-- Rebuild to fix GCC 8 mis-compilation
- See
https://da.gd/YJVwk ("GCC 8 ABI change on x86_64")
-
-* Mon Feb 19 2018 Akira TAGOH <tagoh(a)redhat.com> - v3.1-58
-- Add BR: gcc
-
-* Fri Feb 09 2018 Igor Gnatenko <ignatenkobrain(a)fedoraproject.org> - v3.1-57
-- Escape macros in %%changelog
-
-* Wed Feb 07 2018 Fedora Release Engineering <releng(a)fedoraproject.org> - v3.1-56
-- Rebuilt for
https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild
-
-* Thu Aug 03 2017 Fedora Release Engineering <releng(a)fedoraproject.org> - v3.1-55
-- Rebuilt for
https://fedoraproject.org/wiki/Fedora_27_Binutils_Mass_Rebuild
-
-* Wed Jul 26 2017 Fedora Release Engineering <releng(a)fedoraproject.org> - v3.1-54
-- Rebuilt for
https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild
-
-* Fri Feb 10 2017 Fedora Release Engineering <releng(a)fedoraproject.org> - v3.1-53
-- Rebuilt for
https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild
-
-* Mon Sep 5 2016 Akira TAGOH <tagoh(a)redhat.com> - v3.1-52
-- Drop Obsoletes line because it is too old.
-
-* Thu Feb 04 2016 Fedora Release Engineering <releng(a)fedoraproject.org> - v3.1-51
-- Rebuilt for
https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild
-
-* Mon Jan 4 2016 Akira TAGOH <tagoh(a)redhat.com>
-- Use %%global instead of %%define.
-
-* Wed Jun 17 2015 Fedora Release Engineering <rel-eng(a)lists.fedoraproject.org> -
v3.1-50
-- Rebuilt for
https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild
-
-* Sun Aug 17 2014 Fedora Release Engineering <rel-eng(a)lists.fedoraproject.org> -
v3.1-49
-- Rebuilt for
https://fedoraproject.org/wiki/Fedora_21_22_Mass_Rebuild
-
-* Sun Jun 08 2014 Fedora Release Engineering <rel-eng(a)lists.fedoraproject.org> -
v3.1-48
-- Rebuilt for
https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild
-
-* Sat Aug 03 2013 Fedora Release Engineering <rel-eng(a)lists.fedoraproject.org> -
v3.1-47
-- Rebuilt for
https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild
-
-* Thu Feb 14 2013 Fedora Release Engineering <rel-eng(a)lists.fedoraproject.org> -
v3.1-46
-- Rebuilt for
https://fedoraproject.org/wiki/Fedora_19_Mass_Rebuild
-
-* Thu Jul 19 2012 Fedora Release Engineering <rel-eng(a)lists.fedoraproject.org> -
v3.1-45
-- Rebuilt for
https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild
-
-* Fri Jan 13 2012 Fedora Release Engineering <rel-eng(a)lists.fedoraproject.org> -
v3.1-44
-- Rebuilt for
https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild
-
-* Fri Jun 24 2011 Akira TAGOH <tagoh(a)redhat.com> - v3.1-43
-- Drop Requires(triggerpostun). (#716065)
-
-* Mon Feb 07 2011 Fedora Release Engineering <rel-eng(a)lists.fedoraproject.org>
-- Rebuilt for
https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild
-
-* Fri Jul 24 2009 Fedora Release Engineering <rel-eng(a)lists.fedoraproject.org> -
v3.1-41
-- Rebuilt for
https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
-
-* Wed Feb 25 2009 Fedora Release Engineering <rel-eng(a)lists.fedoraproject.org> -
v3.1-40
-- Rebuilt for
https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
-
-* Tue Sep 2 2008 Akira TAGOH <tagoh(a)redhat.com> - v3.1-39
-- Fix a value type of lineSpace attribute. (#458650)
-
-* Tue Feb 19 2008 Akira TAGOH <tagoh(a)redhat.com> - v3.1-38
-- Fix xinput script to get it working on latest im-chooser.
-
-* Tue Feb 12 2008 Akira TAGOH <tagoh(a)redhat.com> - v3.1-37
-- Rebuild for gcc-4.3.
-
-* Fri Sep 28 2007 Akira TAGOH <tagoh(a)redhat.com> - v3.1-36
-- Add Requires: Canna to get it working just installing the package.
-- clean up a bit the spec file.
-
-* Thu Sep 20 2007 Akira TAGOH <tagoh(a)redhat.com> - v3.1-35
-- Add the versioned dependency for im-chooser.
-
-* Wed Sep 5 2007 Akira TAGOH <tagoh(a)redhat.com> - v3.1-34
-- Add QT_IM_MODULE=xim to the xinput script.
-
-* Thu Aug 23 2007 Akira TAGOH <tagoh(a)redhat.com> - v3.1-33
-- Rebuild
-
-* Thu Aug 9 2007 Akira TAGOH <tagoh(a)redhat.com> - v3.1-32
-- Update License tag.
-
-* Tue Feb 13 2007 Akira TAGOH <tagoh(a)redhat.com> - v3.1-31
-- Build with RPM_OPT_FLAGS. (#227752)
-
-* Fri Jan 26 2007 Akira TAGOH <tagoh(a)redhat.com> - v3.1-30
-- Backport a patch to update the status with XmbResetIC() properly.
-- Disable Wnn support so that no *Wnn* devel package available anymore.
-
-* Mon Sep 11 2006 Akira TAGOH <tagoh(a)redhat.com> - v3.1-29
-- rebuilt
-
-* Wed Jul 12 2006 Akira TAGOH <tagoh(a)redhat.com> - v3.1-28
-- add Requires: im-chooser to support new xinput.sh.
-
-* Tue Mar 7 2006 Akira TAGOH <tagoh(a)redhat.com> - v3.1-27
-- moved out from /usr/X11R6. (#170934)
-
-* Tue Jul 12 2005 Akira TAGOH <tagoh(a)redhat.com> - v3.1-26
-- use proper xinput script for kinput2-wnn.
-
-* Thu Jun 30 2005 Akira TAGOH <tagoh(a)redhat.com> - v3.1-25
-- Import into Extras.
-
-* Tue Feb 8 2005 Akira TAGOH <tagoh(a)redhat.com> - v3.1-24
-- kinput2-redraw.patch: applied to commit the strings after pressing
- Right button say. (#146204)
-
-* Fri Oct 8 2004 Akira TAGOH <tagoh(a)redhat.com> - v3.1-23
-- added BuildRequires xorg-x11-devel (#134950)
-
-* Fri Jul 02 2004 Akira TAGOH <tagoh(a)redhat.com> v3.1-22
-- doh. add %%triggerpostun to recreate a symlink and the alternatives which was
- removed by older kinput2-* package's %%preun. and no need to make a dummy
- package then.
-
-* Fri Jul 02 2004 Akira TAGOH <tagoh(a)redhat.com> v3.1-21
-- package only kinput2-canna-wnn4 by default.
- NOTE: if you need other binaries, you need to rebuild this from srpm.
- please see the top of this spec file for more details.
-- now all binary packages is into kinput2 package.
- kinput2-canna-wnn6 is a dummy package to allow people to upgrade it safely.
-- clean up the spec file.
-
-* Wed Jun 30 2004 Akira TAGOH <tagoh(a)redhat.com> v3.1-20
-- add xinput.d support.
-- require alternatives for %%post and %%preun
- now switching the input method is managed by alternatives.
- the priority is set to 40 to use Canna
- the priority is set to 30 to use Wnn
-
-* Tue Jun 15 2004 Elliot Lee <sopwith(a)redhat.com>
-- rebuilt
-
-* Tue Mar 23 2004 Akira TAGOH <tagoh(a)redhat.com> v3.1-18
-- rebuilt to satisfy the dependency.
-
-* Wed Feb 18 2004 Akira TAGOH <tagoh(a)redhat.com> v3.1-16
-- kinput2-v3.1-activate_im_with_kanji.patch: applied to activate the input method against
Kanji key.
-- kinput2-v3.1-jp106_xfer.patch: applied to support Henkan key.
-
-* Fri Feb 13 2004 Elliot Lee <sopwith(a)redhat.com>
-- rebuilt
-
-* Thu Feb 12 2004 Akira TAGOH <tagoh(a)redhat.com> v3.1-14
-- kinput2-v3.1-fix-gcc-warning.patch: applied to fix gcc warning. (#114750)
-
-* Thu Jan 08 2004 Akira TAGOH <tagoh(a)redhat.com> v3.1-13
-- kinput2-v3.1-Xsji3clib-fix-typo.patch: applied a patch from Dave Jones to fix a typo.
-
-* Wed Nov 05 2003 Akira TAGOH <tagoh(a)redhat.com> v3.1-12.EL
-- rebuilt
-
-* Tue Nov 04 2003 Akira TAGOH <tagoh(a)redhat.com> v3.1-12
-- kinput2-v3.1-wm_delete_window.patch: to avoid to kill itself when clicking the close
button on the candidate window. (#104295)
-
-* Thu Oct 16 2003 Akira TAGOH <tagoh(a)redhat.com> v3.1-11
-- kinput2-v3.1-ia64.patch: updated to fix FreeWnn not working on ia64. (#106048)
-
-* Wed Jun 04 2003 Elliot Lee <sopwith(a)redhat.com>
-- rebuilt
-
-* Wed Apr 23 2003 Akira TAGOH <tagoh(a)redhat.com> v3.1-9
-- rebuild.
-
-* Tue Apr 22 2003 Akira TAGOH <tagoh(a)redhat.com> v3.1-8
-- Kinput2.ad.patch: update to contains the resources for avoiding the input focus issue.
(#78017)
-
-* Thu Mar 27 2003 Akira TAGOH <tagoh(a)redhat.com> v3.1-7
-- Rebuild against the latest Canna.
-
-* Tue Mar 25 2003 Akira TAGOH <tagoh(a)redhat.com> v3.1-6
-- doh! patch4 was not applied. this release is necessary to really fix #84960.
-
-* Tue Feb 25 2003 Akira TAGOH <tagoh(a)redhat.com> v3.1-4
-- kinput2-v3.1-wm_state_above.patch: don't hide the candidate window under
- the panel. (#84960)
-
-* Thu Jan 30 2003 Yukihiro Nakai <ynakai(a)redhat.com>
-- Update to v3.1
-
-* Wed Jan 22 2003 Tim Powers <timp(a)redhat.com>
-- rebuilt
-
-* Tue Jan 7 2003 Tim Powers <timp(a)redhat.com>
-- bump release number
-
-* Mon Dec 16 2002 Yukihiro Nakai <ynakai(a)redhat.com>
-- Update kinput2 resource to support the UTF-8 locale
-- Update kinput2 resource to support the Unix domain socket FreeWnn
-
-* Wed Nov 20 2002 Tim Powers <timp(a)redhat.com>
-- rebuild on all arches
-
-* Fri Jun 21 2002 Tim Powers <timp(a)redhat.com>
-- automated rebuild
-
-* Wed Jun 19 2002 Akira TAGOH <tagoh(a)redhat.com> v3-17
-- fix the stripped binary.
-- s/Copyright/License/
-
-* Thu May 23 2002 Tim Powers <timp(a)redhat.com>
-- automated rebuild
-
-* Wed Jan 09 2002 Tim Powers <timp(a)redhat.com>
-- automated rebuild
-
-* Tue Jul 24 2001 Yukihiro Nakai <ynakai(a)redhat.com>
-- Add Canna-devel and Wnn6-SDK to BuildPrereq (#49881)
-
-* Sun Jun 24 2001 Elliot Lee <sopwith(a)redhat.com>
-- Bump release + rebuild.
-
-* Wed Dec 13 2000 Yukihiro Nakai <ynakai(a)redhat.com>
-- Add IA64 patch (but not complete)
-- Provide only kinput2-canna-wnn6 by default
-
-* Tue Sep 12 2000 Satoru Sato <ssato(a)redhat.com>
-- Add Conflicts
-
-* Fri Aug 11 2000 Yukihiro Nakai <ynakai(a)redhat.com>
-- Add BuildPrereq
-
-* Fri Aug 04 2000 Yukihiro Nakai <ynakai(a)redhat.com>
-- Fix for sawfish
-- Rebuild for 7.0J
-
-* Thu Jul 13 2000 Prospector <bugzilla(a)redhat.com>
-- automatic rebuild
-
-* Mon Jun 12 2000 Matt Wilson <msw(a)redhat.com>
-- merge to head development
-
-* Wed Mar 15 2000 Matt Wilson <msw(a)redhat.com>
-- rebuilt for 6.2j
-- rebuilt against FreeWnn (just in case)
-- gzip man pagesc
-
-* Sat Mar 4 2000 Chris Ding <cding(a)redhat.com>
-- changed group
-
-* Wed Oct 6 1999 Matt Wilson <msw(a)redhat.com>
-- rebuilt for 6.1
-
-* Wed Jul 07 1999 Atsushi Yamagata <yamagata(a)plathome.co.jp>
-- built against glibc-2.1
-
-* Mon Jun 28 1999 Atsushi Yamagata <yamagata(a)plathome.co.jp>
-- 2nd. release
-- defined LIBDIR as /var/lib/wnn in lib/wnnlib.c
- thanks Satoshi Ishikawa <tigre(a)cc.gifu-u.ac.jp>
-
-* Mon May 31 1999 Atsushi Yamagata <yamagata(a)plathome.co.jp>
-- Updated to version v3
-
-* Wed May 26 1999 Atsushi Yamagata <yamagata(a)plathome.co.jp>
-- Updated to version v3-beta4
-
-* Mon May 10 1999 Atsushi Yamagata <yamagata(a)plathome.co.jp>
-- Updated to version v3-beta3
-
-* Tue Apr 20 1999 Atsushi Yamagata <yamagata(a)plathome.co.jp>
-- Updated to version v3-beta2
-
-* Fri Mar 19 1999 Atsushi Yamagata <yamagata(a)plathome.co.jp>
-- version up to v2-fix5-alpha8
-
-* Mon Mar 8 1999 Atsushi Yamagata <yamagata(a)plathome.co.jp>
-- version up to v2-fix5-alpha7
-
-* Mon Feb 8 1999 Atsushi Yamagata <yamagata(a)plathome.co.jp>
-- version up to v2-fix5-alpha6
-
-* Wed Jan 27 1999 Atsushi Yamagata <yamagata(a)plathome.co.jp>
-- 2nd release
-- prepared Kinput2.conf file as a source
-
-* Thu Jan 21 1999 Atsushi Yamagata <yamagata(a)plathome.co.jp>
-- version up to v2-fix5-alpha5
-- wnn -> wnn4
-- added wnn6 and canna-wnn6
-- Extensions/Japanese -> X11/Utilities
-
-* Wed Jul 29 1998 Susumu Nagashige <nagasige(a)ops.dti.ne.jp>
-- 4th Release.
-- removed binary dependency.
-- removed common package.
-
-* Wed May 13 1998 Susumu Nagashige <nagasige(a)netlaputa.ne.jp>
-- 3rd Release.
-- added FilterEvent Patch
-
-* Mon Feb 23 1998 Susumu Nagashige <nagasige(a)netlaputa.ne.jp>
-- 2nd Release.
-- fix to RedHat-5.0
-
-* Sat Dec 13 1997 Susumu Nagashige <nagasige(a)netlaputa.ne.jp>
-- 1st Release
diff --git a/sources b/sources
deleted file mode 100644
index a035b6e..0000000
--- a/sources
+++ /dev/null
@@ -1 +0,0 @@
-2de20576f150248d1fdfe66d7cc4e510 kinput2-v3.1.tar.gz
diff --git a/xinput.d-kinput2-canna b/xinput.d-kinput2-canna
deleted file mode 100644
index 328d820..0000000
--- a/xinput.d-kinput2-canna
+++ /dev/null
@@ -1,5 +0,0 @@
-XIM=kinput2
-XIM_PROGRAM=/usr/bin/kinput2
-XIM_ARGS="-canna +kinput -xim"
-GTK_IM_MODULE=xim
-QT_IM_MODULE=xim
diff --git a/xinput.d-kinput2-wnn b/xinput.d-kinput2-wnn
deleted file mode 100644
index 0b6165c..0000000
--- a/xinput.d-kinput2-wnn
+++ /dev/null
@@ -1,5 +0,0 @@
-XIM=kinput2
-XIM_PROGRAM=/usr/bin/kinput2
-XIM_ARGS="-wnn +kinput -xim"
-GTK_IM_MODULE=xim
-QT_IM_MODULE=xim