Attachment 96673 Details for Bug 135326 – patch-unrar-iconv.txt

[patch] patch-unrar-iconv.txt

patch-unrar-iconv.txt (text/plain; charset="iso 8859-15"), 1.58 KB, created by Yarodin on 2009-06-07 16:30:36 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Yarodin

Created: 2009-06-07 16:30:36 UTC

Size: 1.58 KB

patch

obsolete

>diff -ruN unrar-iconv.orig/Makefile unrar-iconv/Makefile
>--- unrar-iconv.orig/Makefile	2008-06-18 21:36:53.000000000 +0400
>+++ unrar-iconv/Makefile	2009-06-07 19:25:15.000000000 +0400
>@@ -15,6 +15,10 @@
> 
> CONFLICTS=	unrar-[0-9]* zh-unrar-[0-9]*
> 
>+USE_ICONV=	yes
>+
>+MAKE_ENV=	LOCALBASE="${LOCALBASE}"
>+
> post-install:
> 	@${ECHO_MSG} "===> Added iconv support, see new switches:"
> 	@${ECHO_MSG} "     la, ll and lo at \"unrar -?\""
>diff -ruN unrar-iconv.orig/files/patch-iconv unrar-iconv/files/patch-iconv
>--- unrar-iconv.orig/files/patch-iconv	2008-07-03 03:02:46.000000000 +0400
>+++ unrar-iconv/files/patch-iconv	2009-06-07 19:21:50.000000000 +0400
>@@ -123,22 +123,23 @@
> +#define MCHelpSwLO           "\n  lo<option>    Encoding option {ignore,translit,<empty>}"
> +#define MIconvCannotOpen     "\nCannot open iconv to convert between '%s' and '%s' with option '%s'"
> +#endif
>---- makefile.unix	2008-05-31 14:18:14.000000000 +0800
>-+++ makefile.unix	2008-06-27 17:03:22.459952295 +0800
>+--- makefile.unix.orig	2008-10-09 17:43:06.000000000 +0400
>++++ makefile.unix	2009-06-07 17:27:00.000000000 +0400
> @@ -11,6 +11,13 @@
>  DEFINES=-D_FILE_OFFSET_BITS=64 -D_LARGEFILE_SOURCE
>  STRIP=strip
>  DESTDIR=/usr
> +# iconv stuff. Remove #ICONV# to enable
> +# where to get iconv.h
>-+CXXFLAGS+= -I/usr/local/include
>++CXXFLAGS+= -I$(LOCALBASE)/include
> +# where to get libiconv.so*
>-+LIBS+= -L/usr/local/lib -liconv
>++LIBS+= -L$(LOCALBASE)/lib -liconv
> +# enable iconv stuff
> +DEFINES+= -DWITH_ICONV
>  
>  # Linux using LCC
>  #CXX=lcc
>+
> --- os.hpp	Tue Oct  4 11:57:54 2005
> +++ os.hpp	Mon Jan 16 18:04:41 2006
> @@ -169,6 +169,10 @@

Actions: View | Diff

Attachments on bug 135326: 96672 | 96673