From 175546750b12646d83a7f1f3f98f93e6a1ec23b3 Mon Sep 17 00:00:00 2001 From: Christoph Reiter Date: Wed, 10 Sep 2025 16:25:03 +0200 Subject: [PATCH] cjson: Update to 1.7.19 --- mingw-w64-cjson/PKGBUILD | 16 +++++++++++----- 1 file changed, 11 insertions(+), 5 deletions(-) diff --git a/mingw-w64-cjson/PKGBUILD b/mingw-w64-cjson/PKGBUILD index 65d0a3745f..d4ee41f2ee 100644 --- a/mingw-w64-cjson/PKGBUILD +++ b/mingw-w64-cjson/PKGBUILD @@ -3,12 +3,13 @@ _realname=cjson pkgbase=mingw-w64-${_realname} pkgname=("${MINGW_PACKAGE_PREFIX}-${_realname}") -pkgver=1.7.18 +pkgver=1.7.19 pkgrel=1 pkgdesc="Ultralightweight JSON parser in ANSI C (mingw-w64)" arch=(any) mingw_arch=('mingw64' 'ucrt64' 'clang64' 'clangarm64') url="https://github.com/DaveGamble/cJSON" +msys2_repository_url="https://github.com/DaveGamble/cJSON" msys2_references=( "cpe: cpe:/a:cjson_project:cjson" ) @@ -19,7 +20,7 @@ makedepends=("${MINGW_PACKAGE_PREFIX}-cc" "${MINGW_PACKAGE_PREFIX}-ninja") source=("https://github.com/DaveGamble/cJSON/archive/v${pkgver}/${_realname}-${pkgver}.tar.gz" "001-fix-cmake-files.patch") -sha256sums=('3aa806844a03442c00769b83e99970be70fbef03735ff898f4811dd03b9f5ee5' +sha256sums=('7fa616e3046edfa7a28a32d5f9eacfd23f92900fe1f8ccd988c1662f30454562' 'f7a5e88c13d58806876dac5d2e255812bee7837cfe7214c9fe8e0f57edb5c25d') prepare() { @@ -37,8 +38,12 @@ build() { _extra_config+=("-DCMAKE_BUILD_TYPE=Debug") fi + if [[ ${MSYSTEM} == CLANG* ]]; then + CFLAGS+=" -Wno-error=used-but-marked-unused" + fi + MSYS2_ARG_CONV_EXCL="-DCMAKE_INSTALL_PREFIX=" \ - ${MINGW_PREFIX}/bin/cmake \ + cmake \ -G Ninja \ "${_extra_config[@]}" \ -DCMAKE_INSTALL_PREFIX=${MINGW_PREFIX} \ @@ -46,14 +51,15 @@ build() { -DBUILD_SHARED_AND_STATIC_LIBS=ON \ -DCMAKE_DLL_NAME_WITH_SOVERSION=ON \ -DENABLE_CJSON_UTILS=ON \ + -DCMAKE_POLICY_VERSION_MINIMUM=3.5 \ ../${_realname}-${pkgver} - ${MINGW_PREFIX}/bin/cmake --build . + cmake --build . } package() { cd "${srcdir}"/build-${MSYSTEM} - DESTDIR="${pkgdir}" ${MINGW_PREFIX}/bin/cmake --install . + DESTDIR="${pkgdir}" cmake --install . for pcfile in "${pkgdir}${MINGW_PREFIX}"/lib/pkgconfig/*.pc; do sed -s "s|${MINGW_PREFIX}|\${prefix}|g" -i "${pcfile}"