diff --git a/glibmm-2.64.5.tar.xz b/glibmm-2.64.5.tar.xz deleted file mode 100644 index 158dc42..0000000 Binary files a/glibmm-2.64.5.tar.xz and /dev/null differ diff --git a/glibmm-2.66.4.tar.xz b/glibmm-2.66.4.tar.xz new file mode 100644 index 0000000..4b87573 Binary files /dev/null and b/glibmm-2.66.4.tar.xz differ diff --git a/glibmm24-gcc11.patch b/glibmm24-gcc11.patch new file mode 100644 index 0000000..e00e189 --- /dev/null +++ b/glibmm24-gcc11.patch @@ -0,0 +1,80 @@ +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/glibmm24.spec b/glibmm24.spec index 62c3ea6..b68c627 100644 --- a/glibmm24.spec +++ b/glibmm24.spec @@ -1,16 +1,27 @@ +%global apiver 2.4 +%define release_version %(echo %{version} | awk -F. '{print $1"."$2}') + +%global glib2_version 2.61.2 +%global libsigc_version 2.9.1 + Name: glibmm24 -Version: 2.64.5 +Version: 2.66.4 Release: 1 Summary: C++ interface for the GLib library License: LGPLv2+ URL: http://www.gtkmm.org/ -Source0: http://ftp.gnome.org/pub/GNOME/sources/glibmm/2.64/glibmm-%{version}.tar.xz +Source0: http://ftp.gnome.org/pub/GNOME/sources/glibmm/%{release_version}/glibmm-%{version}.tar.xz +Patch0: %{name}-gcc11.patch -BuildRequires: gcc-c++ glib2-devel >= 2.61.2 libsigc++20-devel >= 2.9.1 +BuildRequires: gcc-c++ glib2-devel >= %{glib2_version} libsigc++20-devel >= %{libsigc_version} BuildRequires: m4 perl-generators perl-interpreter perl-Getopt-Long BuildRequires: meson doxygen libxslt mm-common graphviz -Requires: glib2 >= 2.61.2 libsigc++20 >= 2.9.1 +Requires: glib2%{?_isa} >= %{glib2_version} libsigc++20%{?_isa} >= %{libsigc_version} + +# Do not export private Perl modules +%global __provides_exclude %{?__provides_exclude:%{__provides_exclude}|}^perl\\( +%global __requires_exclude %{?__requires_exclude:%{__requires_exclude}|}^perl\\((DocsParser|Enum|Function|FunctionBase|GtkDefs|Object|Output|Property|Util|WrapParser)\\) %description The glibmm package is a set of C++ bindings for Glib. @@ -36,10 +47,8 @@ Requires: libsigc++20-doc %description help The glibmm24-help package contains the full API documentation for glibmm24. - %prep -%autosetup -n glibmm-%{version} - +%autosetup -p1 -n glibmm-%{version} %build %meson -Dbuild-documentation=true @@ -48,24 +57,32 @@ The glibmm24-help package contains the full API documentation for glibmm24. %install %meson_install %delete_la - +chmod +x $RPM_BUILD_ROOT%{_libdir}/glibmm-%{apiver}/proc/generate_wrap_init.pl +chmod +x $RPM_BUILD_ROOT%{_libdir}/glibmm-%{apiver}/proc/gmmproc %files -%doc AUTHORS NEWS README COPYING -%{_libdir}/*.so.* +%license COPYING +%{_libdir}/libgiomm-%{apiver}.so.1* +%{_libdir}/libglibmm-%{apiver}.so.1* +%{_libdir}/libglibmm_generate_extra_defs-%{apiver}.so.1* %files devel -%{_includedir}/{glibmm-2.4,giomm-2.4}/ +%{_includedir}/glibmm-%{apiver}/ +%{_includedir}/giomm-%{apiver}/ %{_libdir}/*.so -%{_libdir}/{glibmm-2.4,giomm-2.4}/ +%{_libdir}/glibmm-%{apiver}/ +%{_libdir}/giomm-%{apiver}/ %{_libdir}/pkgconfig/*.pc %files help +%doc AUTHORS NEWS README %doc %{_datadir}/devhelp/ -%doc %{_docdir}/glibmm-2.4/ - +%doc %{_docdir}/glibmm-%{apiver}/ %changelog +* Mon Jun 6 2022 lin zhang - 2.66.4-1 +- Update to 2.66.4 + * Fri Jun 18 2021 weijin deng - 2.64.5-1 - Upgrade to 2.64.5 - Use meson rebuild diff --git a/glibmm24.yaml b/glibmm24.yaml index 6e801ca..ae57aa1 100644 --- a/glibmm24.yaml +++ b/glibmm24.yaml @@ -1,4 +1,4 @@ version_control: gitlab.gnome src_repo: glibmm tag_prefix: glibmm- -seperator: . +separator: .