public inbox for git-commits@fedoraproject.org
help / color / mirror / Atom feed
* [rpms/glibmm2.68] f45: Update to 2.89.0
@ 2026-08-12 11:29 nmontero
  0 siblings, 0 replies; only message in thread
From: nmontero @ 2026-08-12 11:29 UTC (permalink / raw)
  To: git-commits

A new commit has been pushed.

Repo   : rpms/glibmm2.68
Branch : f45
Commit : e868d32565a1993a7c916b18fd2600d10dbbc909
Author : nmontero <nmontero@redhat.com>
Date   : 2026-08-12T13:28:30+02:00
Stats  : +4/-89 in 3 file(s)
URL    : https://src.fedoraproject.org/rpms/glibmm2.68/c/e868d32565a1993a7c916b18fd2600d10dbbc909?branch=f45

Log:
Update to 2.89.0

---
diff --git a/glibmm2.68-2.88.1-glib_2.89.2-dont-derive-gtkmm-gxxx-types.patch b/glibmm2.68-2.88.1-glib_2.89.2-dont-derive-gtkmm-gxxx-types.patch
deleted file mode 100644
index 2eaab69..0000000
--- a/glibmm2.68-2.88.1-glib_2.89.2-dont-derive-gtkmm-gxxx-types.patch
+++ /dev/null
@@ -1,72 +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 fbc00f8..fe5c032 100644
---- a/gio/src/dbusactiongroup.hg
-+++ b/gio/src/dbusactiongroup.hg
-@@ -21,6 +21,18 @@
- _DEFS(giomm,gio)
- _PINCLUDE(glibmm/private/object_p.h)
- 
-+#ifndef DOXYGEN_SHOULD_SKIP_THIS
-+// 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 */
-+
- namespace Gio
- {
- 
-@@ -43,6 +55,9 @@ class GIOMM_API ActionGroup
-   _CLASS_GOBJECT(ActionGroup, GDBusActionGroup, G_DBUS_ACTION_GROUP, Glib::Object, GObject, , , GIOMM_API)
-   _IMPLEMENTS_INTERFACE(Gio::ActionGroup)
-   _IMPLEMENTS_INTERFACE(Gio::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 e8e8cfb..2e6412f 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)
-@@ -40,6 +41,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
- 
- public:
-   _WRAP_ENUM(Origin, GEmblemOrigin, NO_GTYPE, decl_prefix GIOMM_API)
-
--- 
-GitLab

diff --git a/glibmm2.68.spec b/glibmm2.68.spec
index cc41893..e4d8edf 100644
--- a/glibmm2.68.spec
+++ b/glibmm2.68.spec
@@ -4,7 +4,7 @@
 %global glib2_version 2.81.0
 
 Name:           glibmm2.68
-Version:        2.88.1
+Version:        2.89.0
 Release:        %autorelease
 Summary:        C++ interface for the GLib library
 
@@ -12,12 +12,6 @@ License:        LGPL-2.1-or-later AND GPL-2.0-or-later
 URL:            http://www.gtkmm.org/
 Source0:        https://download.gnome.org/sources/glibmm/%{gnome_major_minor_version}/glibmm-%{version}.tar.xz
 
-# https://gitlab.gnome.org/GNOME/glibmm/-/commit/d26083c41219958e802d5da733d4b4d3c342ec89
-# Fix type definition conflict with GLib 2.89.2
-# NOTE: Remove -Dmaintainer-mode=true from meson config, added Perl dependencies
-# and make -doc again noarch when dropping this patch
-Patch1:         glibmm2.68-2.88.1-glib_2.89.2-dont-derive-gtkmm-gxxx-types.patch
-
 BuildRequires:  doxygen
 BuildRequires:  gcc-c++
 BuildRequires:  pkgconfig(glib-2.0) >= %{glib2_version}
@@ -28,12 +22,7 @@ BuildRequires:  meson
 BuildRequires:  mm-common
 BuildRequires:  perl-generators
 BuildRequires:  perl-interpreter
-BuildRequires:  perl(feature)
 BuildRequires:  perl(Getopt::Long)
-BuildRequires:  perl(open)
-BuildRequires:  perl(strict)
-BuildRequires:  perl(warnings)
-BuildRequires:  perl(XML::Parser)
 
 Requires:       glib2%{?_isa} >= %{glib2_version}
 Requires:       libsigc++30%{?_isa} >= %{libsigc_version}
@@ -59,8 +48,7 @@ developing glibmm applications.
 
 %package        doc
 Summary:        Documentation for %{name}, includes full API docs
-# FIXME: Restore noarch once -Dmaintainer-mode=true is removed
-# BuildArch:      noarch
+BuildArch:      noarch
 Requires:       %{name} = %{version}-%{release}
 Requires:       libsigc++30-doc
 
@@ -73,8 +61,7 @@ This package contains the full API documentation for %{name}.
 
 
 %build
-%meson -Dbuild-documentation=true \
-    -Dmaintainer-mode=true
+%meson -Dbuild-documentation=true
 %meson_build
 
 

diff --git a/sources b/sources
index 0bc35f6..b9f580a 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (glibmm-2.88.1.tar.xz) = af05171b4651e94f4ef0d8e06a27160cd1a7b0a4e596ba7b6584567564829a60031f27ab96a25ba7fefb6395026f4cb40a5eaf1c5bc2e15428c18fd4d52b9328
+SHA512 (glibmm-2.89.0.tar.xz) = cac4f14799c4c1aaddefad85401e7711867e6849e0d5cbf129c0e178df2bbdec6ef065b9108d0d03567812843d6ef7733b57c3744f2c8c7ca2eb902f0d2d1f4f

^ permalink raw reply related	[flat|nested] only message in thread

only message in thread, other threads:[~2026-08-12 11:29 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:29 [rpms/glibmm2.68] f45: Update to 2.89.0 nmontero

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox