commit: 8b9cfca8f52ef19c963b2efdbd15ef0032634a4f Author: Z. Liu <zhixu.liu <AT> gmail <DOT> com> AuthorDate: Tue Jan 20 15:21:41 2026 +0000 Commit: Sam James <sam <AT> gentoo <DOT> org> CommitDate: Sun Jan 25 06:45:35 2026 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8b9cfca8
sys-cluster/ceph: drop ceph-17.2.0-gcc12-header.patch which has been fixed upstream; see https://github.com/ceph/ceph/commit/7c381ba985b Signed-off-by: Z. Liu <zhixu.liu <AT> gmail.com> Part-of: https://github.com/gentoo/gentoo/pull/45459 Signed-off-by: Sam James <sam <AT> gentoo.org> sys-cluster/ceph/ceph-19.2.2-r6.ebuild | 1 - sys-cluster/ceph/ceph-19.2.3.ebuild | 1 - sys-cluster/ceph/ceph-20.1.0-r2.ebuild | 1 - sys-cluster/ceph/ceph-20.1.1.ebuild | 1 - .../ceph/files/ceph-17.2.0-gcc12-header.patch | 30 ---------------------- 5 files changed, 34 deletions(-) diff --git a/sys-cluster/ceph/ceph-19.2.2-r6.ebuild b/sys-cluster/ceph/ceph-19.2.2-r6.ebuild index b65e5bd3f5d7..d17e56724fdf 100644 --- a/sys-cluster/ceph/ceph-19.2.2-r6.ebuild +++ b/sys-cluster/ceph/ceph-19.2.2-r6.ebuild @@ -213,7 +213,6 @@ PATCHES=( "${FILESDIR}/ceph-17.2.0-findre2.patch" "${FILESDIR}/ceph-18.2.0-system-opentelemetry.patch" "${FILESDIR}/ceph-17.2.0-osd_class_dir.patch" - "${FILESDIR}/ceph-17.2.0-gcc12-header.patch" "${FILESDIR}/ceph-17.2.3-flags.patch" # https://bugs.gentoo.org/866165 "${FILESDIR}/ceph-17.2.5-suppress-cmake-warning.patch" diff --git a/sys-cluster/ceph/ceph-19.2.3.ebuild b/sys-cluster/ceph/ceph-19.2.3.ebuild index cdcaf8ecf913..2d26c193d5f0 100644 --- a/sys-cluster/ceph/ceph-19.2.3.ebuild +++ b/sys-cluster/ceph/ceph-19.2.3.ebuild @@ -214,7 +214,6 @@ PATCHES=( "${FILESDIR}/ceph-17.2.0-findre2.patch" "${FILESDIR}/ceph-18.2.0-system-opentelemetry.patch" "${FILESDIR}/ceph-17.2.0-osd_class_dir.patch" - "${FILESDIR}/ceph-17.2.0-gcc12-header.patch" "${FILESDIR}/ceph-17.2.3-flags.patch" # https://bugs.gentoo.org/866165 "${FILESDIR}/ceph-17.2.5-suppress-cmake-warning.patch" diff --git a/sys-cluster/ceph/ceph-20.1.0-r2.ebuild b/sys-cluster/ceph/ceph-20.1.0-r2.ebuild index 33a1aec7db50..3db871ce5080 100644 --- a/sys-cluster/ceph/ceph-20.1.0-r2.ebuild +++ b/sys-cluster/ceph/ceph-20.1.0-r2.ebuild @@ -209,7 +209,6 @@ PATCHES=( "${FILESDIR}/ceph-17.2.0-findre2.patch" "${FILESDIR}/ceph-18.2.0-system-opentelemetry.patch" "${FILESDIR}/ceph-17.2.0-osd_class_dir.patch" - "${FILESDIR}/ceph-17.2.0-gcc12-header.patch" # https://bugs.gentoo.org/866165 "${FILESDIR}/ceph-17.2.5-suppress-cmake-warning.patch" "${FILESDIR}/ceph-17.2.5-gcc13-deux.patch" diff --git a/sys-cluster/ceph/ceph-20.1.1.ebuild b/sys-cluster/ceph/ceph-20.1.1.ebuild index 33a1aec7db50..3db871ce5080 100644 --- a/sys-cluster/ceph/ceph-20.1.1.ebuild +++ b/sys-cluster/ceph/ceph-20.1.1.ebuild @@ -209,7 +209,6 @@ PATCHES=( "${FILESDIR}/ceph-17.2.0-findre2.patch" "${FILESDIR}/ceph-18.2.0-system-opentelemetry.patch" "${FILESDIR}/ceph-17.2.0-osd_class_dir.patch" - "${FILESDIR}/ceph-17.2.0-gcc12-header.patch" # https://bugs.gentoo.org/866165 "${FILESDIR}/ceph-17.2.5-suppress-cmake-warning.patch" "${FILESDIR}/ceph-17.2.5-gcc13-deux.patch" diff --git a/sys-cluster/ceph/files/ceph-17.2.0-gcc12-header.patch b/sys-cluster/ceph/files/ceph-17.2.0-gcc12-header.patch deleted file mode 100644 index 70d3eb94c97a..000000000000 --- a/sys-cluster/ceph/files/ceph-17.2.0-gcc12-header.patch +++ /dev/null @@ -1,30 +0,0 @@ -From 496465d9238109a93612e28682273e5bf576823b Mon Sep 17 00:00:00 2001 -From: Chen Qi <[email protected]> -Date: Sun, 22 May 2022 19:40:59 -0700 -Subject: [PATCH 1/2] buffer.h: add missing header file due to gcc upgrade - -The header file <memory> have been changed to be no longer included by other -heades, thus requiring explicit include. See https://gcc.gnu.org/gcc-12/porting_to.html - -Upstream-Status: Pending - -Signed-off-by: Chen Qi <[email protected]> ---- - src/include/buffer.h | 1 + - 1 file changed, 1 insertion(+) - -diff --git a/src/include/buffer.h b/src/include/buffer.h -index 5c8b427d..88845ee6 100644 ---- a/src/include/buffer.h -+++ b/src/include/buffer.h -@@ -43,6 +43,7 @@ - #include <list> - #include <vector> - #include <string> -+#include <memory> - #if __cplusplus >= 201703L - #include <string_view> - #endif // __cplusplus >= 201703L --- -2.36.0 -
