Merge lp:~alan-griffiths/miral/init-1.1 into lp:miral

[Alan Griffiths]

Init 1.1

[Gerry Boland (gerboland)]

https://launchpad.net/miral/+milestone/1.1 does not exist.
What is this bump for already?

review: Needs Information

[lp:~alan-griffiths/miral/init-1.1]

480. By Alan Griffiths on 2017-01-18

Only use -Wno-mismatched-tags when it is needed

481. By Alan Griffiths on 2017-01-18

Code compatibility with Mir 0.26

482. By Alan Griffiths on 2017-01-18

Respect the deprecations landing in lp:mir (and then 0.26)

483. By Alberto Aguirre on 2017-01-18

Address mir 0.26 changes to debug coordinate translation

484. By Alan Griffiths on 2017-01-18

Update changelog ready for 1.1 release

=== modified file 'debian/changelog'
--- debian/changelog	2016-12-20 16:00:02 +0000
+++ debian/changelog	2017-01-16 17:39:12 +0000
@@ -1,3 +1,13 @@
+miral (1.1.0) UNRELEASED; urgency=medium
+
+  * New upstream release 1.1.0 (https://launchpad.net/miral/+milestone/1.1)
+    - ABI summary:
+      . miral ABI unchanged at 2
+    - Enhancements:
+    - Bugs fixed:
+
+ -- Alan Griffiths <[e-mail]>  Wed, 14 Dec 2016 16:31:08 +0000
+
 miral (1.0.1+17.04.20161220-0ubuntu1) zesty; urgency=medium
 
   * New upstream release 1.0.1 (https://launchpad.net/miral/+milestone/1.0)
 
=== modified file 'debian/libmiral2.symbols'
--- debian/libmiral2.symbols	2016-12-13 13:07:15 +0000
+++ debian/libmiral2.symbols	2017-01-16 17:39:12 +0000
@@ -354,4 +354,12 @@
  (c++)"typeinfo for miral::CanonicalWindowManagerPolicy@MIRAL_1.0" 1.0.0
  (c++)"vtable for miral::ActiveOutputsListener@MIRAL_1.0" 1.0.0
  (c++)"vtable for miral::WindowManagementPolicy@MIRAL_1.0" 1.0.0
- (c++)"vtable for miral::CanonicalWindowManagerPolicy@MIRAL_1.0" 1.0.0
 \ No newline at end of file
+ (c++)"vtable for miral::CanonicalWindowManagerPolicy@MIRAL_1.0" 1.0.0
+ MIRAL_1.1@MIRAL_1.1 1.1.0
+ (c++)"miral::WindowInfo::needs_titlebar(MirWindowType)@MIRAL_1.1" 1.1.0
+ (c++)"miral::WindowInfo::type(MirWindowType)@MIRAL_1.1" 1.1.0
+ (c++)"miral::WindowInfo::type() const@MIRAL_1.1" 1.1.0
+ (c++)"miral::WindowInfo::state() const@MIRAL_1.1" 1.1.0
+ (c++)"miral::WindowInfo::state(MirWindowState)@MIRAL_1.1" 1.1.0
+ (c++)"miral::WindowManagementPolicy::advise_state_change(miral::WindowInfo const&, MirWindowState)@MIRAL_1.1" 1.1.0
+ (c++)"miral::WindowInfo::can_morph_to(MirWindowType) const@MIRAL_1.1" 1.1.0
 
=== modified file 'miral/symbols.map'
--- miral/symbols.map	2016-12-13 13:07:15 +0000
+++ miral/symbols.map	2017-01-16 17:39:12 +0000
@@ -112,7 +112,6 @@
     miral::WindowInfo::WindowInfo*;
     miral::WindowInfo::add_child*;
     miral::WindowInfo::can_be_active*;
-    miral::WindowInfo::can_morph_to*;
     miral::WindowInfo::children*;
     miral::WindowInfo::confine_pointer*;
     miral::WindowInfo::constrain_resize*;
@@ -128,15 +127,12 @@
     miral::WindowInfo::must_have_parent*;
     miral::WindowInfo::must_not_have_parent*;
     miral::WindowInfo::name*;
-    miral::WindowInfo::needs_titlebar*;
     miral::WindowInfo::operator*;
     miral::WindowInfo::output_id*;
     miral::WindowInfo::parent*;
     miral::WindowInfo::preferred_orientation*;
     miral::WindowInfo::remove_child*;
     miral::WindowInfo::restore_rect*;
-    miral::WindowInfo::state*;
-    miral::WindowInfo::type*;
     miral::WindowInfo::userdata*;
     miral::WindowInfo::width_inc*;
     miral::WindowInfo::window*;
@@ -153,7 +149,6 @@
     miral::WindowManagementPolicy::advise_new_window*;
     miral::WindowManagementPolicy::advise_raise*;
     miral::WindowManagementPolicy::advise_resize*;
-    miral::WindowManagementPolicy::advise_state_change*;
     miral::WindowManagementPolicy::operator*;
     miral::WindowManagerOptions::WindowManagerOptions*;
     miral::WindowManagerOptions::operator*;
@@ -311,5 +306,44 @@
     vtable?for?miral::toolkit::Surface;
     vtable?for?miral::toolkit::SurfaceSpec;
   };
+#    miral::WindowInfo::can_morph_to*;
+    _ZNK5miral10WindowInfo12can_morph_toE14MirSurfaceType;
+
+#    miral::WindowInfo::needs_titlebar*;
+    _ZN5miral10WindowInfo14needs_titlebarE14MirSurfaceType;
+
+#    miral::WindowInfo::state*;
+    _ZNK5miral10WindowInfo5stateEv;
+    _ZN5miral10WindowInfo5stateE15MirSurfaceState;
+
+#    miral::WindowInfo::type*;
+    _ZN5miral10WindowInfo4typeE14MirSurfaceType;
+    _ZNK5miral10WindowInfo4typeEv;
+
+#    miral::WindowManagementPolicy::advise_state_change*;
+    _ZN5miral22WindowManagementPolicy19advise_state_changeERKNS_10WindowInfoE15MirSurfaceState;
 local: *;
 };
+
+MIRAL_1.1 {
+global:
+    # miral::WindowInfo::can_morph_to*
+    _ZNK5miral10WindowInfo12can_morph_toE13MirWindowType;
+
+    #miral::WindowInfo::needs_titlebar*;
+    _ZN5miral10WindowInfo14needs_titlebarE13MirWindowType;
+
+    # miral::WindowInfo::state*;
+    _ZNK5miral10WindowInfo5stateEv;
+    _ZN5miral10WindowInfo5stateE14MirWindowState;
+
+    miral::WindowInfo::type*;
+    _ZN5miral10WindowInfo4typeE13MirWindowType;
+    _ZNK5miral10WindowInfo4typeEv;
+
+    # miral::WindowManagementPolicy::advise_state_change*;
+    _ZN5miral22WindowManagementPolicy19advise_state_changeERKNS_10WindowInfoE14MirWindowState;
+
+#  extern "C++" {
+#  };
+} MIRAL_1.0;
 
=== modified file 'miral/window_info.cpp'
--- miral/window_info.cpp	2017-01-16 17:39:11 +0000
+++ miral/window_info.cpp	2017-01-16 17:39:12 +0000
@@ -19,6 +19,7 @@
 #include "miral/window_info.h"
 
 #include <mir/scene/surface.h>
+#include <mir/version.h>
 
 #include <limits>
 
@@ -155,6 +156,11 @@
     }
 }
 
+#if (MIR_SERVER_VERSION >= MIR_VERSION_NUMBER(0, 26, 0)) && (MIR_SERVER_VERSION < MIR_VERSION_NUMBER(1, 0, 0))
+extern "C" __attribute__((alias("_ZNK5miral10WindowInfo12can_morph_toE13MirWindowType"))) void _ZNK5miral10WindowInfo12can_morph_toE14MirSurfaceType();
+__asm__(".symver _ZNK5miral10WindowInfo12can_morph_toE14MirSurfaceType,_ZNK5miral10WindowInfo12can_morph_toE14MirSurfaceType@MIRAL_1.0");
+__asm__(".symver _ZNK5miral10WindowInfo12can_morph_toE13MirWindowType,_ZNK5miral10WindowInfo12can_morph_toE13MirWindowType@@MIRAL_1.1");
+#endif
 bool miral::WindowInfo::can_morph_to(MirWindowType new_type) const
 {
     switch (new_type)
@@ -345,6 +351,11 @@
     requested_size = new_size;
 }
 
+#if (MIR_SERVER_VERSION >= MIR_VERSION_NUMBER(0, 26, 0)) && (MIR_SERVER_VERSION < MIR_VERSION_NUMBER(1, 0, 0))
+extern "C" __attribute__((alias("_ZN5miral10WindowInfo14needs_titlebarE13MirWindowType"))) void _ZN5miral10WindowInfo14needs_titlebarE14MirSurfaceType();
+__asm__(".symver _ZN5miral10WindowInfo14needs_titlebarE14MirSurfaceType,_ZN5miral10WindowInfo14needs_titlebarE14MirSurfaceType@MIRAL_1.0");
+__asm__(".symver _ZN5miral10WindowInfo14needs_titlebarE13MirWindowType,_ZN5miral10WindowInfo14needs_titlebarE13MirWindowType@@MIRAL_1.1");
+#endif
 bool miral::WindowInfo::needs_titlebar(MirWindowType type)
 {
     switch (type)
@@ -366,6 +377,11 @@
     return self->type;
 }
 
+#if (MIR_SERVER_VERSION >= MIR_VERSION_NUMBER(0, 26, 0)) && (MIR_SERVER_VERSION < MIR_VERSION_NUMBER(1, 0, 0))
+extern "C" __attribute__((alias("_ZN5miral10WindowInfo4typeE13MirWindowType"))) void _ZN5miral10WindowInfo4typeE14MirSurfaceType();
+__asm__(".symver _ZN5miral10WindowInfo4typeE14MirSurfaceType,_ZN5miral10WindowInfo4typeE14MirSurfaceType@MIRAL_1.0");
+__asm__(".symver _ZN5miral10WindowInfo4typeE13MirWindowType,_ZN5miral10WindowInfo4typeE13MirWindowType@@MIRAL_1.1");
+#endif
 void miral::WindowInfo::type(MirWindowType type)
 {
     self->type = type;
@@ -376,6 +392,11 @@
     return self->state;
 }
 
+#if (MIR_SERVER_VERSION >= MIR_VERSION_NUMBER(0, 26, 0)) && (MIR_SERVER_VERSION < MIR_VERSION_NUMBER(1, 0, 0))
+extern "C" __attribute__((alias("_ZN5miral10WindowInfo5stateE14MirWindowState"))) void _ZN5miral10WindowInfo5stateE15MirSurfaceState();
+__asm__(".symver _ZN5miral10WindowInfo5stateE15MirSurfaceState,_ZN5miral10WindowInfo5stateE15MirSurfaceState@MIRAL_1.0");
+__asm__(".symver _ZN5miral10WindowInfo5stateE14MirWindowState,_ZN5miral10WindowInfo5stateE14MirWindowState@@MIRAL_1.1");
+#endif
 void miral::WindowInfo::state(MirWindowState state)
 {
     self->state = state;
 
=== modified file 'miral/window_management_policy.cpp'
--- miral/window_management_policy.cpp	2017-01-16 17:39:11 +0000
+++ miral/window_management_policy.cpp	2017-01-16 17:39:12 +0000
@@ -18,6 +18,8 @@
 
 #include "miral/window_management_policy.h"
 
+#include <mir/version.h>
+
 void miral::WindowManagementPolicy::advise_begin() {}
 void miral::WindowManagementPolicy::advise_end() {}
 void miral::WindowManagementPolicy::advise_new_app(ApplicationInfo& /*application*/) {}
@@ -25,6 +27,12 @@
 void miral::WindowManagementPolicy::advise_new_window(WindowInfo const& /*window_info*/) {}
 void miral::WindowManagementPolicy::advise_focus_lost(WindowInfo const& /*info*/) {}
 void miral::WindowManagementPolicy::advise_focus_gained(WindowInfo const& /*info*/) {}
+
+#if (MIR_SERVER_VERSION >= MIR_VERSION_NUMBER(0, 26, 0)) && (MIR_SERVER_VERSION < MIR_VERSION_NUMBER(1, 0, 0))
+extern "C" __attribute__((alias("_ZN5miral22WindowManagementPolicy19advise_state_changeERKNS_10WindowInfoE14MirWindowState"))) void _ZN5miral22WindowManagementPolicy19advise_state_changeERKNS_10WindowInfoE15MirSurfaceState();
+__asm__(".symver _ZN5miral22WindowManagementPolicy19advise_state_changeERKNS_10WindowInfoE15MirSurfaceState,_ZN5miral22WindowManagementPolicy19advise_state_changeERKNS_10WindowInfoE15MirSurfaceState@MIRAL_1.0");
+__asm__(".symver _ZN5miral22WindowManagementPolicy19advise_state_changeERKNS_10WindowInfoE14MirWindowState,_ZN5miral22WindowManagementPolicy19advise_state_changeERKNS_10WindowInfoE14MirWindowState@@MIRAL_1.1");
+#endif
 void miral::WindowManagementPolicy::advise_state_change(WindowInfo const& /*window_info*/, MirWindowState /*state*/) {}
 void miral::WindowManagementPolicy::advise_move_to(WindowInfo const& /*window_info*/, Point /*top_left*/) {}
 void miral::WindowManagementPolicy::advise_resize(WindowInfo const& /*window_info*/, Size const& /*new_size*/) {}
 
=== modified file 'scripts/process_doxygen_xml.py'
--- scripts/process_doxygen_xml.py	2016-12-13 13:07:15 +0000
+++ scripts/process_doxygen_xml.py	2017-01-16 17:39:12 +0000
@@ -83,11 +83,354 @@
 
 OLD_STANZAS = '''MIRAL_1.0 {
 global:
-  extern "C++" {'''
-
-END_NEW_STANZA = '''  };
+  extern "C++" {
+    miral::ActiveOutputsListener::?ActiveOutputsListener*;
+    miral::ActiveOutputsListener::ActiveOutputsListener*;
+    miral::ActiveOutputsListener::advise_output_begin*;
+    miral::ActiveOutputsListener::advise_output_create*;
+    miral::ActiveOutputsListener::advise_output_delete*;
+    miral::ActiveOutputsListener::advise_output_end*;
+    miral::ActiveOutputsListener::advise_output_update*;
+    miral::ActiveOutputsListener::operator*;
+    miral::ActiveOutputsMonitor::?ActiveOutputsMonitor*;
+    miral::ActiveOutputsMonitor::ActiveOutputsMonitor*;
+    miral::ActiveOutputsMonitor::add_listener*;
+    miral::ActiveOutputsMonitor::delete_listener*;
+    miral::ActiveOutputsMonitor::operator*;
+    miral::ActiveOutputsMonitor::process_outputs*;
+    miral::AddInitCallback::?AddInitCallback*;
+    miral::AddInitCallback::AddInitCallback*;
+    miral::AddInitCallback::operator*;
+    miral::AppendEventFilter::AppendEventFilter*;
+    miral::AppendEventFilter::operator*;
+    miral::ApplicationAuthorizer::?ApplicationAuthorizer*;
+    miral::ApplicationAuthorizer::ApplicationAuthorizer*;
+    miral::ApplicationAuthorizer::operator*;
+    miral::ApplicationCredentials::ApplicationCredentials*;
+    miral::ApplicationCredentials::gid*;
+    miral::ApplicationCredentials::pid*;
+    miral::ApplicationCredentials::uid*;
+    miral::ApplicationInfo::?ApplicationInfo*;
+    miral::ApplicationInfo::ApplicationInfo*;
+    miral::ApplicationInfo::add_window*;
+    miral::ApplicationInfo::application*;
+    miral::ApplicationInfo::name*;
+    miral::ApplicationInfo::operator*;
+    miral::ApplicationInfo::remove_window*;
+    miral::ApplicationInfo::userdata*;
+    miral::ApplicationInfo::windows*;
+    miral::BasicSetApplicationAuthorizer::?BasicSetApplicationAuthorizer*;
+    miral::BasicSetApplicationAuthorizer::BasicSetApplicationAuthorizer*;
+    miral::BasicSetApplicationAuthorizer::operator*;
+    miral::BasicSetApplicationAuthorizer::the_application_authorizer*;
+    miral::CanonicalWindowManagerPolicy::CanonicalWindowManagerPolicy*;
+    miral::CanonicalWindowManagerPolicy::advise_focus_gained*;
+    miral::CanonicalWindowManagerPolicy::confirm_inherited_move*;
+    miral::CanonicalWindowManagerPolicy::handle_modify_window*;
+    miral::CanonicalWindowManagerPolicy::handle_raise_window*;
+    miral::CanonicalWindowManagerPolicy::handle_window_ready*;
+    miral::CanonicalWindowManagerPolicy::place_new_surface*;
+    miral::CommandLineOption::?CommandLineOption*;
+    miral::CommandLineOption::CommandLineOption*;
+    miral::CommandLineOption::operator*;
+    miral::CursorTheme::?CursorTheme*;
+    miral::CursorTheme::CursorTheme*;
+    miral::CursorTheme::operator*;
+    miral::DebugExtension::DebugExtension*;
+    miral::DebugExtension::disable*;
+    miral::DebugExtension::enable*;
+    miral::DebugExtension::operator*;
+    miral::InternalClientLauncher::?InternalClientLauncher*;
+    miral::InternalClientLauncher::InternalClientLauncher*;
+    miral::InternalClientLauncher::launch*;
+    miral::InternalClientLauncher::operator*;
+    miral::Keymap::?Keymap*;
+    miral::Keymap::Keymap*;
+    miral::Keymap::operator*;
+    miral::Keymap::set_keymap*;
+    miral::MirRunner::?MirRunner*;
+    miral::MirRunner::MirRunner*;
+    miral::MirRunner::add_start_callback*;
+    miral::MirRunner::add_stop_callback*;
+    miral::MirRunner::run_with*;
+    miral::MirRunner::set_exception_handler*;
+    miral::MirRunner::stop*;
+    miral::Output::?Output*;
+    miral::Output::Output*;
+    miral::Output::connected*;
+    miral::Output::extents*;
+    miral::Output::form_factor*;
+    miral::Output::is_same_output*;
+    miral::Output::operator*;
+    miral::Output::orientation*;
+    miral::Output::physical_size_mm*;
+    miral::Output::pixel_format*;
+    miral::Output::power_mode*;
+    miral::Output::refresh_rate*;
+    miral::Output::scale*;
+    miral::Output::type*;
+    miral::Output::used*;
+    miral::Output::valid*;
+    miral::SetCommandLineHandler::?SetCommandLineHandler*;
+    miral::SetCommandLineHandler::SetCommandLineHandler*;
+    miral::SetCommandLineHandler::operator*;
+    miral::SetTerminator::?SetTerminator*;
+    miral::SetTerminator::SetTerminator*;
+    miral::SetTerminator::operator*;
+    miral::SetWindowManagmentPolicy::?SetWindowManagmentPolicy*;
+    miral::SetWindowManagmentPolicy::SetWindowManagmentPolicy*;
+    miral::SetWindowManagmentPolicy::operator*;
+    miral::StartupInternalClient::?StartupInternalClient*;
+    miral::StartupInternalClient::StartupInternalClient*;
+    miral::StartupInternalClient::operator*;
+    miral::Window::?Window*;
+    miral::Window::Window*;
+    miral::Window::application*;
+    miral::Window::move_to*;
+    miral::Window::operator*;
+    miral::Window::resize*;
+    miral::Window::size*;
+    miral::Window::top_left*;
+    miral::WindowInfo::?WindowInfo*;
+    miral::WindowInfo::WindowInfo*;
+    miral::WindowInfo::add_child*;
+    miral::WindowInfo::can_be_active*;
+    miral::WindowInfo::children*;
+    miral::WindowInfo::confine_pointer*;
+    miral::WindowInfo::constrain_resize*;
+    miral::WindowInfo::has_output_id*;
+    miral::WindowInfo::height_inc*;
+    miral::WindowInfo::is_visible*;
+    miral::WindowInfo::max_aspect*;
+    miral::WindowInfo::max_height*;
+    miral::WindowInfo::max_width*;
+    miral::WindowInfo::min_aspect*;
+    miral::WindowInfo::min_height*;
+    miral::WindowInfo::min_width*;
+    miral::WindowInfo::must_have_parent*;
+    miral::WindowInfo::must_not_have_parent*;
+    miral::WindowInfo::name*;
+    miral::WindowInfo::operator*;
+    miral::WindowInfo::output_id*;
+    miral::WindowInfo::parent*;
+    miral::WindowInfo::preferred_orientation*;
+    miral::WindowInfo::remove_child*;
+    miral::WindowInfo::restore_rect*;
+    miral::WindowInfo::userdata*;
+    miral::WindowInfo::width_inc*;
+    miral::WindowInfo::window*;
+    miral::WindowManagementPolicy::?WindowManagementPolicy*;
+    miral::WindowManagementPolicy::WindowManagementPolicy*;
+    miral::WindowManagementPolicy::advise_begin*;
+    miral::WindowManagementPolicy::advise_delete_app*;
+    miral::WindowManagementPolicy::advise_delete_window*;
+    miral::WindowManagementPolicy::advise_end*;
+    miral::WindowManagementPolicy::advise_focus_gained*;
+    miral::WindowManagementPolicy::advise_focus_lost*;
+    miral::WindowManagementPolicy::advise_move_to*;
+    miral::WindowManagementPolicy::advise_new_app*;
+    miral::WindowManagementPolicy::advise_new_window*;
+    miral::WindowManagementPolicy::advise_raise*;
+    miral::WindowManagementPolicy::advise_resize*;
+    miral::WindowManagementPolicy::operator*;
+    miral::WindowManagerOptions::WindowManagerOptions*;
+    miral::WindowManagerOptions::operator*;
+    miral::WindowManagerTools::?WindowManagerTools*;
+    miral::WindowManagerTools::WindowManagerTools*;
+    miral::WindowManagerTools::active_display*;
+    miral::WindowManagerTools::active_window*;
+    miral::WindowManagerTools::ask_client_to_close*;
+    miral::WindowManagerTools::count_applications*;
+    miral::WindowManagerTools::drag_active_window*;
+    miral::WindowManagerTools::find_application*;
+    miral::WindowManagerTools::focus_next_application*;
+    miral::WindowManagerTools::focus_next_within_application*;
+    miral::WindowManagerTools::for_each_application*;
+    miral::WindowManagerTools::force_close*;
+    miral::WindowManagerTools::id_for_window*;
+    miral::WindowManagerTools::info_for*;
+    miral::WindowManagerTools::info_for_window_id*;
+    miral::WindowManagerTools::invoke_under_lock*;
+    miral::WindowManagerTools::modify_window*;
+    miral::WindowManagerTools::operator*;
+    miral::WindowManagerTools::place_and_size_for_state*;
+    miral::WindowManagerTools::raise_tree*;
+    miral::WindowManagerTools::select_active_window*;
+    miral::WindowManagerTools::window_at*;
+    miral::WindowSpecification::?WindowSpecification*;
+    miral::WindowSpecification::WindowSpecification*;
+    miral::WindowSpecification::aux_rect*;
+    miral::WindowSpecification::aux_rect_placement_gravity*;
+    miral::WindowSpecification::aux_rect_placement_offset*;
+    miral::WindowSpecification::confine_pointer*;
+    miral::WindowSpecification::height_inc*;
+    miral::WindowSpecification::input_mode*;
+    miral::WindowSpecification::input_shape*;
+    miral::WindowSpecification::max_aspect*;
+    miral::WindowSpecification::max_height*;
+    miral::WindowSpecification::max_width*;
+    miral::WindowSpecification::min_aspect*;
+    miral::WindowSpecification::min_height*;
+    miral::WindowSpecification::min_width*;
+    miral::WindowSpecification::name*;
+    miral::WindowSpecification::operator*;
+    miral::WindowSpecification::output_id*;
+    miral::WindowSpecification::parent*;
+    miral::WindowSpecification::placement_hints*;
+    miral::WindowSpecification::preferred_orientation*;
+    miral::WindowSpecification::shell_chrome*;
+    miral::WindowSpecification::size*;
+    miral::WindowSpecification::state*;
+    miral::WindowSpecification::top_left*;
+    miral::WindowSpecification::type*;
+    miral::WindowSpecification::update*;
+    miral::WindowSpecification::userdata*;
+    miral::WindowSpecification::width_inc*;
+    miral::WindowSpecification::window_placement_gravity*;
+    miral::apply_lifecycle_state_to*;
+    miral::display_configuration_options*;
+    miral::equivalent_display_area*;
+    miral::kill*;
+    miral::name_of*;
+    miral::operator*;
+    miral::pid_of*;
+    miral::toolkit::Connection::Connection*;
+    miral::toolkit::Surface::Surface*;
+    non-virtual?thunk?to?miral::ActiveOutputsListener::?ActiveOutputsListener*;
+    non-virtual?thunk?to?miral::ActiveOutputsListener::advise_output_begin*;
+    non-virtual?thunk?to?miral::ActiveOutputsListener::advise_output_create*;
+    non-virtual?thunk?to?miral::ActiveOutputsListener::advise_output_delete*;
+    non-virtual?thunk?to?miral::ActiveOutputsListener::advise_output_end*;
+    non-virtual?thunk?to?miral::ActiveOutputsListener::advise_output_update*;
+    non-virtual?thunk?to?miral::ApplicationAuthorizer::?ApplicationAuthorizer*;
+    non-virtual?thunk?to?miral::CanonicalWindowManagerPolicy::advise_focus_gained*;
+    non-virtual?thunk?to?miral::CanonicalWindowManagerPolicy::confirm_inherited_move*;
+    non-virtual?thunk?to?miral::CanonicalWindowManagerPolicy::handle_modify_window*;
+    non-virtual?thunk?to?miral::CanonicalWindowManagerPolicy::handle_raise_window*;
+    non-virtual?thunk?to?miral::CanonicalWindowManagerPolicy::handle_window_ready*;
+    non-virtual?thunk?to?miral::CanonicalWindowManagerPolicy::place_new_surface*;
+    non-virtual?thunk?to?miral::WindowManagementPolicy::?WindowManagementPolicy*;
+    non-virtual?thunk?to?miral::WindowManagementPolicy::advise_begin*;
+    non-virtual?thunk?to?miral::WindowManagementPolicy::advise_delete_app*;
+    non-virtual?thunk?to?miral::WindowManagementPolicy::advise_delete_window*;
+    non-virtual?thunk?to?miral::WindowManagementPolicy::advise_end*;
+    non-virtual?thunk?to?miral::WindowManagementPolicy::advise_focus_gained*;
+    non-virtual?thunk?to?miral::WindowManagementPolicy::advise_focus_lost*;
+    non-virtual?thunk?to?miral::WindowManagementPolicy::advise_move_to*;
+    non-virtual?thunk?to?miral::WindowManagementPolicy::advise_new_app*;
+    non-virtual?thunk?to?miral::WindowManagementPolicy::advise_new_window*;
+    non-virtual?thunk?to?miral::WindowManagementPolicy::advise_raise*;
+    non-virtual?thunk?to?miral::WindowManagementPolicy::advise_resize*;
+    non-virtual?thunk?to?miral::WindowManagementPolicy::advise_state_change*;
+    typeinfo?for?miral::ActiveOutputsListener;
+    typeinfo?for?miral::ActiveOutputsMonitor;
+    typeinfo?for?miral::AddInitCallback;
+    typeinfo?for?miral::AppendEventFilter;
+    typeinfo?for?miral::ApplicationAuthorizer;
+    typeinfo?for?miral::ApplicationCredentials;
+    typeinfo?for?miral::ApplicationInfo;
+    typeinfo?for?miral::BasicSetApplicationAuthorizer;
+    typeinfo?for?miral::CanonicalWindowManagerPolicy;
+    typeinfo?for?miral::CommandLineOption;
+    typeinfo?for?miral::CursorTheme;
+    typeinfo?for?miral::DebugExtension;
+    typeinfo?for?miral::InternalClientLauncher;
+    typeinfo?for?miral::Keymap;
+    typeinfo?for?miral::MirRunner;
+    typeinfo?for?miral::Output;
+    typeinfo?for?miral::Output::PhysicalSizeMM;
+    typeinfo?for?miral::SetCommandLineHandler;
+    typeinfo?for?miral::SetTerminator;
+    typeinfo?for?miral::SetWindowManagmentPolicy;
+    typeinfo?for?miral::StartupInternalClient;
+    typeinfo?for?miral::Window;
+    typeinfo?for?miral::WindowInfo;
+    typeinfo?for?miral::WindowManagementPolicy;
+    typeinfo?for?miral::WindowManagerOption;
+    typeinfo?for?miral::WindowManagerOptions;
+    typeinfo?for?miral::WindowManagerTools;
+    typeinfo?for?miral::WindowSpecification;
+    typeinfo?for?miral::WindowSpecification::AspectRatio;
+    typeinfo?for?miral::toolkit::Connection;
+    typeinfo?for?miral::toolkit::PersistentId;
+    typeinfo?for?miral::toolkit::Surface;
+    typeinfo?for?miral::toolkit::SurfaceSpec;
+    vtable?for?miral::ActiveOutputsListener;
+    vtable?for?miral::ActiveOutputsMonitor;
+    vtable?for?miral::AddInitCallback;
+    vtable?for?miral::AppendEventFilter;
+    vtable?for?miral::ApplicationAuthorizer;
+    vtable?for?miral::ApplicationCredentials;
+    vtable?for?miral::ApplicationInfo;
+    vtable?for?miral::BasicSetApplicationAuthorizer;
+    vtable?for?miral::CanonicalWindowManagerPolicy;
+    vtable?for?miral::CommandLineOption;
+    vtable?for?miral::CursorTheme;
+    vtable?for?miral::DebugExtension;
+    vtable?for?miral::InternalClientLauncher;
+    vtable?for?miral::Keymap;
+    vtable?for?miral::MirRunner;
+    vtable?for?miral::Output;
+    vtable?for?miral::Output::PhysicalSizeMM;
+    vtable?for?miral::SetCommandLineHandler;
+    vtable?for?miral::SetTerminator;
+    vtable?for?miral::SetWindowManagmentPolicy;
+    vtable?for?miral::StartupInternalClient;
+    vtable?for?miral::Window;
+    vtable?for?miral::WindowInfo;
+    vtable?for?miral::WindowManagementPolicy;
+    vtable?for?miral::WindowManagerOption;
+    vtable?for?miral::WindowManagerOptions;
+    vtable?for?miral::WindowManagerTools;
+    vtable?for?miral::WindowSpecification;
+    vtable?for?miral::WindowSpecification::AspectRatio;
+    vtable?for?miral::toolkit::Connection;
+    vtable?for?miral::toolkit::PersistentId;
+    vtable?for?miral::toolkit::Surface;
+    vtable?for?miral::toolkit::SurfaceSpec;
+  };
+#    miral::WindowInfo::can_morph_to*;
+    _ZNK5miral10WindowInfo12can_morph_toE14MirSurfaceType;
+
+#    miral::WindowInfo::needs_titlebar*;
+    _ZN5miral10WindowInfo14needs_titlebarE14MirSurfaceType;
+
+#    miral::WindowInfo::state*;
+    _ZNK5miral10WindowInfo5stateEv;
+    _ZN5miral10WindowInfo5stateE15MirSurfaceState;
+
+#    miral::WindowInfo::type*;
+    _ZN5miral10WindowInfo4typeE14MirSurfaceType;
+    _ZNK5miral10WindowInfo4typeEv;
+
+#    miral::WindowManagementPolicy::advise_state_change*;
+    _ZN5miral22WindowManagementPolicy19advise_state_changeERKNS_10WindowInfoE15MirSurfaceState;
 local: *;
-};'''
+};
+
+MIRAL_1.1 {
+global:
+    # miral::WindowInfo::can_morph_to*
+    _ZNK5miral10WindowInfo12can_morph_toE13MirWindowType;
+
+    #miral::WindowInfo::needs_titlebar*;
+    _ZN5miral10WindowInfo14needs_titlebarE13MirWindowType;
+
+    # miral::WindowInfo::state*;
+    _ZNK5miral10WindowInfo5stateEv;
+    _ZN5miral10WindowInfo5stateE14MirWindowState;
+
+    miral::WindowInfo::type*;
+    _ZN5miral10WindowInfo4typeE13MirWindowType;
+    _ZNK5miral10WindowInfo4typeEv;
+
+    # miral::WindowManagementPolicy::advise_state_change*;
+    _ZN5miral22WindowManagementPolicy19advise_state_changeERKNS_10WindowInfoE14MirWindowState;
+
+#  extern "C++" {'''
+
+END_NEW_STANZA = '''#  };
+} MIRAL_1.0;'''
 
 def _print_report():
     print OLD_STANZAS