diff options
| author | Julien Nabet <serval2412@yahoo.fr> | 2023-09-23 12:14:34 +0200 |
|---|---|---|
| committer | Caolán McNamara <caolan.mcnamara@collabora.com> | 2023-09-23 14:13:29 +0200 |
| commit | c81a6071536a07734dec2cc36384f583e70c9b5f (patch) | |
| tree | e11318462d6b0f2d185039a7728c08e4edec1d87 | |
| parent | tdf#105303: drop webview files too (diff) | |
| download | core-c81a6071536a07734dec2cc36384f583e70c9b5f.tar.gz core-c81a6071536a07734dec2cc36384f583e70c9b5f.zip | |
Revert partly "Use less epoxy external headers dependency"
Following these errors:
[LNK] Library/libdeployment.so
ld.lld: error: undefined symbol: epoxy_glBindRenderbuffer
>>> referenced by gtkinst.cxx:2081 (vcl/unx/gtk4/../gtk3/gtkinst.cxx:2081)
>>> /home/julien/lo/libreoffice/workdir/CxxObject/vcl/unx/gtk4/gtkinst.o:((anonymous namespace)::GtkOpenGLContext::makeCurrent())
>>> referenced by gtkinst.cxx:2082 (vcl/unx/gtk4/../gtk3/gtkinst.cxx:2082)
>>> /home/julien/lo/libreoffice/workdir/CxxObject/vcl/unx/gtk4/gtkinst.o:((anonymous namespace)::GtkOpenGLContext::makeCurrent())
>>> referenced by gtkinst.cxx:1925 (vcl/unx/gtk4/../gtk3/gtkinst.cxx:1925)
>>> /home/julien/lo/libreoffice/workdir/CxxObject/vcl/unx/gtk4/gtkinst.o:((anonymous namespace)::GtkOpenGLContext::adjustToNewSize())
>>> referenced 5 more times
ld.lld: error: undefined symbol: epoxy_glBindFramebufferEXT
>>> referenced by gtkinst.cxx:2083 (vcl/unx/gtk4/../gtk3/gtkinst.cxx:2083)
>>> /home/julien/lo/libreoffice/workdir/CxxObject/vcl/unx/gtk4/gtkinst.o:((anonymous namespace)::GtkOpenGLContext::makeCurrent())
>>> referenced by gtkinst.cxx:2061 (vcl/unx/gtk4/../gtk3/gtkinst.cxx:2061)
>>> /home/julien/lo/libreoffice/workdir/CxxObject/vcl/unx/gtk4/gtkinst.o:((anonymous namespace)::GtkOpenGLContext::restoreDefaultFramebuffer())
>>> referenced by gtkinst.cxx:1929 (vcl/unx/gtk4/../gtk3/gtkinst.cxx:1929)
>>> /home/julien/lo/libreoffice/workdir/CxxObject/vcl/unx/gtk4/gtkinst.o:((anonymous namespace)::GtkOpenGLContext::adjustToNewSize())
>>> referenced 2 more times
ld.lld: error: undefined symbol: epoxy_glBindRenderbuffer
>>> referenced by gtkinst.cxx:2081 (vcl/unx/gtk3_kde5/../gtk3/gtkinst.cxx:2081)
>>> /home/julien/lo/libreoffice/workdir/CxxObject/vcl/unx/gtk3_kde5/gtk3_kde5_gtkinst.o:((anonymous namespace)::GtkOpenGLContext::makeCurrent())
>>> referenced by gtkinst.cxx:2082 (vcl/unx/gtk3_kde5/../gtk3/gtkinst.cxx:2082)
>>> /home/julien/lo/libreoffice/workdir/CxxObject/vcl/unx/gtk3_kde5/gtk3_kde5_gtkinst.o:((anonymous namespace)::GtkOpenGLContext::makeCurrent())
>>> referenced by gtkinst.cxx:1925 (vcl/unx/gtk3_kde5/../gtk3/gtkinst.cxx:1925)
>>> /home/julien/lo/libreoffice/workdir/CxxObject/vcl/unx/gtk3_kde5/gtk3_kde5_gtkinst.o:((anonymous namespace)::GtkOpenGLContext::adjustToNewSize())
>>> referenced 5 more times
ld.lld: error: undefined symbol: epoxy_glBindFramebufferEXT
>>> referenced by gtkinst.cxx:2083 (vcl/unx/gtk3_kde5/../gtk3/gtkinst.cxx:2083)
>>> /home/julien/lo/libreoffice/workdir/CxxObject/vcl/unx/gtk3_kde5/gtk3_kde5_gtkinst.o:((anonymous namespace)::GtkOpenGLContext::makeCurrent())
>>> referenced by gtkinst.cxx:2061 (vcl/unx/gtk3_kde5/../gtk3/gtkinst.cxx:2061)
>>> /home/julien/lo/libreoffice/workdir/CxxObject/vcl/unx/gtk3_kde5/gtk3_kde5_gtkinst.o:((anonymous namespace)::GtkOpenGLContext::restoreDefaultFramebuffer())
>>> referenced by gtkinst.cxx:1929 (vcl/unx/gtk3_kde5/../gtk3/gtkinst.cxx:1929)
>>> /home/julien/lo/libreoffice/workdir/CxxObject/vcl/unx/gtk3_kde5/gtk3_kde5_gtkinst.o:((anonymous namespace)::GtkOpenGLContext::adjustToNewSize())
>>> referenced 2 more times
ld.lld: error: undefined symbol: epoxy_glFramebufferRenderbufferEXT
>>> referenced by gtkinst.cxx:2084 (vcl/unx/gtk3_kde5/../gtk3/gtkinst.cxx:2084)
>>> /home/julien/lo/libreoffice/workdir/CxxObject/vcl/unx/gtk3_kde5/gtk3_kde5_gtkinst.o:((anonymous namespace)::GtkOpenGLContext::makeCurrent())
>>> referenced by gtkinst.cxx:2086 (vcl/unx/gtk3_kde5/../gtk3/gtkinst.cxx:2086)
>>> /home/julien/lo/libreoffice/workdir/CxxObject/vcl/unx/gtk3_kde5/gtk3_kde5_gtkinst.o:((anonymous namespace)::GtkOpenGLContext::makeCurrent())
>>> referenced by gtkinst.cxx:2062 (vcl/unx/gtk3_kde5/../gtk3/gtkinst.cxx:2062)
>>> /home/julien/lo/libreoffice/workdir/CxxObject/vcl/unx/gtk3_kde5/gtk3_kde5_gtkinst.o:((anonymous namespace)::GtkOpenGLContext::restoreDefaultFramebuffer())
>>> referenced 6 more times
Change-Id: Iaba2323e294aba74a74d3ac98679143a68bbd53a
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/157180
Tested-by: Jenkins
Reviewed-by: Caolán McNamara <caolan.mcnamara@collabora.com>
| -rw-r--r-- | vcl/Library_vclplug_gtk3_kde5.mk | 1 | ||||
| -rw-r--r-- | vcl/Library_vclplug_gtk4.mk | 1 |
2 files changed, 2 insertions, 0 deletions
diff --git a/vcl/Library_vclplug_gtk3_kde5.mk b/vcl/Library_vclplug_gtk3_kde5.mk index 8401a66b2c12..853ec7aafa4e 100644 --- a/vcl/Library_vclplug_gtk3_kde5.mk +++ b/vcl/Library_vclplug_gtk3_kde5.mk @@ -79,6 +79,7 @@ $(eval $(call gb_Library_use_libraries,vclplug_gtk3_kde5,\ $(eval $(call gb_Library_use_externals,vclplug_gtk3_kde5,\ boost_headers \ boost_filesystem \ + epoxy \ dbus \ graphite \ harfbuzz \ diff --git a/vcl/Library_vclplug_gtk4.mk b/vcl/Library_vclplug_gtk4.mk index ed47d0978f59..bb9d82ad570f 100644 --- a/vcl/Library_vclplug_gtk4.mk +++ b/vcl/Library_vclplug_gtk4.mk @@ -74,6 +74,7 @@ $(eval $(call gb_Library_use_libraries,vclplug_gtk4,\ $(eval $(call gb_Library_use_externals,vclplug_gtk4,\ boost_headers \ + epoxy \ dbus \ graphite \ harfbuzz \ |