1 |
commit: 5787ea66fc8036852796a38227d3444ce125880d |
2 |
Author: Michael Haubenwallner <haubi <AT> gentoo <DOT> org> |
3 |
AuthorDate: Wed Feb 27 12:26:35 2019 +0000 |
4 |
Commit: Michael Haubenwallner <haubi <AT> gentoo <DOT> org> |
5 |
CommitDate: Wed Feb 27 12:45:19 2019 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/proj/prefix.git/commit/?id=5787ea66 |
7 |
|
8 |
sys-devel/gettext: update cygwin patches |
9 |
|
10 |
Package-Manager: Portage-2.3.55.1-prefix, Repoman-2.3.12 |
11 |
Signed-off-by: Michael Haubenwallner <haubi <AT> gentoo.org> |
12 |
|
13 |
sys-devel/gettext/files/0.19.8.1-cygwin-ftm.patch | 11 +++ |
14 |
sys-devel/gettext/files/0.19.8.1-no-woe32dll.patch | 95 ++++++++++++++++++++++ |
15 |
.../gettext/files/0.19.8.1-tests-cygwin.patch | 89 ++++++++++++++++++++ |
16 |
sys-devel/gettext/gettext-0.19.8.1.ebuild | 9 +- |
17 |
4 files changed, 203 insertions(+), 1 deletion(-) |
18 |
|
19 |
diff --git a/sys-devel/gettext/files/0.19.8.1-cygwin-ftm.patch b/sys-devel/gettext/files/0.19.8.1-cygwin-ftm.patch |
20 |
new file mode 100644 |
21 |
index 0000000000..23f88f0b56 |
22 |
--- /dev/null |
23 |
+++ b/sys-devel/gettext/files/0.19.8.1-cygwin-ftm.patch |
24 |
@@ -0,0 +1,11 @@ |
25 |
+--- origsrc/gettext-0.19.8.1/gettext-runtime/intl/libgnuintl.in.h 2016-06-09 17:56:00.000000000 -0500 |
26 |
++++ src/gettext-0.19.8.1/gettext-runtime/intl/libgnuintl.in.h 2016-10-20 11:03:43.187813700 -0500 |
27 |
+@@ -435,7 +435,7 @@ extern int vswprintf (wchar_t *, size_t, |
28 |
+ extern char *setlocale (int, const char *); |
29 |
+ #endif |
30 |
+ |
31 |
+-#if @HAVE_NEWLOCALE@ |
32 |
++#if @HAVE_NEWLOCALE@ && __POSIX_VISIBLE >= 200809 |
33 |
+ |
34 |
+ #undef newlocale |
35 |
+ #define newlocale libintl_newlocale |
36 |
|
37 |
diff --git a/sys-devel/gettext/files/0.19.8.1-no-woe32dll.patch b/sys-devel/gettext/files/0.19.8.1-no-woe32dll.patch |
38 |
new file mode 100644 |
39 |
index 0000000000..75bb0a1e1e |
40 |
--- /dev/null |
41 |
+++ b/sys-devel/gettext/files/0.19.8.1-no-woe32dll.patch |
42 |
@@ -0,0 +1,95 @@ |
43 |
+Derived from Cygwin: gettext-0.19.8.1-2.src/0.19.8.1-no-woe32dll.patch |
44 |
+ |
45 |
+--- origsrc/gettext-0.19.8.1/gettext-tools/configure.ac 2016-06-09 17:56:00.000000000 -0500 |
46 |
++++ src/gettext-0.19.8.1/gettext-tools/configure.ac 2016-10-10 02:10:37.323106300 -0500 |
47 |
+#@@ -100,7 +100,7 @@ LT_LANG([Windows Resource]) |
48 |
+ dnl On mingw and Cygwin, we can activate special Makefile rules which add |
49 |
+ dnl version information to the shared libraries and executables. |
50 |
+ case "$host_os" in |
51 |
+- mingw* | cygwin*) special_makefile_rules=woe32 ;; |
52 |
++ mingw*) special_makefile_rules=woe32 ;; |
53 |
+ os2*) special_makefile_rules=os2 ;; |
54 |
+ *) special_makefile_rules=none ;; |
55 |
+ esac |
56 |
+#@@ -212,7 +212,7 @@ dnl must arrange to define the auxili |
57 |
+ dnl exported variables _also_ in the static library. |
58 |
+ if test "$enable_shared" = yes; then |
59 |
+ case "$host_os" in |
60 |
+- mingw* | cygwin*) is_woe32dll=yes ;; |
61 |
++ mingw*) is_woe32dll=yes ;; |
62 |
+ *) is_woe32dll=no ;; |
63 |
+ esac |
64 |
+ else |
65 |
+--- gettext-0.19.8.1/gettext-tools/configure |
66 |
++++ gettext-0.19.8.1/gettext-tools/configure |
67 |
+@@ -100,7 +100,7 @@ |
68 |
+ |
69 |
+ |
70 |
+ case "$host_os" in |
71 |
+- mingw* | cygwin*) special_makefile_rules=woe32 ;; |
72 |
++ mingw*) special_makefile_rules=woe32 ;; |
73 |
+ os2*) special_makefile_rules=os2 ;; |
74 |
+ *) special_makefile_rules=none ;; |
75 |
+ esac |
76 |
+@@ -100,7 +100,7 @@ |
77 |
+ |
78 |
+ if test "$enable_shared" = yes; then |
79 |
+ case "$host_os" in |
80 |
+- mingw* | cygwin*) is_woe32dll=yes ;; |
81 |
++ mingw*) is_woe32dll=yes ;; |
82 |
+ *) is_woe32dll=no ;; |
83 |
+ esac |
84 |
+ else |
85 |
+@@ -100,7 +100,7 @@ |
86 |
+ |
87 |
+ if test "$enable_shared" = yes; then |
88 |
+ case "$host_os" in |
89 |
+- mingw* | cygwin*) is_woe32dll=yes ;; |
90 |
++ mingw*) is_woe32dll=yes ;; |
91 |
+ *) is_woe32dll=no ;; |
92 |
+ esac |
93 |
+ else |
94 |
+--- origsrc/gettext-0.19.8.1/m4/woe32-dll.m4 2016-03-20 02:37:53.000000000 -0500 |
95 |
++++ src/gettext-0.19.8.1/m4/woe32-dll.m4 2016-10-10 02:11:04.906081600 -0500 |
96 |
+#@@ -30,7 +30,7 @@ AC_DEFUN([gl_WOE32_DLL], |
97 |
+ [ |
98 |
+ AC_REQUIRE([AC_CANONICAL_HOST]) |
99 |
+ case "$host_os" in |
100 |
+- mingw* | cygwin*) |
101 |
++ mingw*) |
102 |
+ AC_MSG_CHECKING([for auto-import of symbols]) |
103 |
+ AC_CACHE_VAL([gl_cv_ld_autoimport], [ |
104 |
+ gl_save_LDFLAGS="$LDFLAGS" |
105 |
+--- gettext-0.19.8.1/gettext-runtime/configure |
106 |
++++ gettext-0.19.8.1/gettext-runtime/configure |
107 |
+@@ -100,7 +100,7 @@ |
108 |
+ |
109 |
+ |
110 |
+ case "$host_os" in |
111 |
+- mingw* | cygwin*) |
112 |
++ mingw*) |
113 |
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for auto-import of symbols" >&5 |
114 |
+ $as_echo_n "checking for auto-import of symbols... " >&6; } |
115 |
+ if ${gl_cv_ld_autoimport+:} false; then : |
116 |
+--- gettext-0.19.8.1/gettext-runtime/libasprintf/configure |
117 |
++++ gettext-0.19.8.1/gettext-runtime/libasprintf/configure |
118 |
+@@ -100,7 +100,7 @@ |
119 |
+ |
120 |
+ |
121 |
+ case "$host_os" in |
122 |
+- mingw* | cygwin*) |
123 |
++ mingw*) |
124 |
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for auto-import of symbols" >&5 |
125 |
+ $as_echo_n "checking for auto-import of symbols... " >&6; } |
126 |
+ if ${gl_cv_ld_autoimport+:} false; then : |
127 |
+--- gettext-0.19.8.1/gettext-tools/configure |
128 |
++++ gettext-0.19.8.1/gettext-tools/configure |
129 |
+@@ -100,7 +100,7 @@ |
130 |
+ |
131 |
+ |
132 |
+ case "$host_os" in |
133 |
+- mingw* | cygwin*) |
134 |
++ mingw*) |
135 |
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for auto-import of symbols" >&5 |
136 |
+ $as_echo_n "checking for auto-import of symbols... " >&6; } |
137 |
+ if ${gl_cv_ld_autoimport+:} false; then : |
138 |
|
139 |
diff --git a/sys-devel/gettext/files/0.19.8.1-tests-cygwin.patch b/sys-devel/gettext/files/0.19.8.1-tests-cygwin.patch |
140 |
new file mode 100644 |
141 |
index 0000000000..38aefe9904 |
142 |
--- /dev/null |
143 |
+++ b/sys-devel/gettext/files/0.19.8.1-tests-cygwin.patch |
144 |
@@ -0,0 +1,89 @@ |
145 |
+--- origsrc/gettext-0.19.3/gettext-tools/tests/format-c-3-prg.c 2013-05-31 00:01:54.000000000 -0500 |
146 |
++++ src/gettext-0.19.3/gettext-tools/tests/format-c-3-prg.c 2014-11-17 23:26:21.975557100 -0600 |
147 |
+@@ -34,7 +34,7 @@ |
148 |
+ /* Disable the override of setlocale that libgnuintl.h activates on MacOS X |
149 |
+ and Windows. This test relies on the fake setlocale function in |
150 |
+ setlocale.c. */ |
151 |
+-#undef setlocale |
152 |
++/* #undef setlocale */ |
153 |
+ |
154 |
+ #define _(string) gettext (string) |
155 |
+ |
156 |
+--- origsrc/gettext-0.19.3/gettext-tools/tests/format-c-4-prg.c 2013-05-31 00:01:54.000000000 -0500 |
157 |
++++ src/gettext-0.19.3/gettext-tools/tests/format-c-4-prg.c 2014-11-17 23:26:21.979557600 -0600 |
158 |
+@@ -34,7 +34,7 @@ |
159 |
+ /* Disable the override of setlocale that libgnuintl.h activates on MacOS X |
160 |
+ and Windows. This test relies on the fake setlocale function in |
161 |
+ setlocale.c. */ |
162 |
+-#undef setlocale |
163 |
++/* #undef setlocale */ |
164 |
+ |
165 |
+ #define _(string) gettext (string) |
166 |
+ |
167 |
+--- origsrc/gettext-0.19.3/gettext-tools/tests/plural-1 2014-04-14 20:52:11.000000000 -0500 |
168 |
++++ src/gettext-0.19.3/gettext-tools/tests/plural-1 2014-11-17 23:26:21.983058100 -0600 |
169 |
+@@ -50,15 +50,15 @@ ${DIFF} plural-1-fr.po.strip plural-1-fr |
170 |
+ |
171 |
+ : ${DIFF=diff} |
172 |
+ echo 'un morceau de gateau' > plural-1-cake.ok |
173 |
+-LANGUAGE= ../cake fr 1 > plural-1-cake.tmp || Exit 1 |
174 |
++LANGUAGE= ../cake fr_FR 1 > plural-1-cake.tmp || Exit 1 |
175 |
+ LC_ALL=C tr -d '\r' < plural-1-cake.tmp > cake.out || Exit 1 |
176 |
+ ${DIFF} plural-1-cake.ok cake.out || Exit 1 |
177 |
+ echo '2 morceaux de gateau' > plural-1-cake.ok |
178 |
+-LANGUAGE= ../cake fr 2 > plural-1-cake.tmp || Exit 1 |
179 |
++LANGUAGE= ../cake fr_FR 2 > plural-1-cake.tmp || Exit 1 |
180 |
+ LC_ALL=C tr -d '\r' < plural-1-cake.tmp > cake.out || Exit 1 |
181 |
+ ${DIFF} plural-1-cake.ok cake.out || Exit 1 |
182 |
+ echo '10 morceaux de gateau' > plural-1-cake.ok |
183 |
+-LANGUAGE= ../cake fr 10 > plural-1-cake.tmp || Exit 1 |
184 |
++LANGUAGE= ../cake fr_FR 10 > plural-1-cake.tmp || Exit 1 |
185 |
+ LC_ALL=C tr -d '\r' < plural-1-cake.tmp > cake.out || Exit 1 |
186 |
+ ${DIFF} plural-1-cake.ok cake.out || Exit 1 |
187 |
+ |
188 |
+--- origsrc/gettext-0.19.3/gettext-tools/tests/plural-1-prg.c 2013-05-31 00:01:54.000000000 -0500 |
189 |
++++ src/gettext-0.19.3/gettext-tools/tests/plural-1-prg.c 2014-11-17 23:26:21.989058800 -0600 |
190 |
+@@ -30,7 +30,7 @@ |
191 |
+ /* Disable the override of setlocale that libgnuintl.h activates on MacOS X |
192 |
+ and Windows. This test relies on the fake setlocale function in |
193 |
+ setlocale.c. */ |
194 |
+-#undef setlocale |
195 |
++/* #undef setlocale */ |
196 |
+ |
197 |
+ int |
198 |
+ main (int argc, char *argv[]) |
199 |
+--- origsrc/gettext-0.19.3/gettext-tools/tests/plural-2 2014-04-14 20:52:11.000000000 -0500 |
200 |
++++ src/gettext-0.19.3/gettext-tools/tests/plural-2 2014-11-17 23:25:50.637077600 -0600 |
201 |
+@@ -3,8 +3,8 @@ |
202 |
+ |
203 |
+ : ${MSGFMT=msgfmt} |
204 |
+ test -d plural-2-dir || mkdir plural-2-dir |
205 |
+-test -d plural-2-dir/ll || mkdir plural-2-dir/ll |
206 |
+-test -d plural-2-dir/ll/LC_MESSAGES || mkdir plural-2-dir/ll/LC_MESSAGES |
207 |
++test -d plural-2-dir/es || mkdir plural-2-dir/es |
208 |
++test -d plural-2-dir/es/LC_MESSAGES || mkdir plural-2-dir/es/LC_MESSAGES |
209 |
+ |
210 |
+ cat <<EOF > plural-2.data |
211 |
+ ja |
212 |
+@@ -44,7 +44,7 @@ EOF |
213 |
+ while read lang; do |
214 |
+ read formula |
215 |
+ read dataok |
216 |
+- cat > plural-2-ll.po <<EOF |
217 |
++ cat > plural-2-es.po <<EOF |
218 |
+ msgid "" |
219 |
+ msgstr "" |
220 |
+ "MIME-Version: 1.0\n" |
221 |
+@@ -65,10 +65,10 @@ msgstr[7] "7" |
222 |
+ msgstr[8] "8" |
223 |
+ msgstr[9] "9" |
224 |
+ EOF |
225 |
+- ${MSGFMT} -o plural-2-dir/ll/LC_MESSAGES/plural.mo plural-2-ll.po || Exit 1 |
226 |
++ ${MSGFMT} -o plural-2-dir/es/LC_MESSAGES/plural.mo plural-2-es.po || Exit 1 |
227 |
+ (for i in '' 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19; do |
228 |
+ LANGUAGE= TEXTDOMAIN=plural TEXTDOMAINDIR=plural-2-dir \ |
229 |
+- $NGETTEXT --env LC_ALL=ll X Y ${i}0 ${i}1 ${i}2 ${i}3 ${i}4 ${i}5 ${i}6 ${i}7 ${i}8 ${i}9 |
230 |
++ $NGETTEXT --env LC_ALL=es_ES X Y ${i}0 ${i}1 ${i}2 ${i}3 ${i}4 ${i}5 ${i}6 ${i}7 ${i}8 ${i}9 |
231 |
+ done) > dataout |
232 |
+ test "$dataok" = `cat dataout` || { |
233 |
+ echo "Formula evaluation error for language $lang" 1>&2 |
234 |
|
235 |
diff --git a/sys-devel/gettext/gettext-0.19.8.1.ebuild b/sys-devel/gettext/gettext-0.19.8.1.ebuild |
236 |
index b83c0f8a1d..d73a427485 100644 |
237 |
--- a/sys-devel/gettext/gettext-0.19.8.1.ebuild |
238 |
+++ b/sys-devel/gettext/gettext-0.19.8.1.ebuild |
239 |
@@ -1,4 +1,4 @@ |
240 |
-# Copyright 1999-2018 Gentoo Foundation |
241 |
+# Copyright 1999-2019 Gentoo Authors |
242 |
# Distributed under the terms of the GNU General Public License v2 |
243 |
|
244 |
# Note: Keep version bumps in sync with dev-libs/libintl. |
245 |
@@ -54,6 +54,13 @@ src_prepare() { |
246 |
epatch "${FILESDIR}"/${PN}-0.19.7-disable-libintl.patch #564168 |
247 |
epatch "${FILESDIR}"/${PN}-0.19.8.1-format-security.patch |
248 |
|
249 |
+ if use elibc_Cygwin; then |
250 |
+ epatch "${FILESDIR}"/0.19.8.1-no-woe32dll.patch |
251 |
+ epatch "${FILESDIR}"/0.19.3-localename.patch |
252 |
+ epatch "${FILESDIR}"/0.19.8.1-tests-cygwin.patch |
253 |
+ epatch "${FILESDIR}"/0.19.8.1-cygwin-ftm.patch |
254 |
+ fi |
255 |
+ |
256 |
# this script uses syntax that Solaris /bin/sh doesn't grok |
257 |
sed -i -e '1c\#!/usr/bin/env sh' \ |
258 |
gettext-tools/misc/convert-archive.in || die |