diff options
| author | yhfudev | 2016-04-16 08:40:51 -0400 |
|---|---|---|
| committer | yhfudev | 2016-04-16 08:40:51 -0400 |
| commit | f21815d2d08b10c724ad999445923bbc68d9e8c4 (patch) | |
| tree | a1e12750a7bff276c34a9415055ed19ee34bf8ef /wxmedit-encdet-mozilla.patch | |
| parent | bf0444e4ef6241803ffe68d2abe9424dc1b3772e (diff) | |
| download | aur-f21815d2d08b10c724ad999445923bbc68d9e8c4.tar.gz | |
update
Diffstat (limited to 'wxmedit-encdet-mozilla.patch')
| -rw-r--r-- | wxmedit-encdet-mozilla.patch | 26 |
1 files changed, 13 insertions, 13 deletions
diff --git a/wxmedit-encdet-mozilla.patch b/wxmedit-encdet-mozilla.patch index 9d95e50658b9..52a119bc9025 100644 --- a/wxmedit-encdet-mozilla.patch +++ b/wxmedit-encdet-mozilla.patch @@ -1,8 +1,8 @@ diff --git a/Makefile.am b/Makefile.am -index ef95dbb..b70f986 100644 +index b660cc4..e8519c6 100644 --- a/Makefile.am +++ b/Makefile.am -@@ -24,7 +24,7 @@ encdet_src = src/wxmedit/mad_encdet.cpp \ +@@ -26,7 +26,7 @@ encdet_src = src/xm/encdet.cpp \ bin_PROGRAMS = wxmedit check_PROGRAMS = wxmedit_test TESTS = wxmedit_test @@ -11,11 +11,11 @@ index ef95dbb..b70f986 100644 wxmedit_CXXFLAGS = -DDATA_DIR=\"${datadir}\" ${curl_CFLAGS} wxmedit_SOURCES = $(enc_src) \ $(encdet_src) \ -diff --git a/src/xm/wxm_encdet.cpp b/src/xm/wxm_encdet.cpp -index 715c7df..ca4edad 100644 ---- a/src/xm/wxm_encdet.cpp -+++ b/src/xm/wxm_encdet.cpp -@@ -529,8 +529,13 @@ private: +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
@@ -23,15 +23,15 @@ index 715c7df..ca4edad 100644 +#include <libucd.h>
+#endif
+
- void DetectEncoding(const wxByte *text, size_t len, wxm::WXMEncodingID &enc, bool skip_utf8)
+ 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);
-@@ -556,6 +561,19 @@ void DetectEncoding(const wxByte *text, size_t len, wxm::WXMEncodingID &enc, boo - else
- enc_name.clear();
+@@ -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;
@@ -46,6 +46,6 @@ index 715c7df..ca4edad 100644 + }
+ std::string enc_name(buffer);
+#endif
+ }
- if(enc_name == "EUC-KR")
- enc_name = "UHC";
+ } // namespace xm
|