From 5395548d7b96e4cfc6f3bfe7e7293d9583521f06 Mon Sep 17 00:00:00 2001 From: DistroBaker Date: Sat, 31 Oct 2020 21:21:30 +0000 Subject: [PATCH] Merged update from upstream sources This is an automated DistroBaker update from upstream sources. If you do not know what this is about or would like to opt out, contact the OSCI team. Source: https://src.fedoraproject.org/rpms/glibmm24.git#b1651ee0b2f524707e2e4f745f66c3f96b6be983 --- glibmm24-gcc11.patch | 80 ++++++++++++++++++++++++++++++++++++++++++++ glibmm24.spec | 6 +++- 2 files changed, 85 insertions(+), 1 deletion(-) create mode 100644 glibmm24-gcc11.patch diff --git a/glibmm24-gcc11.patch b/glibmm24-gcc11.patch new file mode 100644 index 0000000..7fbb66a --- /dev/null +++ b/glibmm24-gcc11.patch @@ -0,0 +1,80 @@ +diff --git a/gio/giomm/dbusconnection.cc b/gio/giomm/dbusconnection.cc +index 9ddeeb4..9701106 100644 +--- a/gio/giomm/dbusconnection.cc ++++ b/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/glibmm24.spec b/glibmm24.spec index 811e316..05a34eb 100644 --- a/glibmm24.spec +++ b/glibmm24.spec @@ -6,12 +6,13 @@ Name: glibmm24 Version: 2.64.2 -Release: 4%{?dist} +Release: 5%{?dist} Summary: C++ interface for the GLib library License: LGPLv2+ URL: http://www.gtkmm.org/ Source0: http://ftp.gnome.org/pub/GNOME/sources/glibmm/%{release_version}/glibmm-%{version}.tar.xz +Patch0: %{name}-gcc11.patch BuildRequires: gcc-c++ BuildRequires: glib2-devel >= %{glib2_version} @@ -90,6 +91,9 @@ find $RPM_BUILD_ROOT -type f -name "*.la" -exec rm -f {} ';' %changelog +* Sat Oct 31 2020 Jeff Law - 2.64.2-5 +- Fix bogus volatile caught by gcc-11 + * Sat Aug 01 2020 Fedora Release Engineering - 2.64.2-4 - Second attempt - Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild