[3party] Update jansson, freetype, expat

Fixes CMake warning about the symbol visibility policy CMP0063 caused by 3party libs that claim to support older CMake versions. Updated expat build settings. We don't use DTD and general entities. Signed-off-by: Alexander Borsuk <me@alex.bio>
organicmaps · Apr 5, 2024 · 57402cf · 57402cf
1 parent a99eb33
commit 57402cf
Show file tree

Hide file tree

Showing 6 changed files with 23 additions and 11 deletions.
diff --git a/3party/CMakeLists.txt b/3party/CMakeLists.txt
@@ -6,17 +6,24 @@ if (WITH_SYSTEM_PROVIDED_3PARTY)
   set(GFLAGS_USE_TARGET_NAMESPACE ON)
   find_package(gflags REQUIRED GLOBAL)
 else()
-  # Configure expat library.
   # Suppress "Policy CMP0077 is not set: option() honors normal variables"
-  # for the expat options below.
+  # for the freetype, expat and jansson options.
   set(CMAKE_POLICY_DEFAULT_CMP0077 NEW)
+  # Suppress "Policy CMP0063 is not set: Honor visibility properties for all target types."
+  # for jansson
+  set(CMAKE_POLICY_DEFAULT_CMP0063 NEW)
+
+  # Configure expat library.
   set(EXPAT_BUILD_TOOLS OFF)
   set(EXPAT_BUILD_EXAMPLES OFF)
   set(EXPAT_BUILD_TESTS OFF)
   set(EXPAT_BUILD_DOCS OFF)
   set(EXPAT_BUILD_PKGCONFIG OFF)
   set(EXPAT_ENABLE_INSTALL OFF)
   set(EXPAT_SHARED_LIBS OFF)
+  set(EXPAT_GE OFF)
+  set(EXPAT_DTD OFF)
+  set(EXPAT_NS ON)
   add_subdirectory(expat/expat)
 
   # Configure Jansson library.

diff --git a/3party/expat b/3party/expat
diff --git a/3party/freetype/freetype b/3party/freetype/freetype
diff --git a/3party/jansson/jansson b/3party/jansson/jansson
diff --git a/xcode/expat/expat.xcodeproj/project.pbxproj b/xcode/expat/expat.xcodeproj/project.pbxproj
@@ -165,7 +165,7 @@
 			attributes = {
 				BuildIndependentTargetsInParallel = YES;
 				DefaultBuildSystemTypeForWorkspace = Latest;
-				LastUpgradeCheck = 1510;
+				LastUpgradeCheck = 1530;
 				TargetAttributes = {
 					670D04F71B0BAEE50013A7AC = {
 						CreatedOnToolsVersion = 6.3.2;

diff --git a/xcode/expat/expat_config.h b/xcode/expat/expat_config.h
@@ -64,13 +64,13 @@
 #define PACKAGE "expat"
 
 /* Define to the address where bug reports for this package should be sent. */
-#define PACKAGE_BUGREPORT "expat-bugs@libexpat.org"
+#define PACKAGE_BUGREPORT "https://github.com/libexpat/libexpat/issues"
 
 /* Define to the full name of this package. */
 #define PACKAGE_NAME "expat"
 
 /* Define to the full name and version of this package. */
-#define PACKAGE_STRING "expat 2.5.0"
+#define PACKAGE_STRING "expat 2.6.2"
 
 /* Define to the one symbol short name of this package. */
 #define PACKAGE_TARNAME "expat"
@@ -79,10 +79,12 @@
 #define PACKAGE_URL ""
 
 /* Define to the version of this package. */
-#define PACKAGE_VERSION "2.5.0"
+#define PACKAGE_VERSION "2.6.2"
 
 /* Define to 1 if you have the ANSI C header files. */
+#ifndef STDC_HEADERS
 #define STDC_HEADERS
+#endif
 
 /* whether byteorder is bigendian */
 /* #undef WORDS_BIGENDIAN */
@@ -92,7 +94,7 @@
 /* #undef XML_ATTR_INFO */
 
 /* Define to specify how much context to retain around the current parse
-   point. */
+   point, 0 to disable. */
 #define XML_CONTEXT_BYTES 1024
 
 #if ! defined(_WIN32)
@@ -101,7 +103,10 @@
 #endif
 
 /* Define to make parameter entity parsing functionality available. */
-#define XML_DTD
+//#define XML_DTD
+
+/* Define as 1/0 to enable/disable support for general entities. */
+#define XML_GE 0
 
 /* Define to make XML Namespaces functionality available. */
 #define XML_NS
+1 −1		CMakeLists.txt
+4 −4		README
+1 −1		builds/freetype.mk
+13 −18		builds/toplevel.mk
+4 −4		builds/unix/configure.raw
+1 −1		builds/wince/vc2005-ce/index.html
+1 −1		builds/wince/vc2008-ce/index.html
+1 −1		builds/windows/vc2010/index.html
+1 −1		builds/windows/visualc/index.html
+1 −1		builds/windows/visualce/index.html
+14 −0		docs/CHANGES
+1 −0		docs/VERSIONS.TXT
+1 −1		docs/freetype-config.1
+1 −1		include/freetype/freetype.h
+2 −2		include/freetype/internal/ftcalc.h
+0 −15		include/freetype/internal/tttypes.h
+3 −3		src/autofit/afcjk.c
+19 −19		src/autofit/aflatin.c
+27 −55		src/base/ftcalc.c
+2 −1		src/base/ftobjs.c
+6 −2		src/base/ftstream.c
+2 −2		src/base/ftver.rc
+5 −4		src/cff/cffload.c
+20 −2		src/cff/cffparse.c
+4 −0		src/cff/cffparse.h
+16 −17		src/gzip/rules.mk
+3 −3		src/psaux/cffdecode.c
+1 −1		src/psaux/pshints.c
+2 −2		src/psaux/t1decode.c
+12 −6		src/sfnt/sfwoff2.c
+2 −2		src/sfnt/ttcolr.c
+6 −5		src/smooth/ftgrays.c
+1 −2		src/truetype/rules.mk
+0 −1		src/truetype/truetype.c
+0 −5		src/truetype/ttdriver.c
+34 −261		src/truetype/ttgload.c
+4 −4		src/truetype/ttgxvar.c
+20 −814		src/truetype/ttinterp.c
+0 −74		src/truetype/ttinterp.h
+0 −3		src/truetype/ttobjs.c
+0 −2		src/truetype/ttobjs.h
+0 −1,013		src/truetype/ttsubpix.c
+0 −110		src/truetype/ttsubpix.h
+2 −2		src/type1/t1load.c
+1 −1		src/type42/t42parse.c
+9 −9		subprojects/libpng.wrap
+9 −9		subprojects/zlib.wrap
+692 −80		vms_make.com
+15 −0		.github/dependabot.yml
+1 −1		.github/workflows/fuzz.yml
+10 −23		.github/workflows/tests.yml
+23 −1		CHANGES
+15 −14		CMakeLists.txt
+25 −1		LICENSE
+3 −7		README.rst
+9 −0		SECURITY.md
+0 −4		android/jansson_config.h
+4 −6		cmake/jansson_config.h.cmake
+9 −0		cmake/jansson_private_config.h.cmake
+16 −7		configure.ac
+1 −1		scripts/clang-format
+5 −2		scripts/clang-format-check
+6 −1		src/Makefile.am
+6,265 −0		src/dtoa.c
+2 −2		src/dump.c
+0 −4		src/jansson_config.h.in
+135 −30		src/strconv.c
+1 −0		test/.gitignore
+16 −121		test/bin/json_process.c
+0 −1		test/suites/encoding-flags/compact-array/env
+0 −1		test/suites/encoding-flags/compact-object/env
+0 −1		test/suites/encoding-flags/ensure-ascii/env
+0 −1		test/suites/encoding-flags/indent-array/env
+0 −1		test/suites/encoding-flags/indent-compact-array/env
+0 −1		test/suites/encoding-flags/indent-compact-object/env
+0 −1		test/suites/encoding-flags/indent-object/env
+0 −1		test/suites/encoding-flags/object/env
+0 −1		test/suites/encoding-flags/preserve-order/env
+0 −1		test/suites/encoding-flags/real-precision/env
+1 −1		test/suites/encoding-flags/real-precision/input
+1 −1		test/suites/encoding-flags/real-precision/output
+2 −12		test/suites/encoding-flags/run
+0 −1		test/suites/encoding-flags/sort-keys/env
+3 −8		test/suites/invalid-unicode/run
+6 −19		test/suites/invalid/run
+1 −0		test/suites/valid/real-exponent-no-dtoa/input
+1 −0		test/suites/valid/real-exponent-no-dtoa/output
+0 −0		test/suites/valid/real-exponent-no-dtoa/skip_if_dtoa
+1 −1		test/suites/valid/real-exponent/input
+1 −1		test/suites/valid/real-exponent/output
+0 −0		test/suites/valid/real-exponent/skip_unless_dtoa
+16 −21		test/suites/valid/run