FreeBSD Bugzilla – Attachment 112668 Details for
Bug 154105
[PATCH] archivers/unrar-iconv: update to 4.0.4
Home
|
New
|
Browse
|
Search
|
[?]
|
Reports
|
Help
|
New Account
|
Log In
Remember
[x]
|
Forgot Password
Login:
[x]
[patch]
unrar-iconv-4.0.4,5.patch
unrar-iconv-4.0.4,5.patch (text/plain), 5.78 KB, created by
Po-Chuan Hsieh
on 2011-01-18 04:30:12 UTC
(
hide
)
Description:
unrar-iconv-4.0.4,5.patch
Filename:
MIME Type:
Creator:
Po-Chuan Hsieh
Created:
2011-01-18 04:30:12 UTC
Size:
5.78 KB
patch
obsolete
>Index: Makefile >=================================================================== >RCS file: /home/ncvs/ports/archivers/unrar-iconv/Makefile,v >retrieving revision 1.4 >diff -u -u -r1.4 Makefile >--- Makefile 7 Jun 2009 17:24:26 -0000 1.4 >+++ Makefile 18 Jan 2011 04:17:11 -0000 >@@ -14,7 +14,6 @@ > EXTRA_PATCHES= ${.CURDIR}/files/patch-iconv > > USE_ICONV= yes >-MAKE_ENV= LOCALBASE="${LOCALBASE}" > > CONFLICTS= unrar-[0-9]* zh-unrar-[0-9]* > >Index: files/patch-iconv >=================================================================== >RCS file: /home/ncvs/ports/archivers/unrar-iconv/files/patch-iconv,v >retrieving revision 1.5 >diff -u -u -r1.5 patch-iconv >--- files/patch-iconv 7 Jun 2009 17:24:26 -0000 1.5 >+++ files/patch-iconv 18 Jan 2011 04:17:11 -0000 >@@ -1,8 +1,8 @@ >---- cmddata.cpp Tue Oct 4 11:57:54 2005 >-+++ cmddata.cpp Mon Jan 16 18:06:24 2006 >-@@ -123,6 +123,34 @@ >+--- cmddata.cpp.orig 2011-01-04 20:28:47.000000000 +0800 >++++ cmddata.cpp 2011-01-18 11:21:35.000000000 +0800 >+@@ -153,6 +153,34 @@ > if (Test && Extract) >- Test=false; >+ Test=false; // Switch '-t' is senseless for 'X', 'E', 'P' commands. > BareOutput=(CmdChar=='L' || CmdChar=='V') && Command[1]=='B'; > +#ifdef WITH_ICONV > + if ( (encInt[0] != '\0') || (encExt[0] != '\0') ) { >@@ -35,7 +35,7 @@ > } > > >-@@ -746,6 +774,22 @@ >+@@ -877,6 +905,22 @@ > break; > } > break; >@@ -58,8 +58,8 @@ > #ifndef GUI > case '?' : > OutHelp(); >-@@ -938,7 +982,11 @@ >- MCHelpSwm,MCHelpSwAC,MCHelpSwAD,MCHelpSwAP, >+@@ -955,7 +999,11 @@ >+ MCHelpSwm,MCHelpSwAC,MCHelpSwAD,MCHelpSwAI,MCHelpSwAP, > MCHelpSwCm,MCHelpSwCFGm,MCHelpSwCL,MCHelpSwCU, > MCHelpSwDH,MCHelpSwEP,MCHelpSwEP3,MCHelpSwF,MCHelpSwIDP,MCHelpSwIERR, > - MCHelpSwINUL,MCHelpSwIOFF,MCHelpSwKB,MCHelpSwN,MCHelpSwNa,MCHelpSwNal, >@@ -71,8 +71,8 @@ > MCHelpSwO,MCHelpSwOC,MCHelpSwOR,MCHelpSwOW,MCHelpSwP, > MCHelpSwPm,MCHelpSwR,MCHelpSwRI,MCHelpSwSL,MCHelpSwSM,MCHelpSwTA, > MCHelpSwTB,MCHelpSwTN,MCHelpSwTO,MCHelpSwTS,MCHelpSwU,MCHelpSwVUnr, >---- global.hpp Tue Oct 4 11:57:54 2005 >-+++ global.hpp Mon Jan 16 18:04:41 2006 >+--- global.hpp.orig 2011-01-04 20:28:47.000000000 +0800 >++++ global.hpp 2011-01-18 11:21:35.000000000 +0800 > @@ -9,6 +9,19 @@ > > EXTVAR ErrorHandler ErrHandler; >@@ -93,9 +93,9 @@ > +#endif > > #endif >---- loclang.hpp Tue Oct 4 11:57:54 2005 >-+++ loclang.hpp Mon Jan 16 18:04:41 2006 >-@@ -6,7 +6,7 @@ >+--- loclang.hpp.orig 2011-01-04 20:28:47.000000000 +0800 >++++ loclang.hpp 2011-01-18 11:21:35.000000000 +0800 >+@@ -7,7 +7,7 @@ > #define MCopyright "\nRAR %s Copyright (c) 1993-%d Alexander Roshal %d %s %d" > #define MRegTo "\nRegistered to %s\n" > #define MShare "\nShareware version Type RAR -? for help\n" >@@ -104,7 +104,7 @@ > #define MBeta "beta" > #define MMonthJan "Jan" > #define MMonthFeb "Feb" >-@@ -310,7 +310,7 @@ >+@@ -319,7 +319,7 @@ > #define MSyncScanError "\nFile search errors, cannot synchronize archive" > #define MCorrectingName "\nWARNING: Attempting to correct the invalid file name" > #define MUnpCannotMerge "\nWARNING: You need to start extraction from a previous volume to unpack %s" >@@ -113,7 +113,7 @@ > #define MSubHeadCorrupt "\nERROR: Corrupt data header found, ignored" > #define MSubHeadUnknown "\nWARNING: Unknown data header format, ignored" > #define MSubHeadDataCRC "\nERROR: Corrupt %s data block" >-@@ -338,3 +338,9 @@ >+@@ -347,6 +347,12 @@ > #define MMaxPathLimit "\nTotal path and file name length must not exceed %d characters" > #define MRecVolLimit "\nTotal number of usual and recovery volumes must not exceed 255" > #define MVolumeNumber "volume %d" >@@ -123,8 +123,11 @@ > +#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.orig 2008-10-09 17:43:06.000000000 +0400 >-+++ makefile.unix 2009-06-07 17:27:00.000000000 +0400 >+ #define MCannotDelete "\nCannot delete %s" >+ #define MCalcCRC "\nCalculating the control sum" >+ #define MTooLargeSFXArc "\nWARNING: Too large SFX archive. Windows cannot run the executable file exceeding 4 GB." >+--- makefile.unix.orig 2010-03-30 23:26:26.000000000 +0800 >++++ makefile.unix 2011-01-18 11:21:35.000000000 +0800 > @@ -11,6 +11,13 @@ > DEFINES=-D_FILE_OFFSET_BITS=64 -D_LARGEFILE_SOURCE > STRIP=strip >@@ -139,10 +142,9 @@ > > # 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 @@ >+--- os.hpp.orig 2011-01-04 20:28:47.000000000 +0800 >++++ os.hpp 2011-01-18 11:21:35.000000000 +0800 >+@@ -192,6 +192,10 @@ > #include <utime.h> > #include <locale.h> > >@@ -153,10 +155,10 @@ > #ifdef S_IFLNK > #define SAVE_LINKS > #endif >---- strfn.cpp.orig 2007-09-10 17:49:28.000000000 +0600 >-+++ strfn.cpp 2008-04-03 21:15:08.000000000 +0600 >+--- strfn.cpp.orig 2011-01-04 20:28:47.000000000 +0800 >++++ strfn.cpp 2011-01-18 11:29:00.000000000 +0800 > @@ -22,23 +22,49 @@ >- >+ > void ExtToInt(const char *Src,char *Dest) > { > +#ifdef WITH_ICONV >@@ -171,16 +173,16 @@ > + } > + if (ret == (size_t)(-1)) strcpy(Dest, Src); > +#else /* !WITH_ICONV */ >- #if defined(_WIN_32) >- CharToOem(Src,Dest); >+ #if defined(_WIN_ALL) >+ CharToOemA(Src,Dest); > #else > if (Dest!=Src) > strcpy(Dest,Src); > #endif > +#endif /* !WITH_ICONV */ > } >- >- >+ >+ > void IntToExt(const char *Src,char *Dest) > { > +#ifdef WITH_ICONV >@@ -195,11 +197,13 @@ > + } > + if (ret == (size_t)(-1)) strcpy(Dest,Src); > +#else /* !WITH_ICONV */ >- #if defined(_WIN_32) >- OemToChar(Src,Dest); >+ #if defined(_WIN_ALL) >+ OemToCharA(Src,Dest); > #else > if (Dest!=Src) > strcpy(Dest,Src); > #endif > +#endif /* !WITH_ICONV */ > } >+ >+
You cannot view the attachment while viewing its details because your browser does not support IFRAMEs.
View the attachment on a separate page
.
View Attachment As Diff
View Attachment As Raw
Actions:
View
|
Diff
Attachments on
bug 154105
: 112668