aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJonLiu1993 <63675417+JonLiu1993@users.noreply.github.com>2021-03-11 03:57:51 +0800
committerGitHub <noreply@github.com>2021-03-10 13:57:51 -0600
commitaac436abe0f887869771fb06cb0041267d67cdac (patch)
tree33d1b72dba9ab2a3a365175bd045dd1bf47f0201
parent1eb9348a3aae437b7a9dd6504b2e6209d613a119 (diff)
downloadvcpkg-aac436abe0f887869771fb06cb0041267d67cdac.tar.gz
vcpkg-aac436abe0f887869771fb06cb0041267d67cdac.zip
[scintilla] update to 4.4.6 (#16508)
* [scintilla] update to 4.4.6 * update version * modify portifile.cmake * update version
-rw-r--r--ports/scintilla/CONTROL5
-rw-r--r--ports/scintilla/portfile.cmake12
-rw-r--r--ports/scintilla/vcpkg.json7
-rw-r--r--versions/baseline.json2
-rw-r--r--versions/s-/scintilla.json5
5 files changed, 19 insertions, 12 deletions
diff --git a/ports/scintilla/CONTROL b/ports/scintilla/CONTROL
deleted file mode 100644
index 290fb456a..000000000
--- a/ports/scintilla/CONTROL
+++ /dev/null
@@ -1,5 +0,0 @@
-Source: scintilla
-Version: 4.4.5
-Homepage: https://www.scintilla.org/
-Description: A free source code editing component for Win32, GTK+, and OS X
-Supports: !(uwp|linux|osx)
diff --git a/ports/scintilla/portfile.cmake b/ports/scintilla/portfile.cmake
index 8823621ac..d1e1f1b77 100644
--- a/ports/scintilla/portfile.cmake
+++ b/ports/scintilla/portfile.cmake
@@ -1,9 +1,9 @@
vcpkg_fail_port_install(ON_TARGET "Linux" "OSX" "UWP")
vcpkg_download_distfile(ARCHIVE
- URLS "https://www.scintilla.org/scintilla445.zip"
- FILENAME "scintilla445.zip"
- SHA512 bac25ee6e9b1ab3602a6fbf2f28f046f6da5c45dfd6e882df250760a254517ee9b05d95b816234b5145553f0a8da92016d7839a50624543c52fde7539ea08259
+ URLS "https://www.scintilla.org/scintilla446.zip"
+ FILENAME "scintilla446.zip"
+ SHA512 db6fa38283401497d8331f97dc5b57ea11d998988001f06b95892de769de5829b9f567635f3c1f2d9cfbc4384024d11666d28224ce90c5813ceef865b0dec255
)
if (VCPKG_LIBRARY_LINKAGE STREQUAL "static")
@@ -17,14 +17,14 @@ endif()
vcpkg_extract_source_archive_ex(
OUT_SOURCE_PATH SOURCE_PATH
ARCHIVE ${ARCHIVE}
- REF 4.4.5
+ REF 4.4.6
PATCHES ${PATCHES}
)
vcpkg_install_msbuild(
SOURCE_PATH ${SOURCE_PATH}
PROJECT_SUBPATH Win32/SciLexer.vcxproj
- INCLUDES_SUBPATH include
LICENSE_SUBPATH License.txt
- ALLOW_ROOT_INCLUDES
)
+
+file(INSTALL ${SOURCE_PATH}/include/ DESTINATION ${CURRENT_PACKAGES_DIR}/include/${PORT} FILES_MATCHING PATTERN "*.*")
diff --git a/ports/scintilla/vcpkg.json b/ports/scintilla/vcpkg.json
new file mode 100644
index 000000000..c223db6a0
--- /dev/null
+++ b/ports/scintilla/vcpkg.json
@@ -0,0 +1,7 @@
+{
+ "name": "scintilla",
+ "version": "4.4.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 08a43c344..f451013dd 100644
--- a/versions/baseline.json
+++ b/versions/baseline.json
@@ -5269,7 +5269,7 @@
"port-version": 0
},
"scintilla": {
- "baseline": "4.4.5",
+ "baseline": "4.4.6",
"port-version": 0
},
"sciter": {
diff --git a/versions/s-/scintilla.json b/versions/s-/scintilla.json
index 6494ee11e..95e205182 100644
--- a/versions/s-/scintilla.json
+++ b/versions/s-/scintilla.json
@@ -1,6 +1,11 @@
{
"versions": [
{
+ "git-tree": "725d3e47a1e30713a272b1ef12251b65696f8a3e",
+ "version": "4.4.6",
+ "port-version": 0
+ },
+ {
"git-tree": "1bb13f73af518651e5dafcd0767ca409d3219ac3",
"version-string": "4.4.5",
"port-version": 0