-
-
Notifications
You must be signed in to change notification settings - Fork 192
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
added a package patch "0001-default-identity-encoding.patch" to the tcl
package to make the "identity" character encoding the default+system encoding like it had been with tclsh 8.2 and which seem to have caused the umlaut character encoding issues recently seen. In addition, adapted tclrega and tclrpc accordingly so that they only actively perform character conversion in case no "identity" encoding is used. Furthermore, remove the explicit "convertto" char conversion calls in jsonrpc.tcl so fix similar issues. This altogether should hopefully fix the char encoding issues seen in the WebUI and external CCU addons like hm_pdetect, etc. This refs #1782.
- Loading branch information
Showing
7 changed files
with
65 additions
and
28 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
23 changes: 22 additions & 1 deletion
23
buildroot-external/patches/occu/0159-WebUI-Fix-JSONRpcResponses.patch
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
33 changes: 33 additions & 0 deletions
33
buildroot-external/patches/tcl/0001-default-identity-encoding.patch
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,33 @@ | ||
--- tcl/generic/tclEncoding.c.orig 2022-04-04 10:38:56.350621821 +0200 | ||
+++ tcl/generic/tclEncoding.c 2022-04-04 10:37:19.845418339 +0200 | ||
@@ -563,6 +563,9 @@ | ||
type.clientData = NULL; | ||
tclIdentityEncoding = Tcl_CreateEncoding(&type); | ||
|
||
+ defaultEncoding = tclIdentityEncoding; | ||
+ systemEncoding = Tcl_GetEncoding(NULL, type.encodingName); | ||
+ | ||
type.encodingName = "utf-8"; | ||
type.toUtfProc = UtfExtToUtfIntProc; | ||
type.fromUtfProc = UtfIntToUtfExtProc; | ||
@@ -614,8 +617,7 @@ | ||
type.freeProc = TableFreeProc; | ||
type.nullSize = 1; | ||
type.clientData = dataPtr; | ||
- defaultEncoding = Tcl_CreateEncoding(&type); | ||
- systemEncoding = Tcl_GetEncoding(NULL, type.encodingName); | ||
+ Tcl_CreateEncoding(&type); | ||
|
||
encodingsInitialized = 1; | ||
} | ||
--- tcl/unix/tclUnixInit.c.orig 2022-04-04 11:21:21.783353703 +0200 | ||
+++ tcl/unix/tclUnixInit.c 2022-04-04 11:21:33.023496137 +0200 | ||
@@ -94,7 +94,7 @@ | ||
*/ | ||
|
||
#ifndef TCL_DEFAULT_ENCODING | ||
-#define TCL_DEFAULT_ENCODING "iso8859-1" | ||
+#define TCL_DEFAULT_ENCODING "identity" | ||
#endif | ||
|
||
/* |