Update to 2.77.0

Use SPDX for License field.
This commit is contained in:
David King 2023-07-17 09:37:30 +01:00
parent be801e5ea6
commit 60c5389d77
4 changed files with 6 additions and 87 deletions

1
.gitignore vendored
View File

@ -4,3 +4,4 @@
/glibmm-2.72.1.tar.xz /glibmm-2.72.1.tar.xz
/glibmm-2.74.0.tar.xz /glibmm-2.74.0.tar.xz
/glibmm-2.76.0.tar.xz /glibmm-2.76.0.tar.xz
/glibmm-2.77.0.tar.xz

View File

@ -3,19 +3,17 @@
%define release_version %(echo %{version} | awk -F. '{print $1"."$2}') %define release_version %(echo %{version} | awk -F. '{print $1"."$2}')
%global libsigc_version 3.0.0 %global libsigc_version 3.0.0
%global glib2_version 2.73.2 %global glib2_version 2.77.0
Name: glibmm2.68 Name: glibmm2.68
Version: 2.76.0 Version: 2.77.0
Release: %autorelease Release: %autorelease
Summary: C++ interface for the GLib library 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/ URL: http://www.gtkmm.org/
Source0: https://download.gnome.org/sources/glibmm/%{release_version}/glibmm-%{version}.tar.xz Source0: https://download.gnome.org/sources/glibmm/%{release_version}/glibmm-%{version}.tar.xz
Patch0: glibmm24-gcc11.patch
BuildRequires: doxygen BuildRequires: doxygen
BuildRequires: gcc-c++ BuildRequires: gcc-c++
BuildRequires: pkgconfig(glib-2.0) >= %{glib2_version} BuildRequires: pkgconfig(glib-2.0) >= %{glib2_version}
@ -78,7 +76,7 @@ chmod +x $RPM_BUILD_ROOT%{_libdir}/glibmm-%{apiver}/proc/gmmproc
%files %files
%license COPYING %license COPYING
%doc AUTHORS NEWS README.md %doc NEWS README.md
%{_libdir}/libgiomm-%{apiver}.so.1* %{_libdir}/libgiomm-%{apiver}.so.1*
%{_libdir}/libglibmm-%{apiver}.so.1* %{_libdir}/libglibmm-%{apiver}.so.1*
%{_libdir}/libglibmm_generate_extra_defs-%{apiver}.so.1* %{_libdir}/libglibmm_generate_extra_defs-%{apiver}.so.1*

View File

@ -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>& 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(),

View File

@ -1 +1 @@
SHA512 (glibmm-2.76.0.tar.xz) = be49599f5eb8eb5a1cef015cdb37af2564fcd1ea845aa4344804ca5f0f61468949711e25cefebb93219e1be37128ebfdd2a816324e752ac4395b4b87c072fc78 SHA512 (glibmm-2.77.0.tar.xz) = 6650e822de2529582d93291025500afb6a182a0c5a564f656f164d79d8765bb4ca9c9d16227148431cc71c2677923b9364e81bbd4ca4f07f68e36bb380fb9574