From 8e33c8d330e607b4795db25f8b4e90c316807133 Mon Sep 17 00:00:00 2001
From: Lukas Schmelting <lschmelting@posteo.com>
Date: Thu, 9 Oct 2025 11:09:17 +0200
Subject: [PATCH] dev-cpp/gtkmm: Restrict <gtkmm-4.20:4 to <gtk-4.20

Bumping gtk to 4.20.1 exposed a compilation error caused by
conflicting C++ alias declarations in gtk/src/iconpaintable.h:

  using GtkIconPaintable = struct _GtkIconPaintable;
  using GtkIconPaintableClass = struct _GtkIconPaintableClass;

Specifically, the build fails with errors like:

  error: conflicting declaration
  using GtkIconPaintableClass = struct _GtkIconPaintableClass;

These aliases were introduced in commit 04ab9653 (probably) and later
removed in commit 94959145, which fixed the conflict.

Bug: https://bugs.gentoo.org/963805
Signed-off-by: Lukas Schmelting <lschmelting@posteo.com>
Part-of: https://github.com/gentoo/gentoo/pull/44106
Signed-off-by: Sam James <sam@gentoo.org>
---
 dev-cpp/gtkmm/{gtkmm-4.14.0.ebuild => gtkmm-4.14.0-r1.ebuild} | 1 +
 dev-cpp/gtkmm/{gtkmm-4.18.0.ebuild => gtkmm-4.18.0-r1.ebuild} | 1 +
 2 files changed, 2 insertions(+)
 rename dev-cpp/gtkmm/{gtkmm-4.14.0.ebuild => gtkmm-4.14.0-r1.ebuild} (97%)
 rename dev-cpp/gtkmm/{gtkmm-4.18.0.ebuild => gtkmm-4.18.0-r1.ebuild} (97%)

diff --git a/dev-cpp/gtkmm/gtkmm-4.14.0.ebuild b/dev-cpp/gtkmm/gtkmm-4.14.0-r1.ebuild
similarity index 97%
rename from dev-cpp/gtkmm/gtkmm-4.14.0.ebuild
rename to dev-cpp/gtkmm/gtkmm-4.14.0-r1.ebuild
index aa89cf98ebcfa..83e6a4f623ffd 100644
--- a/dev-cpp/gtkmm/gtkmm-4.14.0.ebuild
+++ b/dev-cpp/gtkmm/gtkmm-4.14.0-r1.ebuild
@@ -19,6 +19,7 @@ RESTRICT="!test? ( test )"
 RDEPEND="
 	>=dev-cpp/glibmm-2.68.0:2.68[gtk-doc?]
 	>=gui-libs/gtk-4.14.0:4
+	<gui-libs/gtk-4.20:4
 	>=dev-cpp/cairomm-1.15.4:1.16[gtk-doc?]
 	>=dev-cpp/pangomm-2.50.0:2.48[gtk-doc?]
 	>=x11-libs/gdk-pixbuf-2.35.5:2
diff --git a/dev-cpp/gtkmm/gtkmm-4.18.0.ebuild b/dev-cpp/gtkmm/gtkmm-4.18.0-r1.ebuild
similarity index 97%
rename from dev-cpp/gtkmm/gtkmm-4.18.0.ebuild
rename to dev-cpp/gtkmm/gtkmm-4.18.0-r1.ebuild
index 8952af75443b0..acd6f8fb60300 100644
--- a/dev-cpp/gtkmm/gtkmm-4.18.0.ebuild
+++ b/dev-cpp/gtkmm/gtkmm-4.18.0-r1.ebuild
@@ -19,6 +19,7 @@ RESTRICT="!test? ( test )"
 RDEPEND="
 	>=dev-cpp/glibmm-2.75.0:2.68[gtk-doc?]
 	>=gui-libs/gtk-4.17.5:4
+	<gui-libs/gtk-4.20:4
 	>=dev-cpp/cairomm-1.15.4:1.16[gtk-doc?]
 	>=dev-cpp/pangomm-2.50.0:2.48[gtk-doc?]
 	>=x11-libs/gdk-pixbuf-2.35.5:2