public inbox for git-commits@fedoraproject.org
help / color / mirror / Atom feed
* [rpms/glibmm2.4] rawhide: Update to 2.66.10
@ 2026-08-12 11:15 nmontero
0 siblings, 0 replies; only message in thread
From: nmontero @ 2026-08-12 11:15 UTC (permalink / raw)
To: git-commits
A new commit has been pushed.
Repo : rpms/glibmm2.4
Branch : rawhide
Commit : 75196b31f041b7f6646aa3f65601f90fc6122371
Author : nmontero <nmontero@redhat.com>
Date : 2026-08-12T13:14:23+02:00
Stats : +2/-117 in 3 file(s)
URL : https://src.fedoraproject.org/rpms/glibmm2.4/c/75196b31f041b7f6646aa3f65601f90fc6122371?branch=rawhide
Log:
Update to 2.66.10
---
diff --git a/glibmm2.4.spec b/glibmm2.4.spec
index a7e8207..0e81807 100644
--- a/glibmm2.4.spec
+++ b/glibmm2.4.spec
@@ -4,7 +4,7 @@
%global libsigc_version 2.9.1
Name: glibmm2.4
-Version: 2.66.9
+Version: 2.66.10
Release: %autorelease
Summary: C++ interface for the GLib library
@@ -14,11 +14,6 @@ URL: https://gtkmm.org/
Source0: https://download.gnome.org/sources/glibmm/%{gnome_major_minor_version}/glibmm-%{version}.tar.xz
Patch0: glibmm24-gcc11.patch
-# https://gitlab.gnome.org/GNOME/glibmm/-/commit/d26083c41219958e802d5da733d4b4d3c342ec89
-# https://gitlab.gnome.org/GNOME/glibmm/-/commit/b353a8b0afc1aa78f3eec58229f02acd9fab6d3e
-# Fix type definition conflict with GLib 2.89.2
-Patch1: glibmm24-2.66.9-glib_2.89.2-type-definition.patch
-
BuildRequires: doxygen
BuildRequires: gcc-c++
diff --git a/glibmm24-2.66.9-glib_2.89.2-type-definition.patch b/glibmm24-2.66.9-glib_2.89.2-type-definition.patch
deleted file mode 100644
index d108c25..0000000
--- a/glibmm24-2.66.9-glib_2.89.2-type-definition.patch
+++ /dev/null
@@ -1,110 +0,0 @@
-From d26083c41219958e802d5da733d4b4d3c342ec89 Mon Sep 17 00:00:00 2001
-From: Kjell Ahlstedt <kjellahlstedt@gmail.com>
-Date: Sun, 5 Jul 2026 16:49:52 +0200
-Subject: [PATCH] Gio: Emblem and DBus::ActionGroup: Don't derive gtkmm__Gxxx
- types
-
-GEmblem and GDBusActionGroup are declared G_DECLARE_FINAL_TYPE.
-Add _DO_NOT_DERIVE_GTYPE, _ABI_AS_WITH_DERIVED_GTYPE and _STRUCT_NOT_HIDDEN
-to the corresponding glibmm classes.
----
- gio/src/dbusactiongroup.hg | 14 ++++++++++++++
- gio/src/emblem.hg | 4 ++++
- 2 files changed, 18 insertions(+)
-
-diff --git a/gio/src/dbusactiongroup.hg b/gio/src/dbusactiongroup.hg
-index ae9bb6fd..27359bfe 100644
---- a/gio/src/dbusactiongroup.hg
-+++ b/gio/src/dbusactiongroup.hg
-@@ -21,6 +21,17 @@
- _DEFS(giomm,gio)
- _PINCLUDE(glibmm/private/object_p.h)
-
-+#ifndef DOXYGEN_SHOULD_SKIP_THIS
-+// Necessary if compiled against glib < 2.89.1, where GDBusActionGroup is not
-+// a final type, and GDBusActionGroupClass is not defined by G_DECLARE_FINAL_TYPE().
-+// (It was declared a final type somewhere between 2.89.1 and 2.89.2.
-+// The compiler will probably complain if you compile against a glib 2.89.1
-+// where GDBusActionGroup is not a final type.)
-+#if !GLIB_CHECK_VERSION(2,89,1)
-+using GDBusActionGroupClass = struct _GDBusActionGroupClass;
-+#endif
-+#endif /* DOXYGEN_SHOULD_SKIP_THIS */
-+
- namespace Gio
- {
-
-@@ -43,6 +54,9 @@ class GIOMM_API ActionGroup
- _CLASS_GOBJECT(ActionGroup, GDBusActionGroup, G_DBUS_ACTION_GROUP, Glib::Object, GObject, , , GIOMM_API)
- _IMPLEMENTS_INTERFACE(::Gio::ActionGroup)
- _IMPLEMENTS_INTERFACE(RemoteActionGroup)
-+ _DO_NOT_DERIVE_GTYPE dnl// GDBusActionGroup is a final type since glib 2.89.2
-+ _ABI_AS_WITH_DERIVED_GTYPE dnl// Remove when we can break ABI
-+ _STRUCT_NOT_HIDDEN
-
- protected:
- _CTOR_DEFAULT
-diff --git a/gio/src/emblem.hg b/gio/src/emblem.hg
-index 3a0d3316..737fff24 100644
---- a/gio/src/emblem.hg
-+++ b/gio/src/emblem.hg
-@@ -16,6 +16,7 @@
-
- #include <glibmm/object.h>
- #include <giomm/icon.h>
-+#include <gio/gio.h>
-
- _DEFS(giomm,gio)
- _PINCLUDE(glibmm/private/object_p.h)
-@@ -42,6 +43,9 @@ class GIOMM_API Emblem
- {
- _CLASS_GOBJECT(Emblem, GEmblem, G_EMBLEM, Glib::Object, GObject, , , GIOMM_API)
- _IMPLEMENTS_INTERFACE(Icon)
-+ _DO_NOT_DERIVE_GTYPE dnl// GEmblem is a final type since glib 2.89.2
-+ _ABI_AS_WITH_DERIVED_GTYPE dnl// Remove when we can break ABI
-+ _STRUCT_NOT_HIDDEN
-
- protected:
- /** Creates a new emblem for @a icon.
---
-GitLab
-
-From b353a8b0afc1aa78f3eec58229f02acd9fab6d3e Mon Sep 17 00:00:00 2001
-From: Kjell Ahlstedt <kjellahlstedt@gmail.com>
-Date: Mon, 6 Jul 2026 12:23:57 +0200
-Subject: [PATCH] Gio::DBus::ActionGroup: Improve the test whether
- GDBusActionGroup is final
-
----
- gio/src/dbusactiongroup.hg | 15 ++++++++-------
- 1 file changed, 8 insertions(+), 7 deletions(-)
-
-diff --git a/gio/src/dbusactiongroup.hg b/gio/src/dbusactiongroup.hg
-index 27359bfe..777e8fd7 100644
---- a/gio/src/dbusactiongroup.hg
-+++ b/gio/src/dbusactiongroup.hg
-@@ -22,13 +22,14 @@ _DEFS(giomm,gio)
- _PINCLUDE(glibmm/private/object_p.h)
-
- #ifndef DOXYGEN_SHOULD_SKIP_THIS
--// Necessary if compiled against glib < 2.89.1, where GDBusActionGroup is not
--// a final type, and GDBusActionGroupClass is not defined by G_DECLARE_FINAL_TYPE().
--// (It was declared a final type somewhere between 2.89.1 and 2.89.2.
--// The compiler will probably complain if you compile against a glib 2.89.1
--// where GDBusActionGroup is not a final type.)
--#if !GLIB_CHECK_VERSION(2,89,1)
--using GDBusActionGroupClass = struct _GDBusActionGroupClass;
-+// GDBusActionGroup was declared a final type between GLib 2.89.1 and 2.89.2.
-+// Before that, GDBusActionGroupClass was not declared in GLib.
-+// The preprocessor macro G_DBUS_ACTION_GROUP_CLASS was defined, though.
-+#if !GLIB_CHECK_VERSION(2,89,1) || (!GLIB_CHECK_VERSION(2,89,2) && defined(G_DBUS_ACTION_GROUP_CLASS))
-+ // glib < 2.89.1 or (glib == 2.89.1 and G_DBUS_ACTION_GROUP_CLASS is a preprocessor macro)
-+ // GDBusActionGroup is not a final type,
-+ // GDBusActionGroupClass is not declared in GLib.
-+ using GDBusActionGroupClass = struct _GDBusActionGroupClass;
- #endif
- #endif /* DOXYGEN_SHOULD_SKIP_THIS */
-
---
-GitLab
-
diff --git a/sources b/sources
index 4572abe..1509f9e 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (glibmm-2.66.9.tar.xz) = 0983d606f3bac6271699fcfed22c63937778e024c7666a55b03d831ebd8637c385ce1c6bef78ece4d0f73ec05e8e9bfa47df2f524c9bd34ccf6d8192f6717610
+SHA512 (glibmm-2.66.10.tar.xz) = ec817b0c681c413348c7cd6577975a8d9ee50c30e6553799e76e0dae53cffcdfce9194462a0b7772da661e4c305fdddf07204ffeb30b9ab3bc37cd1dbda69c08
^ permalink raw reply related [flat|nested] only message in thread
only message in thread, other threads:[~2026-08-12 11:15 UTC | newest]
Thread overview: (only message) (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2026-08-12 11:15 [rpms/glibmm2.4] rawhide: Update to 2.66.10 nmontero
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox