diff options
| author | Thorsten Behrens <Thorsten.Behrens@CIB.de> | 2018-09-05 02:53:07 +0200 |
|---|---|---|
| committer | Thorsten Behrens <Thorsten.Behrens@CIB.de> | 2018-12-17 18:33:13 +0100 |
| commit | 410bf59de02192c2daf1158b9de76ec0ebab4c56 (patch) | |
| tree | be010e92b862f169076de979796075c925c3e576 /bin | |
| parent | 6a53832080cf201e960113de8e1887d99e857606 (diff) | |
kde5: remove older kde/tde plugins, and references to that
KDE4 is out of maintenance upstream since Nov. 2014, and binaries
provided by TDF have switched to KDE5 as the official backend.
Change-Id: I165465b56d3ba3a18912b203c06ae8fc6111c0c9
Reviewed-on: https://gerrit.libreoffice.org/60014
Reviewed-by: Thorsten Behrens <Thorsten.Behrens@CIB.de>
Tested-by: Thorsten Behrens <Thorsten.Behrens@CIB.de>
Diffstat (limited to 'bin')
| -rwxr-xr-x | bin/check-elf-dynamic-objects | 4 | ||||
| -rwxr-xr-x | bin/distro-install-file-lists | 6 |
2 files changed, 0 insertions, 10 deletions
diff --git a/bin/check-elf-dynamic-objects b/bin/check-elf-dynamic-objects index 7b92a61d15ce..c83649850331 100755 --- a/bin/check-elf-dynamic-objects +++ b/bin/check-elf-dynamic-objects @@ -96,7 +96,6 @@ gstreamer010whitelist="libgstpbutils-0.10.so.0 libgstinterfaces-0.10.so.0 libgst gstreamerwhitelist="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" -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" 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" @@ -126,9 +125,6 @@ local file="$1" */libavmediagst_0_10.so) whitelist="${whitelist} ${gtk2whitelist} ${gstreamer010whitelist}" ;; - */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" diff --git a/bin/distro-install-file-lists b/bin/distro-install-file-lists index 378f55ce746b..4cbe0be407ac 100755 --- a/bin/distro-install-file-lists +++ b/bin/distro-install-file-lists @@ -216,12 +216,6 @@ if test "z$OOO_VENDOR" != "zDebian" ; then cd $FILELISTSDIR - # create kde4 subpackage - test -f $DESTDIR/gid_Module_Optional_Kde && cp $DESTDIR/gid_Module_Optional_Kde kde4_list.txt || : - mv_file_between_flists kde4_list.txt common_list.txt $INSTALLDIR/program/libvclplug_kde4l..so - mv_file_between_flists kde4_list.txt common_list.txt $INSTALLDIR/program/fps_kde4lo.so - add_used_directories kde4_list.txt common_list.txt - # gnome subpackage test -f $DESTDIR/gid_Module_Optional_Gnome && cp $DESTDIR/gid_Module_Optional_Gnome gnome_list.txt || : mv_file_between_flists gnome_list.txt common_list.txt $INSTALLDIR/program/libevoab2.so |