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 /distro-configs | |
| 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 'distro-configs')
| -rw-r--r-- | distro-configs/Jenkins/LibreOfficeLinuxUpdater.conf | 2 | ||||
| -rw-r--r-- | distro-configs/Jenkins/Linux_dev_master.conf | 2 | ||||
| -rw-r--r-- | distro-configs/Jenkins/Linux_rel_master.conf | 2 | ||||
| -rw-r--r-- | distro-configs/LibreOfficeCoverity.conf | 2 | ||||
| -rw-r--r-- | distro-configs/LibreOfficeLinux.conf | 2 | ||||
| -rw-r--r-- | distro-configs/LibreOfficeOpenBSD.conf | 3 | ||||
| -rw-r--r-- | distro-configs/LibreOfficeiOS.conf | 2 |
7 files changed, 7 insertions, 8 deletions
diff --git a/distro-configs/Jenkins/LibreOfficeLinuxUpdater.conf b/distro-configs/Jenkins/LibreOfficeLinuxUpdater.conf index e5b5ebdc9110..4ddcc344a796 100644 --- a/distro-configs/Jenkins/LibreOfficeLinuxUpdater.conf +++ b/distro-configs/Jenkins/LibreOfficeLinuxUpdater.conf @@ -16,7 +16,7 @@ --with-external-dict-dir=/usr/share/hunspell --enable-dbus --enable-extension-integration ---enable-kde4 +--enable-kde5 # --enable-gstreamer-0-10 --enable-gstreamer-1-0 --enable-evolution2 diff --git a/distro-configs/Jenkins/Linux_dev_master.conf b/distro-configs/Jenkins/Linux_dev_master.conf index 6b3c7a7b0cc0..505e03568ad0 100644 --- a/distro-configs/Jenkins/Linux_dev_master.conf +++ b/distro-configs/Jenkins/Linux_dev_master.conf @@ -1,4 +1,4 @@ --enable-dbgutil ---enable-kde4 +--enable-kde5 CC=/opt/rh/devtoolset-7/root/usr/bin/gcc CXX=/opt/rh/devtoolset-7/root/usr/bin/g++ diff --git a/distro-configs/Jenkins/Linux_rel_master.conf b/distro-configs/Jenkins/Linux_rel_master.conf index ca2119d9e7a7..77c7dc6b64b4 100644 --- a/distro-configs/Jenkins/Linux_rel_master.conf +++ b/distro-configs/Jenkins/Linux_rel_master.conf @@ -1,4 +1,4 @@ --disable-werror ---enable-kde4 +--enable-kde5 CC=/opt/rh/devtoolset-7/root/usr/bin/gcc CXX=/opt/rh/devtoolset-7/root/usr/bin/g++ diff --git a/distro-configs/LibreOfficeCoverity.conf b/distro-configs/LibreOfficeCoverity.conf index e387254a6405..34b9593a6984 100644 --- a/distro-configs/LibreOfficeCoverity.conf +++ b/distro-configs/LibreOfficeCoverity.conf @@ -14,7 +14,7 @@ --enable-dbus --enable-extension-integration --enable-gtk3 ---enable-kde4 +--enable-kde5 --enable-evolution2 --enable-scripting-beanshell --enable-scripting-javascript diff --git a/distro-configs/LibreOfficeLinux.conf b/distro-configs/LibreOfficeLinux.conf index e6e887af646d..2be88ea32d19 100644 --- a/distro-configs/LibreOfficeLinux.conf +++ b/distro-configs/LibreOfficeLinux.conf @@ -20,7 +20,7 @@ --enable-dbus --enable-extension-integration --enable-odk ---enable-kde4 +--disable-kde5 --disable-gtk3 --enable-gstreamer-0-10 --enable-gstreamer-1-0 diff --git a/distro-configs/LibreOfficeOpenBSD.conf b/distro-configs/LibreOfficeOpenBSD.conf index fb0e3551c0d4..bc3905df10e3 100644 --- a/distro-configs/LibreOfficeOpenBSD.conf +++ b/distro-configs/LibreOfficeOpenBSD.conf @@ -1,7 +1,6 @@ --disable-dbus --disable-epm ---disable-kde ---disable-kde4 +--disable-kde5 --disable-nss-module --disable-odk --enable-gstreamer-0-10 diff --git a/distro-configs/LibreOfficeiOS.conf b/distro-configs/LibreOfficeiOS.conf index 92bc968a9f76..411ba8d69798 100644 --- a/distro-configs/LibreOfficeiOS.conf +++ b/distro-configs/LibreOfficeiOS.conf @@ -19,7 +19,7 @@ --disable-database-connectivity --disable-dconf --disable-extensions ---disable-kde4 +--disable-kde5 --disable-odk --disable-openssl --disable-pdfium |