Skip to content

Commit

Permalink
We broke the platform ABI since 2.18 (#3682)
Browse files Browse the repository at this point in the history
As noted in
#3590 (review)
  • Loading branch information
Saviq authored Nov 28, 2024
2 parents f370f46 + 37e2192 commit 3c9a7c6
Show file tree
Hide file tree
Showing 6 changed files with 8 additions and 14 deletions.
4 changes: 2 additions & 2 deletions debian/control
Original file line number Diff line number Diff line change
Expand Up @@ -77,7 +77,7 @@ Description: Display server for Ubuntu - server library
.
Contains the shared library needed by server applications for Mir.

Package: libmirplatform29
Package: libmirplatform30
Section: libs
Architecture: linux-any
Multi-Arch: same
Expand Down Expand Up @@ -140,7 +140,7 @@ Section: libdevel
Architecture: linux-any
Multi-Arch: same
Pre-Depends: ${misc:Pre-Depends}
Depends: libmirplatform29 (= ${binary:Version}),
Depends: libmirplatform30 (= ${binary:Version}),
libmircommon-dev (= ${binary:Version}),
libboost-program-options-dev,
${misc:Depends},
Expand Down
1 change: 0 additions & 1 deletion debian/libmirplatform29.install

This file was deleted.

1 change: 1 addition & 0 deletions debian/libmirplatform30.install
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
usr/lib/*/libmirplatform.so.30
2 changes: 1 addition & 1 deletion src/CMakeLists.txt
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
# We need MIRPLATFORM_ABI in both libmirplatform and the platform implementations.
set(MIRPLATFORM_ABI 29)
set(MIRPLATFORM_ABI 30)

set(MIRAL_VERSION_MAJOR 5)
set(MIRAL_VERSION_MINOR 1)
Expand Down
12 changes: 3 additions & 9 deletions src/platform/symbols.map
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
MIR_PLATFORM_2.18 {
MIR_PLATFORM_2.19 {
global:
extern "C++" {
mir::graphics::AtomicFrame::increment*;
Expand Down Expand Up @@ -125,6 +125,7 @@ MIR_PLATFORM_2.18 {
mir::options::enable_key_repeat_opt*;
mir::options::fatal_except_opt*;
mir::options::idle_timeout_opt;
mir::options::idle_timeout_when_locked_opt;
mir::options::input_report_opt*;
mir::options::log_opt_value*;
mir::options::logind_console;
Expand Down Expand Up @@ -200,12 +201,5 @@ MIR_PLATFORM_2.18 {
vtable?for?mir::options::Option;
vtable?for?mir::options::ProgramOption;
};
};

MIR_PLATFORM_2.19 {
global:
extern "C++" {
mir::options::idle_timeout_when_locked_opt;
};
local: *;
} MIR_PLATFORM_2.18;
};
2 changes: 1 addition & 1 deletion src/server/symbols.map
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
MIR_SERVER_INTERNAL_2.18 {
MIR_SERVER_INTERNAL_2.19 {
global:
extern "C++" {
VTT?for?mir::DefaultServerConfiguration;
Expand Down

0 comments on commit 3c9a7c6

Please sign in to comment.