Compare commits
No commits in common. "c8" and "c10s" have entirely different histories.
3
.gitignore
vendored
3
.gitignore
vendored
@ -1 +1,2 @@
|
||||
SOURCES/glibmm-2.56.0.tar.xz
|
||||
/glibmm-*.tar.bz2
|
||||
/glibmm-*.tar.xz
|
||||
|
@ -1 +0,0 @@
|
||||
d733d9206d706d53058749f92dfb319bb189c289 SOURCES/glibmm-2.56.0.tar.xz
|
6
gating.yaml
Normal file
6
gating.yaml
Normal file
@ -0,0 +1,6 @@
|
||||
--- !Policy
|
||||
product_versions:
|
||||
- rhel-9
|
||||
decision_context: osci_compose_gate
|
||||
rules:
|
||||
- !PassingTestCaseRule {test_case_name: desktop-qe.desktop-ci.tier1-gating.functional}
|
80
glibmm24-gcc11.patch
Normal file
80
glibmm24-gcc11.patch
Normal file
@ -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>& 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,30 +1,39 @@
|
||||
# first two digits of version
|
||||
%define release_version %(echo %{version} | awk -F. '{print $1"."$2}')
|
||||
|
||||
%global glib2_version 2.50.0
|
||||
%global glib2_version 2.61.2
|
||||
%global libsigc_version 2.9.1
|
||||
|
||||
Name: glibmm24
|
||||
Version: 2.56.0
|
||||
Release: 2%{?dist}
|
||||
Version: 2.66.1
|
||||
Release: 1%{?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: doxygen
|
||||
BuildRequires: gcc-c++
|
||||
BuildRequires: glib2-devel >= %{glib2_version}
|
||||
BuildRequires: libsigc++20-devel >= %{libsigc_version}
|
||||
BuildRequires: libxslt
|
||||
BuildRequires: m4
|
||||
BuildRequires: perl-interpreter
|
||||
%if 0%{?fedora} || 0%{?rhel} > 7
|
||||
BuildRequires: meson
|
||||
BuildRequires: mm-common
|
||||
BuildRequires: perl-generators
|
||||
%endif
|
||||
BuildRequires: perl-interpreter
|
||||
BuildRequires: perl(Getopt::Long)
|
||||
|
||||
Requires: glib2%{?_isa} >= %{glib2_version}
|
||||
Requires: 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
|
||||
glibmm is the official C++ interface for the popular cross-platform
|
||||
library GLib. It provides non-UI API that is not available in standard
|
||||
@ -51,27 +60,27 @@ This package contains the full API documentation for %{name}.
|
||||
|
||||
|
||||
%prep
|
||||
%setup -q -n glibmm-%{version}
|
||||
%autosetup -p1 -n glibmm-%{version}
|
||||
|
||||
|
||||
%build
|
||||
%configure
|
||||
# removing rpath
|
||||
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}
|
||||
%meson -Dbuild-documentation=true
|
||||
%meson_build
|
||||
|
||||
|
||||
%install
|
||||
%make_install
|
||||
find $RPM_BUILD_ROOT -type f -name "*.la" -exec rm -f {} ';'
|
||||
%meson_install
|
||||
|
||||
chmod +x $RPM_BUILD_ROOT%{_libdir}/glibmm-2.4/proc/generate_wrap_init.pl
|
||||
chmod +x $RPM_BUILD_ROOT%{_libdir}/glibmm-2.4/proc/gmmproc
|
||||
|
||||
|
||||
%files
|
||||
%license COPYING
|
||||
%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
|
||||
%{_includedir}/glibmm-2.4/
|
||||
@ -87,9 +96,88 @@ find $RPM_BUILD_ROOT -type f -name "*.la" -exec rm -f {} ';'
|
||||
|
||||
|
||||
%changelog
|
||||
* Thu Oct 15 2020 Tomas Popela <tpopela@redhat.com> - 2.56.0-2
|
||||
- Rebuild for the annobin fixes
|
||||
- Resolves: rhbz#1704002
|
||||
* Tue Aug 24 2021 Kalev Lember <klember@redhat.com> - 2.66.1-1
|
||||
- Update to 2.66.1
|
||||
|
||||
* Mon Aug 09 2021 Mohan Boddu <mboddu@redhat.com> - 2.66.0-3
|
||||
- Rebuilt for IMA sigs, glibc 2.34, aarch64 flags
|
||||
Related: rhbz#1991688
|
||||
|
||||
* Fri May 07 2021 Kalev Lember <klember@redhat.com> - 2.66.0-2
|
||||
- Update generated header files for C++20 compatibility (#1947838)
|
||||
|
||||
* Fri May 07 2021 Kalev Lember <klember@redhat.com> - 2.66.0-1
|
||||
- Update to 2.66.0
|
||||
- Backport upstream fix for C++20 compatibility (#1947838)
|
||||
|
||||
* Thu Apr 15 2021 Mohan Boddu <mboddu@redhat.com> - 2.64.5-5
|
||||
- Rebuilt for RHEL 9 BETA on Apr 15th 2021. Related: rhbz#1947937
|
||||
|
||||
* Tue Jan 26 2021 Fedora Release Engineering <releng@fedoraproject.org> - 2.64.5-4
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild
|
||||
|
||||
* Tue Jan 19 2021 Kalev Lember <klember@redhat.com> - 2.64.5-3
|
||||
- Fix gmmproc and generate_wrap_init.pl to be executable (#1917035)
|
||||
|
||||
* Mon Dec 14 2020 Kalev Lember <klember@redhat.com> - 2.64.5-2
|
||||
- Add missing dep for generating links to libstdc++ docs
|
||||
|
||||
* Tue Dec 1 2020 Kalev Lember <klember@redhat.com> - 2.64.5-1
|
||||
- Update to 2.64.5
|
||||
|
||||
* 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
|
||||
- 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
|
||||
|
||||
* Mon Jul 27 2020 Fedora Release Engineering <releng@fedoraproject.org> - 2.64.2-3
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild
|
||||
|
||||
* Tue Jul 07 2020 Petr Pisar <ppisar@redhat.com> - 2.64.2-2
|
||||
- Do not export private Perl modules
|
||||
|
||||
* Fri Mar 27 2020 Kalev Lember <klember@redhat.com> - 2.64.2-1
|
||||
- Update to 2.64.2
|
||||
|
||||
* Fri Mar 20 2020 Kalev Lember <klember@redhat.com> - 2.64.1-2
|
||||
- Backport an upstream fix to fix ardour5 build (#1815144)
|
||||
|
||||
* Wed Mar 18 2020 Kalev Lember <klember@redhat.com> - 2.64.1-1
|
||||
- Update to 2.64.1
|
||||
|
||||
* Tue Mar 17 2020 Kalev Lember <klember@redhat.com> - 2.64.0-1
|
||||
- Update to 2.64.0
|
||||
|
||||
* Tue Jan 28 2020 Fedora Release Engineering <releng@fedoraproject.org> - 2.62.0-2
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild
|
||||
|
||||
* Thu Sep 19 2019 Kalev Lember <klember@redhat.com> - 2.62.0-1
|
||||
- Update to 2.62.0
|
||||
|
||||
* Thu Jul 25 2019 Fedora Release Engineering <releng@fedoraproject.org> - 2.60.0-2
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild
|
||||
|
||||
* Tue Mar 19 2019 Kalev Lember <klember@redhat.com> - 2.60.0-1
|
||||
- Update to 2.60.0
|
||||
|
||||
* Mon Mar 18 2019 Kalev Lember <klember@redhat.com> - 2.58.1-1
|
||||
- Update to 2.58.1
|
||||
|
||||
* Thu Jan 31 2019 Fedora Release Engineering <releng@fedoraproject.org> - 2.58.0-2
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild
|
||||
|
||||
* Thu Nov 01 2018 Kalev Lember <klember@redhat.com> - 2.58.0-1
|
||||
- Update to 2.58.0
|
||||
|
||||
* Fri Jul 13 2018 Fedora Release Engineering <releng@fedoraproject.org> - 2.56.0-2
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild
|
||||
|
||||
* Mon Apr 02 2018 Kalev Lember <klember@redhat.com> - 2.56.0-1
|
||||
- Update to 2.56.0
|
Loading…
Reference in New Issue
Block a user