From 2a2013577c351690ddd6419ef67ad32824d81210 Mon Sep 17 00:00:00 2001 From: Adrien Bourdeaux Date: Thu, 17 Apr 2025 22:32:17 -0400 Subject: [PATCH 1/7] update to 5.5.6 --- ports/scintilla/portfile.cmake | 8 ++++---- ports/scintilla/vcpkg.json | 2 +- versions/baseline.json | 2 +- versions/s-/scintilla.json | 5 +++++ 4 files changed, 11 insertions(+), 6 deletions(-) diff --git a/ports/scintilla/portfile.cmake b/ports/scintilla/portfile.cmake index 6b42c8a3ecf122..28192b05f6eada 100644 --- a/ports/scintilla/portfile.cmake +++ b/ports/scintilla/portfile.cmake @@ -1,7 +1,7 @@ vcpkg_download_distfile(ARCHIVE - URLS "https://www.scintilla.org/scintilla551.zip" - FILENAME "scintilla551.zip" - SHA512 00a230cbdd6e41925eec71566143f4a0fc8e4a87eddb459e3b547835e0cc1a8773e450112468acddacebbf0d4252c9b7edc9d813804a144d6f090f96441b7e1b + URLS "https://www.scintilla.org/scintilla556.zip" + FILENAME "scintilla556.zip" + SHA512 8e845a94379fff88222fa9e4e5f534f62595420dd933166e4d9cc67b197c79f578405cb020892142ead1afd85bd42f1dc4361a339134a087e14760ff33d0a1cf ) if (VCPKG_LIBRARY_LINKAGE STREQUAL "static") @@ -15,7 +15,7 @@ endif() vcpkg_extract_source_archive( SOURCE_PATH ARCHIVE ${ARCHIVE} - SOURCE_BASE 5.5.0 + SOURCE_BASE 5.5.6 PATCHES ${PATCHES} ) diff --git a/ports/scintilla/vcpkg.json b/ports/scintilla/vcpkg.json index 50cdc920d27a65..9a114416847eaa 100644 --- a/ports/scintilla/vcpkg.json +++ b/ports/scintilla/vcpkg.json @@ -1,6 +1,6 @@ { "name": "scintilla", - "version": "5.5.1", + "version": "5.5.6", "description": "A free source code editing component for Win32, GTK+, and OS X", "homepage": "https://www.scintilla.org/", "supports": "!(uwp | linux | osx)", diff --git a/versions/baseline.json b/versions/baseline.json index 61a30858e219e6..98e4ee1ea81568 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -8393,7 +8393,7 @@ "port-version": 0 }, "scintilla": { - "baseline": "5.5.1", + "baseline": "5.5.6", "port-version": 0 }, "sciplot": { diff --git a/versions/s-/scintilla.json b/versions/s-/scintilla.json index 0b0f07caa2d36d..35c5a042adb125 100644 --- a/versions/s-/scintilla.json +++ b/versions/s-/scintilla.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "5882d4b9310bd261eb89dc92f58d8427f8c7680c", + "version": "5.5.6", + "port-version": 0 + }, { "git-tree": "9879865509d99cf64894e8573f8dcbc4e4dde77d", "version": "5.5.1", From 541a4d8d110f7b58f599ab0826370fa46810ae51 Mon Sep 17 00:00:00 2001 From: Adrien Bourdeaux Date: Thu, 17 Apr 2025 22:56:59 -0400 Subject: [PATCH 2/7] scintilla does not build on android since it doesn't have msbuild --- ports/scintilla/vcpkg.json | 4 ++-- versions/baseline.json | 2 +- versions/s-/scintilla.json | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/ports/scintilla/vcpkg.json b/ports/scintilla/vcpkg.json index 9a114416847eaa..afe986d74c56ba 100644 --- a/ports/scintilla/vcpkg.json +++ b/ports/scintilla/vcpkg.json @@ -1,9 +1,9 @@ { "name": "scintilla", - "version": "5.5.6", + "version": "5.5.1", "description": "A free source code editing component for Win32, GTK+, and OS X", "homepage": "https://www.scintilla.org/", - "supports": "!(uwp | linux | osx)", + "supports": "!(uwp | linux | osx | android)", "dependencies": [ { "name": "vcpkg-msbuild", diff --git a/versions/baseline.json b/versions/baseline.json index 98e4ee1ea81568..61a30858e219e6 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -8393,7 +8393,7 @@ "port-version": 0 }, "scintilla": { - "baseline": "5.5.6", + "baseline": "5.5.1", "port-version": 0 }, "sciplot": { diff --git a/versions/s-/scintilla.json b/versions/s-/scintilla.json index 35c5a042adb125..b4ded44d32d684 100644 --- a/versions/s-/scintilla.json +++ b/versions/s-/scintilla.json @@ -6,7 +6,7 @@ "port-version": 0 }, { - "git-tree": "9879865509d99cf64894e8573f8dcbc4e4dde77d", + "git-tree": "4d0de69c251c9cb96eb66e43927d1f30d3fe4dcc", "version": "5.5.1", "port-version": 0 }, From c6b3a42eb5bc807eca5e718aca2e46d80e913e86 Mon Sep 17 00:00:00 2001 From: Adrien Bourdeaux Date: Fri, 18 Apr 2025 06:32:40 -0400 Subject: [PATCH 3/7] Update ports/scintilla/vcpkg.json Co-authored-by: Kai Pastor --- ports/scintilla/vcpkg.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ports/scintilla/vcpkg.json b/ports/scintilla/vcpkg.json index afe986d74c56ba..7db80ee1c9b2e7 100644 --- a/ports/scintilla/vcpkg.json +++ b/ports/scintilla/vcpkg.json @@ -3,7 +3,7 @@ "version": "5.5.1", "description": "A free source code editing component for Win32, GTK+, and OS X", "homepage": "https://www.scintilla.org/", - "supports": "!(uwp | linux | osx | android)", + "supports": "windows & !uwp & !mingw", "dependencies": [ { "name": "vcpkg-msbuild", From 98cf56bf6b114b1640bd265f17b043cf0bd11dd1 Mon Sep 17 00:00:00 2001 From: Adrien Bourdeaux Date: Fri, 18 Apr 2025 06:32:47 -0400 Subject: [PATCH 4/7] Update ports/scintilla/vcpkg.json Co-authored-by: Cheney Wang <38240633+Cheney-W@users.noreply.github.com> --- ports/scintilla/vcpkg.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ports/scintilla/vcpkg.json b/ports/scintilla/vcpkg.json index 7db80ee1c9b2e7..0b89a4c502000a 100644 --- a/ports/scintilla/vcpkg.json +++ b/ports/scintilla/vcpkg.json @@ -1,6 +1,6 @@ { "name": "scintilla", - "version": "5.5.1", + "version": "5.5.6", "description": "A free source code editing component for Win32, GTK+, and OS X", "homepage": "https://www.scintilla.org/", "supports": "windows & !uwp & !mingw", From 8a712da39e9510c9815e35bba6b6d1f6c096a907 Mon Sep 17 00:00:00 2001 From: Adrien Bourdeaux Date: Fri, 18 Apr 2025 06:37:17 -0400 Subject: [PATCH 5/7] fix version db --- versions/baseline.json | 2 +- versions/s-/scintilla.json | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/versions/baseline.json b/versions/baseline.json index 61a30858e219e6..98e4ee1ea81568 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -8393,7 +8393,7 @@ "port-version": 0 }, "scintilla": { - "baseline": "5.5.1", + "baseline": "5.5.6", "port-version": 0 }, "sciplot": { diff --git a/versions/s-/scintilla.json b/versions/s-/scintilla.json index b4ded44d32d684..3a6bbf451aadba 100644 --- a/versions/s-/scintilla.json +++ b/versions/s-/scintilla.json @@ -1,7 +1,7 @@ { "versions": [ { - "git-tree": "5882d4b9310bd261eb89dc92f58d8427f8c7680c", + "git-tree": "a82db6d9c0d2eaf3fe2e54810820a76c0948d3cd", "version": "5.5.6", "port-version": 0 }, From f55e07faf8ce08a86b07371662a28e5c72409994 Mon Sep 17 00:00:00 2001 From: Cheney Wang <38240633+Cheney-W@users.noreply.github.com> Date: Mon, 21 Apr 2025 09:38:28 +0800 Subject: [PATCH 6/7] Update scintilla.json --- versions/s-/scintilla.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/versions/s-/scintilla.json b/versions/s-/scintilla.json index 3a6bbf451aadba..22973807096458 100644 --- a/versions/s-/scintilla.json +++ b/versions/s-/scintilla.json @@ -6,7 +6,7 @@ "port-version": 0 }, { - "git-tree": "4d0de69c251c9cb96eb66e43927d1f30d3fe4dcc", + "git-tree": "9879865509d99cf64894e8573f8dcbc4e4dde77d", "version": "5.5.1", "port-version": 0 }, From 1eb03a0856e0cc6f49e50931442170910c81d12e Mon Sep 17 00:00:00 2001 From: Billy Robert O'Neal III Date: Thu, 24 Apr 2025 13:57:01 -0700 Subject: [PATCH 7/7] Remove supports failures from ci.baseline.txt. --- scripts/ci.baseline.txt | 3 --- 1 file changed, 3 deletions(-) diff --git a/scripts/ci.baseline.txt b/scripts/ci.baseline.txt index 9cb9eb65566ccb..5c3cac0c00f9a6 100644 --- a/scripts/ci.baseline.txt +++ b/scripts/ci.baseline.txt @@ -911,9 +911,6 @@ rtmidi:arm64-android=fail rtmidi:x64-android=fail safetyhook:x64-linux=fail salome-medcoupling:x64-linux=fail -scintilla:arm-neon-android=fail -scintilla:arm64-android=fail -scintilla:x64-android=fail sciter:arm-neon-android=fail sciter:arm64-android=fail sciter:arm64-osx=skip