Sync p7zip patch from Arch Linux

See https://gitlab.archlinux.org/archlinux/packaging/packages/p7zip/-/blob/main/PKGBUILD?ref_type=heads

0e0a1a8316b6.patch

@@ -0,0 +1,30 @@
+From 0e0a1a8316b691de8f1eca8e9520274e00205884 Mon Sep 17 00:00:00 2001
+From: hanjinfei <hWX701289@china.huawei.com>
+Date: Wed, 22 Jul 2020 03:05:53 +0100
+Subject: [PATCH] fix Compilation error on cygwin.
+
+---
+ CPP/7zip/Archive/Zip/ZipItem.cpp | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/CPP/7zip/Archive/Zip/ZipItem.cpp b/CPP/7zip/Archive/Zip/ZipItem.cpp
+index 7e11b197..37b69933 100644
+--- a/CPP/7zip/Archive/Zip/ZipItem.cpp
++++ b/CPP/7zip/Archive/Zip/ZipItem.cpp
+@@ -1,6 +1,6 @@
+ // Archive/ZipItem.cpp
+
+-#ifndef _WIN32
++#if (!defined _WIN32) && (!defined __CYGWIN__)
+ #include <iconv.h>
+ #include <locale.h>
+ #endif
+@@ -355,7 +355,7 @@ void CItem::GetUnicodeString(UString &res, const AString &s, bool isComment, boo
+     #endif
+   }
+
+-  #ifndef _WIN32
++  #if (!defined _WIN32) && (!defined __CYGWIN__)
+   // Convert OEM char set to UTF-8 if needed
+   // Use system locale to select code page
+

334a01e3f8bc.patch

@@ -0,0 +1,30 @@
+From 334a01e3f8bcfb6da15352b5a067098ee78709d8 Mon Sep 17 00:00:00 2001
+From: jinfeihan57 <38484902+jinfeihan57@users.noreply.github.com>
+Date: Wed, 21 Oct 2020 16:36:31 +0800
+Subject: [PATCH] fix issue #78
+
+---
+ CPP/7zip/Archive/Zip/ZipItem.cpp | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/CPP/7zip/Archive/Zip/ZipItem.cpp b/CPP/7zip/Archive/Zip/ZipItem.cpp
+index 37b69933..353e8955 100644
+--- a/CPP/7zip/Archive/Zip/ZipItem.cpp
++++ b/CPP/7zip/Archive/Zip/ZipItem.cpp
+@@ -1,6 +1,6 @@
+ // Archive/ZipItem.cpp
+
+-#if (!defined _WIN32) && (!defined __CYGWIN__)
++#if (!defined _WIN32) && (!defined __CYGWIN__) && (!defined __APPLE__)
+ #include <iconv.h>
+ #include <locale.h>
+ #endif
+@@ -355,7 +355,7 @@ void CItem::GetUnicodeString(UString &res, const AString &s, bool isComment, boo
+     #endif
+   }
+
+-  #if (!defined _WIN32) && (!defined __CYGWIN__)
++  #if (!defined _WIN32) && (!defined __CYGWIN__) && (!defined __APPLE__)
+   // Convert OEM char set to UTF-8 if needed
+   // Use system locale to select code page
+

c104127e6a93.patch

@@ -0,0 +1,112 @@
+From c104127e6a9364b8d6a1d79012e5249a129c3857 Mon Sep 17 00:00:00 2001
+From: unxed <unxed@mail.ru>
+Date: Fri, 17 Jul 2020 12:15:53 +0300
+Subject: [PATCH] Use system locale to select OEM code page for zip archives
+ made on dos/windows. Can be overriden with OEMCP environment variable.
+
+---
+ CPP/7zip/Archive/Zip/ZipItem.cpp | 85 ++++++++++++++++++++++++++++++++
+ 1 file changed, 85 insertions(+)
+
+diff --git a/CPP/7zip/Archive/Zip/ZipItem.cpp b/CPP/7zip/Archive/Zip/ZipItem.cpp
+index 885a43cd..7e11b197 100644
+--- a/CPP/7zip/Archive/Zip/ZipItem.cpp
++++ b/CPP/7zip/Archive/Zip/ZipItem.cpp
+@@ -1,5 +1,10 @@
+ // Archive/ZipItem.cpp
+
++#ifndef _WIN32
++#include <iconv.h>
++#include <locale.h>
++#endif
++
+ #include "StdAfx.h"
+
+ #include "../../../../C/CpuArch.h"
+@@ -350,6 +355,86 @@ void CItem::GetUnicodeString(UString &res, const AString &s, bool isComment, boo
+     #endif
+   }
+
++  #ifndef _WIN32
++  // Convert OEM char set to UTF-8 if needed
++  // Use system locale to select code page
++
++  Byte hostOS = GetHostOS();
++  if (!isUtf8 && ((hostOS == NFileHeader::NHostOS::kFAT) || (hostOS == NFileHeader::NHostOS::kNTFS))) {
++
++    const char *oemcp;
++    oemcp = getenv("OEMCP");
++    if (!oemcp) {
++      oemcp = "CP437\0"; // CP name is 6 chars max
++
++      const char *lc_to_cp_table[] = {
++      "af_ZA", "CP850", "ar_SA", "CP720", "ar_LB", "CP720", "ar_EG", "CP720",
++      "ar_DZ", "CP720", "ar_BH", "CP720", "ar_IQ", "CP720", "ar_JO", "CP720",
++      "ar_KW", "CP720", "ar_LY", "CP720", "ar_MA", "CP720", "ar_OM", "CP720",
++      "ar_QA", "CP720", "ar_SY", "CP720", "ar_TN", "CP720", "ar_AE", "CP720",
++      "ar_YE", "CP720","ast_ES", "CP850", "az_AZ", "CP866", "az_AZ", "CP857",
++      "be_BY", "CP866", "bg_BG", "CP866", "br_FR", "CP850", "ca_ES", "CP850",
++      "zh_CN", "CP936", "zh_TW", "CP950", "kw_GB", "CP850", "cs_CZ", "CP852",
++      "cy_GB", "CP850", "da_DK", "CP850", "de_AT", "CP850", "de_LI", "CP850",
++      "de_LU", "CP850", "de_CH", "CP850", "de_DE", "CP850", "el_GR", "CP737",
++      "en_AU", "CP850", "en_CA", "CP850", "en_GB", "CP850", "en_IE", "CP850",
++      "en_JM", "CP850", "en_BZ", "CP850", "en_PH", "CP437", "en_ZA", "CP437",
++      "en_TT", "CP850", "en_US", "CP437", "en_ZW", "CP437", "en_NZ", "CP850",
++      "es_PA", "CP850", "es_BO", "CP850", "es_CR", "CP850", "es_DO", "CP850",
++      "es_SV", "CP850", "es_EC", "CP850", "es_GT", "CP850", "es_HN", "CP850",
++      "es_NI", "CP850", "es_CL", "CP850", "es_MX", "CP850", "es_ES", "CP850",
++      "es_CO", "CP850", "es_ES", "CP850", "es_PE", "CP850", "es_AR", "CP850",
++      "es_PR", "CP850", "es_VE", "CP850", "es_UY", "CP850", "es_PY", "CP850",
++      "et_EE", "CP775", "eu_ES", "CP850", "fa_IR", "CP720", "fi_FI", "CP850",
++      "fo_FO", "CP850", "fr_FR", "CP850", "fr_BE", "CP850", "fr_CA", "CP850",
++      "fr_LU", "CP850", "fr_MC", "CP850", "fr_CH", "CP850", "ga_IE", "CP437",
++      "gd_GB", "CP850", "gv_IM", "CP850", "gl_ES", "CP850", "he_IL", "CP862",
++      "hr_HR", "CP852", "hu_HU", "CP852", "id_ID", "CP850", "is_IS", "CP850",
++      "it_IT", "CP850", "it_CH", "CP850", "iv_IV", "CP437", "ja_JP", "CP932",
++      "kk_KZ", "CP866", "ko_KR", "CP949", "ky_KG", "CP866", "lt_LT", "CP775",
++      "lv_LV", "CP775", "mk_MK", "CP866", "mn_MN", "CP866", "ms_BN", "CP850",
++      "ms_MY", "CP850", "nl_BE", "CP850", "nl_NL", "CP850", "nl_SR", "CP850",
++      "nn_NO", "CP850", "nb_NO", "CP850", "pl_PL", "CP852", "pt_BR", "CP850",
++      "pt_PT", "CP850", "rm_CH", "CP850", "ro_RO", "CP852", "ru_RU", "CP866",
++      "sk_SK", "CP852", "sl_SI", "CP852", "sq_AL", "CP852", "sr_RS", "CP855",
++      "sr_RS", "CP852", "sv_SE", "CP850", "sv_FI", "CP850", "sw_KE", "CP437",
++      "th_TH", "CP874", "tr_TR", "CP857", "tt_RU", "CP866", "uk_UA", "CP866",
++      "ur_PK", "CP720", "uz_UZ", "CP866", "uz_UZ", "CP857", "vi_VN", "CP1258",
++      "wa_BE", "CP850", "zh_HK", "CP950", "zh_SG", "CP936"};
++      int table_len = sizeof(lc_to_cp_table) / sizeof(char *);
++      int lc_len, i;
++
++      char *lc = setlocale(LC_CTYPE, "");
++
++      if (lc && lc[0]) {
++          // Compare up to the dot, if it exists, e.g. en_US.UTF-8
++          for (lc_len = 0; lc[lc_len] != '.' && lc[lc_len] != '\0'; ++lc_len)
++              ;
++          for (i = 0; i < table_len; i += 2)
++              if (strncmp(lc, lc_to_cp_table[i], lc_len) == 0)
++                  oemcp = lc_to_cp_table[i + 1];
++      }
++    }
++
++    iconv_t cd;
++    if ((cd = iconv_open("UTF-8", oemcp)) != (iconv_t)-1) {
++
++      AString s_utf8;
++      const char* src = s.Ptr();
++      size_t slen = s.Len();
++      size_t dlen = slen * 4;
++      const char* dest = s_utf8.GetBuf_SetEnd(dlen + 1); // (source length * 4) + null termination
++
++      size_t done = iconv(cd, (char**)&src, &slen, (char**)&dest, &dlen);
++      bzero((size_t*)dest + done, 1);
++
++      iconv_close(cd);
++
++      if (ConvertUTF8ToUnicode(s_utf8, res) || ignore_Utf8_Errors)
++        return;
++    }    
++  }
++  #endif
+
+   if (isUtf8)
+     if (ConvertUTF8ToUnicode(s, res) || ignore_Utf8_Errors)

org.kde.ark.json

@@ -215,7 +215,9 @@
             "name": "p7zip",
             "no-autogen": true,
             "make-args": [
-                "7z"
+                "7z",
+                "7zr",
+                "7za"
             ],
             "sources": [
                 {
@@ -228,6 +230,18 @@
                         "stable-only": true,
                         "url-template": "https://github.com/p7zip-project/p7zip/archive/v$version/p7zip-v$version.tar.gz"
                     }
+                },
+                {
+                    "type": "patch",
+                    "path": "334a01e3f8bc.patch"
+                },
+                {
+                    "type": "patch",
+                    "path": "0e0a1a8316b6.patch"
+                },
+                {
+                    "type": "patch",
+                    "path": "c104127e6a93.patch"
                 }
             ]
         },