[Libreoffice-commits] core.git: Branch 'distro/lhm/libreoffice-6-1+backports' - bin/check-elf-dynamic-objects

Libreoffice Gerrit user logerrit at kemper.freedesktop.org
Mon Dec 10 10:05:37 UTC 2018


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

New commits:
commit e4afe6fc5a26060976b5b36e860bf2bebfbd9863
Author:     Stephan Bergmann <sbergman at redhat.com>
AuthorDate: Mon Aug 27 12:45:37 2018 +0200
Commit:     Michael Weghorn <m.weghorn at posteo.de>
CommitDate: Mon Dec 10 11:04:25 2018 +0100

    Adapt CustomTarget_postprocess/check_dynamic_objects to --enable-kde5
    
    Change-Id: I3b03e3a75f5a6157479582e74be349c567fc1e8c
    (cherry picked from commit 0705d2a239b8fd44420fe2af3555436775660cd6)

diff --git a/bin/check-elf-dynamic-objects b/bin/check-elf-dynamic-objects
index 1a11e6dca223..e1ce2763a716 100755
--- a/bin/check-elf-dynamic-objects
+++ b/bin/check-elf-dynamic-objects
@@ -103,6 +103,11 @@ local file="$1"
         */libvclplug_kde4lo.so|*/libkde4be1lo.so)
             whitelist="${whitelist} ${x11whitelist} ${kde4whitelist}"
         ;;
+        */libvclplug_kde5lo.so|*/libkde5be1lo.so)
+            if [ "$ENABLE_KDE5" = TRUE ]; then
+                whitelist="${whitelist} ${qt5whitelist} ${kf5whitelist} libxcb.so.1"
+            fi
+        ;;
         */libvclplug_gtklo.so|*/libqstart_gtklo.so|*/updater)
             whitelist="${whitelist} ${x11whitelist} ${gtk2whitelist}"
         ;;


More information about the Libreoffice-commits mailing list