[pcre] Update to v8.44 (#10335)

- Drop patches (fixed upstream):
  fix-option-2.patch
  fix-arm64-config-define.patch
  fix-arm-config-define.patch
- Add patch
  pcre-8.44_suppress_cmake_and_compiler_warnings-errors.patch

7 files changed, 25 insertions, 114 deletions

diff --git a/ports/pcre/CONTROL b/ports/pcre/CONTROL
index 4eb5b394c..58e40065d 100644
--- a/ports/pcre/CONTROL
+++ b/ports/pcre/CONTROL
@@ -1,4 +1,4 @@
 Source: pcre
-Version: 8.41-4
+Version: 8.44
 Homepage: https://www.pcre.org/
 Description: Perl Compatible Regular Expressions
diff --git a/ports/pcre/fix-arm-config-define.patch b/ports/pcre/fix-arm-config-define.patch
deleted file mode 100644
index eb136a8cd..000000000
--- a/ports/pcre/fix-arm-config-define.patch
+++ /dev/null
@@ -1,60 +0,0 @@
-diff --git a/sljit/sljitConfigInternal.h b/sljit/sljitConfigInternal.h
-index 4dc452f..5a9827d 100644
---- "a/sljit/sljitConfigInternal.h"
-+++ "b/sljit/sljitConfigInternal.h"
-@@ -149,7 +149,7 @@
- 
- #if defined(_M_X64) || defined(__x86_64__)
- #define SLJIT_CONFIG_X86_64 1
--#elif defined(_ARM_)
-+#elif defined(_M_ARM)
- #define SLJIT_CONFIG_ARM_V5 1
- #else
- #define SLJIT_CONFIG_X86_32 1
-@@ -332,9 +332,16 @@
- 
- #else
- 
-+#if defined(__linux__)
- /* Calls __ARM_NR_cacheflush on ARM-Linux. */
- #define SLJIT_CACHE_FLUSH(from, to) \
- 	__clear_cache((char*)(from), (char*)(to))
-+#elif(_WIN32)
-+#pragma comment(lib, "kernel32.lib")
-+uint32_t FlushInstructionCache(void *hProcess, void *lpBaseAddress, uintptr_t dwSize);
-+#define SLJIT_CACHE_FLUSH(from, to) \
-+	FlushInstructionCache(GetCurrentProcess(), (void*)(from), (uintptr_t)(to - from));
-+#endif
- 
- #endif
- 
-diff --git a/sljit/sljitNativeARM_32.c b/sljit/sljitNativeARM_32.c
-index 745da99..83942b0 100644
---- a/sljit/sljitNativeARM_32.c
-+++ b/sljit/sljitNativeARM_32.c
-@@ -1573,12 +1573,8 @@ static sljit_s32 emit_op(struct sljit_compiler *compiler, sljit_s32 op, sljit_s3
- extern "C" {
- #endif
- 
--#if defined(__GNUC__)
- extern unsigned int __aeabi_uidivmod(unsigned int numerator, unsigned int denominator);
- extern int __aeabi_idivmod(int numerator, int denominator);
--#else
--#error "Software divmod functions are needed"
--#endif
- 
- #ifdef __cplusplus
- }
-@@ -1635,12 +1631,8 @@ SLJIT_API_FUNC_ATTRIBUTE sljit_s32 sljit_emit_op0(struct sljit_compiler *compile
- 			}
- 		}
- 
--#if defined(__GNUC__)
- 		FAIL_IF(sljit_emit_ijump(compiler, SLJIT_FAST_CALL, SLJIT_IMM,
- 			((op | 0x2) == SLJIT_DIV_UW ? SLJIT_FUNC_OFFSET(__aeabi_uidivmod) : SLJIT_FUNC_OFFSET(__aeabi_idivmod))));
--#else
--#error "Software divmod functions are needed"
--#endif
- 
- 		if (saved_reg_count > 0) {
- 			if (saved_reg_count >= 3) {
diff --git a/ports/pcre/fix-arm64-config-define.patch b/ports/pcre/fix-arm64-config-define.patch
deleted file mode 100644
index d92ced46b..000000000
--- a/ports/pcre/fix-arm64-config-define.patch
+++ /dev/null
@@ -1,21 +0,0 @@
-diff --git a/sljit/sljitConfigInternal.h b/sljit/sljitConfigInternal.h

-index 2bda29e..56ba7a6 100644

---- a/sljit/sljitConfigInternal.h

-+++ b/sljit/sljitConfigInternal.h

-@@ -151,6 +151,8 @@

- #define SLJIT_CONFIG_X86_64 1

- #elif defined(_M_ARM)

- #define SLJIT_CONFIG_ARM_V5 1

-+#elif defined(_M_ARM64)

-+#define SLJIT_CONFIG_ARM_64 1

- #else

- #define SLJIT_CONFIG_X86_32 1

- #endif

-@@ -330,7 +332,6 @@

- 	__clear_cache((char*)(from), (char*)(to))

- #elif(_WIN32)

- #pragma comment(lib, "kernel32.lib")

--uint32_t FlushInstructionCache(void *hProcess, void *lpBaseAddress, uintptr_t dwSize);

- #define SLJIT_CACHE_FLUSH(from, to) \

- 	FlushInstructionCache(GetCurrentProcess(), (void*)(from), (uintptr_t)(to - from));

- #endif

diff --git a/ports/pcre/fix-option-2.patch b/ports/pcre/fix-option-2.patch
deleted file mode 100644
index de78c5f16..000000000
--- a/ports/pcre/fix-option-2.patch
+++ /dev/null
@@ -1,24 +0,0 @@
-diff --git b/CMakeLists.txt a/CMakeLists.txt
-index 858a34bd..d1a64570 100644
---- b/CMakeLists.txt
-+++ a/CMakeLists.txt
-@@ -74,7 +74,6 @@ PROJECT(PCRE C CXX)
- # CMP0026 to avoid warnings for the use of LOCATION in GET_TARGET_PROPERTY.
- 
- CMAKE_MINIMUM_REQUIRED(VERSION 2.8.0)
--CMAKE_POLICY(SET CMP0026 OLD)
- 
- SET(CMAKE_MODULE_PATH ${PROJECT_SOURCE_DIR}/cmake) # for FindReadline.cmake
- 
-@@ -191,9 +190,8 @@ IF (MINGW)
- ENDIF(MINGW)
- 
- IF(MSVC)
--  OPTION(PCRE_STATIC_RUNTIME
--	"ON=Compile against the static runtime (/MT)."
--	OFF)
-+  add_definitions(/wd4703 /wd4146 /wd4308)
-+  OPTION(PCRE_STATIC_RUNTIME "ON=Compile against the static runtime (/MT)." OFF)
-   OPTION(INSTALL_MSVC_PDB
-          "ON=Install .pdb files built by MSVC, if generated"
-          OFF)
diff --git a/ports/pcre/pcre-8.44_suppress_cmake_and_compiler_warnings-errors.patch b/ports/pcre/pcre-8.44_suppress_cmake_and_compiler_warnings-errors.patch
new file mode 100644
index 000000000..12792689f
--- /dev/null
+++ b/ports/pcre/pcre-8.44_suppress_cmake_and_compiler_warnings-errors.patch
@@ -0,0 +1,18 @@
+--- a/CMakeLists.txt	2017-01-23 16:33:46.000000000 +0100
++++ b/CMakeLists.txt	2020-03-08 21:12:00.225068400 +0100
+@@ -74,7 +74,6 @@
+ # CMP0026 to avoid warnings for the use of LOCATION in GET_TARGET_PROPERTY.
+ 
+ CMAKE_MINIMUM_REQUIRED(VERSION 2.8.0)
+-CMAKE_POLICY(SET CMP0026 OLD)
+ 
+ SET(CMAKE_MODULE_PATH ${PROJECT_SOURCE_DIR}/cmake) # for FindReadline.cmake
+ 
+@@ -191,6 +190,7 @@
+ ENDIF(MINGW)
+ 
+ IF(MSVC)
++  add_definitions(/wd4703 /wd4146 /wd4308)
+   OPTION(PCRE_STATIC_RUNTIME
+ 	"ON=Compile against the static runtime (/MT)."
+ 	OFF)
diff --git a/ports/pcre/portfile.cmake b/ports/pcre/portfile.cmake
index 8c816f0ab..546494087 100644
--- a/ports/pcre/portfile.cmake
+++ b/ports/pcre/portfile.cmake
@@ -1,21 +1,20 @@
-include(vcpkg_common_functions)
-
-set(PCRE_VERSION 8.41)
+set(PCRE_VERSION 8.44)
 
 vcpkg_download_distfile(ARCHIVE
     URLS "https://ftp.pcre.org/pub/pcre/pcre-${PCRE_VERSION}.zip"
          "https://downloads.sourceforge.net/project/pcre/pcre/${PCRE_VERSION}/pcre-${PCRE_VERSION}.zip"
     FILENAME "pcre-${PCRE_VERSION}.zip"
-    SHA512 a3fd57090a5d9ce9d608aeecd59f42f04deea5b86a5c5899bdb25b18d8ec3a89b2b52b62e325c6485a87411eb65f1421604f80c3eaa653bd7dbab05ad22795ea
+    SHA512 adddec1236b25ff1c90e73835c2ba25d60a5839cbde2d6be7838a8ec099f7443dede931dc39002943243e21afea572eda71ee8739058e72235a192e4324398f0
 )
 
 vcpkg_extract_source_archive_ex(
     OUT_SOURCE_PATH SOURCE_PATH
     ARCHIVE ${ARCHIVE}
     PATCHES
-        fix-option-2.patch
-        fix-arm-config-define.patch
-        fix-arm64-config-define.patch
+        # Fix CMake Deprecation Warning concerning OLD behavior for policy CMP0026
+        # Suppress MSVC compiler warnings C4703, C4146, C4308, which fixes errors
+        # under x64-uwp and arm-uwp
+        pcre-8.44_suppress_cmake_and_compiler_warnings-errors.patch
 )
 
 vcpkg_configure_cmake(
diff --git a/scripts/ci.baseline.txt b/scripts/ci.baseline.txt
index adfb92959..bffa4fd59 100644
--- a/scripts/ci.baseline.txt
+++ b/scripts/ci.baseline.txt
@@ -1336,7 +1336,6 @@ osgearth:x64-osx=fail
 osgearth:x64-linux=fail

 osgearth:x64-windows-static=fail

 osg-qt:x64-windows-static=fail

-osg-qt:x64-linux=fail

 otl:x64-windows=ignore

 otl:x64-windows-static=ignore

 otl:x64-uwp=ignore