diff --git a/.gitignore b/.gitignore index 70ba1c2..76aa0e9 100644 --- a/.gitignore +++ b/.gitignore @@ -4,3 +4,4 @@ /glibmm-2.72.1.tar.xz /glibmm-2.74.0.tar.xz /glibmm-2.76.0.tar.xz +/glibmm-2.77.0.tar.xz diff --git a/glibmm2.68.spec b/glibmm2.68.spec index 1e45870..b377a95 100644 --- a/glibmm2.68.spec +++ b/glibmm2.68.spec @@ -3,19 +3,17 @@ %define release_version %(echo %{version} | awk -F. '{print $1"."$2}') %global libsigc_version 3.0.0 -%global glib2_version 2.73.2 +%global glib2_version 2.77.0 Name: glibmm2.68 -Version: 2.76.0 +Version: 2.77.0 Release: %autorelease Summary: C++ interface for the GLib library -License: LGPLv2+ +License: LGPL-2.1-or-later AND GPL-2.0-or-later URL: http://www.gtkmm.org/ Source0: https://download.gnome.org/sources/glibmm/%{release_version}/glibmm-%{version}.tar.xz -Patch0: glibmm24-gcc11.patch - BuildRequires: doxygen BuildRequires: gcc-c++ BuildRequires: pkgconfig(glib-2.0) >= %{glib2_version} @@ -78,7 +76,7 @@ chmod +x $RPM_BUILD_ROOT%{_libdir}/glibmm-%{apiver}/proc/gmmproc %files %license COPYING -%doc AUTHORS NEWS README.md +%doc NEWS README.md %{_libdir}/libgiomm-%{apiver}.so.1* %{_libdir}/libglibmm-%{apiver}.so.1* %{_libdir}/libglibmm_generate_extra_defs-%{apiver}.so.1* diff --git a/glibmm24-gcc11.patch b/glibmm24-gcc11.patch deleted file mode 100644 index e00e189..0000000 --- a/glibmm24-gcc11.patch +++ /dev/null @@ -1,80 +0,0 @@ -diff --git a/untracked/gio/giomm/dbusconnection.cc b/untracked/gio/giomm/dbusconnection.cc -index 9ddeeb4..9701106 100644 ---- a/untracked/gio/giomm/dbusconnection.cc -+++ b/untracked/gio/giomm/dbusconnection.cc -@@ -494,7 +494,7 @@ Connection::send_message_with_reply(const Glib::RefPtr& message, int ti - const SlotAsyncReady& slot, const Glib::RefPtr& cancellable) - { - auto slot_copy = new SlotAsyncReady(slot); -- volatile guint32 out_serial = 0; -+ guint32 out_serial = 0; - g_dbus_connection_send_message_with_reply(gobj(), Glib::unwrap(message), - static_cast(message->get_flags()), timeout_msec, &out_serial, - Glib::unwrap(cancellable), &SignalProxy_async_callback, slot_copy); -@@ -506,7 +506,7 @@ Connection::send_message_with_reply( - const Glib::RefPtr& message, int timeout_msec, const SlotAsyncReady& slot) - { - auto slot_copy = new SlotAsyncReady(slot); -- volatile guint32 out_serial = 0; -+ guint32 out_serial = 0; - g_dbus_connection_send_message_with_reply(gobj(), Glib::unwrap(message), - static_cast(message->get_flags()), timeout_msec, &out_serial, nullptr, - &SignalProxy_async_callback, slot_copy); -@@ -517,7 +517,7 @@ Glib::RefPtr - Connection::send_message_with_reply_sync(const Glib::RefPtr& message, - const Glib::RefPtr& cancellable, gint timeout_msec) - { -- volatile guint32 out_serial = 0; -+ guint32 out_serial = 0; - GError* gerror = nullptr; - - GDBusMessage* result = g_dbus_connection_send_message_with_reply_sync(gobj(), -@@ -533,7 +533,7 @@ Connection::send_message_with_reply_sync(const Glib::RefPtr& message, - Glib::RefPtr - Connection::send_message_with_reply_sync(const Glib::RefPtr& message, gint timeout_msec) - { -- volatile guint32 out_serial = 0; -+ guint32 out_serial = 0; - GError* gerror = nullptr; - - GDBusMessage* result = g_dbus_connection_send_message_with_reply_sync(gobj(), -diff --git a/gio/src/dbusconnection.ccg b/gio/src/dbusconnection.ccg -index e28e7b4..3d9860a 100644 ---- a/gio/src/dbusconnection.ccg -+++ b/gio/src/dbusconnection.ccg -@@ -477,7 +477,7 @@ Connection::send_message_with_reply(const Glib::RefPtr& message, int ti - const SlotAsyncReady& slot, const Glib::RefPtr& cancellable) - { - auto slot_copy = new SlotAsyncReady(slot); -- volatile guint32 out_serial = 0; -+ guint32 out_serial = 0; - g_dbus_connection_send_message_with_reply(gobj(), Glib::unwrap(message), - static_cast(message->get_flags()), timeout_msec, &out_serial, - Glib::unwrap(cancellable), &SignalProxy_async_callback, slot_copy); -@@ -489,7 +489,7 @@ Connection::send_message_with_reply( - const Glib::RefPtr& message, int timeout_msec, const SlotAsyncReady& slot) - { - auto slot_copy = new SlotAsyncReady(slot); -- volatile guint32 out_serial = 0; -+ guint32 out_serial = 0; - g_dbus_connection_send_message_with_reply(gobj(), Glib::unwrap(message), - static_cast(message->get_flags()), timeout_msec, &out_serial, nullptr, - &SignalProxy_async_callback, slot_copy); -@@ -500,7 +500,7 @@ Glib::RefPtr - Connection::send_message_with_reply_sync(const Glib::RefPtr& message, - const Glib::RefPtr& cancellable, gint timeout_msec) - { -- volatile guint32 out_serial = 0; -+ guint32 out_serial = 0; - GError* gerror = nullptr; - - GDBusMessage* result = g_dbus_connection_send_message_with_reply_sync(gobj(), -@@ -516,7 +516,7 @@ Connection::send_message_with_reply_sync(const Glib::RefPtr& message, - Glib::RefPtr - Connection::send_message_with_reply_sync(const Glib::RefPtr& message, gint timeout_msec) - { -- volatile guint32 out_serial = 0; -+ guint32 out_serial = 0; - GError* gerror = nullptr; - - GDBusMessage* result = g_dbus_connection_send_message_with_reply_sync(gobj(), diff --git a/sources b/sources index 254445a..c532ef1 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (glibmm-2.76.0.tar.xz) = be49599f5eb8eb5a1cef015cdb37af2564fcd1ea845aa4344804ca5f0f61468949711e25cefebb93219e1be37128ebfdd2a816324e752ac4395b4b87c072fc78 +SHA512 (glibmm-2.77.0.tar.xz) = 6650e822de2529582d93291025500afb6a182a0c5a564f656f164d79d8765bb4ca9c9d16227148431cc71c2677923b9364e81bbd4ca4f07f68e36bb380fb9574