Skip to content

Commit cfc7923

Browse files
thexaithexai
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 Bump Zlib to 1.3.1 Bump xz to 5.2.5 Bump SQLite to 3500300 (3.50.3)
1 parent 14385ed commit cfc7923

File tree

6 files changed

+162
-250
lines changed

6 files changed

+162
-250
lines changed

‎CMakeLists.txt‎

Lines changed: 26 additions & 28 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,40 +173,38 @@ 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
186-
GIT_REPOSITORY https://github.com/Paxxi/zlib
187-
GIT_TAG 1b8fe34fdd7b08da4629783d865df13dd2217bc8
188-
GIT_SHALLOW ON
186+
DOWNLOAD_DIR ${CMAKE_SOURCE_DIR}/downloads
187+
URL https://github.com/madler/zlib/releases/download/v1.3.1/zlib-1.3.1.tar.gz
188+
URL_HASH SHA256=9a93b2b7dfdac77ceba5a558a580e74667dd6fede4585b91eefb60f03b72df23
189+
PATCH_COMMAND ${PATCH} -p1 -i ${CMAKE_SOURCE_DIR}/patches/$(TargetName).diff
189190
CMAKE_ARGS
190191
${ADDITIONAL_ARGS}
191192
-DCMAKE_INSTALL_PREFIX:PATH=${INSTALL_PREFIX}
192-
-DBUILD_EXAMPLES:BOOL=OFF
193-
-DBUILD_SHARED_LIBS:BOOL=OFF
193+
-DZLIB_BUILD_EXAMPLES:BOOL=OFF
194194
-DSKIP_INSTALL_FILES:BOOL=ON
195-
-DASM686:BOOL=OFF
196-
-DAMD64:BOOL=OFF
197195
)
198-
add_dependency_project_package(zlib 1.2.11)
196+
add_dependency_project_package(zlib 1.3.1)
199197

200198
ExternalProject_Add(xz
201199
DOWNLOAD_DIR ${CMAKE_SOURCE_DIR}/downloads
202-
URL https://netix.dl.sourceforge.net/project/lzmautils/xz-5.2.4.tar.gz
203-
URL_HASH SHA256=b512f3b726d3b37b6dc4c8570e137b9311e7552e8ccbab4d39d47ce5f4177145
200+
URL https://netix.dl.sourceforge.net/project/lzmautils/xz-5.2.5.tar.gz
201+
URL_HASH SHA256=f6f4910fd033078738bd82bfba4f49219d03b17eb0794eb91efbae419f4aba10
204202
PATCH_COMMAND ${PATCH} -p1 -i ${CMAKE_SOURCE_DIR}/patches/$(TargetName).diff
205203
CMAKE_ARGS
206204
${ADDITIONAL_ARGS}
207205
-DCMAKE_INSTALL_PREFIX:PATH=${INSTALL_PREFIX}
208206
)
209-
add_dependency_project_package(xz 5.2.4)
207+
add_dependency_project_package(xz 5.2.5)
210208

211209
ExternalProject_Add(miniwdk
212210
GIT_REPOSITORY https://github.com/Paxxi/miniwdk
@@ -305,15 +303,15 @@ add_dependency_project_package(harfbuzz 2.8.0)
305303

306304
ExternalProject_Add(sqlite
307305
DOWNLOAD_DIR ${CMAKE_SOURCE_DIR}/downloads
308-
URL https://sqlite.org/2019/sqlite-amalgamation-3300100.zip
309-
URL_HASH SHA256=adf051d4c10781ea5cfabbbc4a2577b6ceca68590d23b58b8260a8e24cc5f081
306+
URL https://www.sqlite.org/2025/sqlite-amalgamation-3500300.zip
307+
URL_HASH SHA256=9ad6d16cbc1df7cd55c8b55127c82a9bca5e9f287818de6dc87e04e73599d754
310308
PATCH_COMMAND ${PATCH} -p1 -i ${CMAKE_SOURCE_DIR}/patches/$(TargetName).diff
311309
CMAKE_ARGS
312310
${ADDITIONAL_ARGS}
313311
-DCMAKE_INSTALL_PREFIX:PATH=${INSTALL_PREFIX}
314-
-DBUILD_SHARED_LIBS:BOOL=OFF
312+
-DBUILD_SHARED_LIBS:BOOL=ON
315313
)
316-
add_dependency_project_package(sqlite 3300100)
314+
add_dependency_project_package(sqlite 3500300)
317315

318316
ExternalProject_Add(tinyxml
319317
DOWNLOAD_DIR ${CMAKE_SOURCE_DIR}/downloads
@@ -522,14 +520,14 @@ ExternalProject_Add(libwebp
522520
add_dependency_project_package(libwebp 1.0.3)
523521

524522
ExternalProject_Add(mariadb-connector-c
525-
DEPENDS openssl uwp_compat
526-
GIT_REPOSITORY https://github.com/Paxxi/mariadb-connector-c
527-
GIT_TAG f26c0be86e7f534996f62646f9015da504515d11
523+
DEPENDS openssl
524+
GIT_REPOSITORY https://github.com/thexai/mariadb-connector-c
525+
GIT_TAG 1ad1ad6b25a95950ed7b81907a2ed28553d47343
528526
GIT_SHALLOW ON
529527
CMAKE_ARGS
530528
${ADDITIONAL_ARGS}
531529
-DCMAKE_INSTALL_PREFIX:PATH=${INSTALL_PREFIX}
532-
-DCMAKE_PREFIX_PATH:PATH=${PREFIX}%3B%3B${PREFIX}/openssl%3B%3B${PREFIX}/uwp_compat
530+
-DCMAKE_PREFIX_PATH:PATH=${PREFIX}%3B%3B${PREFIX}/openssl
533531
-DBUILD_SHARED_LIBS:BOOL=ON
534532
-DPLUGIN_AUTH_GSSAPI_CLIENT:STRING=OFF
535533
-DPLUGIN_DIALOG:STRING=STATIC
@@ -544,7 +542,7 @@ ExternalProject_Add(mariadb-connector-c
544542
-DWITH_SSL:STRING=OPENSSL
545543
-DWITH_UNIT_TESTS:BOOL=OFF
546544
)
547-
add_dependency_project_package(mariadb-connector-c 3.1.6)
545+
add_dependency_project_package(mariadb-connector-c 3.3.15)
548546

549547
ExternalProject_Add(libffi
550548
DOWNLOAD_DIR ${CMAKE_SOURCE_DIR}/downloads
@@ -560,14 +558,14 @@ add_dependency_project_package(libffi 3.3.0)
560558
ExternalProject_Add(python
561559
DEPENDS bzip2 openssl sqlite zlib expat libffi xz
562560
GIT_REPOSITORY https://github.com/thexai/cpython
563-
GIT_TAG 4c97e13f50ce1f925e5f95945c6d395b83f78a64
561+
GIT_TAG ac18623a47b8c3d6bfe1ef5923ea37ca6635ab05
564562
GIT_SHALLOW ON
565563
CMAKE_ARGS
566564
${ADDITIONAL_ARGS}
567565
-DCMAKE_INSTALL_PREFIX:PATH=${INSTALL_PREFIX}
568566
-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
569567
)
570-
add_dependency_project_package(python 3.12.11)
568+
add_dependency_project_package(python 3.13.5)
571569

572570
ExternalProject_Add(libjpeg-turbo
573571
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)