Compare commits
No commits in common. "b179d71eca58f243da58fc269c3b61a201e63112" and "8ed22b03b028baa1321413c241a16c477f26cfff" have entirely different histories.
b179d71eca
...
8ed22b03b0
Binary file not shown.
@ -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(),
|
|
||||||
@ -1,94 +0,0 @@
|
|||||||
%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.66.5
|
|
||||||
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/%{release_version}/glibmm-%{version}.tar.xz
|
|
||||||
Patch0: %{name}-gcc11.patch
|
|
||||||
|
|
||||||
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%{?_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.
|
|
||||||
It provides non-UI API that is not available in standard C++
|
|
||||||
and makes it possible for gtkmm to wrap GObject-based APIs.
|
|
||||||
|
|
||||||
%package devel
|
|
||||||
Summary: Headers for developing programs using glibmm24
|
|
||||||
Requires: %{name} = %{version}-%{release}
|
|
||||||
|
|
||||||
%description devel
|
|
||||||
The glibmm24-devel package contains the static libraries and
|
|
||||||
header files needed for developing glibmm applications.
|
|
||||||
|
|
||||||
%package help
|
|
||||||
Provides: %{name}-doc = %{version}-%{release}
|
|
||||||
Obsoletes: %{name}-doc < %{version}-%{release}
|
|
||||||
Summary: full API documentation for glibmm24
|
|
||||||
BuildArch: noarch
|
|
||||||
Requires: %{name} = %{version}-%{release}
|
|
||||||
Requires: libsigc++20-doc
|
|
||||||
|
|
||||||
%description help
|
|
||||||
The glibmm24-help package contains the full API documentation for glibmm24.
|
|
||||||
|
|
||||||
%prep
|
|
||||||
%autosetup -p1 -n glibmm-%{version}
|
|
||||||
|
|
||||||
%build
|
|
||||||
%meson -Dbuild-documentation=true
|
|
||||||
%meson_build
|
|
||||||
|
|
||||||
%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
|
|
||||||
%license COPYING
|
|
||||||
%{_libdir}/libgiomm-%{apiver}.so.1*
|
|
||||||
%{_libdir}/libglibmm-%{apiver}.so.1*
|
|
||||||
%{_libdir}/libglibmm_generate_extra_defs-%{apiver}.so.1*
|
|
||||||
|
|
||||||
%files devel
|
|
||||||
%{_includedir}/glibmm-%{apiver}/
|
|
||||||
%{_includedir}/giomm-%{apiver}/
|
|
||||||
%{_libdir}/*.so
|
|
||||||
%{_libdir}/glibmm-%{apiver}/
|
|
||||||
%{_libdir}/giomm-%{apiver}/
|
|
||||||
%{_libdir}/pkgconfig/*.pc
|
|
||||||
|
|
||||||
%files help
|
|
||||||
%doc AUTHORS NEWS
|
|
||||||
%doc %{_datadir}/devhelp/
|
|
||||||
%doc %{_docdir}/glibmm-%{apiver}/
|
|
||||||
|
|
||||||
%changelog
|
|
||||||
* Mon Jan 02 2023 lin zhang <lin.zhang@turbolinux.com.cn> - 2.66.5-1
|
|
||||||
- Update to 2.66.5
|
|
||||||
|
|
||||||
* Mon Jun 6 2022 lin zhang <lin.zhang@turbolinux.com.cn> - 2.66.4-1
|
|
||||||
- Update to 2.66.4
|
|
||||||
|
|
||||||
* Fri Jun 18 2021 weijin deng <weijin.deng@turbolinux.com.cn> - 2.64.5-1
|
|
||||||
- Upgrade to 2.64.5
|
|
||||||
- Use meson rebuild
|
|
||||||
|
|
||||||
* Thu Dec 12 2019 zoushuangshuang<zoushuangshuang@huawei.com> - 2.58.0-2
|
|
||||||
- Package init
|
|
||||||
@ -1,4 +0,0 @@
|
|||||||
version_control: gitlab.gnome
|
|
||||||
src_repo: glibmm
|
|
||||||
tag_prefix: glibmm-
|
|
||||||
separator: .
|
|
||||||
Loading…
x
Reference in New Issue
Block a user