bidiv-1.5-fribidi.patch 1.1 KB

1234567891011121314151617181920212223242526272829303132333435363738394041424344454647
  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. /* output the line */
  11. @@ -201,10 +201,10 @@
  12. rtl_line=0;
  13. if(out_utf8)
  14. - fribidi_unicode_to_utf8(unicode_out, len,
  15. + fribidi_unicode_to_charset(FRIBIDI_CHAR_SET_UTF8, unicode_out, len,
  16. out);
  17. else
  18. - fribidi_unicode_to_iso8859_8(unicode_out, len,
  19. + fribidi_unicode_to_charset(FRIBIDI_CHAR_SET_ISO8859_8, unicode_out, len,
  20. out);
  21. /* if rtl_line (i.e., base_dir is RL), and we didn't fill the
  22. entire width, we need to pad with spaces. Maybe in the
  23. --- Makefile
  24. +++ Makefile
  25. @@ -1,16 +1,14 @@
  26. PREFIX=/usr/local
  27. BIN_DIR=$(PREFIX)/bin
  28. MAN_PATH=$(PREFIX)/man
  29. -CC_OPT_FLAGS=-O2 -Wall
  30. -
  31. -CFLAGS= $(CC_OPT_FLAGS) $(DEFS) `fribidi-config --cflags`
  32. -LDFLAGS=`fribidi-config --libs`
  33. +CFLAGS+=`pkg-config fribidi --cflags` -Wall
  34. +LIBS=`pkg-config fribidi --libs`
  35. all: bidiv
  36. bidiv: bidiv.o
  37. - $(CC) -o bidiv bidiv.o $(LDFLAGS)
  38. + $(CC) $(LDFLAGS) -o bidiv bidiv.o $(LIBS)
  39. clean:
  40. rm -f bidiv.o *~