From 1ae450504cf57457f9702684b1517fda1dd3c481 Mon Sep 17 00:00:00 2001 From: Caolán McNamara Date: Tue, 13 Aug 2019 10:37:50 +0100 Subject: drop gtk2 support MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Change-Id: Ie838cabfecfef7e3225c1555536d5c9cf3b43f15 Reviewed-on: https://gerrit.libreoffice.org/77405 Tested-by: Jenkins Reviewed-by: Michael Weghorn Reviewed-by: Caolán McNamara Tested-by: Caolán McNamara --- bin/check-elf-dynamic-objects | 6 +----- bin/distro-install-file-lists | 3 --- bin/moveglobalheaders.sh | 3 +-- 3 files changed, 2 insertions(+), 10 deletions(-) (limited to 'bin') diff --git a/bin/check-elf-dynamic-objects b/bin/check-elf-dynamic-objects index 5492aafaca34..f64044dd1e49 100755 --- a/bin/check-elf-dynamic-objects +++ b/bin/check-elf-dynamic-objects @@ -93,7 +93,6 @@ x11whitelist="libX11.so.6 libXext.so.6 libSM.so.6 libICE.so.6 libXinerama.so.1 l openglwhitelist="libGL.so.1" giowhitelist="libgio-2.0.so.0 libgobject-2.0.so.0 libgmodule-2.0.so.0 libgthread-2.0.so.0 libglib-2.0.so.0 libdbus-glib-1.so.2 libdbus-1.so.3" 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 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" @@ -129,10 +128,7 @@ local file="$1" whitelist="${whitelist} ${qt5whitelist} ${kf5whitelist}" fi ;; - */libvclplug_gtklo.so|*/libqstart_gtklo.so|*/updater) - whitelist="${whitelist} ${x11whitelist} ${gtk2whitelist}" - ;; - */libvclplug_gtk3lo.so) + */libvclplug_gtk3lo.so|*/updater) whitelist="${whitelist} ${x11whitelist} ${gtk3whitelist}" ;; */libvclplug_qt5lo.so) diff --git a/bin/distro-install-file-lists b/bin/distro-install-file-lists index 4cbe0be407ac..ef016e3df6cc 100755 --- a/bin/distro-install-file-lists +++ b/bin/distro-install-file-lists @@ -324,9 +324,6 @@ if test "z$OOO_VENDOR" != "zDebian" ; then mv_file_between_flists core_list.txt common_list.txt "$INSTALLDIR/$f" done - # Ship ooqstart for gnome in gnome package - mv_file_between_flists gnome_list.txt core_list.txt "$INSTALLDIR/program/libqstart_gtk680.*" - # themes are included in other packages # don't use remove_file as we don't want them removed from the buildroot. mv_file_between_flists /dev/null common_list.txt $INSTALLDIR/share/config/images_crystal.zip diff --git a/bin/moveglobalheaders.sh b/bin/moveglobalheaders.sh index 6c8cff729505..ca202832bd6a 100755 --- a/bin/moveglobalheaders.sh +++ b/bin/moveglobalheaders.sh @@ -36,8 +36,7 @@ done # we like to be special ... sed -ie 's/\/svtools\/inc\/svtools/\/include\/svtools\//' svtools/Library_svt.mk sed -ie 's/\/sfx2\/inc\/sfx2/\/include\/sfx2\//' sfx2/Library_sfx.mk -sed -ie 's/\/sfx2\/inc\/sfx2/\/include\/sfx2\//' sfx2/Library_qstart_gtk.mk -git add svtools/Library_svt.mk sfx2/Library_sfx.mk sfx2/Library_qstart_gtk.mk +git add svtools/Library_svt.mk sfx2/Library_sfx.mk # urgh sed -ie 's/\.\.\/svx\//svx\//' svx/source/svdraw/svdoashp.cxx -- cgit