diff options
author | V3n3RiX <venerix@redcorelinux.org> | 2018-07-14 20:56:41 +0100 |
---|---|---|
committer | V3n3RiX <venerix@redcorelinux.org> | 2018-07-14 20:56:41 +0100 |
commit | d87262dd706fec50cd150aab3e93883b6337466d (patch) | |
tree | 246b44c33ad7a57550430b0a60fa0df86a3c9e68 /app-i18n/kinput2 | |
parent | 71bc00c87bba1ce31de0dac6c3b7fd1aee6917fc (diff) |
gentoo resync : 14.07.2018
Diffstat (limited to 'app-i18n/kinput2')
-rw-r--r-- | app-i18n/kinput2/Manifest | 9 | ||||
-rw-r--r-- | app-i18n/kinput2/files/kinput2-gentoo.patch | 99 | ||||
-rw-r--r-- | app-i18n/kinput2/files/kinput2-headers.patch | 101 | ||||
-rw-r--r-- | app-i18n/kinput2/files/kinput2-ppc.patch | 11 | ||||
-rw-r--r-- | app-i18n/kinput2/files/kinput2-segfault.patch | 12 | ||||
-rw-r--r-- | app-i18n/kinput2/files/kinput2-wnn.patch | 51 | ||||
-rw-r--r-- | app-i18n/kinput2/files/xinput-kinput2 | 5 | ||||
-rw-r--r-- | app-i18n/kinput2/kinput2-3.1-r2.ebuild | 77 | ||||
-rw-r--r-- | app-i18n/kinput2/metadata.xml | 8 |
9 files changed, 0 insertions, 373 deletions
diff --git a/app-i18n/kinput2/Manifest b/app-i18n/kinput2/Manifest deleted file mode 100644 index 43051274f8ca..000000000000 --- a/app-i18n/kinput2/Manifest +++ /dev/null @@ -1,9 +0,0 @@ -AUX kinput2-gentoo.patch 2900 BLAKE2B ead35f38fe2aeacdfc9f3b04e72591b0143785b8be74d4be099ab59bc205c0914a15315ff18457dcecf371cbc503bdbfa85c357ddf02e06e2b1f9c543961617b SHA512 22c38c2b344b18f545501e5e351f0952d2b317d05e87ba0630a9fba235e5111e3e269c42388a7495153f6a36a0277798039a35c1968889697b8e97e4e4e5bd4e -AUX kinput2-headers.patch 2090 BLAKE2B b8c4e443dbf2b6c34020ef93b197c67c7ef67035a9014f47b3ddb0b8736fa149363f1745b789f922c45b370eb1e757c3623255790ec73767d7d30ff5b9dbaa98 SHA512 5f4839155d7d11784716c4c786b09184b04d68deaebd99fa2f446258017a893ad52e23f3df91a8827bfc8d4c238494ffdef9135c0959e7a2377947b96e5b4f7c -AUX kinput2-ppc.patch 181 BLAKE2B 422c35f38af1e497b2ad012d4b184d4d61bddcd880a6f77052b7cb8d55e32a2ed78e49e4c09abdca35b3477567efdf1224bcc35c769622ad685db4d5bf20c085 SHA512 e5b5e851792668a8f4f15e45dcbf24336310f36c2be5a565dfffd25b58fadef04b92124fc2955342ed05ab467e8bff8fbf9d561a3553d7059155007df877dcde -AUX kinput2-segfault.patch 240 BLAKE2B e8815bf5a3ca6b19fac492e51dea7faa98d3acacbd02f13cb816355c5f69a65f5618cc59e69b41d39eb32bc52bcc80f0b280ccfa52402e2dc2c96111335071f4 SHA512 c3441925e867edcc5060e79e0f999c0cfe60930d87ad8d51cb4120253dd9ab6ccfac7de0c04e3d7043100026bc67962bba81a507b037901c115a7559916eb1c5 -AUX kinput2-wnn.patch 1726 BLAKE2B 034b74ce8de370d2088dbd77ac61f3268c5b28537619985ed1ad6896d011ddff31c1b9523f38681e8461b935b01239697606f3106cad521e5d1dc55922f1d760 SHA512 a8ea7756ca893b0bdd7d491c8e2a4187c5d34b084c567449597b8fa1d9fb9ae4437bedba9d771a7b88a3e621573ce6650243dfa5ff396bebb653cbf4b6f5712b -AUX xinput-kinput2 121 BLAKE2B 34d40a7874ee79faff6f602bb32d705efdeac28a3d0a2bf89c68ba8f6e771eacc5878faf8347de171e813384e3bfdb113dcba7229ce1b5ecf6b1a293a6516b00 SHA512 09aaae3bebb062db82e8440977f58b9324e53262c6a9c95a276d305e87a2f9c0f9775077bd05c6ea069cceb6e45cb4efc4a6c412da7501b2b01825bc26799ec5 -DIST kinput2-v3.1.tar.gz 512177 BLAKE2B d67ca132fe3054d862c80b03b4665cdc5f4089745d848f6af9309b5896e0931182bdeefc621fad1cb8f1fd3686b07106cd6df5e703b3623f926cf83d637fa5df SHA512 5950f7294fa2bf915e6591290a3deb2c95f27706f3a180a084d14fbc008f3cf363b155b29c8103a8b999e44ae98182ff35bcfda85725b2c565f3e37f54788731 -EBUILD kinput2-3.1-r2.ebuild 1602 BLAKE2B fb1af03451d193f4a253946c72dda53ebd7c1d556e09b334b55d6d166d45362d596b740a41a094863918cfabf719731b54b0a5e7a04cec69f2a8b4f5f2ad7123 SHA512 6a4d1b8e7f2dd97cbfcf67186e11b05c5867c97ebad98ae1264b54a2b46bc2abae15bb15b69b27bfa5c2ffa049968408e0574dceafa97a66cbd1fd395bd868b7 -MISC metadata.xml 240 BLAKE2B 3e01f599fdbafa5c02b594007c673bcfcccb41559bd2f42d7ea60a1f13932335cecf353c1216e8feba4bb091385b57f05c4c8b3c62eed6c7bea41e308fc6115c SHA512 12aaa73d9b690de68a5c7b20e214ceb099efa87884b784eafd994f26032b44dcb66e7feac8a5b1df7f349ac05c5a198a7593dff2cc686de158cb21e4c54f38dd diff --git a/app-i18n/kinput2/files/kinput2-gentoo.patch b/app-i18n/kinput2/files/kinput2-gentoo.patch deleted file mode 100644 index 2c22723b3851..000000000000 --- a/app-i18n/kinput2/files/kinput2-gentoo.patch +++ /dev/null @@ -1,99 +0,0 @@ ---- a/Kinput2.conf -+++ b/Kinput2.conf -@@ -17,8 +17,8 @@ - - /* #define UseWnn */ /* define if you are going to use Wnn (v4, v6 or v7) */ - /* #define UseWnn6 */ /* define if you are going to use Wnn6 or above */ --#define UseCanna /* define if you are going to use Canna */ --#define UseSj3 /* define if you are going to use Sj3 */ -+/* #define UseCanna */ /* define if you are going to use Canna */ -+/* #define UseSj3 */ /* define if you are going to use Sj3 */ - /* #define UseAtok */ /* define if you are going to use Atok */ - - -@@ -34,7 +34,7 @@ - * 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 */ -+#define WnnLibDir $(EPREFIX)/usr/lib/wnn - - /* for convenience.. */ - #if defined(UseWnn6) && !defined(UseWnn) -@@ -52,17 +52,17 @@ - * WnnLibDir above. - */ - XCOMM use installed header files --XCOMM WNNINCDIR = /usr/X11R6/include/wnn -+WNNINCDIR = $(EPREFIX)/usr/include/wnn - XCOMM use installed library --XCOMM WNNLIB = -lwnn -+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 WNNSRC = $(CONTRIBSRC)/programs/Xsi/Wnn -+XCOMM WNNINCDIR = $(WNNSRC)/include -+XCOMM WNNLIB = $(WNNSRC)/jlib/libwnn.a - - - XCOMM Canna configuration -@@ -78,17 +78,17 @@ - * 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 -+CANNAINSTDIR = $(EPREFIX)/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 CANNASRC = $(CONTRIBSRC)/programs/Canna32 -+XCOMM CANNALIB = -L$(CANNASRC)/lib/canna16 -lcanna16 - - - XCOMM SJ3 configuration -@@ -100,7 +100,7 @@ - * definition files are to be installed - */ - --SJ3DEF_DIR = $(LIBDIR)/sj3def -+XCOMM SJ3DEF_DIR = $(LIBDIR)/sj3def - - /* - * If you have installed SJ3 library and header file, -@@ -117,8 +117,8 @@ - * Use compiled library in the source tree.. - */ - XCOMM use library in the source tree --SJ3SRC = $(CONTRIBSRC)/programs/sj3 --SJ3LIB = $(SJ3SRC)/sj3lib/libsj3lib.a -+XCOMM SJ3SRC = $(CONTRIBSRC)/programs/sj3 -+XCOMM SJ3LIB = $(SJ3SRC)/sj3lib/libsj3lib.a - - - XCOMM Atok configuration -@@ -133,8 +133,8 @@ - */ - XCOMM use installed headers/libraries - XCOMM ATOKINCDIR = /usr/include/atok --XCOMM ATOKLIBDIR = /usr/jp/lib --ATOKLIB = -latok12n -latok12util -+XCOMM ATOKLIBDIR = /var/lib/atok -+XCOMM ATOKLIB = -latok12n -latok12util - - - /** diff --git a/app-i18n/kinput2/files/kinput2-headers.patch b/app-i18n/kinput2/files/kinput2-headers.patch deleted file mode 100644 index 0075f710e9b6..000000000000 --- a/app-i18n/kinput2/files/kinput2-headers.patch +++ /dev/null @@ -1,101 +0,0 @@ ---- a/cmd/kinput2.c -+++ b/cmd/kinput2.c -@@ -25,6 +25,7 @@ - #endif - - #include <stdio.h> -+#include <stdlib.h> - #include <signal.h> - #include <X11/Intrinsic.h> - #include <X11/StringDefs.h> ---- a/lib/Canna.c -+++ b/lib/Canna.c -@@ -50,6 +50,7 @@ - static char *rcsid = "$Id: Canna.c,v 1.55 1999/05/25 08:13:03 ishisone Exp $"; - #endif - -+#include <stdlib.h> - #include <X11/IntrinsicP.h> - #include <X11/StringDefs.h> - #include <X11/Xmu/Atoms.h> ---- a/lib/CcWnn.c -+++ b/lib/CcWnn.c -@@ -2754,6 +2754,7 @@ - wchar wbuf[1024]; - int wlen; - int len; -+ extern int convJWStoCT(); - - TRACE(("CcWnn:saveYomiAndKanji()\n")); - ---- a/lib/ConvCtrl.c -+++ b/lib/ConvCtrl.c -@@ -18,6 +18,7 @@ - * Author: Makoto Ishisone, Software Research Associates, Inc., Japan - */ - -+#include <stdio.h> - #include <X11/IntrinsicP.h> - #include <X11/StringDefs.h> - #include <X11/Xmu/CharSet.h> ---- a/lib/KIProto.c -+++ b/lib/KIProto.c -@@ -18,6 +18,7 @@ - * Author: Makoto Ishisone, Software Research Associates, Inc., Japan - */ - -+#include <stdio.h> - #include <X11/IntrinsicP.h> - #include <X11/StringDefs.h> - #include <X11/Xatom.h> ---- a/lib/XimpProto.c -+++ b/lib/XimpProto.c -@@ -18,6 +18,7 @@ - * Author: Makoto Ishisone, Software Research Associates, Inc., Japan - */ - -+#include <stdio.h> - #include <X11/Xos.h> - #include <X11/IntrinsicP.h> - ---- a/lib/cconv.c -+++ b/lib/cconv.c -@@ -604,6 +604,7 @@ - #endif - - #include <stdio.h> -+#include <stdlib.h> - #include <X11/Xlib.h> - #include <X11/keysym.h> - #include <X11/Xutil.h> ---- a/lib/ctext.c -+++ b/lib/ctext.c -@@ -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 ---- a/lib/ioecall.c -+++ b/lib/ioecall.c -@@ -23,6 +23,7 @@ - */ - - #include <stdio.h> -+#include <stdlib.h> - #include <X11/Xlib.h> - #include <X11/Xfuncproto.h> - #include "IOECall.h" ---- a/lib/wnnlib.c -+++ b/lib/wnnlib.c -@@ -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/app-i18n/kinput2/files/kinput2-ppc.patch b/app-i18n/kinput2/files/kinput2-ppc.patch deleted file mode 100644 index 897b154eb5ac..000000000000 --- a/app-i18n/kinput2/files/kinput2-ppc.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- a/cmd/kinput2.c -+++ b/cmd/kinput2.c -@@ -644,3 +644,8 @@ - return n; - } - #endif -+ -+#if defined(linux) && defined(PPC) -+/* avoid nusty gcc bug */ -+void _XtInherit() {} -+#endif diff --git a/app-i18n/kinput2/files/kinput2-segfault.patch b/app-i18n/kinput2/files/kinput2-segfault.patch deleted file mode 100644 index 9b3a83163b4f..000000000000 --- a/app-i18n/kinput2/files/kinput2-segfault.patch +++ /dev/null @@ -1,12 +0,0 @@ ---- a/lib/imlib/imconv.c -+++ b/lib/imlib/imconv.c -@@ -591,6 +591,9 @@ - } - } - IMFinishRequest(conn, offset); -+ #ifdef STATUS_SYNC -+ IMFlush(conn); -+ #endif /* STATUS_SYNC */ - } - - /*- preeditCaret: do actual preedit caret -*/ diff --git a/app-i18n/kinput2/files/kinput2-wnn.patch b/app-i18n/kinput2/files/kinput2-wnn.patch deleted file mode 100644 index 4e7001938fb2..000000000000 --- a/app-i18n/kinput2/files/kinput2-wnn.patch +++ /dev/null @@ -1,51 +0,0 @@ ---- a/lib/cconv.c -+++ b/lib/cconv.c -@@ -790,7 +790,7 @@ - static int parseLine(uchar *, uchar **, int); - static FILE *openfile(char *); - static int doinclude(uchar *, Files *, void (*)()); --static uchar *getline(uchar *, int, Files *, void (*)()); -+static uchar *getLine(uchar *, int, Files *, void (*)()); - static int readRuleFile(ccRule, char *); - static int registMode(ccRule, int, uchar **); - static int newMode(ccRule, Files *, _strbufRec *, _funcbufRec *, -@@ -1035,8 +1035,8 @@ - return 0; - } - --/* getline -- 1$B9TFI$_9~$`(B ($B$=$N:](B include $B$N=hM}$r9T$J$&(B) */ --static uchar *getline(line, linesize, files, efunc) -+/* getLine -- 1$B9TFI$_9~$`(B ($B$=$N:](B include $B$N=hM}$r9T$J$&(B) */ -+static uchar *getLine(line, linesize, files, efunc) - uchar *line; - int linesize; - Files *files; -@@ -1100,7 +1100,7 @@ - rule->nmode = 0; - rule->initialmode = -1; - -- while (getline(line, sizeof(line), &files, efunc)) { -+ while (getLine(line, sizeof(line), &files, efunc)) { - (void)Strcpy(tmp, line); - if ((argc = parseLine(tmp, argv, 20)) == 0) - continue; -@@ -1269,7 +1269,7 @@ - cdbuf.cdbuf = NULL; - - /* $B%k!<%k$rFI$s$G%9%H%"$9$k(B */ -- while (getline(line, sizeof(line), files, efunc)) { -+ while (getLine(line, sizeof(line), files, efunc)) { - /* '#' $B$G;O$^$k9T$O%3%a%s%H(B */ - if (*line == '\0' || *line == '\n' || *line == '#') - continue; ---- a/lib/wnnlib.c -+++ b/lib/wnnlib.c -@@ -1367,7 +1367,7 @@ - - /* $BJQ49J8;zNs$ND9$5$N%A%'%C%/(B */ - clp = buf->clauseInfo + cl; -- len = jl_kanji_len(buf->wnn, cl); -+ len = jl_kanji_len(buf->wnn, cl, -1); - diff = len - ((clp + 1)->dispp - clp->dispp); - newlen = (buf->displayEnd - buf->displayBuf) + diff; - if (newlen > buf->bufferSize) { diff --git a/app-i18n/kinput2/files/xinput-kinput2 b/app-i18n/kinput2/files/xinput-kinput2 deleted file mode 100644 index dcb3b63330ac..000000000000 --- a/app-i18n/kinput2/files/xinput-kinput2 +++ /dev/null @@ -1,5 +0,0 @@ -XIM=kinput2 -XIM_PROGRAM="@EPREFIX@/usr/bin/kinput2" -XIM_ARGS="-@SERVER@ +kinput -xim" -GTK_IM_MODULE=xim -QT_IM_MODULE=xim diff --git a/app-i18n/kinput2/kinput2-3.1-r2.ebuild b/app-i18n/kinput2/kinput2-3.1-r2.ebuild deleted file mode 100644 index 78b586f2ec09..000000000000 --- a/app-i18n/kinput2/kinput2-3.1-r2.ebuild +++ /dev/null @@ -1,77 +0,0 @@ -# Copyright 1999-2017 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI="6" - -inherit toolchain-funcs - -MY_P="${PN}-v${PV}" - -DESCRIPTION="A Japanese input server which supports the XIM protocol" -HOMEPAGE="http://www.nec.co.jp/canna" -SRC_URI="ftp://ftp.sra.co.jp/pub/x11/${PN}/${MY_P}.tar.gz" - -LICENSE="HPND" -SLOT="0" -KEYWORDS="amd64 ppc ppc64 sparc x86" -IUSE="freewnn" - -RDEPEND="x11-libs/libICE - x11-libs/libSM - x11-libs/libX11 - x11-libs/libXaw - x11-libs/libXext - x11-libs/libXmu - x11-libs/libXpm - x11-libs/libXt - !freewnn? ( app-i18n/canna ) - freewnn? ( app-i18n/freewnn )" -DEPEND="${RDEPEND} - x11-misc/gccmakedep - x11-misc/imake" -S="${WORKDIR}/${MY_P}" - -PATCHES=( - "${FILESDIR}"/${PN}-gentoo.patch - "${FILESDIR}"/${PN}-headers.patch - "${FILESDIR}"/${PN}-ppc.patch - "${FILESDIR}"/${PN}-segfault.patch - "${FILESDIR}"/${PN}-wnn.patch -) -DOCS=( README NEWS doc/. ) - -src_prepare() { - default - - sed -i "s|^/\* \(#define Use$(usex freewnn Wnn Canna)\) \*/|\1|" ${PN^k}.conf -} - -src_configure() { - xmkmf -a || die -} - -src_compile() { - emake \ - CC="$(tc-getCC)" \ - CDEBUGFLAGS="${CFLAGS}" \ - LOCAL_LDFLAGS="${LDFLAGS}" \ - XAPPLOADDIR="${EPREFIX}/usr/share/X11/app-defaults" -} - -src_install() { - emake \ - XAPPLOADDIR="${EPREFIX}/usr/share/X11/app-defaults" \ - DESTDIR="${D}" \ - install - einstalldocs - newman cmd/${PN}.man ${PN}.1 - - rm -rf "${ED}"/usr/$(get_libdir)/X11 - - insinto /etc/X11/xinit/xinput.d - sed \ - -e "s:@EPREFIX@:${EPREFIX}:g" \ - -e "s:@SERVER@:$(usex freewnn wnn canna):g" \ - "${FILESDIR}"/xinput-${PN} > "${T}"/${PN}.conf - doins "${T}"/${PN}.conf -} diff --git a/app-i18n/kinput2/metadata.xml b/app-i18n/kinput2/metadata.xml deleted file mode 100644 index e1a49f498885..000000000000 --- a/app-i18n/kinput2/metadata.xml +++ /dev/null @@ -1,8 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> -<pkgmetadata> - <maintainer type="project"> - <email>cjk@gentoo.org</email> - <name>Cjk</name> - </maintainer> -</pkgmetadata> |