Fix accidental ABI break
Signed-off-by: Stephen Gallagher <sgallagh@redhat.com>
This commit is contained in:
parent
a0feddd7a1
commit
49160525f2
37
0001-Fix-accidental-ABI-break.patch
Normal file
37
0001-Fix-accidental-ABI-break.patch
Normal file
@ -0,0 +1,37 @@
|
|||||||
|
From bf5c2f76f6d4fe8510e8a2e1b24db72c5b53c846 Mon Sep 17 00:00:00 2001
|
||||||
|
From: Stephen Gallagher <sgallagh@redhat.com>
|
||||||
|
Date: Wed, 3 Apr 2019 08:54:19 -0400
|
||||||
|
Subject: [PATCH] Fix accidental ABI break
|
||||||
|
|
||||||
|
When we added the .equals() functions for ModulemdDefaults and
|
||||||
|
ModulemdComponent, we did not decrease the padding value, which
|
||||||
|
resulted in the structure being enlarged.
|
||||||
|
|
||||||
|
Signed-off-by: Stephen Gallagher <sgallagh@redhat.com>
|
||||||
|
---
|
||||||
|
modulemd/v2/include/modulemd-2.0/modulemd-defaults.h | 4 ++--
|
||||||
|
1 file changed, 2 insertions(+), 2 deletions(-)
|
||||||
|
|
||||||
|
diff --git a/modulemd/v2/include/modulemd-2.0/modulemd-defaults.h b/modulemd/v2/include/modulemd-2.0/modulemd-defaults.h
|
||||||
|
index 4794c2f65ea1990f5dc36c80df0804e0320b7730..5da77fb2aead0f8b2c5e8d9dd667a4aaca526d52 100644
|
||||||
|
--- a/modulemd/v2/include/modulemd-2.0/modulemd-defaults.h
|
||||||
|
+++ b/modulemd/v2/include/modulemd-2.0/modulemd-defaults.h
|
||||||
|
@@ -63,13 +63,13 @@ struct _ModulemdDefaultsClass
|
||||||
|
|
||||||
|
guint64 (*get_mdversion) (ModulemdDefaults *self);
|
||||||
|
|
||||||
|
gboolean (*equals) (ModulemdDefaults *self_1, ModulemdDefaults *self_2);
|
||||||
|
|
||||||
|
- /* Padding to allow adding up to 10 new virtual functions without
|
||||||
|
+ /* Padding to allow adding up to 9 new virtual functions without
|
||||||
|
* breaking ABI. */
|
||||||
|
- gpointer padding[10];
|
||||||
|
+ gpointer padding[9];
|
||||||
|
};
|
||||||
|
|
||||||
|
|
||||||
|
/**
|
||||||
|
* modulemd_defaults_new:
|
||||||
|
--
|
||||||
|
2.21.0
|
||||||
|
|
@ -12,7 +12,7 @@
|
|||||||
|
|
||||||
Name: libmodulemd
|
Name: libmodulemd
|
||||||
Version: %{libmodulemd_version}
|
Version: %{libmodulemd_version}
|
||||||
Release: 1%{?dist}
|
Release: 2%{?dist}
|
||||||
Summary: Module metadata manipulation library
|
Summary: Module metadata manipulation library
|
||||||
|
|
||||||
License: MIT
|
License: MIT
|
||||||
@ -42,6 +42,7 @@ Conflicts: libmodulemd1 < %{libmodulemd_v1_version}-%{release}
|
|||||||
|
|
||||||
|
|
||||||
# Patches
|
# Patches
|
||||||
|
Patch0001: 0001-Fix-accidental-ABI-break.patch
|
||||||
|
|
||||||
|
|
||||||
%description
|
%description
|
||||||
@ -229,6 +230,9 @@ ln -s libmodulemd.so.%{libmodulemd_v1_version} \
|
|||||||
%{_datadir}/gtk-doc/html/modulemd-1.0/
|
%{_datadir}/gtk-doc/html/modulemd-1.0/
|
||||||
|
|
||||||
%changelog
|
%changelog
|
||||||
|
* Wed Apr 03 2019 Stephen Gallagher <sgallagh@redhat.com> - 2.2.3-2
|
||||||
|
- Fix accidental ABI break
|
||||||
|
|
||||||
* Mon Apr 01 2019 Stephen Gallagher <sgallagh@redhat.com> - 2.2.3-1
|
* Mon Apr 01 2019 Stephen Gallagher <sgallagh@redhat.com> - 2.2.3-1
|
||||||
- Update to 2.2.3 and 1.8.6
|
- Update to 2.2.3 and 1.8.6
|
||||||
- Fix header issue with ModulemdRpmMapEntry
|
- Fix header issue with ModulemdRpmMapEntry
|
||||||
|
Loading…
Reference in New Issue
Block a user