[pcre2] Update to 10.37 (#18547)

- New upstream version 10.37 - Drop patches (fixed upstream): pcre2-10.35_add_check_for_Intel_CET.patch pcre2-10.35_fix_postfix_for_debug_Windows_builds.patch pcre2-10.35_fix-space.patch - Switch from CONTROL to vcpkg.json .\vcpkg format-manifest .\ports\pcre2\CONTROL
microsoft · Jun 21, 2021 · 88a341b · 88a341b
1 parent d1d672d
commit 88a341b
Show file tree

Hide file tree

Showing 8 changed files with 15 additions and 190 deletions.
diff --git a/ports/pcre2/CONTROL b/ports/pcre2/CONTROL
diff --git a/ports/pcre2/pcre2-10.35_add_check_for_Intel_CET.patch b/ports/pcre2/pcre2-10.35_add_check_for_Intel_CET.patch
diff --git a/ports/pcre2/pcre2-10.35_fix-space.patch b/ports/pcre2/pcre2-10.35_fix-space.patch
diff --git a/ports/pcre2/pcre2-10.35_fix_postfix_for_debug_Windows_builds.patch b/ports/pcre2/pcre2-10.35_fix_postfix_for_debug_Windows_builds.patch
diff --git a/ports/pcre2/portfile.cmake b/ports/pcre2/portfile.cmake
@@ -1,10 +1,7 @@
-set(PCRE2_VERSION 10.35)
-set(EXPECTED_SHA bf1cb6ab8b1103f9503609783945b02cdc4294bb266643d0ba03656c941f07b6e183793f3bf513da950460e78cb9b429bff8ade27d8930339a63caed3a3236e3)
+set(PCRE2_VERSION 10.37)
+set(EXPECTED_SHA f91760a8e0747f52211612fb0e134d685e224d16bd884eb574718d077a586b1fd7b6435d4e3b75c879b12e02b252467ecc28cdc4bc2903c783dacab089f99c99)
 set(PATCHES
-        pcre2-10.35_fix-space.patch # Upstream: https://bugs.exim.org/show_bug.cgi?id=2588
         pcre2-10.35_fix-uwp.patch
-        pcre2-10.35_fix_postfix_for_debug_Windows_builds.patch # Upstream: https://bugs.exim.org/show_bug.cgi?id=2600
-        pcre2-10.35_add_check_for_Intel_CET.patch # Upstream: https://bugs.exim.org/show_bug.cgi?id=2578
 )
 
 vcpkg_download_distfile(ARCHIVE

diff --git a/ports/pcre2/vcpkg.json b/ports/pcre2/vcpkg.json
@@ -0,0 +1,6 @@
+{
+  "name": "pcre2",
+  "version-string": "10.37",
+  "description": "PCRE2 is a re-working of the original Perl Compatible Regular Expressions library",
+  "homepage": "https://pcre.org/"
+}
diff --git a/versions/baseline.json b/versions/baseline.json
@@ -4761,8 +4761,8 @@
       "port-version": 8
     },
     "pcre2": {
-      "baseline": "10.35",
-      "port-version": 2
+      "baseline": "10.37",
+      "port-version": 0
     },
     "pdal": {
       "baseline": "1.7.1",

diff --git a/versions/p-/pcre2.json b/versions/p-/pcre2.json
@@ -1,5 +1,10 @@
 {
   "versions": [
+    {
+      "git-tree": "9f61b1640aff6d4d306d30338bbd360c223301b0",
+      "version-string": "10.37",
+      "port-version": 0
+    },
     {
       "git-tree": "c0357d3b67540bd7e46f4301e5e1507ecddfaa1e",
       "version-string": "10.35",