1 files changed, 12 insertions, 51 deletions
diff --git a/wxmedit-encdet-mozilla.patch b/wxmedit-encdet-mozilla.patch
index 52a119bc9025..5c42a5742268 100644
--- a/wxmedit-encdet-mozilla.patch
+++ b/wxmedit-encdet-mozilla.patch
@@ -1,51 +1,12 @@
-diff --git a/Makefile.am b/Makefile.am
-index b660cc4..e8519c6 100644
---- a/Makefile.am
-+++ b/Makefile.am
-@@ -26,7 +26,7 @@ encdet_src =	src/xm/encdet.cpp \
- bin_PROGRAMS = wxmedit
- check_PROGRAMS = wxmedit_test
- TESTS = wxmedit_test
--wxmedit_LDADD = ${curl_LIBS}
-+wxmedit_LDADD = ${curl_LIBS} -lucd
- wxmedit_CXXFLAGS = -DDATA_DIR=\"${datadir}\" ${curl_CFLAGS}
- wxmedit_SOURCES =	$(enc_src) \
- 	$(encdet_src) \
-diff --git a/src/xm/encdet.cpp b/src/xm/encdet.cpp
-index 8200fdc..4270e93 100644
---- a/src/xm/encdet.cpp
-+++ b/src/xm/encdet.cpp
-@@ -558,8 +558,13 @@ private:
- };
- #endif
- 
-+#if 1
-+#include <libucd.h>
-+#endif
-+
- void DetectEncoding(const ubyte* text, size_t len, EncodingID& enc, bool skip_utf8)
- {
-+#if 0
- 	UErrorCode status = U_ZERO_ERROR;
- 	LocalUCharsetDetectorPointer csd(ucsdet_open(&status));
- 	ucsdet_setText(csd.getAlias(), (const char*)text, len, &status);
-@@ -611,6 +616,19 @@ void DetectEncoding(const ubyte* text, size_t len, EncodingID& enc, bool skip_ut
- 		if(det != ENC_DEFAULT)
- 			enc = det;
- 	}
-+#else
-+    ucd_t det;
-+    char buffer[UCD_MAX_ENCODING_NAME + 1] = "GB18030";
-+    if (ucd_init (&det) >= 0) {
-+        ucd_parse (&det, (const char*)text, len);
-+        ucd_end (&det);
-+        if (ucd_results (&det, buffer, sizeof(buffer) - 1) < 0) {
-+            buffer[0] = 0;
-+        }
-+        ucd_clear(&det);
-+    }
-+    std::string enc_name(buffer);
-+#endif
- }
- 
- } // namespace xm
+diff -uprN wxmedit-git.git/src/wxmedit/src/xm/encoding/multibyte.cpp wxmedit-git/src/wxmedit/src/xm/encoding/multibyte.cpp
+--- a/src/xm/encoding/multibyte.cpp	2022-05-15 23:58:39.274350279 +0800
++++ b/src/xm/encoding/multibyte.cpp	2022-05-15 22:48:47.800707488 +0800
+@@ -33,7 +33,7 @@ ICUConverter::ICUConverter(const std::st
+ 
+ 	m_ucnv = ucnv_open(encname.c_str(), &err);
+ 
+-	ucnv_setFallback(m_ucnv, FALSE);
++	ucnv_setFallback(m_ucnv, false);
+ 	ucnv_setFromUCallBack(m_ucnv, error_callback, nullptr, nullptr, nullptr, &err);
+ }
+