From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 1E9271581F2 for ; Thu, 12 Dec 2024 05:40:27 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 0761FE0C40; Thu, 12 Dec 2024 05:40:26 +0000 (UTC) Received: from smtp.gentoo.org (woodpecker.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 3A7E0E0C50 for ; Thu, 12 Dec 2024 05:40:25 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 535DF335DC7 for ; Thu, 12 Dec 2024 05:40:24 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id AF5E41F28 for ; Thu, 12 Dec 2024 05:40:22 +0000 (UTC) From: "Sam James" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Sam James" Message-ID: <1733981958.b8cca5206e08045a5aae0dd807962abcb3c28533.sam@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: dev-cpp/glibmm/files/, dev-cpp/glibmm/ X-VCS-Repository: repo/gentoo X-VCS-Files: dev-cpp/glibmm/files/glibmm-2.78.1-libcxx-fix.patch dev-cpp/glibmm/glibmm-2.78.1.ebuild X-VCS-Directories: dev-cpp/glibmm/files/ dev-cpp/glibmm/ X-VCS-Committer: sam X-VCS-Committer-Name: Sam James X-VCS-Revision: b8cca5206e08045a5aae0dd807962abcb3c28533 X-VCS-Branch: master Date: Thu, 12 Dec 2024 05:40:22 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: c6ac20fd-8df6-40d3-a59a-83745aa1bfb3 X-Archives-Hash: 9bda42fcaf7d533897e8c5ee500c9592 commit: b8cca5206e08045a5aae0dd807962abcb3c28533 Author: Denis Pronin yandex ru> AuthorDate: Fri Nov 29 07:51:58 2024 +0000 Commit: Sam James gentoo org> CommitDate: Thu Dec 12 05:39:18 2024 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b8cca520 dev-cpp/glibmm: remove method that is not used any where Closes: https://bugs.gentoo.org/945375 Signed-off-by: Denis Pronin yandex.ru> Closes: https://github.com/gentoo/gentoo/pull/39525 Signed-off-by: Sam James gentoo.org> .../glibmm/files/glibmm-2.78.1-libcxx-fix.patch | 52 ++++++++++++++++++++++ dev-cpp/glibmm/glibmm-2.78.1.ebuild | 2 + 2 files changed, 54 insertions(+) diff --git a/dev-cpp/glibmm/files/glibmm-2.78.1-libcxx-fix.patch b/dev-cpp/glibmm/files/glibmm-2.78.1-libcxx-fix.patch new file mode 100644 index 000000000000..0b7cc7ee28d4 --- /dev/null +++ b/dev-cpp/glibmm/files/glibmm-2.78.1-libcxx-fix.patch @@ -0,0 +1,52 @@ +# This patch is fetched from the upstream and dedicated to making compiling with clang-19 possible +# Bug related https://bugs.gentoo.org/945375 +# The patch is added by Denis Pronin + +From 72c5ad98d858fa4fc0183a5ec1a61bb48ef5bd95 Mon Sep 17 00:00:00 2001 +From: Kjell Ahlstedt +Date: Fri, 22 Mar 2024 10:32:45 +0100 +Subject: [PATCH] Gio::content_type_guess(): Remove most of an unneccesary + overload + +clang 19.0.0 does not like the overload that takes a +const std::basic_string&. This overload should have been removed +16 years ago by commit 84135b93a20e6c9fe652849959d3ff90474c99bb. +It can't be removed completely now, because that would break ABI. +Remove as much as possible. +Fixes #118 +--- + gio/giomm/contenttype.cc | 15 +++++++++------ + 1 file changed, 9 insertions(+), 6 deletions(-) + +diff --git a/gio/giomm/contenttype.cc b/gio/giomm/contenttype.cc +index abe67337..8eb1bd71 100644 +--- a/gio/giomm/contenttype.cc ++++ b/gio/giomm/contenttype.cc +@@ -84,15 +84,18 @@ content_type_from_mime_type(const Glib::ustring& mime_type) + g_content_type_from_mime_type(mime_type.c_str())); + } + ++//TODO: When we can break ABI, remove this content_type_guess() overload. ++// Commit https://gitlab.gnome.org/GNOME/glibmm/-/commit/84135b93a20e6c9fe652849959d3ff90474c99bb ++// removed it from contenttype.h, but not from contenttype.cc. ++// For the time being, it's replaced by a function that does almost nothing. ++// clang 19.0.0 does not like a complete version. ++// See issue https://gitlab.gnome.org/GNOME/glibmm/-/issues/118 + Glib::ustring + content_type_guess( +- const std::string& filename, const std::basic_string& data, bool& result_uncertain) ++ const std::string& /*filename*/, const std::basic_string& /*data*/, bool& result_uncertain) + { +- gboolean c_result_uncertain = FALSE; +- const gchar* c_filename = filename.empty() ? nullptr : filename.c_str(); +- gchar* cresult = g_content_type_guess(c_filename, data.c_str(), data.size(), &c_result_uncertain); +- result_uncertain = c_result_uncertain; +- return Glib::convert_return_gchar_ptr_to_ustring(cresult); ++ result_uncertain = true; ++ return Glib::ustring(); + } + + Glib::ustring +-- +2.45.2 + diff --git a/dev-cpp/glibmm/glibmm-2.78.1.ebuild b/dev-cpp/glibmm/glibmm-2.78.1.ebuild index a8e3d22a6aa2..b5b3c5c985a0 100644 --- a/dev-cpp/glibmm/glibmm-2.78.1.ebuild +++ b/dev-cpp/glibmm/glibmm-2.78.1.ebuild @@ -29,6 +29,8 @@ BDEPEND=" ) " +PATCHES=( "${FILESDIR}"/${P}-libcxx-fix.patch ) + src_prepare() { default