1 |
commit: 80f2fd6ce99506458d02421a9b9be4cd216116c0 |
2 |
Author: Akinori Hattori <hattya <AT> gentoo <DOT> org> |
3 |
AuthorDate: Tue Jul 18 15:00:19 2017 +0000 |
4 |
Commit: Akinori Hattori <hattya <AT> gentoo <DOT> org> |
5 |
CommitDate: Tue Jul 18 15:00:19 2017 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=80f2fd6c |
7 |
|
8 |
app-i18n/kinput2: update patches |
9 |
|
10 |
Package-Manager: Portage-2.3.6, Repoman-2.3.1 |
11 |
|
12 |
...ut2-3.1-r1-gentoo.diff => kinput2-gentoo.patch} | 36 +++------------------- |
13 |
app-i18n/kinput2/files/kinput2-ppc.patch | 11 +++++++ |
14 |
app-i18n/kinput2/files/kinput2-segfault.patch | 12 ++++++++ |
15 |
app-i18n/kinput2/kinput2-3.1-r1.ebuild | 11 ++++--- |
16 |
app-i18n/kinput2/kinput2-3.1-r2.ebuild | 6 ++-- |
17 |
5 files changed, 39 insertions(+), 37 deletions(-) |
18 |
|
19 |
diff --git a/app-i18n/kinput2/files/kinput2-3.1-r1-gentoo.diff b/app-i18n/kinput2/files/kinput2-gentoo.patch |
20 |
similarity index 72% |
21 |
rename from app-i18n/kinput2/files/kinput2-3.1-r1-gentoo.diff |
22 |
rename to app-i18n/kinput2/files/kinput2-gentoo.patch |
23 |
index d4c03d527c4..2c22723b385 100644 |
24 |
--- a/app-i18n/kinput2/files/kinput2-3.1-r1-gentoo.diff |
25 |
+++ b/app-i18n/kinput2/files/kinput2-gentoo.patch |
26 |
@@ -1,6 +1,5 @@ |
27 |
-diff -Naur kinput2-v3.1.orig/Kinput2.conf kinput2-v3.1/Kinput2.conf |
28 |
---- kinput2-v3.1.orig/Kinput2.conf 2002-10-03 18:35:26.000000000 +0900 |
29 |
-+++ kinput2-v3.1/Kinput2.conf 2003-08-13 15:51:21.000000000 +0900 |
30 |
+--- a/Kinput2.conf |
31 |
++++ b/Kinput2.conf |
32 |
@@ -17,8 +17,8 @@ |
33 |
|
34 |
/* #define UseWnn */ /* define if you are going to use Wnn (v4, v6 or v7) */ |
35 |
@@ -17,7 +16,7 @@ diff -Naur kinput2-v3.1.orig/Kinput2.conf kinput2-v3.1/Kinput2.conf |
36 |
* are not installed in /usr/local/lib/wnn (which is the default). |
37 |
*/ |
38 |
-/* #define WnnLibDir /some/peculiar/directory/wnn */ |
39 |
-+#define WnnLibDir /usr/lib/wnn |
40 |
++#define WnnLibDir $(EPREFIX)/usr/lib/wnn |
41 |
|
42 |
/* for convenience.. */ |
43 |
#if defined(UseWnn6) && !defined(UseWnn) |
44 |
@@ -26,7 +25,7 @@ diff -Naur kinput2-v3.1.orig/Kinput2.conf kinput2-v3.1/Kinput2.conf |
45 |
*/ |
46 |
XCOMM use installed header files |
47 |
-XCOMM WNNINCDIR = /usr/X11R6/include/wnn |
48 |
-+WNNINCDIR = /usr/include/wnn |
49 |
++WNNINCDIR = $(EPREFIX)/usr/include/wnn |
50 |
XCOMM use installed library |
51 |
-XCOMM WNNLIB = -lwnn |
52 |
+WNNLIB = -lwnn |
53 |
@@ -51,7 +50,7 @@ diff -Naur kinput2-v3.1.orig/Kinput2.conf kinput2-v3.1/Kinput2.conf |
54 |
-XCOMM CANNAINSTDIR = /usr/local/canna |
55 |
-XCOMM CANNASRC = $(CANNAINSTDIR)/include |
56 |
-XCOMM CANNALIB = -lcanna16 |
57 |
-+CANNAINSTDIR = /usr |
58 |
++CANNAINSTDIR = $(EPREFIX)/usr |
59 |
+CANNASRC = $(CANNAINSTDIR)/include |
60 |
+CANNALIB = -lcanna16 |
61 |
|
62 |
@@ -98,28 +97,3 @@ diff -Naur kinput2-v3.1.orig/Kinput2.conf kinput2-v3.1/Kinput2.conf |
63 |
|
64 |
|
65 |
/** |
66 |
-diff -Naur kinput2-v3.1.orig/cmd/kinput2.c kinput2-v3.1/cmd/kinput2.c |
67 |
---- kinput2-v3.1.orig/cmd/kinput2.c 2002-10-03 18:35:26.000000000 +0900 |
68 |
-+++ kinput2-v3.1/cmd/kinput2.c 2003-08-13 15:51:21.000000000 +0900 |
69 |
-@@ -644,3 +644,8 @@ |
70 |
- return n; |
71 |
- } |
72 |
- #endif |
73 |
-+ |
74 |
-+#if defined(linux) && defined(PPC) |
75 |
-+/* avoid nusty gcc bug */ |
76 |
-+void _XtInherit() {} |
77 |
-+#endif |
78 |
-diff -Naur kinput2-v3.1.orig/lib/imlib/imconv.c kinput2-v3.1/lib/imlib/imconv.c |
79 |
---- kinput2-v3.1.orig/lib/imlib/imconv.c 2002-10-03 18:35:30.000000000 +0900 |
80 |
-+++ kinput2-v3.1/lib/imlib/imconv.c 2003-08-13 15:55:54.000000000 +0900 |
81 |
-@@ -591,6 +591,9 @@ |
82 |
- } |
83 |
- } |
84 |
- IMFinishRequest(conn, offset); |
85 |
-+ #ifdef STATUS_SYNC |
86 |
-+ IMFlush(conn); |
87 |
-+ #endif /* STATUS_SYNC */ |
88 |
- } |
89 |
- |
90 |
- /*- preeditCaret: do actual preedit caret -*/ |
91 |
|
92 |
diff --git a/app-i18n/kinput2/files/kinput2-ppc.patch b/app-i18n/kinput2/files/kinput2-ppc.patch |
93 |
new file mode 100644 |
94 |
index 00000000000..897b154eb5a |
95 |
--- /dev/null |
96 |
+++ b/app-i18n/kinput2/files/kinput2-ppc.patch |
97 |
@@ -0,0 +1,11 @@ |
98 |
+--- a/cmd/kinput2.c |
99 |
++++ b/cmd/kinput2.c |
100 |
+@@ -644,3 +644,8 @@ |
101 |
+ return n; |
102 |
+ } |
103 |
+ #endif |
104 |
++ |
105 |
++#if defined(linux) && defined(PPC) |
106 |
++/* avoid nusty gcc bug */ |
107 |
++void _XtInherit() {} |
108 |
++#endif |
109 |
|
110 |
diff --git a/app-i18n/kinput2/files/kinput2-segfault.patch b/app-i18n/kinput2/files/kinput2-segfault.patch |
111 |
new file mode 100644 |
112 |
index 00000000000..9b3a83163b4 |
113 |
--- /dev/null |
114 |
+++ b/app-i18n/kinput2/files/kinput2-segfault.patch |
115 |
@@ -0,0 +1,12 @@ |
116 |
+--- a/lib/imlib/imconv.c |
117 |
++++ b/lib/imlib/imconv.c |
118 |
+@@ -591,6 +591,9 @@ |
119 |
+ } |
120 |
+ } |
121 |
+ IMFinishRequest(conn, offset); |
122 |
++ #ifdef STATUS_SYNC |
123 |
++ IMFlush(conn); |
124 |
++ #endif /* STATUS_SYNC */ |
125 |
+ } |
126 |
+ |
127 |
+ /*- preeditCaret: do actual preedit caret -*/ |
128 |
|
129 |
diff --git a/app-i18n/kinput2/kinput2-3.1-r1.ebuild b/app-i18n/kinput2/kinput2-3.1-r1.ebuild |
130 |
index 7badd093e35..7d264fb834e 100644 |
131 |
--- a/app-i18n/kinput2/kinput2-3.1-r1.ebuild |
132 |
+++ b/app-i18n/kinput2/kinput2-3.1-r1.ebuild |
133 |
@@ -1,4 +1,4 @@ |
134 |
-# Copyright 1999-2012 Gentoo Foundation |
135 |
+# Copyright 1999-2017 Gentoo Foundation |
136 |
# Distributed under the terms of the GNU General Public License v2 |
137 |
|
138 |
inherit eutils |
139 |
@@ -32,12 +32,15 @@ src_unpack() { |
140 |
local mysed="" |
141 |
|
142 |
unpack ${A} |
143 |
- epatch "${FILESDIR}/${PF}-gentoo.diff" |
144 |
+ cd "${S}" |
145 |
+ epatch "${FILESDIR}/${PN}-gentoo.patch" |
146 |
+ epatch "${FILESDIR}/${PN}-ppc.patch" |
147 |
+ epatch "${FILESDIR}/${PN}-segfault.patch" |
148 |
|
149 |
if use freewnn; then |
150 |
- sed -i -e '/\/\* #define UseWnn/s:^:#define UseWnn\n:' "${S}/Kinput2.conf" |
151 |
+ sed -i -e '/\/\* #define UseWnn/s:^:#define UseWnn\n:' Kinput2.conf |
152 |
else |
153 |
- sed -i -e '/\/\* #define UseCanna/s:^:#define UseCanna\n:' "${S}/Kinput2.conf" |
154 |
+ sed -i -e '/\/\* #define UseCanna/s:^:#define UseCanna\n:' Kinput2.conf |
155 |
fi |
156 |
} |
157 |
|
158 |
|
159 |
diff --git a/app-i18n/kinput2/kinput2-3.1-r2.ebuild b/app-i18n/kinput2/kinput2-3.1-r2.ebuild |
160 |
index ccdfc9770d1..d0412807189 100644 |
161 |
--- a/app-i18n/kinput2/kinput2-3.1-r2.ebuild |
162 |
+++ b/app-i18n/kinput2/kinput2-3.1-r2.ebuild |
163 |
@@ -1,4 +1,4 @@ |
164 |
-# Copyright 1999-2012 Gentoo Foundation |
165 |
+# Copyright 1999-2017 Gentoo Foundation |
166 |
# Distributed under the terms of the GNU General Public License v2 |
167 |
|
168 |
EAPI="3" |
169 |
@@ -30,7 +30,9 @@ DEPEND="${RDEPEND} |
170 |
S="${WORKDIR}/${MY_P}" |
171 |
|
172 |
src_prepare() { |
173 |
- epatch "${FILESDIR}/${P}-r1-gentoo.diff" |
174 |
+ epatch "${FILESDIR}/${PN}-gentoo.patch" |
175 |
+ epatch "${FILESDIR}/${PN}-ppc.patch" |
176 |
+ epatch "${FILESDIR}/${PN}-segfault.patch" |
177 |
|
178 |
if use freewnn; then |
179 |
sed -i -e '/\/\* #define UseWnn/s:^:#define UseWnn\n:' Kinput2.conf || die |