From f541b92cf2bb7f8f708f147bd320becf48587d14 Mon Sep 17 00:00:00 2001 From: fanquake Date: Thu, 20 Nov 2025 11:07:45 +0000 Subject: [PATCH] depends: expat 2.7.3 Remove the patch, as expat has bumped it's minimum to 3.15. Remove the lto related workaround. I haven't seen issues with CMakes TestBigEndian. --- depends/packages/expat.mk | 15 +++------------ depends/patches/expat/cmake_minimum.patch | 13 ------------- 2 files changed, 3 insertions(+), 25 deletions(-) delete mode 100644 depends/patches/expat/cmake_minimum.patch diff --git a/depends/packages/expat.mk b/depends/packages/expat.mk index fb7d5099383..88e4d5c884c 100644 --- a/depends/packages/expat.mk +++ b/depends/packages/expat.mk @@ -1,23 +1,14 @@ package=expat -$(package)_version=2.4.8 +$(package)_version=2.7.3 $(package)_download_path=https://github.com/libexpat/libexpat/releases/download/R_$(subst .,_,$($(package)_version))/ -$(package)_file_name=$(package)-$($(package)_version).tar.xz -$(package)_sha256_hash=f79b8f904b749e3e0d20afeadecf8249c55b2e32d4ebb089ae378df479dcaf25 +$(package)_file_name=$(package)-$($(package)_version).tar.gz +$(package)_sha256_hash=821ac9710d2c073eaf13e1b1895a9c9aa66c1157a99635c639fbff65cdbdd732 $(package)_build_subdir=build -$(package)_patches += cmake_minimum.patch -# -D_DEFAULT_SOURCE defines __USE_MISC, which exposes additional -# definitions in endian.h, which are required for a working -# endianness check in configure when building with -flto. define $(package)_set_vars $(package)_config_opts := -DCMAKE_BUILD_TYPE=None -DEXPAT_BUILD_TOOLS=OFF $(package)_config_opts += -DEXPAT_BUILD_EXAMPLES=OFF -DEXPAT_BUILD_TESTS=OFF $(package)_config_opts += -DBUILD_SHARED_LIBS=OFF - $(package)_cppflags += -D_DEFAULT_SOURCE -endef - -define $(package)_preprocess_cmds - patch -p1 < $($(package)_patch_dir)/cmake_minimum.patch endef define $(package)_config_cmds diff --git a/depends/patches/expat/cmake_minimum.patch b/depends/patches/expat/cmake_minimum.patch deleted file mode 100644 index a849a82a337..00000000000 --- a/depends/patches/expat/cmake_minimum.patch +++ /dev/null @@ -1,13 +0,0 @@ -build: set minimum required CMake to 3.16 - ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -33,7 +33,7 @@ - # Unlike most of Expat, - # this file is copyrighted under the BSD-license for buildsystem files of KDE. - --cmake_minimum_required(VERSION 3.1.3) -+cmake_minimum_required(VERSION 3.16) - - # This allows controlling documented build time switches - # when Expat is pulled in using the add_subdirectory function, e.g.