bin/check-elf-dynamic-objects | 6 ++++++ filter/source/xsltfilter/XSLTFilter.cxx | 12 +----------- 2 files changed, 7 insertions(+), 11 deletions(-)
New commits: commit 304ebfad5193c857e4edf18cb05d61b6ccc1f7d0 Author: Stephan Bergmann <[email protected]> AuthorDate: Mon Feb 13 16:59:14 2023 +0100 Commit: Stephan Bergmann <[email protected]> CommitDate: Mon Feb 13 17:40:42 2023 +0000 XSLT2Transformer::create should always succeed Change-Id: Ie2aa4fe48da2362ff1a88fa44a51bed498a4f432 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/146935 Tested-by: Jenkins Reviewed-by: Stephan Bergmann <[email protected]> diff --git a/filter/source/xsltfilter/XSLTFilter.cxx b/filter/source/xsltfilter/XSLTFilter.cxx index f08933276055..dd4b8551fce0 100644 --- a/filter/source/xsltfilter/XSLTFilter.cxx +++ b/filter/source/xsltfilter/XSLTFilter.cxx @@ -236,17 +236,7 @@ namespace XSLT // service name there) if (rTransformer.toBoolean() || rTransformer.startsWith("com.sun.")) { - try - { - xTransformer = xslt::XSLT2Transformer::create(m_xContext, rArgs); - } - catch (const Exception&) - { - // TODO: put a dialog telling about the need to install - // xslt2-transformer extension here - SAL_WARN("filter.xslt", "could not create XSLT 2.0 transformer"); - throw; - } + xTransformer = xslt::XSLT2Transformer::create(m_xContext, rArgs); } // instantiation of XSLT 2.0 transformer service failed, or the commit 6b2e8bb614ee4cc755766c8b7590df0c10f89a27 Author: Stephan Bergmann <[email protected]> AuthorDate: Mon Feb 13 16:07:18 2023 +0100 Commit: Stephan Bergmann <[email protected]> CommitDate: Mon Feb 13 17:40:31 2023 +0000 Fix CustomTarget_postprocess/check_dynamic_objects for --enable-qt6 Change-Id: Id1e76a7ed728beb359e0944b51de84bf720490ec Reviewed-on: https://gerrit.libreoffice.org/c/core/+/146910 Tested-by: Jenkins Reviewed-by: Stephan Bergmann <[email protected]> diff --git a/bin/check-elf-dynamic-objects b/bin/check-elf-dynamic-objects index 133f58d34dda..3cb4d564a7ae 100755 --- a/bin/check-elf-dynamic-objects +++ b/bin/check-elf-dynamic-objects @@ -98,6 +98,7 @@ gstreamerallowlist="libgsttag-1.0.so.0 libgstaudio-1.0.so.0 libgstpbutils-1.0.so gtk3allowlist="libgtk-3.so.0 libgdk-3.so.0 libcairo-gobject.so.2 libpangocairo-1.0.so.0 libfribidi.so.0 libatk-1.0.so.0 libcairo.so.2 libpangoft2-1.0.so.0 libpango-1.0.so.0 libfontconfig.so.1 libfreetype.so.6 libgdk_pixbuf-2.0.so.0 libharfbuzz.so.0 ${gioallowlist}" gtk4allowlist="libgtk-4.so.1 libcairo-gobject.so.2 libpangocairo-1.0.so.0 libatk-1.0.so.0 libcairo.so.2 libpango-1.0.so.0 libgdk_pixbuf-2.0.so.0 libharfbuzz.so.0 libgraphene-1.0.so.0 ${gioallowlist}" qt5allowlist="libQt5Core.so.5 libQt5Gui.so.5 libQt5Network.so.5 libQt5Widgets.so.5 libQt5X11Extras.so.5 libcairo.so.2 libxcb.so.1 libxcb-icccm.so.4 ${gobjectallowlist}" +qt6allowlist="libQt6Core.so.6 libQt6Gui.so.6 libQt6Network.so.6 libQt6Widgets.so.6 libxcb.so.1" kf5allowlist="libKF5ConfigCore.so.5 libKF5CoreAddons.so.5 libKF5I18n.so.5 libKF5KIOCore.so.5 libKF5KIOFileWidgets.so.5 libKF5KIOWidgets.so.5 libKF5WindowSystem.so.5" avahiallowlist="libavahi-common.so.3 libavahi-client.so.3 ${gdbusallowlist}" kerberosallowlist="libgssapi_krb5.so.2 libcom_err.so.2 libkrb5.so.3" @@ -148,6 +149,11 @@ local file="$1" allowlist="${allowlist} ${qt5allowlist}" fi ;; + */libvclplug_qt6lo.so) + if [ "$ENABLE_QT6" = TRUE ]; then + allowlist="${allowlist} ${qt6allowlist}" + fi + ;; */libvclplug_gtk3_kde5lo.so) if [ "$ENABLE_GTK3_KDE5" = TRUE ]; then allowlist="${allowlist} ${x11allowlist} ${gtk3allowlist} ${qt5allowlist} ${kf5allowlist}"
