Skip to content

Commit

Permalink
[tidy-html5] Replace uwp does not support functions (#35375)
Browse files Browse the repository at this point in the history
* Replace uwp does not support functions

* update version

* fix patch

* update version

* del baseline

---------

Co-authored-by: Jim wang (BEYONDSOFT CONSULTING INC) <[email protected]>
  • Loading branch information
jimwang118 and jimwang118 authored Jan 30, 2024
1 parent 7f3acf6 commit 98ee16b
Show file tree
Hide file tree
Showing 6 changed files with 21 additions and 4 deletions.
13 changes: 13 additions & 0 deletions ports/tidy-html5/fix_unsupport_func_uwp.patch
Original file line number Diff line number Diff line change
@@ -0,0 +1,13 @@
diff --git a/src/sprtf.c b/src/sprtf.c
index 3468ac1..1630405 100644
--- a/src/sprtf.c
+++ b/src/sprtf.c
@@ -387,7 +387,7 @@ static void wprt( PTSTR ps )
{
static char _s_woibuf[1024];
char * cp = _s_woibuf;
- int len = (int)lstrlen(ps);
+ int len = (int)wcslen(ps);
if(len) {
int ret = WideCharToMultiByte( CP_ACP, /* UINT CodePage, // code page */
0, /* DWORD dwFlags, // performance and mapping flags */
2 changes: 1 addition & 1 deletion ports/tidy-html5/portfile.cmake
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@ vcpkg_from_github(
disable-doc.patch
static-vs-shared.patch
debug-postfix.patch
fix_unsupport_func_uwp.patch
)

string(COMPARE EQUAL "${VCPKG_LIBRARY_LINKAGE}" "dynamic" BUILD_SHARED_LIB)
Expand All @@ -19,7 +20,6 @@ vcpkg_cmake_configure(
-DTIDY_CONSOLE_SHARED=${BUILD_SHARED_LIB}
)
vcpkg_cmake_install()
vcpkg_copy_pdbs()
vcpkg_fixup_pkgconfig()

file(REMOVE_RECURSE
Expand Down
1 change: 1 addition & 0 deletions ports/tidy-html5/vcpkg.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
{
"name": "tidy-html5",
"version": "5.8.0",
"port-version": 1,
"description": "Tidy tidies HTML and XML. It can tidy your documents by itself, and developers can easily integrate its features into even more powerful tools.",
"homepage": "https://www.html-tidy.org",
"license": null,
Expand Down
2 changes: 0 additions & 2 deletions scripts/ci.baseline.txt
Original file line number Diff line number Diff line change
Expand Up @@ -1140,8 +1140,6 @@ tensorflow-cc:x64-osx=skip
tensorflow-cc:arm-osx=skip

thorvg:arm-neon-android=fail
tidy-html5:arm64-uwp=fail
tidy-html5:x64-uwp=fail
tinycthread:arm-neon-android=fail
tinycthread:arm64-android=fail
tinycthread:x64-android=fail
Expand Down
2 changes: 1 addition & 1 deletion versions/baseline.json
Original file line number Diff line number Diff line change
Expand Up @@ -8490,7 +8490,7 @@
},
"tidy-html5": {
"baseline": "5.8.0",
"port-version": 0
"port-version": 1
},
"tiff": {
"baseline": "4.6.0",
Expand Down
5 changes: 5 additions & 0 deletions versions/t-/tidy-html5.json
Original file line number Diff line number Diff line change
@@ -1,5 +1,10 @@
{
"versions": [
{
"git-tree": "3ff916aaab30ac5a85e702ab9cf4e8092db79477",
"version": "5.8.0",
"port-version": 1
},
{
"git-tree": "e16455cbec8214de37e3deb0ad41fe57323a7dd0",
"version": "5.8.0",
Expand Down

0 comments on commit 98ee16b

Please sign in to comment.