From 4789f5871d7a17950463512b21efbea6a4f14aaa Mon Sep 17 00:00:00 2001 From: Stephan Lachnit Date: Mon, 17 Nov 2025 10:33:04 +0100 Subject: [PATCH] cpr: update to 1.13.0 --- releases.json | 1 + subprojects/cpr.wrap | 10 +++++----- subprojects/packagefiles/cpr/cpr/meson.build | 1 + subprojects/packagefiles/cpr/meson.build | 13 +++++++++++-- subprojects/packagefiles/cpr/test/meson.build | 1 + 5 files changed, 19 insertions(+), 7 deletions(-) diff --git a/releases.json b/releases.json index f72193ff6..491cacea0 100644 --- a/releases.json +++ b/releases.json @@ -653,6 +653,7 @@ "cpr" ], "versions": [ + "1.13.0-1", "1.12.0-1", "1.11.2-1", "1.11.1-1", diff --git a/subprojects/cpr.wrap b/subprojects/cpr.wrap index 0beda6f33..b78b001ce 100644 --- a/subprojects/cpr.wrap +++ b/subprojects/cpr.wrap @@ -1,9 +1,9 @@ [wrap-file] -directory = cpr-1.12.0 -source_url = https://github.com/libcpr/cpr/archive/1.12.0.tar.gz -source_filename = cpr-1.12.0.tar.gz -source_hash = f64b501de66e163d6a278fbb6a95f395ee873b7a66c905dd785eae107266a709 +directory = cpr-1.13.0 +source_url = https://github.com/libcpr/cpr/archive/1.13.0.tar.gz +source_filename = cpr-1.13.0.tar.gz +source_hash = c55d805300c224f099cad74ad9c68799f23d005d09ba2df76ead975a3e50e09d patch_directory = cpr [provide] -cpr = cpr_dep +dependency_names = cpr diff --git a/subprojects/packagefiles/cpr/cpr/meson.build b/subprojects/packagefiles/cpr/cpr/meson.build index 2c6b9db4f..47d695bb3 100644 --- a/subprojects/packagefiles/cpr/cpr/meson.build +++ b/subprojects/packagefiles/cpr/cpr/meson.build @@ -4,6 +4,7 @@ cpr_src = files( 'auth.cpp', 'callback.cpp', 'cert_info.cpp', + 'connection_pool.cpp', 'cookies.cpp', 'cprtypes.cpp', 'curl_container.cpp', diff --git a/subprojects/packagefiles/cpr/meson.build b/subprojects/packagefiles/cpr/meson.build index 1b7045147..4b2d51947 100644 --- a/subprojects/packagefiles/cpr/meson.build +++ b/subprojects/packagefiles/cpr/meson.build @@ -1,25 +1,33 @@ project( 'cpr', 'cpp', - version: '1.12.0', + version: '1.13.0', license: 'MIT', default_options: 'cpp_std=c++17', ) curl_dep = dependency( 'libcurl', - version: '>=7.64.0', + version: '>=7.71.0', ) thread_dep = dependency('threads') includes = include_directories('.', 'include') subdir('cpr') +includes = include_directories('include') +install_subdir( + 'include/cpr', + install_dir: get_option('includedir'), +) + cpr_lib = library( 'cpr', include_directories: includes, sources: cpr_src, dependencies: [curl_dep, thread_dep], + version: meson.project_version(), + install: true, ) cpr_dep = declare_dependency( @@ -27,5 +35,6 @@ cpr_dep = declare_dependency( link_with: cpr_lib, dependencies: [curl_dep, thread_dep], ) +meson.override_dependency('cpr', cpr_dep) subdir('test') diff --git a/subprojects/packagefiles/cpr/test/meson.build b/subprojects/packagefiles/cpr/test/meson.build index 8f259f9c9..5093b4613 100644 --- a/subprojects/packagefiles/cpr/test/meson.build +++ b/subprojects/packagefiles/cpr/test/meson.build @@ -11,6 +11,7 @@ tests = [ # 'alternating', # 'async', # 'callback', + # 'connection_pool', # 'delete', # 'download', 'encoded_auth',