3party/vcpkg
0
0
Fork 0
mirror of https://github.com/microsoft/vcpkg.git synced 2025-01-14 13:54:46 +08:00
Code Issues Projects Releases Wiki Activity

[scintilla] Update to 5.5.0 (#39002)

Browse Source 
Fixes https://github.com/microsoft/vcpkg/issues/38985

- [X] Changes comply with the [maintainer
guide](https://github.com/microsoft/vcpkg-docs/blob/main/vcpkg/contributing/maintainer-guide.md).
- [X] SHA512s are updated for each updated download.
- [ ] ~~The "supports" clause reflects platforms that may be fixed by
this new version.~~
- [ ] ~~Any fixed [CI
baseline](https://github.com/microsoft/vcpkg/blob/master/scripts/ci.baseline.txt)
entries are removed from that file.~~
- [ ] ~~Any patches that are no longer applied are deleted from the
port's directory.~~
- [X] The version database is fixed by rerunning `./vcpkg x-add-version
--all` and committing the result.
- [X] Only one version is added to each modified port's versions file.

Compile test pass with following triplets:
```
x64-windows
x64-windows-static
```
This commit is contained in:
jim wang 2024-05-30 06:36:58 +00:00 committed by GitHub
parent fc6345e114
commit 1e767d2ca4
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
6 changed files with 78 additions and 60 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
ports/scintilla/0001-static-lib.patch
View File

@ -1,14 +1,13 @@
diff --git a/win32/SciLexer.vcxproj b/win32/SciLexer.vcxproj diff --git a/win32/Scintilla.vcxproj b/win32/Scintilla.vcxproj
index b2e993c..c8774f1 100644 index 82aa9b7..5eac42f 100644
--- a/win32/SciLexer.vcxproj --- a/win32/Scintilla.vcxproj
+++ b/win32/SciLexer.vcxproj +++ b/win32/Scintilla.vcxproj
@@ -33,7 +33,7 @@ @@ -34,7 +34,7 @@
</PropertyGroup> </PropertyGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" /> <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
<PropertyGroup> <PropertyGroup>
- <ConfigurationType>DynamicLibrary</ConfigurationType> - <ConfigurationType>DynamicLibrary</ConfigurationType>
+ <ConfigurationType>StaticLibrary</ConfigurationType> + <ConfigurationType>StaticLibrary</ConfigurationType>
<CharacterSet>Unicode</CharacterSet> <CharacterSet>Unicode</CharacterSet>
<PlatformToolset>v141</PlatformToolset> <PlatformToolset>v143</PlatformToolset>
</PropertyGroup> </PropertyGroup>
--

89
ports/scintilla/0002-static-crt.patch
View File

@ -1,37 +1,52 @@
diff --git a/win32/SciLexer.vcxproj b/win32/SciLexer.vcxproj diff --git a/win32/Scintilla.vcxproj b/win32/Scintilla.vcxproj
index b2e993c..c8774f1 100644 index 82aa9b7..6b6f340 100644
--- a/win32/SciLexer.vcxproj --- a/win32/Scintilla.vcxproj
+++ b/win32/SciLexer.vcxproj +++ b/win32/Scintilla.vcxproj
@@ -88,6 +88,7 @@ @@ -102,6 +102,7 @@
<ClCompile> <ClCompile>
<PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions> <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<LanguageStandard>stdcpp17</LanguageStandard> <LanguageStandard>stdcpp17</LanguageStandard>
+ <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary> + <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
</ClCompile> </ClCompile>
<Link> <Link>
<LinkTimeCodeGeneration>Default</LinkTimeCodeGeneration> <LinkTimeCodeGeneration>Default</LinkTimeCodeGeneration>
@@ -97,6 +98,7 @@ @@ -112,6 +113,7 @@
<ClCompile> <ClCompile>
<PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions> <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<LanguageStandard>stdcpp17</LanguageStandard> <LanguageStandard>stdcpp17</LanguageStandard>
+ <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary> + <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
</ClCompile> </ClCompile>
<Link> <Link>
<LinkTimeCodeGeneration>Default</LinkTimeCodeGeneration> <LinkTimeCodeGeneration>Default</LinkTimeCodeGeneration>
@@ -117,6 +119,7 @@ @@ -122,6 +124,7 @@
<IntrinsicFunctions>true</IntrinsicFunctions> <ClCompile>
<PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions> <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<LanguageStandard>stdcpp17</LanguageStandard> <LanguageStandard>stdcpp17</LanguageStandard>
+ <RuntimeLibrary>MultiThreaded</RuntimeLibrary> + <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
</ClCompile> </ClCompile>
<Link> <Link>
<EnableCOMDATFolding>true</EnableCOMDATFolding> <LinkTimeCodeGeneration>Default</LinkTimeCodeGeneration>
@@ -129,6 +132,7 @@ @@ -133,6 +136,7 @@
<IntrinsicFunctions>true</IntrinsicFunctions> <IntrinsicFunctions>true</IntrinsicFunctions>
<PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions> <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<LanguageStandard>stdcpp17</LanguageStandard> <LanguageStandard>stdcpp17</LanguageStandard>
+ <RuntimeLibrary>MultiThreaded</RuntimeLibrary> + <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
</ClCompile> </ClCompile>
<Link> <Link>
<EnableCOMDATFolding>true</EnableCOMDATFolding> <EnableCOMDATFolding>true</EnableCOMDATFolding>
-- @@ -146,6 +150,7 @@
<IntrinsicFunctions>true</IntrinsicFunctions>
<PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<LanguageStandard>stdcpp17</LanguageStandard>
+ <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
</ClCompile>
<Link>
<EnableCOMDATFolding>true</EnableCOMDATFolding>
@@ -159,6 +164,7 @@
<IntrinsicFunctions>true</IntrinsicFunctions>
<PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<LanguageStandard>stdcpp17</LanguageStandard>
+ <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
</ClCompile>
<Link>
<EnableCOMDATFolding>true</EnableCOMDATFolding>

10
ports/scintilla/portfile.cmake
View File

@ -1,7 +1,7 @@
vcpkg_download_distfile(ARCHIVE vcpkg_download_distfile(ARCHIVE
URLS "https://www.scintilla.org/scintilla446.zip" URLS "https://www.scintilla.org/scintilla550.zip"
FILENAME "scintilla446.zip" FILENAME "scintilla550.zip"
SHA512 db6fa38283401497d8331f97dc5b57ea11d998988001f06b95892de769de5829b9f567635f3c1f2d9cfbc4384024d11666d28224ce90c5813ceef865b0dec255 SHA512 6e6dac00a6be902e64abdb6687887ef3c956cbeaf0ea5e05ce99af6876b5b57898c3633b38b9f975e6b06d3d4e17c6e6b6d4c51b0982b5e3375422af046830d1
) )
if (VCPKG_LIBRARY_LINKAGE STREQUAL "static") if (VCPKG_LIBRARY_LINKAGE STREQUAL "static")
@ -15,13 +15,13 @@ endif()
vcpkg_extract_source_archive( vcpkg_extract_source_archive(
SOURCE_PATH SOURCE_PATH
ARCHIVE ${ARCHIVE} ARCHIVE ${ARCHIVE}
SOURCE_BASE 4.4.6 SOURCE_BASE 5.5.0
PATCHES ${PATCHES} PATCHES ${PATCHES}
) )
vcpkg_install_msbuild( vcpkg_install_msbuild(
SOURCE_PATH "${SOURCE_PATH}" SOURCE_PATH "${SOURCE_PATH}"
PROJECT_SUBPATH Win32/SciLexer.vcxproj PROJECT_SUBPATH Win32/Scintilla.vcxproj
) )
vcpkg_install_copyright(FILE_LIST "${SOURCE_PATH}/License.txt") vcpkg_install_copyright(FILE_LIST "${SOURCE_PATH}/License.txt")

3
ports/scintilla/vcpkg.json
View File

@ -1,7 +1,6 @@
{ {
"name": "scintilla", "name": "scintilla",
"version": "4.4.6", "version": "5.5.0",
"port-version": 3,
"description": "A free source code editing component for Win32, GTK+, and OS X", "description": "A free source code editing component for Win32, GTK+, and OS X",
"homepage": "https://www.scintilla.org/", "homepage": "https://www.scintilla.org/",
"supports": "!(uwp | linux | osx)", "supports": "!(uwp | linux | osx)",

4
versions/baseline.json
View File

@ -7901,8 +7901,8 @@
"port-version": 1 "port-version": 1
}, },
"scintilla": { "scintilla": {
"baseline": "4.4.6", "baseline": "5.5.0",
"port-version": 3 "port-version": 0
}, },
"sciplot": { "sciplot": {
"baseline": "0.3.1", "baseline": "0.3.1",

5
versions/s-/scintilla.json
View File

@ -1,5 +1,10 @@
{ {
"versions": [ "versions": [
{
"git-tree": "9d311c9adf5b021fbc6b5e3b3bcf99e036472f44",
"version": "5.5.0",
"port-version": 0
},
{ {
"git-tree": "8851877b637605265f10c086366f022205fcc1f7", "git-tree": "8851877b637605265f10c086366f022205fcc1f7",
"version": "4.4.6", "version": "4.4.6",