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#1ccfa547171da0d05a7e43fab70a047df6704ca1
This commit is contained in:
DistroBaker 2020-11-25 12:30:44 +00:00
parent 5395548d7b
commit cff347a234
3 changed files with 20 additions and 15 deletions

View File

@ -1,7 +1,7 @@
diff --git a/gio/giomm/dbusconnection.cc b/gio/giomm/dbusconnection.cc diff --git a/untracked/gio/giomm/dbusconnection.cc b/untracked/gio/giomm/dbusconnection.cc
index 9ddeeb4..9701106 100644 index 9ddeeb4..9701106 100644
--- a/gio/giomm/dbusconnection.cc --- a/untracked/gio/giomm/dbusconnection.cc
+++ b/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 @@ -494,7 +494,7 @@ Connection::send_message_with_reply(const Glib::RefPtr<Message>& message, int ti
const SlotAsyncReady& slot, const Glib::RefPtr<Cancellable>& cancellable) const SlotAsyncReady& slot, const Glib::RefPtr<Cancellable>& cancellable)
{ {

View File

@ -5,8 +5,8 @@
%global libsigc_version 2.9.1 %global libsigc_version 2.9.1
Name: glibmm24 Name: glibmm24
Version: 2.64.2 Version: 2.64.4
Release: 5%{?dist} Release: 1%{?dist}
Summary: C++ interface for the GLib library Summary: C++ interface for the GLib library
License: LGPLv2+ License: LGPLv2+
@ -14,10 +14,13 @@ URL: http://www.gtkmm.org/
Source0: http://ftp.gnome.org/pub/GNOME/sources/glibmm/%{release_version}/glibmm-%{version}.tar.xz Source0: http://ftp.gnome.org/pub/GNOME/sources/glibmm/%{release_version}/glibmm-%{version}.tar.xz
Patch0: %{name}-gcc11.patch Patch0: %{name}-gcc11.patch
BuildRequires: doxygen
BuildRequires: gcc-c++ BuildRequires: gcc-c++
BuildRequires: glib2-devel >= %{glib2_version} BuildRequires: glib2-devel >= %{glib2_version}
BuildRequires: libsigc++20-devel >= %{libsigc_version} BuildRequires: libsigc++20-devel >= %{libsigc_version}
BuildRequires: libxslt
BuildRequires: m4 BuildRequires: m4
BuildRequires: meson
BuildRequires: perl-generators BuildRequires: perl-generators
BuildRequires: perl-interpreter BuildRequires: perl-interpreter
BuildRequires: perl(Getopt::Long) BuildRequires: perl(Getopt::Long)
@ -59,23 +62,20 @@ This package contains the full API documentation for %{name}.
%build %build
%configure %meson -Dbuild-documentation=true
# removing rpath %meson_build
sed -i 's|^hardcode_libdir_flag_spec=.*|hardcode_libdir_flag_spec=""|g' libtool
sed -i 's|^runpath_var=LD_RUN_PATH|runpath_var=DIE_RPATH_DIE|g' libtool
make %{?_smp_mflags}
%install %install
%make_install %meson_install
find $RPM_BUILD_ROOT -type f -name "*.la" -exec rm -f {} ';'
%files %files
%license COPYING %license COPYING
%doc AUTHORS NEWS README %doc AUTHORS NEWS README
%{_libdir}/*.so.* %{_libdir}/libgiomm-2.4.so.1*
%{_libdir}/libglibmm-2.4.so.1*
%{_libdir}/libglibmm_generate_extra_defs-2.4.so.1*
%files devel %files devel
%{_includedir}/glibmm-2.4/ %{_includedir}/glibmm-2.4/
@ -91,6 +91,11 @@ find $RPM_BUILD_ROOT -type f -name "*.la" -exec rm -f {} ';'
%changelog %changelog
* Tue Nov 24 2020 Kalev Lember <klember@redhat.com> - 2.64.4-1
- Update to 2.64.4
- Switch to meson build system
- Tighten soname globs
* Sat Oct 31 2020 Jeff Law <law@redhat.com> - 2.64.2-5 * Sat Oct 31 2020 Jeff Law <law@redhat.com> - 2.64.2-5
- Fix bogus volatile caught by gcc-11 - Fix bogus volatile caught by gcc-11

View File

@ -1 +1 @@
SHA512 (glibmm-2.64.2.tar.xz) = 0130af9a16981a54630150db6f4b1a95458d72d650c5e4781ee97ce624ec98c600b79ebf234d212e025781453fd11d78b9e8273235ffa143397423418fe970cc SHA512 (glibmm-2.64.4.tar.xz) = 1c5280ac5661c899b0a52fe740f239d57c8ac1495dcc88bf98f9be461753f78c9485ccec1bbd3527bc3162da3e87bd2d7f29a45afa91fad3625651c6019c6da7