From nobody Mon Feb 28 12:53:41 2022 X-Original-To: dev-commits-ports-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 2873419F7D45; Mon, 28 Feb 2022 12:53:43 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4K6gKy1Qbsz3kb1; Mon, 28 Feb 2022 12:53:41 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1646052822; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=QXQU4vdafca0dFMiy36Go8T/1eLoxWpzUZS7x47YBgM=; b=LLgrorIc0vwyPkWUkmrGAlQ7vuWnH71fYVFajyhve5/QhU4i9TTdgOl5Px7gKR2oMEysKE SLpIiKSf5Jb7Y3FI9Io7nAs3jQrlg+j/BA4ES8Ei1y2hR7ANDB/QixcKlnIDTKz58j4Uug +woHABar0fhKYRdBpIOi3mgrUJTY5fnbcBneeP9GvWJElmzdPnZfYtytXta0SD2kWND1CE I7MkBMYvrXPo7rEBqrJdJMhwzawi6O4022tlLh+UC1jymAyW9iaZAUTCQedk8a9bdr2Pix V77SdpKPRflaBUDz8vMzMTG9mseQkxp7gUmog0tbo8gkdBZnkT9LjUd4nZN9oA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 988401BF81; Mon, 28 Feb 2022 12:53:41 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 21SCrfOo067124; Mon, 28 Feb 2022 12:53:41 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 21SCrfZq067123; Mon, 28 Feb 2022 12:53:41 GMT (envelope-from git) Date: Mon, 28 Feb 2022 12:53:41 GMT Message-Id: <202202281253.21SCrfZq067123@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Po-Chuan Hsieh Subject: git: c2fa4b35c54c - main - archivers/unrar-iconv: Fix build with unrar 6.10 List-Id: Commits to the main branch of the FreeBSD ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-ports-main@freebsd.org X-BeenThere: dev-commits-ports-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: sunpoet X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: c2fa4b35c54c608893ad9008bcc8a1fdcf9636a4 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1646052822; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=QXQU4vdafca0dFMiy36Go8T/1eLoxWpzUZS7x47YBgM=; b=dbWoWhFSOBBCskOwR1DFenclERhG6f2XK4bGYQ7KIhnM5xy8nwn9RoVAzZ60zaTZXmtQdq ZVg5na8fcrMvtlltn3MjowstVTCMerUVIge1TVUe+q4Hgk30/0zNuAEz9K9KfHwRfDsqZe LZnyQGxy9LNmA3jV03LfhCKbQjQPnaUfTbXxm/65hoyBn/oNpjj4+c2wIEHtkKCGeePA6O SJ7JTMfpGSZM3Et1RIHKP21vLUF7d9tnjP+axX/mKbWBmxyRPmAWnXOwA+HFhIgkju17Cc GsEaTOTdfcCdkHZ/NlT7cmyjmqZGsTrdpRRzUAXYTyfXweqmKAM+xhNAxlOhng== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1646052822; a=rsa-sha256; cv=none; b=u84jBwxD7PBNunrYJKpahR7LKcj8/XNEgpgOCAzjbciY0+y0Z7xGCXeqvZyCgm+VGDtW0m agiLh1I671rzZhh7QhW/unZF8bBphxHc/j/f1ekPdEAs8rAarKub3idUVwDSy6qVhhiMpZ F4F42aLvkK3m6ZILYgupVz+tB715/ND37R+7y4of+fS+vnSJKrj3NZjQdX9QLmBf3EQtzx xQm61+efW1x6aeGt0ndD5YqgYU3AFAqHWW4D5t8WP2dS0zxmnviBwv/wzX9IVfEQ+nSZV/ cBuq49X6xZjjg6fBNKZ1CiPKnVPsIqlvNOgT8qkVJXiLLmUuUBNIVihNJmgkqg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by sunpoet: URL: https://cgit.FreeBSD.org/ports/commit/?id=c2fa4b35c54c608893ad9008bcc8a1fdcf9636a4 commit c2fa4b35c54c608893ad9008bcc8a1fdcf9636a4 Author: Po-Chuan Hsieh AuthorDate: 2022-02-28 09:40:03 +0000 Commit: Po-Chuan Hsieh CommitDate: 2022-02-28 12:46:38 +0000 archivers/unrar-iconv: Fix build with unrar 6.10 --- archivers/unrar-iconv/files/patch-iconv | 48 ++++++++++++++++----------------- 1 file changed, 24 insertions(+), 24 deletions(-) diff --git a/archivers/unrar-iconv/files/patch-iconv b/archivers/unrar-iconv/files/patch-iconv index 685a8abf8b10..d8e09924af5f 100644 --- a/archivers/unrar-iconv/files/patch-iconv +++ b/archivers/unrar-iconv/files/patch-iconv @@ -1,6 +1,6 @@ ---- cmddata.cpp.orig 2019-04-27 20:05:15 UTC +--- cmddata.cpp.orig 2022-01-24 07:33:17 UTC +++ cmddata.cpp -@@ -167,6 +167,34 @@ void CommandData::ParseDone() +@@ -171,6 +171,34 @@ void CommandData::ParseDone() // Suppress the copyright message and final end of line for 'lb' and 'vb'. if ((CmdChar=='L' || CmdChar=='V') && Command[1]=='B') BareOutput=true; @@ -35,7 +35,7 @@ } -@@ -910,6 +938,22 @@ void CommandData::ProcessSwitch(const wc +@@ -912,6 +940,22 @@ void CommandData::ProcessSwitch(const wchar *Switch) else wcsncpyz(CommentFile,Switch+1,ASIZE(CommentFile)); break; @@ -58,22 +58,22 @@ case '?' : OutHelp(RARX_SUCCESS); break; ---- cmdmix.cpp.orig 2019-04-27 20:05:15 UTC +--- cmdmix.cpp.orig 2022-01-24 07:33:17 UTC +++ cmdmix.cpp -@@ -63,7 +63,11 @@ void CommandData::OutHelp(RAR_EXIT ExitC +@@ -63,7 +63,11 @@ void CommandData::OutHelp(RAR_EXIT ExitCode) MCHelpSwAT,MCHelpSwAC,MCHelpSwAD,MCHelpSwAG,MCHelpSwAI,MCHelpSwAP, - MCHelpSwCm,MCHelpSwCFGm,MCHelpSwCL,MCHelpSwCU, - MCHelpSwDH,MCHelpSwEP,MCHelpSwEP3,MCHelpSwF,MCHelpSwIDP,MCHelpSwIERR, -- MCHelpSwINUL,MCHelpSwIOFF,MCHelpSwKB,MCHelpSwN,MCHelpSwNa,MCHelpSwNal, + MCHelpSwCm,MCHelpSwCFGm,MCHelpSwCL,MCHelpSwCU,MCHelpSwDH,MCHelpSwEP, + MCHelpSwEP3,MCHelpSwEP4,MCHelpSwF,MCHelpSwIDP,MCHelpSwIERR, +- MCHelpSwINUL,MCHelpSwIOFF,MCHelpSwKB,MCHelpSwME,MCHelpSwN,MCHelpSwNa, + MCHelpSwINUL,MCHelpSwIOFF,MCHelpSwKB, +#ifdef WITH_ICONV + MCHelpSwLA,MCHelpSwLL,MCHelpSwLO, +#endif -+ MCHelpSwN,MCHelpSwNa,MCHelpSwNal, - MCHelpSwO,MCHelpSwOC,MCHelpSwOL,MCHelpSwOR,MCHelpSwOW,MCHelpSwP, - MCHelpSwPm,MCHelpSwR,MCHelpSwRI,MCHelpSwSC,MCHelpSwSL,MCHelpSwSM, - MCHelpSwTA,MCHelpSwTB,MCHelpSwTN,MCHelpSwTO,MCHelpSwTS,MCHelpSwU, ---- global.hpp.orig 2019-04-27 20:05:17 UTC ++ MCHelpSwME,MCHelpSwN,MCHelpSwNa, + MCHelpSwNal,MCHelpSwO,MCHelpSwOC,MCHelpSwOL,MCHelpSwOP,MCHelpSwOR, + MCHelpSwOW,MCHelpSwP,MCHelpSwR,MCHelpSwRI,MCHelpSwSC,MCHelpSwSI, + MCHelpSwSL,MCHelpSwSM,MCHelpSwTA,MCHelpSwTB,MCHelpSwTN,MCHelpSwTO, +--- global.hpp.orig 2022-01-24 07:33:18 UTC +++ global.hpp @@ -9,6 +9,17 @@ @@ -93,9 +93,9 @@ +#endif #endif ---- loclang.hpp.orig 2019-04-27 20:05:18 UTC +--- loclang.hpp.orig 2022-01-24 07:33:18 UTC +++ loclang.hpp -@@ -8,7 +8,7 @@ +@@ -9,7 +9,7 @@ #define MRegTo L"\nRegistered to %s\n" #define MShare L"\nTrial version Type 'rar -?' for help\n" #define MRegKeyWarning L"\nAvailable license key is valid only for %s\n" @@ -104,16 +104,16 @@ #define MBeta L"beta" #define Mx86 L"x86" #define Mx64 L"x64" -@@ -323,7 +323,7 @@ +@@ -327,7 +327,7 @@ #define MProcessArc L"\n\nProcessing archive %s" - #define MCorrectingName L"\nWARNING: Attempting to correct the invalid file name" + #define MCorrectingName L"\nWARNING: Attempting to correct the invalid file or directory name" #define MUnpCannotMerge L"\nWARNING: You need to start extraction from a previous volume to unpack %s" -#define MUnknownOption L"\nERROR: Unknown option: %s" +#define MUnknownOption L"\nERROR: Unknown option: %s\n" #define MSubHeadCorrupt L"\nERROR: Corrupt data header found, ignored" #define MSubHeadUnknown L"\nWARNING: Unknown data header format, ignored" #define MSubHeadDataCRC L"\nERROR: Corrupt %s data block" -@@ -351,6 +351,12 @@ +@@ -355,6 +355,12 @@ #define MSHelpCmdV L"\n -v Verbosely list contents of archive" #define MRecVolLimit L"\nTotal number of usual and recovery volumes must not exceed %d" #define MVolumeNumber L"volume %d" @@ -124,11 +124,11 @@ +#define MIconvCannotOpen L"\nCannot open iconv to convert between '%s' and '%s' with option '%s'" +#endif #define MCannotDelete L"\nCannot delete %s" - #define MRecycleFailed L"\nCannot move some files and folders to Recycle Bin" + #define MRecycleFailed L"\nCannot move some files and directories to Recycle Bin" #define MCalcCRC L"\nCalculating the checksum" ---- os.hpp.orig 2019-04-27 20:05:18 UTC +--- os.hpp.orig 2022-01-24 07:33:18 UTC +++ os.hpp -@@ -166,6 +166,10 @@ +@@ -168,6 +168,10 @@ #include @@ -139,9 +139,9 @@ #ifdef S_IFLNK #define SAVE_LINKS #endif ---- strfn.cpp.orig 2019-04-27 20:05:20 UTC +--- strfn.cpp.orig 2022-01-24 07:33:18 UTC +++ strfn.cpp -@@ -14,6 +14,19 @@ const wchar *NullToEmpty(const wchar *St +@@ -14,6 +14,19 @@ const wchar *NullToEmpty(const wchar *Str) void IntToExt(const char *Src,char *Dest,size_t DestSize) { @@ -161,7 +161,7 @@ #ifdef _WIN_ALL // OemToCharBuff does not stop at 0, so let's check source length. size_t SrcLength=strlen(Src)+1; -@@ -25,6 +38,7 @@ void IntToExt(const char *Src,char *Dest +@@ -25,6 +38,7 @@ void IntToExt(const char *Src,char *Dest,size_t DestSi if (Dest!=Src) strncpyz(Dest,Src,DestSize); #endif