| blob | a3b5385bf356ecedce728e760e3aba2c6db6c148 |
1 diff -upr gettext-0.18.3.1.old/gettext-tools/gnulib-lib/Makefile gettext-0.18.3.1/gettext-tools/gnulib-lib/Makefile
2 --- gettext-0.18.3.1.old/gettext-tools/gnulib-lib/Makefile 2014-05-08 15:10:25 +0000
3 +++ gettext-0.18.3.1/gettext-tools/gnulib-lib/Makefile 2014-05-07 19:38:11 +0000
4 @@ -129,7 +129,7 @@ am__append_12 = $(LTLIBCROCO) $(LTLIBGLI
5 #am__append_17 = libxml_rpl.la
6 #am__append_18 = libxml_rpl.la
7 #am__append_19 = term-styled-ostream.c
8 -am__append_20 = ../woe32dll/c++term-styled-ostream.cc
9 +#am__append_20 = ../woe32dll/c++term-styled-ostream.cc
10 am__append_21 = uniconv/u8-conv-from-enc.c
11 am__append_22 = unilbrk/u8-possible-linebreaks.c
12 am__append_23 = unilbrk/u8-width-linebreaks.c
13 @@ -475,7 +475,7 @@ am__libgettextlib_la_SOURCES_DIST = copy
14 findprog.h findprog.c fstrcmp.h fstrcmp.c full-write.h \
15 full-write.c fwriteerror.h fwriteerror.c gcd.h gcd.c gettext.h \
16 ../woe32dll/gettextlib-exports.c hash.h hash.c html-ostream.c \
17 - html-styled-ostream.c ../woe32dll/c++html-styled-ostream.cc \
18 + \
19 javacomp.h javacomp.c javaexec.h javaexec.c javaversion.h \
20 javaversion.c gl_linkedhash_list.h gl_linkedhash_list.c \
21 gl_anyhash_list1.h gl_anyhash_list2.h gl_anylinked_list1.h \
22 @@ -490,8 +490,8 @@ am__libgettextlib_la_SOURCES_DIST = copy
23 sig-handler.c size_max.h spawn-pipe.h spawn-pipe.c striconv.h \
24 striconv.c striconveh.h striconveh.c striconveha.h \
25 striconveha.c strnlen1.h strnlen1.c styled-ostream.c \
26 - tempname.c term-ostream.c term-styled-ostream.c \
27 - ../woe32dll/c++term-styled-ostream.cc glthread/threadlib.c \
28 + tempname.c term-ostream.c \
29 + glthread/threadlib.c \
30 glthread/tls.h glthread/tls.c tmpdir.h tmpdir.c trim.c \
31 uniconv/u8-conv-from-enc.c unilbrk/lbrktables.c \
32 unilbrk/u8-possible-linebreaks.c unilbrk/u8-width-linebreaks.c \
33 @@ -509,9 +509,9 @@ am__libgettextlib_la_SOURCES_DIST = copy
34 xvasprintf.c xasprintf.c
35 am__objects_1 = ../woe32dll/gettextlib-exports.lo
36 #am__objects_2 = html-styled-ostream.lo
37 -am__objects_3 = ../woe32dll/c++html-styled-ostream.lo
38 +#am__objects_3 = ../woe32dll/c++html-styled-ostream.lo
39 #am__objects_4 = term-styled-ostream.lo
40 -am__objects_5 = ../woe32dll/c++term-styled-ostream.lo
41 +#am__objects_5 = ../woe32dll/c++term-styled-ostream.lo
42 am__objects_6 = uniconv/u8-conv-from-enc.lo
43 am__objects_7 = unilbrk/u8-possible-linebreaks.lo
44 am__objects_8 = unilbrk/u8-width-linebreaks.lo
45 @@ -545,7 +545,7 @@ am_libgettextlib_la_OBJECTS = copy-acl.l
46 fd-hook.lo fd-ostream.lo fd-safer-flag.lo dup-safer-flag.lo \
47 file-ostream.lo findprog.lo fstrcmp.lo full-write.lo \
48 fwriteerror.lo gcd.lo $(am__objects_1) hash.lo html-ostream.lo \
49 - $(am__objects_2) $(am__objects_3) javacomp.lo javaexec.lo \
50 + $(am__objects_2) javacomp.lo javaexec.lo \
51 javaversion.lo gl_linkedhash_list.lo gl_list.lo \
52 localcharset.lo localename.lo glthread/lock.lo malloca.lo \
53 mbchar.lo mbiter.lo mbslen.lo mbsstr.lo mbswidth.lo mbuiter.lo \
54 @@ -555,7 +555,7 @@ am_libgettextlib_la_OBJECTS = copy-acl.l
55 safe-read.lo safe-write.lo sh-quote.lo sig-handler.lo \
56 spawn-pipe.lo striconv.lo striconveh.lo striconveha.lo \
57 strnlen1.lo styled-ostream.lo tempname.lo term-ostream.lo \
58 - $(am__objects_4) $(am__objects_5) glthread/threadlib.lo \
59 + $(am__objects_4) glthread/threadlib.lo \
60 glthread/tls.lo tmpdir.lo trim.lo $(am__objects_6) \
61 unilbrk/lbrktables.lo $(am__objects_7) $(am__objects_8) \
62 unilbrk/ulc-common.lo $(am__objects_9) $(am__objects_10) \
63 diff -upr gettext-0.18.3.1.old/gettext-tools/src/write-catalog.c gettext-0.18.3.1/gettext-tools/src/write-catalog.c
64 --- gettext-0.18.3.1.old/gettext-tools/src/write-catalog.c 2012-12-10 01:59:06 +0000
65 +++ gettext-0.18.3.1/gettext-tools/src/write-catalog.c 2014-05-07 19:41:40 +0000
66 @@ -240,7 +240,7 @@ message catalog has plural form translat
67 }
69 style_file_prepare ();
70 - stream = term_styled_ostream_create (fd, filename, style_file_name);
71 + stream = NULL; /*term_styled_ostream_create (fd, filename, style_file_name);*/
72 if (stream == NULL)
73 stream = fd_ostream_create (fd, filename, true);
74 output_syntax->print (mdlp, stream, page_width, debug);
75 @@ -286,11 +286,11 @@ message catalog has plural form translat
76 stream = file_ostream_create (fp);
78 #if ENABLE_COLOR
79 - if (output_syntax->supports_color && color_mode == color_html)
80 + /*if (output_syntax->supports_color && color_mode == color_html)
81 {
82 html_styled_ostream_t html_stream;
84 - /* Convert mdlp to UTF-8 encoding. */
85 + /* Convert mdlp to UTF-8 encoding. * /
86 if (mdlp->encoding != po_charset_utf8)
87 {
88 mdlp = msgdomain_list_copy (mdlp, 0);
89 @@ -302,7 +302,7 @@ message catalog has plural form translat
90 output_syntax->print (mdlp, html_stream, page_width, debug);
91 ostream_free (html_stream);
92 }
93 - else
94 + else*/
95 #endif
96 {
97 output_syntax->print (mdlp, stream, page_width, debug);