[Libreoffice-commits] core.git: Branch 'libreoffice-6-3' - bin/check-elf-dynamic-objects

[Michael Weghorn (via logerrit)]

 bin/check-elf-dynamic-objects |    8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

New commits:
commit 7e9e4b59fdbd9995d9e80164671feb4581cdd2e3
Author:     Michael Weghorn <m.weghorn at posteo.de>
AuthorDate: Sat Jun 15 07:28:07 2019 +0200
Commit:     Michael Weghorn <m.weghorn at posteo.de>
CommitDate: Sat Jun 15 10:31:04 2019 +0200

    check-elf-dynamic-objects: Update 'qt5whitelist'
    
    This needs 'libgobject-2.0.so.0' and 'libxcb.so.1'
    as well now, since
    a6201725d760cbce832d4de029b418bb7334df6a
    ("Don't link avmediagst with gtk3 and qt5")
    and 77a3c443d35c7d966217f02ea9189cb1819c7828
    ("tdf#125921 Qt5 set WM_CLASS for top level windows").
    
    Change-Id: I453cede879eda8470a45c48f789a0419866fcb79
    Reviewed-on: https://gerrit.libreoffice.org/74085
    Tested-by: Jenkins
    Reviewed-by: Michael Weghorn <m.weghorn at posteo.de>
    (cherry picked from commit 365df1880a5bfacf25beddefc9206a783e6a4877)
    Reviewed-on: https://gerrit.libreoffice.org/74089

diff --git a/bin/check-elf-dynamic-objects b/bin/check-elf-dynamic-objects
index de9601dae334..3667f5c09a83 100755
--- a/bin/check-elf-dynamic-objects
+++ b/bin/check-elf-dynamic-objects
@@ -96,7 +96,7 @@ gstreamer010whitelist="libgstpbutils-0.10.so.0 libgstinterfaces-0.10.so.0 libgst
 gstreamerwhitelist="libgstaudio-1.0.so.0 libgstpbutils-1.0.so.0 libgstvideo-1.0.so.0 libgstbase-1.0.so.0 libgstreamer-1.0.so.0"
 gtk2whitelist="libgtk-x11-2.0.so.0 libgdk-x11-2.0.so.0 libpangocairo-1.0.so.0 libfribidi.so.0 libatk-1.0.so.0 libcairo.so.2 libgio-2.0.so.0 libpangoft2-1.0.so.0 libpango-1.0.so.0 libfontconfig.so.1 libfreetype.so.6 libgdk_pixbuf-2.0.so.0 libgobject-2.0.so.0 libglib-2.0.so.0 libgmodule-2.0.so.0 libgthread-2.0.so.0 libdbus-glib-1.so.2 libdbus-1.so.3"
 gtk3whitelist="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 libgio-2.0.so.0 libpangoft2-1.0.so.0 libpango-1.0.so.0 libfontconfig.so.1 libfreetype.so.6 libgdk_pixbuf-2.0.so.0 libgobject-2.0.so.0 libglib-2.0.so.0 libgmodule-2.0.so.0 libgthread-2.0.so.0 libdbus-glib-1.so.2 libdbus-1.so.3"
-qt5whitelist="libQt5Core.so.5 libQt5Gui.so.5 libQt5Network.so.5 libQt5Widgets.so.5 libQt5X11Extras.so.5 libcairo.so.2 libglib-2.0.so.0"
+qt5whitelist="libQt5Core.so.5 libQt5Gui.so.5 libQt5Network.so.5 libQt5Widgets.so.5 libQt5X11Extras.so.5 libcairo.so.2 libglib-2.0.so.0 libgobject-2.0.so.0 libxcb.so.1"
 kf5whitelist="libKF5ConfigCore.so.5 libKF5CoreAddons.so.5 libKF5I18n.so.5 libKF5KIOCore.so.5 libKF5KIOFileWidgets.so.5 libKF5KIOWidgets.so.5 libKF5WindowSystem.so.5"
 avahiwhitelist="libdbus-glib-1.so.2 libdbus-1.so.3 libgobject-2.0.so.0 libgmodule-2.0.so.0 libgthread-2.0.so.0 libglib-2.0.so.0 libavahi-common.so.3 libavahi-client.so.3"
 kerberoswhitelist="libgssapi_krb5.so.2 libcom_err.so.2 libkrb5.so.3"
@@ -127,7 +127,7 @@ local file="$1"
         ;;
         */libvclplug_kde5lo.so|*/libkde5be1lo.so)
             if [ "$ENABLE_KDE5" = TRUE ]; then
-                whitelist="${whitelist} ${qt5whitelist} ${kf5whitelist} libxcb.so.1"
+                whitelist="${whitelist} ${qt5whitelist} ${kf5whitelist}"
             fi
         ;;
         */libvclplug_gtklo.so|*/libqstart_gtklo.so|*/updater)
@@ -143,13 +143,13 @@ local file="$1"
         ;;
         */libvclplug_gtk3_kde5lo.so)
             if [ "$ENABLE_GTK3_KDE5" = TRUE ]; then
-                whitelist="${whitelist} ${x11whitelist} ${gtk3whitelist} ${qt5whitelist} ${kf5whitelist} libxcb.so.1"
+                whitelist="${whitelist} ${x11whitelist} ${gtk3whitelist} ${qt5whitelist} ${kf5whitelist}"
             fi
         ;;
         */lo_kde5filepicker)
             if [ "$ENABLE_GTK3_KDE5" = TRUE ]; then
                 whitelist="${whitelist} ${x11whitelist} ${gtk3whitelist} ${qt5whitelist} \
-                    ${kf5whitelist} libxcb.so.1"
+                    ${kf5whitelist}"
             fi
         ;;
         */libdesktop_detectorlo.so|*/ui-previewer|*/oosplash|*/gengal.bin)