rpms/glibmm24
5
0
Fork 0
Code Issues Pull Requests Releases Activity

Merged update from upstream sources

Browse Source 
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
This commit is contained in:
DistroBaker 2020-10-31 21:21:30 +00:00
parent 1847e07a41
commit 5395548d7b
2 changed files with 85 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

80
glibmm24-gcc11.patch Normal file
View File

@ -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>& message, int ti
const SlotAsyncReady& slot, const Glib::RefPtr<Cancellable>& 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<GDBusSendMessageFlags>(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>& 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<GDBusSendMessageFlags>(message->get_flags()), timeout_msec, &out_serial, nullptr,
&SignalProxy_async_callback, slot_copy);
@@ -517,7 +517,7 @@ Glib::RefPtr<Message>
Connection::send_message_with_reply_sync(const Glib::RefPtr<Message>& message,
const Glib::RefPtr<Cancellable>& 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>& message,
Glib::RefPtr<Message>
Connection::send_message_with_reply_sync(const Glib::RefPtr<Message>& 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>& message, int ti
const SlotAsyncReady& slot, const Glib::RefPtr<Cancellable>& 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<GDBusSendMessageFlags>(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>& 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<GDBusSendMessageFlags>(message->get_flags()), timeout_msec, &out_serial, nullptr,
&SignalProxy_async_callback, slot_copy);
@@ -500,7 +500,7 @@ Glib::RefPtr<Message>
Connection::send_message_with_reply_sync(const Glib::RefPtr<Message>& message,
const Glib::RefPtr<Cancellable>& 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>& message,
Glib::RefPtr<Message>
Connection::send_message_with_reply_sync(const Glib::RefPtr<Message>& 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(),

6
glibmm24.spec
View File

@ -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 <law@redhat.com> - 2.64.2-5
- Fix bogus volatile caught by gcc-11
* Sat Aug 01 2020 Fedora Release Engineering <releng@fedoraproject.org> - 2.64.2-4
- Second attempt - Rebuilt for
https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild