Skip to content

Commit be36a51

Browse files
committed
Bump Python to 3.13.5
Bump libexpat to 2.7.1 Bump OpenSSL to 3.0.17 Bump MariaDB Connector/C to 3.3.15
1 parent 14385ed commit be36a51

File tree

3 files changed

+57
-233
lines changed

3 files changed

+57
-233
lines changed

CMakeLists.txt

Lines changed: 13 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -143,8 +143,8 @@ add_dependency_project_package(bzip2 1.0.8)
143143

144144
ExternalProject_Add(expat
145145
DOWNLOAD_DIR ${CMAKE_SOURCE_DIR}/downloads
146-
URL https://github.com/libexpat/libexpat/archive/R_2_4_9.tar.gz
147-
URL_HASH SHA256=286bb78d8800f20b5da0ff48d98d6c67a16242cfe8cc823a04998f94b5253279
146+
URL https://github.com/libexpat/libexpat/archive/R_2_7_1.tar.gz
147+
URL_HASH SHA256=85372797ff0673a8fc4a6be16466bb5a0ca28c0dcf3c6f7ac1686b4a3ba2aabb
148148
PATCH_COMMAND ${PATCH} -p1 -i ${CMAKE_SOURCE_DIR}/patches/$(TargetName).diff
149149
UPDATE_DISCONNECTED ON
150150
CMAKE_ARGS
@@ -157,7 +157,7 @@ ExternalProject_Add(expat
157157
-DEXPAT_SHARED_LIBS:BOOL=OFF
158158
SOURCE_SUBDIR expat
159159
)
160-
add_dependency_project_package(expat 2.4.9)
160+
add_dependency_project_package(expat 2.7.1)
161161

162162
ExternalProject_Add(libiconv
163163
GIT_REPOSITORY https://github.com/Paxxi/libiconv
@@ -173,14 +173,14 @@ add_dependency_project_package(libiconv 1.16)
173173

174174
ExternalProject_Add(openssl
175175
DOWNLOAD_DIR ${CMAKE_SOURCE_DIR}/downloads
176-
URL https://www.openssl.org/source/openssl-1.1.1q.tar.gz
177-
URL_HASH SHA256=d7939ce614029cdff0b6c20f0e2e5703158a489a72b2507b8bd51bf8c8fd10ca
176+
URL https://www.openssl.org/source/openssl-3.0.17.tar.gz
177+
URL_HASH SHA256=dfdd77e4ea1b57ff3a6dbde6b0bdc3f31db5ac99e7fdd4eaf9e1fbb6ec2db8ce
178178
PATCH_COMMAND ${PATCH} -p1 -i ${CMAKE_SOURCE_DIR}/patches/$(TargetName).diff
179179
CMAKE_ARGS
180180
${ADDITIONAL_ARGS}
181181
-DCMAKE_INSTALL_PREFIX:PATH=${INSTALL_PREFIX}
182182
)
183-
add_dependency_project_package(openssl 1.1.1q)
183+
add_dependency_project_package(openssl 3.0.17)
184184

185185
ExternalProject_Add(zlib
186186
GIT_REPOSITORY https://github.com/Paxxi/zlib
@@ -522,14 +522,14 @@ ExternalProject_Add(libwebp
522522
add_dependency_project_package(libwebp 1.0.3)
523523

524524
ExternalProject_Add(mariadb-connector-c
525-
DEPENDS openssl uwp_compat
526-
GIT_REPOSITORY https://github.com/Paxxi/mariadb-connector-c
527-
GIT_TAG f26c0be86e7f534996f62646f9015da504515d11
525+
DEPENDS openssl
526+
GIT_REPOSITORY https://github.com/thexai/mariadb-connector-c
527+
GIT_TAG 0e9aaa890fa04b0aeb19d41c6eb85a3991f5dd91
528528
GIT_SHALLOW ON
529529
CMAKE_ARGS
530530
${ADDITIONAL_ARGS}
531531
-DCMAKE_INSTALL_PREFIX:PATH=${INSTALL_PREFIX}
532-
-DCMAKE_PREFIX_PATH:PATH=${PREFIX}%3B%3B${PREFIX}/openssl%3B%3B${PREFIX}/uwp_compat
532+
-DCMAKE_PREFIX_PATH:PATH=${PREFIX}%3B%3B${PREFIX}/openssl
533533
-DBUILD_SHARED_LIBS:BOOL=ON
534534
-DPLUGIN_AUTH_GSSAPI_CLIENT:STRING=OFF
535535
-DPLUGIN_DIALOG:STRING=STATIC
@@ -544,7 +544,7 @@ ExternalProject_Add(mariadb-connector-c
544544
-DWITH_SSL:STRING=OPENSSL
545545
-DWITH_UNIT_TESTS:BOOL=OFF
546546
)
547-
add_dependency_project_package(mariadb-connector-c 3.1.6)
547+
add_dependency_project_package(mariadb-connector-c 3.3.15)
548548

549549
ExternalProject_Add(libffi
550550
DOWNLOAD_DIR ${CMAKE_SOURCE_DIR}/downloads
@@ -560,14 +560,14 @@ add_dependency_project_package(libffi 3.3.0)
560560
ExternalProject_Add(python
561561
DEPENDS bzip2 openssl sqlite zlib expat libffi xz
562562
GIT_REPOSITORY https://github.com/thexai/cpython
563-
GIT_TAG 4c97e13f50ce1f925e5f95945c6d395b83f78a64
563+
GIT_TAG 75b437bb6c5e1b5e6ab7835a9e1690b459d96cc8
564564
GIT_SHALLOW ON
565565
CMAKE_ARGS
566566
${ADDITIONAL_ARGS}
567567
-DCMAKE_INSTALL_PREFIX:PATH=${INSTALL_PREFIX}
568568
-DCMAKE_PREFIX_PATH:PATH=${PREFIX}%3B%3B${PREFIX}/bzip2%3B%3B${PREFIX}/openssl%3B%3B${PREFIX}/sqlite%3B%3B${PREFIX}/zlib%3B%3B${PREFIX}/libffi%3B%3B${PREFIX}/xz%3B%3B${PREFIX}/expat
569569
)
570-
add_dependency_project_package(python 3.12.11)
570+
add_dependency_project_package(python 3.13.5)
571571

572572
ExternalProject_Add(libjpeg-turbo
573573
GIT_REPOSITORY https://github.com/Paxxi/libjpeg-turbo

patches/expat.diff

Lines changed: 13 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,17 @@
1-
diff --git a/expat/CMakeLists.txt b/expat/CMakeLists.txt
2-
index 3417b69..7925ba1 100644
1+
diff --git a/expat/CMakeLists.txt b/expat/CMakeLists.txt
2+
index 386b66ab..e22bb3a0 100644
33
--- a/expat/CMakeLists.txt
44
+++ b/expat/CMakeLists.txt
5-
@@ -490,7 +490,8 @@ endif(NOT WIN32)
5+
@@ -375,7 +375,7 @@ endif()
6+
7+
include_directories(${CMAKE_CURRENT_BINARY_DIR} ${CMAKE_CURRENT_SOURCE_DIR}/lib)
8+
if(MSVC)
9+
- add_definitions(-D_CRT_SECURE_NO_WARNINGS -wd4996)
10+
+ add_definitions(-D_CRT_SECURE_NO_WARNINGS -wd4996 /sdl-)
11+
endif()
12+
13+
#
14+
@@ -518,7 +518,8 @@ endif()
615
expat_install(TARGETS expat EXPORT expat
716
RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR}
817
LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}
@@ -12,7 +21,7 @@ index 3417b69..7925ba1 100644
1221

1322
expat_install(FILES lib/expat.h lib/expat_external.h DESTINATION ${CMAKE_INSTALL_INCLUDEDIR})
1423

15-
@@ -807,13 +807,13 @@ expat_install(
24+
@@ -919,13 +920,13 @@ expat_install(
1625
${CMAKE_CURRENT_BINARY_DIR}/cmake/expat-config.cmake
1726
${CMAKE_CURRENT_BINARY_DIR}/cmake/expat-config-version.cmake
1827
DESTINATION

0 commit comments

Comments
 (0)