summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorStephan Bergmann <sbergman@redhat.com>2022-02-21 22:59:51 +0100
committerStephan Bergmann <sbergman@redhat.com>2022-02-22 07:56:24 +0100
commit44c7cbd93fa5ad8e9a6eb8494e64cfcfcb019c29 (patch)
tree194b685bc5bc1b3d19dcf53d8d5269edcf654a14
parente2b4b08549ee95288fe4cb6e8f71bc75574e0414 (diff)
Adapt CustomTarget_postprocess/check_dynamic_objects to --enable-gtk4
> instdir/program/libavmediagtk.so has suspicious NEEDED: libgtk-4.so.1 > instdir/program/libavmediagtk.so has suspicious NEEDED: libpangocairo-1.0.so.0 > instdir/program/libavmediagtk.so has suspicious NEEDED: libpango-1.0.so.0 > instdir/program/libavmediagtk.so has suspicious NEEDED: libharfbuzz.so.0 > instdir/program/libavmediagtk.so has suspicious NEEDED: libgdk_pixbuf-2.0.so.0 > instdir/program/libavmediagtk.so has suspicious NEEDED: libcairo-gobject.so.2 > instdir/program/libavmediagtk.so has suspicious NEEDED: libgraphene-1.0.so.0 > instdir/program/libavmediagtk.so has suspicious NEEDED: libgio-2.0.so.0 > instdir/program/libavmediagtk.so has suspicious NEEDED: libgmodule-2.0.so.0 > instdir/program/libavmediagtk.so has suspicious NEEDED: libglib-2.0.so.0 > instdir/program/libavmediagtk.so has suspicious NEEDED: libatk-1.0.so.0 > instdir/program/libavmediagtk.so has suspicious NEEDED: libgobject-2.0.so.0 > instdir/program/libvclplug_gtk4lo.so has suspicious NEEDED: libgtk-4.so.1 > instdir/program/libvclplug_gtk4lo.so has suspicious NEEDED: libpangocairo-1.0.so.0 > instdir/program/libvclplug_gtk4lo.so has suspicious NEEDED: libpango-1.0.so.0 > instdir/program/libvclplug_gtk4lo.so has suspicious NEEDED: libgdk_pixbuf-2.0.so.0 > instdir/program/libvclplug_gtk4lo.so has suspicious NEEDED: libcairo-gobject.so.2 > instdir/program/libvclplug_gtk4lo.so has suspicious NEEDED: libgraphene-1.0.so.0 > instdir/program/libvclplug_gtk4lo.so has suspicious NEEDED: libgio-2.0.so.0 > instdir/program/libvclplug_gtk4lo.so has suspicious NEEDED: libgmodule-2.0.so.0 > instdir/program/libvclplug_gtk4lo.so has suspicious NEEDED: libglib-2.0.so.0 > instdir/program/libvclplug_gtk4lo.so has suspicious NEEDED: libcairo.so.2 > instdir/program/libvclplug_gtk4lo.so has suspicious NEEDED: libatk-1.0.so.0 > instdir/program/libvclplug_gtk4lo.so has suspicious NEEDED: libgobject-2.0.so.0 > instdir/program/libvclplug_gtk4lo.so has suspicious NEEDED: libX11.so.6 > instdir/program/libvclplug_gtk4lo.so has suspicious NEEDED: libXext.so.6 > instdir/program/libvclplug_gtk4lo.so has suspicious NEEDED: libSM.so.6 > instdir/program/libvclplug_gtk4lo.so has suspicious NEEDED: libICE.so.6 > instdir/program/libvclplug_gtk4lo.so has suspicious NEEDED: libdbus-1.so.3 Change-Id: I686cdc5f21c9a730167e9efa120946f6d96eaed0 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/130305 Tested-by: Jenkins Reviewed-by: Stephan Bergmann <sbergman@redhat.com>
-rwxr-xr-xbin/check-elf-dynamic-objects7
1 files changed, 7 insertions, 0 deletions
diff --git a/bin/check-elf-dynamic-objects b/bin/check-elf-dynamic-objects
index f23363da84fa..7d4011597f8f 100755
--- a/bin/check-elf-dynamic-objects
+++ b/bin/check-elf-dynamic-objects
@@ -96,6 +96,7 @@ gdbusallowlist="libdbus-glib-1.so.2 libdbus-1.so.3 libgmodule-2.0.so.0 libgthrea
gioallowlist="libgio-2.0.so.0 ${gdbusallowlist}"
gstreamerallowlist="libgsttag-1.0.so.0 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 ${gobjectallowlist}"
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}"
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}"
@@ -128,6 +129,9 @@ local file="$1"
*/libavmediagst.so)
allowlist="${allowlist} ${gstreamerallowlist}"
;;
+ */libavmediagtk.so)
+ allowlist="${allowlist} ${gtk4allowlist}"
+ ;;
*/libvclplug_kf5lo.so|*/libkf5be1lo.so)
if [ "$ENABLE_KF5" = TRUE ]; then
allowlist="${allowlist} ${qt5allowlist} ${kf5allowlist}"
@@ -136,6 +140,9 @@ local file="$1"
*/libvclplug_gtk3lo.so|*/updater)
allowlist="${allowlist} ${x11allowlist} ${gtk3allowlist}"
;;
+ */libvclplug_gtk4lo.so)
+ allowlist="${allowlist} ${x11allowlist} ${gtk4allowlist}"
+ ;;
*/libvclplug_qt5lo.so)
if [ "$ENABLE_QT5" = TRUE ]; then
allowlist="${allowlist} ${qt5allowlist}"