public inbox for git-commits@fedoraproject.org
help / color / mirror / Atom feed
From: Federico Pellegrin <fede@evolware.org>
To: git-commits@fedoraproject.org
Subject: [rpms/conan] rawhide: Bump to 2.29.0 (rhbz#2482786), remove upstreamed patches
Date: Fri, 29 May 2026 04:22:41 +0000 [thread overview]
Message-ID: <rpms-conan-b036f983345d@fedoraproject.org> (raw)
A new commit has been pushed.
Repo : rpms/conan
Branch : rawhide
Commit : b036f983345d8593731017e24c4f454260c97972
Author : Federico Pellegrin <fede@evolware.org>
Date : 2026-05-29T06:22:21+02:00
Stats : +3/-85 in 3 file(s)
URL : https://src.fedoraproject.org/rpms/conan/c/b036f983345d8593731017e24c4f454260c97972?branch=rawhide
Log:
Bump to 2.29.0 (rhbz#2482786), remove upstreamed patches
---
diff --git a/0001-Add_gcc_16_in_tests.patch b/0001-Add_gcc_16_in_tests.patch
deleted file mode 100644
index cf32ce8..0000000
--- a/0001-Add_gcc_16_in_tests.patch
+++ /dev/null
@@ -1,76 +0,0 @@
-From 84b11af77424b18fd934ac8e0379f4fe5c57f0ad Mon Sep 17 00:00:00 2001
-From: Federico Pellegrin <fede@evolware.org>
-Date: Wed, 29 Apr 2026 11:27:48 +0200
-Subject: [PATCH] Add gcc 16 support (#19921)
-
-* Add gcc 16 support
-
-* gcc16 moves forward C++20 as default cppstd
-
-* Added tests
-
----------
-
-Co-authored-by: PerseoGI <perseog@jfrog.com>
----
- conan/internal/api/detect/detect_api.py | 2 ++
- conan/internal/default_settings.py | 3 ++-
- test/unittests/client/build/cpp_std_flags_test.py | 11 +++++++++++
- 3 files changed, 15 insertions(+), 1 deletion(-)
-
-diff --git a/conan/internal/api/detect/detect_api.py b/conan/internal/api/detect/detect_api.py
-index 6e380a2e492..b5a7edb3a8c 100644
---- a/conan/internal/api/detect/detect_api.py
-+++ b/conan/internal/api/detect/detect_api.py
-@@ -304,6 +304,8 @@ def _clang_cppstd_default(version):
- return "gnu98" if version < "6" else "gnu14"
-
- def _gcc_cppstd_default(version):
-+ if version >= "16":
-+ return "gnu20"
- if version >= "11":
- return "gnu17"
- return "gnu98" if version < "6" else "gnu14"
-diff --git a/conan/internal/default_settings.py b/conan/internal/default_settings.py
-index 1a363bfd216..efa50c192d2 100644
---- a/conan/internal/default_settings.py
-+++ b/conan/internal/default_settings.py
-@@ -125,7 +125,8 @@
- "12", "12.1", "12.2", "12.3", "12.4", "12.5",
- "13", "13.1", "13.2", "13.3", "13.4",
- "14", "14.1", "14.2", "14.3",
-- "15", "15.1", "15.2"]
-+ "15", "15.1", "15.2",
-+ "16", "16.1"]
- libcxx: [libstdc++, libstdc++11]
- threads: [null, posix, win32, mcf] # Windows MinGW
- exception: [null, dwarf2, sjlj, seh] # Windows MinGW
-diff --git a/test/unittests/client/build/cpp_std_flags_test.py b/test/unittests/client/build/cpp_std_flags_test.py
-index 800f269cbd0..838b482e7b4 100644
---- a/test/unittests/client/build/cpp_std_flags_test.py
-+++ b/test/unittests/client/build/cpp_std_flags_test.py
-@@ -83,6 +83,15 @@ def test_gcc_cppstd_flags(self):
- assert _make_cppstd_flag("gcc", "15", "20") == '-std=c++20'
- assert _make_cppstd_flag("gcc", "15", "23") == '-std=c++23'
- assert _make_cppstd_flag("gcc", "15", "26") == '-std=c++26'
-+ assert _make_cppstd_flag("gcc", "15", "26") == '-std=c++26'
-+
-+ assert _make_cppstd_flag("gcc", "16", "11") == '-std=c++11'
-+ assert _make_cppstd_flag("gcc", "16", "14") == '-std=c++14'
-+ assert _make_cppstd_flag("gcc", "16", "17") == '-std=c++17'
-+ assert _make_cppstd_flag("gcc", "16", "20") == '-std=c++20'
-+ assert _make_cppstd_flag("gcc", "16", "23") == '-std=c++23'
-+ assert _make_cppstd_flag("gcc", "16", "26") == '-std=c++26'
-+ assert _make_cppstd_flag("gcc", "16", "26") == '-std=c++26'
-
- def test_gcc_cppstd_defaults(self):
- assert _make_cppstd_default("gcc", "4") == "gnu98"
-@@ -94,6 +103,8 @@ def test_gcc_cppstd_defaults(self):
- assert _make_cppstd_default("gcc", "11") == "gnu17"
- assert _make_cppstd_default("gcc", "11.1") == "gnu17"
- assert _make_cppstd_default("gcc", "15.1") == "gnu17"
-+ assert _make_cppstd_default("gcc", "16") == "gnu20"
-+ assert _make_cppstd_default("gcc", "16.1") == "gnu20"
-
- def test_clang_cppstd_flags(self):
- assert _make_cppstd_flag("clang", "2.0", "98") is None
diff --git a/conan.spec b/conan.spec
index 1289509..1d048d9 100644
--- a/conan.spec
+++ b/conan.spec
@@ -2,16 +2,13 @@
%bcond_without check
Name: conan
-Version: 2.28.1
+Version: 2.29.0
Release: %autorelease
License: MIT
Summary: Open-source C/C++ package manager
URL: https://github.com/%{name}-io/%{name}
Source0: %{url}/archive/%{version}/%{name}-%{version}.tar.gz
-# Add support for GCC 16, already merged upstream, to be removed with 2.29.x
-# https://github.com/conan-io/conan/commit/84b11af77424b18fd934ac8e0379f4fe5c57f0ad
-Patch1: 0001-Add_gcc_16_in_tests.patch
BuildArch: noarch
BuildRequires: python3-devel
@@ -70,10 +67,7 @@ find -name '*.py' \( \! -perm /u+x,g+x,o+x -exec sed -e '/^#!/Q 0' -e 'Q 1' {} \
%{pytest} -v test/unittests
# Fail currently:
# - toolchains/gnu/test_autotoolsdeps.py to be investigated further why
-# - toolchains/microsoft/test_vs_layout.py cannot run on ppc64
-# - workspace/test_workspace.py MSBuildDeps problems, unsure what that is
-# - toolchains/qbs/test_qbsprofile.py since 2.7.0, seems not to find a tool, to be investigated
-rm test/integration/toolchains/gnu/test_autotoolsdeps.py test/integration/toolchains/microsoft/test_vs_layout.py test/integration/workspace/test_workspace.py test/integration/toolchains/qbs/test_qbsprofile.py
+rm test/integration/toolchains/gnu/test_autotoolsdeps.py
%{pytest} -v test/integration
%endif
diff --git a/sources b/sources
index c6a5a42..33e5568 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (conan-2.28.1.tar.gz) = 493f1a12a43b8be3d876c4cdc232c90b4485338965b2c363307a8f3bb975c76d2e00060579f6ed73503c16739b293b9f03f6866f075031734d94b782cddca708
+SHA512 (conan-2.29.0.tar.gz) = 8c7185c3d11e9b6edaa791e2191c9f0f73a4426f77a7ed6a186c8a540567546193a3ceb3a4e74c349e4387e78dbcc00d11d3ee2ee2abc9320e7f0769da2fd5db
reply other threads:[~2026-05-29 4:22 UTC|newest]
Thread overview: [no followups] expand[flat|nested] mbox.gz Atom feed
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=rpms-conan-b036f983345d@fedoraproject.org \
--to=fede@evolware.org \
--cc=git-commits@fedoraproject.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox