[gentoo-commits] repo/gentoo:master commit in: app-i18n/kinput2/files/, app-i18n/kinput2/, profiles/
commit: 5abc472f8f87df9fcc461e2e6af29d1b375dd753 Author: Arthur Zamarin gentoo org> AuthorDate: Fri Aug 16 07:10:00 2024 + Commit: Arthur Zamarin gentoo org> CommitDate: Fri Aug 16 07:12:12 2024 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5abc472f app-i18n/kinput2: treeclean Closes: https://bugs.gentoo.org/919362 (pkgremoved) Closes: https://bugs.gentoo.org/936129 (pkgremoved) Signed-off-by: Arthur Zamarin gentoo.org> app-i18n/kinput2/Manifest | 1 - app-i18n/kinput2/files/kinput2-gentoo.patch | 99 - app-i18n/kinput2/files/kinput2-headers.patch | 101 -- app-i18n/kinput2/files/kinput2-ppc.patch | 11 --- app-i18n/kinput2/files/kinput2-segfault.patch | 12 --- app-i18n/kinput2/files/kinput2-wnn.patch | 51 - app-i18n/kinput2/files/xinput-kinput2 | 5 -- app-i18n/kinput2/kinput2-3.1-r3.ebuild| 80 app-i18n/kinput2/metadata.xml | 8 -- profiles/package.mask | 1 - 10 files changed, 369 deletions(-) diff --git a/app-i18n/kinput2/Manifest b/app-i18n/kinput2/Manifest deleted file mode 100644 index 3826c12f4220.. --- a/app-i18n/kinput2/Manifest +++ /dev/null @@ -1 +0,0 @@ -DIST kinput2-v3.1.tar.gz 512177 BLAKE2B d67ca132fe3054d862c80b03b4665cdc5f4089745d848f6af9309b5896e0931182bdeefc621fad1cb8f1fd3686b07106cd6df5e703b3623f926cf83d637fa5df SHA512 5950f7294fa2bf915e6591290a3deb2c95f27706f3a180a084d14fbc008f3cf363b155b29c8103a8b999e44ae98182ff35bcfda85725b2c565f3e37f54788731 diff --git a/app-i18n/kinput2/files/kinput2-gentoo.patch b/app-i18n/kinput2/files/kinput2-gentoo.patch deleted file mode 100644 index 2c22723b3851.. --- 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
[gentoo-commits] repo/gentoo:master commit in: app-i18n/kinput2/files/, app-i18n/kinput2/
commit: bf119982cec646b01f5dcd69e69fb9cdcd342c78
Author: Akinori Hattori gentoo org>
AuthorDate: Tue Jul 18 15:22:25 2017 +
Commit: Akinori Hattori gentoo org>
CommitDate: Tue Jul 18 15:22:25 2017 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=bf119982
app-i18n/kinput2: fix implicit declarations
Package-Manager: Portage-2.3.6, Repoman-2.3.1
app-i18n/kinput2/files/kinput2-headers.patch | 101 +++
app-i18n/kinput2/kinput2-3.1-r1.ebuild | 1 +
app-i18n/kinput2/kinput2-3.1-r2.ebuild | 1 +
3 files changed, 103 insertions(+)
diff --git a/app-i18n/kinput2/files/kinput2-headers.patch
b/app-i18n/kinput2/files/kinput2-headers.patch
new file mode 100644
index 000..0075f710e9b
--- /dev/null
+++ b/app-i18n/kinput2/files/kinput2-headers.patch
@@ -0,0 +1,101 @@
+--- a/cmd/kinput2.c
b/cmd/kinput2.c
+@@ -25,6 +25,7 @@
+ #endif
+
+ #include
++#include
+ #include
+ #include
+ #include
+--- 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
+ #include
+ #include
+ #include
+--- 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
+ #include
+ #include
+ #include
+--- a/lib/KIProto.c
b/lib/KIProto.c
+@@ -18,6 +18,7 @@
+ * Author: Makoto Ishisone, Software Research Associates, Inc., Japan
+ */
+
++#include
+ #include
+ #include
+ #include
+--- a/lib/XimpProto.c
b/lib/XimpProto.c
+@@ -18,6 +18,7 @@
+ * Author: Makoto Ishisone, Software Research Associates, Inc., Japan
+ */
+
++#include
+ #include
+ #include
+
+--- a/lib/cconv.c
b/lib/cconv.c
+@@ -604,6 +604,7 @@
+ #endif
+
+ #include
++#include
+ #include
+ #include
+ #include
+--- 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
++
+ typedef unsigned shortwchar;
+
+ #define NULL 0
+--- a/lib/ioecall.c
b/lib/ioecall.c
+@@ -23,6 +23,7 @@
+ */
+
+ #include
++#include
+ #include
+ #include
+ #include "IOECall.h"
+--- a/lib/wnnlib.c
b/lib/wnnlib.c
+@@ -578,6 +578,7 @@
+ #ifdef DEBUG_WNNLIB
+ #include
+ #endif
++#include
+ #include "wnnlib.h"
+ #include "WStr.h"
+ #include
diff --git a/app-i18n/kinput2/kinput2-3.1-r1.ebuild
b/app-i18n/kinput2/kinput2-3.1-r1.ebuild
index 5e3579baa0d..caf4b59765b 100644
--- a/app-i18n/kinput2/kinput2-3.1-r1.ebuild
+++ b/app-i18n/kinput2/kinput2-3.1-r1.ebuild
@@ -33,6 +33,7 @@ S="${WORKDIR}/${MY_P}"
PATCHES=(
"${FILESDIR}"/${PN}-gentoo.patch
+ "${FILESDIR}"/${PN}-headers.patch
"${FILESDIR}"/${PN}-ppc.patch
"${FILESDIR}"/${PN}-segfault.patch
)
diff --git a/app-i18n/kinput2/kinput2-3.1-r2.ebuild
b/app-i18n/kinput2/kinput2-3.1-r2.ebuild
index 724a233a91e..0f1fc47b2a4 100644
--- a/app-i18n/kinput2/kinput2-3.1-r2.ebuild
+++ b/app-i18n/kinput2/kinput2-3.1-r2.ebuild
@@ -33,6 +33,7 @@ S="${WORKDIR}/${MY_P}"
PATCHES=(
"${FILESDIR}"/${PN}-gentoo.patch
+ "${FILESDIR}"/${PN}-headers.patch
"${FILESDIR}"/${PN}-ppc.patch
"${FILESDIR}"/${PN}-segfault.patch
)
