/[gentoo-x86]/app-i18n/bidiv/files/bidiv-1.5-fribidi.patch
Gentoo

Contents of /app-i18n/bidiv/files/bidiv-1.5-fribidi.patch

Parent Directory Parent Directory | Revision Log Revision Log


Revision 1.3 - (show annotations) (download) (as text)
Sun May 20 04:55:55 2012 UTC (7 years, 9 months ago) by ssuominen
Branch: MAIN
CVS Tags: HEAD
Changes since 1.2: +22 -13 lines
File MIME type: text/x-diff
Remove forced -O2 and use environment LDFLAGS wrt #341791 by Diego Elio Pettenò. Edit -fribidi.patch because it was patching Makefile as-is.

(Portage version: 2.2.0_alpha107/cvs/Linux x86_64)

1 --- bidiv.c
2 +++ bidiv.c
3 @@ -172,7 +172,7 @@
4 }
5 #ifndef TRY_UTF8
6 in[len]='\0';
7 - fribidi_iso8859_8_to_unicode(in, unicode_in);
8 + fribidi_charset_to_unicode(FRIBIDI_CHAR_SET_ISO8859_8, in, unicode_in);
9 #endif
10
11 /* output the line */
12 @@ -201,10 +201,10 @@
13 rtl_line=0;
14
15 if(out_utf8)
16 - fribidi_unicode_to_utf8(unicode_out, len,
17 + fribidi_unicode_to_charset(FRIBIDI_CHAR_SET_UTF8, unicode_out, len,
18 out);
19 else
20 - fribidi_unicode_to_iso8859_8(unicode_out, len,
21 + fribidi_unicode_to_charset(FRIBIDI_CHAR_SET_ISO8859_8, unicode_out, len,
22 out);
23 /* if rtl_line (i.e., base_dir is RL), and we didn't fill the
24 entire width, we need to pad with spaces. Maybe in the
25 --- Makefile
26 +++ Makefile
27 @@ -1,16 +1,14 @@
28 PREFIX=/usr/local
29 BIN_DIR=$(PREFIX)/bin
30 MAN_PATH=$(PREFIX)/man
31 -CC_OPT_FLAGS=-O2 -Wall
32
33 -
34 -CFLAGS= $(CC_OPT_FLAGS) $(DEFS) `fribidi-config --cflags`
35 -LDFLAGS=`fribidi-config --libs`
36 +CFLAGS+=`pkg-config fribidi --cflags` -Wall
37 +LIBS=`pkg-config fribidi --libs`
38
39 all: bidiv
40
41 bidiv: bidiv.o
42 - $(CC) -o bidiv bidiv.o $(LDFLAGS)
43 + $(CC) $(LDFLAGS) -o bidiv bidiv.o $(LIBS)
44
45 clean:
46 rm -f bidiv.o *~

  ViewVC Help
Powered by ViewVC 1.1.20