commit: 5cce4b23baf021f7096a56a3f020938fd01f48d0 Author: Pacho Ramos <pacho <AT> gentoo <DOT> org> AuthorDate: Sun Dec 14 16:41:58 2025 +0000 Commit: Pacho Ramos <pacho <AT> gentoo <DOT> org> CommitDate: Sun Dec 14 17:03:49 2025 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5cce4b23
dev-cpp/glibmm: drop 2.66.7, 2.78.1 Signed-off-by: Pacho Ramos <pacho <AT> gentoo.org> dev-cpp/glibmm/Manifest | 2 - .../glibmm/files/glibmm-2.78.1-libcxx-fix.patch | 52 --------------------- dev-cpp/glibmm/glibmm-2.66.7.ebuild | 54 ---------------------- dev-cpp/glibmm/glibmm-2.78.1.ebuild | 54 ---------------------- 4 files changed, 162 deletions(-) diff --git a/dev-cpp/glibmm/Manifest b/dev-cpp/glibmm/Manifest index 05c3eb11011f..c4e3824d74dd 100644 --- a/dev-cpp/glibmm/Manifest +++ b/dev-cpp/glibmm/Manifest @@ -1,4 +1,2 @@ -DIST glibmm-2.66.7.tar.xz 8773780 BLAKE2B faef7b6a9ca91aed3ac7ddeddc0413f87daba4b8d1e887431bd7db8b7cae66ec449292bbb0fb9e4e574d1ce680853ab0ffb476abd76c19257c7434389ba3d2cc SHA512 09b99622c051afd264d7a9b23025ee28ec870c6d23a5084ef7192f67b96fb8f16be5dbb2e8a4ff8a1d4ff873d3e73b4e25dee122049266687f471dcd3989b5bb DIST glibmm-2.66.8.tar.xz 8597344 BLAKE2B 43ce7739259b928ed71946b3de8090aab9c4c900d8233dbe16cef2a1ff9b9521f304b50bf4a57c9398aaa8deed882600814551404991d1cdd09b3c45bb461cc7 SHA512 4ebf203324d3ee95c47012915efb39d4dc59eb7a6f337e7b8c7c0b3589574b07967974363931b0d4159618f88178b04715b2c359c3dc3f67a7781bfac0d9f277 -DIST glibmm-2.78.1.tar.xz 9486784 BLAKE2B 2875d93b0cedb6bf84cb463b1c73743c55dc446ee0c1dce36344a8e0ff77cec8d890d1e3b0f1d4a841d293ab123cc60bf5c6b55ed9a0456fe235d928bf28ff05 SHA512 5ace15c492be553e2c6abd8d0699197239261feaa2b45ff77181f59bb98b584dc822bdd46dbdee35691cc5a955a3b88e03f58532459236fd780823354c35d0a6 DIST glibmm-2.84.0.tar.xz 9596876 BLAKE2B efbf89adaed0d673bc6391f44205cdbfa5400c4137a199cb69bb7580b81ae0e2d2304906b0b15409c68b369929d44fb2b9134d23638d7244a69f92ccfc7a8402 SHA512 dbe7d7b39ccf4a4acb0a67a0eab1a4b5f47dff3c0ae645aa2eaca498b646ee2da0f6f8ef81b3253621119d94bcdc3b1d4dcbf234eedfbd20aaa065c430e67daf 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 deleted file mode 100644 index 0b7cc7ee28d4..000000000000 --- a/dev-cpp/glibmm/files/glibmm-2.78.1-libcxx-fix.patch +++ /dev/null @@ -1,52 +0,0 @@ -# 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 <[email protected]> - -From 72c5ad98d858fa4fc0183a5ec1a61bb48ef5bd95 Mon Sep 17 00:00:00 2001 -From: Kjell Ahlstedt <[email protected]> -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<guchar>&. 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<guchar>& data, bool& result_uncertain) -+ const std::string& /*filename*/, const std::basic_string<guchar>& /*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.66.7.ebuild b/dev-cpp/glibmm/glibmm-2.66.7.ebuild deleted file mode 100644 index 8863e66d91c9..000000000000 --- a/dev-cpp/glibmm/glibmm-2.66.7.ebuild +++ /dev/null @@ -1,54 +0,0 @@ -# Copyright 1999-2025 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 -PYTHON_COMPAT=( python3_{10..13} ) -inherit gnome.org meson-multilib python-any-r1 - -DESCRIPTION="C++ interface for glib2" -HOMEPAGE="https://gtkmm.gnome.org/en/index.html"; - -LICENSE="LGPL-2.1+" -SLOT="2" -KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~mips ppc ppc64 ~riscv ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos" -IUSE="gtk-doc debug test" -RESTRICT="!test? ( test )" - -RDEPEND=" - >=dev-libs/libsigc++-2.9.1:2[${MULTILIB_USEDEP}] - >=dev-libs/glib-2.61.2:2[${MULTILIB_USEDEP}] -" -DEPEND="${RDEPEND}" -BDEPEND=" - ${PYTHON_DEPS} - virtual/pkgconfig - gtk-doc? ( - app-text/doxygen[dot] - dev-lang/perl - dev-perl/XML-Parser - dev-libs/libxslt - media-gfx/graphviz - ) -" - -src_prepare() { - default - - # giomm_tls_client requires FEATURES=-network-sandbox and glib-networking rdep - sed -i -e '/giomm_tls_client/d' tests/meson.build || die - - if ! use test; then - sed -i -e "/^subdir('tests')/d" meson.build || die - fi -} - -multilib_src_configure() { - local emesonargs=( - -Dwarnings=min - -Dbuild-deprecated-api=true - $(meson_native_use_bool gtk-doc build-documentation) - $(meson_use debug debug-refcounting) - -Dbuild-examples=false - ) - meson_src_configure -} diff --git a/dev-cpp/glibmm/glibmm-2.78.1.ebuild b/dev-cpp/glibmm/glibmm-2.78.1.ebuild deleted file mode 100644 index 058d7c5d6e82..000000000000 --- a/dev-cpp/glibmm/glibmm-2.78.1.ebuild +++ /dev/null @@ -1,54 +0,0 @@ -# Copyright 1999-2025 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 -PYTHON_COMPAT=( python3_{10..13} ) -inherit gnome.org meson-multilib python-any-r1 - -DESCRIPTION="C++ interface for glib2" -HOMEPAGE="https://gtkmm.gnome.org/en/index.html"; - -LICENSE="LGPL-2.1+" -SLOT="2.68" -KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~mips ppc ppc64 ~riscv ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos" -IUSE="gtk-doc debug test" -RESTRICT="!test? ( test )" - -RDEPEND=" - >=dev-libs/glib-2.77.0:2[${MULTILIB_USEDEP}] - dev-libs/libsigc++:3[gtk-doc?,${MULTILIB_USEDEP}] -" -DEPEND="${RDEPEND}" -BDEPEND=" - ${PYTHON_DEPS} - virtual/pkgconfig - gtk-doc? ( - app-text/doxygen[dot] - dev-lang/perl - dev-libs/libxslt - ) -" - -PATCHES=( "${FILESDIR}"/${P}-libcxx-fix.patch ) - -src_prepare() { - default - - # giomm_tls_client requires FEATURES=-network-sandbox and glib-networking rdep - sed -i -e '/giomm_tls_client/d' tests/meson.build || die - - if ! use test; then - sed -i -e "/^subdir('tests')/d" meson.build || die - fi -} - -multilib_src_configure() { - local emesonargs=( - -Dwarnings=min - -Dbuild-deprecated-api=true - $(meson_native_use_bool gtk-doc build-documentation) - $(meson_use debug debug-refcounting) - -Dbuild-examples=false - ) - meson_src_configure -}
