summaryrefslogtreecommitdiff
path: root/bin
diff options
context:
space:
mode:
authorMichael Weghorn <m.weghorn@posteo.de>2019-06-15 07:28:07 +0200
committerAndras Timar <andras.timar@collabora.com>2019-06-19 10:55:26 +0200
commite42c7968737b0dbed83fcad4427f7aed15b24047 (patch)
treecd29f8dbb39d78f3dbce8a6815da197d9e5b75ca /bin
parentdc614865c560523a57e046ba33f4df5aafb0d893 (diff)
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"). Reviewed-on: https://gerrit.libreoffice.org/74085 Tested-by: Jenkins Reviewed-by: Michael Weghorn <m.weghorn@posteo.de> (cherry picked from commit 365df1880a5bfacf25beddefc9206a783e6a4877) Reviewed-on: https://gerrit.libreoffice.org/74089 Change-Id: I453cede879eda8470a45c48f789a0419866fcb79 Reviewed-on: https://gerrit.libreoffice.org/74194 Reviewed-by: Michael Weghorn <m.weghorn@posteo.de> Tested-by: Jenkins (cherry picked from commit bed632513d7e2495b5f7622c214f0163d75babff)
Diffstat (limited to 'bin')
-rwxr-xr-xbin/check-elf-dynamic-objects8
1 files changed, 4 insertions, 4 deletions
diff --git a/bin/check-elf-dynamic-objects b/bin/check-elf-dynamic-objects
index a2bb41b3548b..8848207855f5 100755
--- a/bin/check-elf-dynamic-objects
+++ b/bin/check-elf-dynamic-objects
@@ -97,7 +97,7 @@ gstreamerwhitelist="libgstpbutils-1.0.so.0 libgstvideo-1.0.so.0 libgstbase-1.0.s
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"
kde4whitelist="libkio.so.5 libkfile.so.4 libkdeui.so.5 libkdecore.so.5 libQtNetwork.so.4 libQtGui.so.4 libQtCore.so.4 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"
+qt5whitelist="libQt5Core.so.5 libQt5Gui.so.5 libQt5Network.so.5 libQt5Widgets.so.5 libQt5X11Extras.so.5 libcairo.so.2 libglib-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"
@@ -131,7 +131,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)
@@ -147,13 +147,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)