strepsirrhini/office-gobmx
9
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

gtk4 a11y: Fix build for Gtk < 4.9

Browse source 
The code in `vcl/unx/gtk4/a11y.cxx` is

    #if GTK_CHECK_VERSION(4, 9, 0)

, so should the code using that be.

Should fix this issue reported in [1]:

> Hi, building on Linux (Debian 12) breaks with the following error:
>
> [LNK] Library/libvclplug_gtk4lo.so
> ld.lld: error: undefined symbol: lo_accessible_new(_GdkDisplay*, _GtkAccessible*, com::sun:⭐:uno::Reference<com::sun:⭐:accessibility::XAccessible> const&)
> >>> referenced by gtkaccessibleregistry.cxx
> >>>               /home/etna/Tmpdir/libreoffice/build/workdir/CxxObject/vcl/unx/gtk4/gtkaccessibleregistry.o:(GtkAccessibleRegistry::getLOAccessible(com::sun:⭐:uno::Reference<com::sun:⭐:accessibility::XAccessible>, _GdkDisplay*, _GtkAccessible*))
> clang-15: error: linker command failed with exit code 1 (use -v to see invocation)
> make[1]: *** [/home/etna/Tmpdir/libreoffice/vcl/Library_vclplug_gtk4.mk:20: /home/etna/Tmpdir/libreoffice/build/instdir/program/libvclplug_gtk4lo.so] Error 1
> make[1]: *** Waiting for unfinished jobs....
>
> I was able to get the build to succeed by rolling back commit 70ef230 ( 70ef230aae )

[1] https://lists.freedesktop.org/archives/libreoffice/2023-December/091330.html

Change-Id: Ifc359bd8b96af8eaa5427a7949259beb607e105d
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/161144
Tested-by: Jenkins
Reviewed-by: Michael Weghorn <m.weghorn@posteo.de>
This commit is contained in:
Michael Weghorn 2023-12-22 08:45:26 +01:00
parent e9e3576ada
commit f557e22a67
2 changed files with 8 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
vcl/unx/gtk4/gtkaccessibleeventlistener.cxx
View file

@ -14,6 +14,8 @@
#include "gtkaccessibleeventlistener.hxx"
#include "gtkaccessibleregistry.hxx"
#if GTK_CHECK_VERSION(4, 9, 0)
GtkAccessibleEventListener::GtkAccessibleEventListener(LoAccessible* pLoAccessible)
: m_pLoAccessible(pLoAccessible)
{
@ -65,4 +67,6 @@ void GtkAccessibleEventListener::notifyEvent(
}
}
#endif
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */

4
vcl/unx/gtk4/gtkaccessibleregistry.cxx
View file

@ -12,6 +12,8 @@
#include <cassert>
#if GTK_CHECK_VERSION(4, 9, 0)
std::map<css::accessibility::XAccessible*, LoAccessible*> GtkAccessibleRegistry::m_aMapping = {};
LoAccessible*
@ -38,4 +40,6 @@ void GtkAccessibleRegistry::remove(css::uno::Reference<css::accessibility::XAcce
m_aMapping.erase(xAcc.get());
}
#endif
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */