From e26a8e3559ee52b52df7dce84b4fedcecf102eec Mon Sep 17 00:00:00 2001 From: Biswapriyo Nath Date: Sat, 12 Apr 2025 05:32:22 +0000 Subject: [PATCH] nlohmann-json: update to 3.12.0 --- .../0001-fix-pkgconfig-files.patch | 23 ------------------- mingw-w64-nlohmann-json/PKGBUILD | 13 +++-------- 2 files changed, 3 insertions(+), 33 deletions(-) delete mode 100644 mingw-w64-nlohmann-json/0001-fix-pkgconfig-files.patch diff --git a/mingw-w64-nlohmann-json/0001-fix-pkgconfig-files.patch b/mingw-w64-nlohmann-json/0001-fix-pkgconfig-files.patch deleted file mode 100644 index 373703b67f..0000000000 --- a/mingw-w64-nlohmann-json/0001-fix-pkgconfig-files.patch +++ /dev/null @@ -1,23 +0,0 @@ ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -120,6 +120,7 @@ - CONFIGURE_FILE( - "${CMAKE_CURRENT_SOURCE_DIR}/cmake/pkg-config.pc.in" - "${CMAKE_CURRENT_BINARY_DIR}/${PROJECT_NAME}.pc" -+ @ONLY - ) - - ## ---- a/cmake/pkg-config.pc.in -+++ b/cmake/pkg-config.pc.in -@@ -1,4 +1,7 @@ --Name: ${PROJECT_NAME} -+prefix=@CMAKE_INSTALL_PREFIX@ -+includedir=${prefix}/@CMAKE_INSTALL_INCLUDEDIR@ -+ -+Name: @PROJECT_NAME@ - Description: JSON for Modern C++ --Version: ${PROJECT_VERSION} --Cflags: -I${CMAKE_INSTALL_FULL_INCLUDEDIR} -+Version: @PROJECT_VERSION@ -+Cflags: -I${includedir} diff --git a/mingw-w64-nlohmann-json/PKGBUILD b/mingw-w64-nlohmann-json/PKGBUILD index 34c5077287..f764f6c3f5 100644 --- a/mingw-w64-nlohmann-json/PKGBUILD +++ b/mingw-w64-nlohmann-json/PKGBUILD @@ -4,7 +4,7 @@ _realname=json _pkgname=nlohmann-json pkgbase=mingw-w64-${_pkgname} pkgname="${MINGW_PACKAGE_PREFIX}-${_pkgname}" -pkgver=3.11.3 +pkgver=3.12.0 pkgrel=1 pkgdesc="JSON for Modern C++ (mingw-w64)" arch=('any') @@ -18,15 +18,8 @@ conflicts=("${MINGW_PACKAGE_PREFIX}-nlohmann_json") provides=("${MINGW_PACKAGE_PREFIX}-nlohmann_json") replaces=("${MINGW_PACKAGE_PREFIX}-nlohmann_json") options=('!strip' '!buildflags') -source=("${_realname}-${pkgver}.tar.gz"::"https://github.com/nlohmann/json/archive/v${pkgver}.tar.gz" - "0001-fix-pkgconfig-files.patch") -sha256sums=('0d8ef5af7f9794e3263480193c491549b2ba6cc74bb018906202ada498a79406' - '49d5e9e3c860a4c348b1d0a74ad38b6d9b30e73c71cfc64ad6f5c70e40c307d0') - -prepare() { - cd "${_realname}-${pkgver}" - patch -p1 -i "${srcdir}/0001-fix-pkgconfig-files.patch" -} +source=("${_realname}-${pkgver}.tar.gz"::"https://github.com/nlohmann/json/archive/v${pkgver}.tar.gz") +sha256sums=('4b92eb0c06d10683f7447ce9406cb97cd4b453be18d7279320f7b2f025c10187') build() { mkdir -p "${srcdir}/build-${MSYSTEM}" && cd "${srcdir}/build-${MSYSTEM}"