diff options
author | Jan-Marek Glogowski <glogow@fbihome.de> | 2019-07-09 15:28:29 +0000 |
---|---|---|
committer | Jan-Marek Glogowski <glogow@fbihome.de> | 2019-07-21 23:22:46 +0200 |
commit | d3c6ac6d0f23df56644008ccb6aa2c8fa37ab1b5 (patch) | |
tree | 8f5e5a004c937d5a85fd66ff72834a977b645ace /distro-configs | |
parent | 49d17d392b7c7a309b3d9264643881656d386eb1 (diff) |
tdf#125922 rename kde5 to kf5 + plasma5
Just as the gtk3 plugin isn't named GNOME, rename kde5 to kf5, as
it is based on the KDE frameworks 5 libraries.
This also includes:
* a convenience alias to load the kf5 VCL plugin in case someone
requests the kde5 plugin.
* keep convenience kde5 configure switch, but warn about it
* rename detected desktop from kde5 to plasma5
Change-Id: I6764a05b81a5edbf284484c234fee2649aacf735
Reviewed-on: https://gerrit.libreoffice.org/75313
Tested-by: Jenkins
Reviewed-by: Jan-Marek Glogowski <glogow@fbihome.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/Jenkins/linux_clang_dbgutil_64 | 2 | ||||
-rw-r--r-- | distro-configs/Jenkins/linux_gcc_release_64 | 2 | ||||
-rw-r--r-- | distro-configs/LibreOfficeCoverity.conf | 2 | ||||
-rw-r--r-- | distro-configs/LibreOfficeLinux.conf | 2 | ||||
-rw-r--r-- | distro-configs/LibreOfficeOnline.conf | 2 | ||||
-rw-r--r-- | distro-configs/LibreOfficeOpenBSD.conf | 2 | ||||
-rw-r--r-- | distro-configs/LibreOfficeiOS.conf | 2 | ||||
-rw-r--r-- | distro-configs/LibreOfficeiOS_Sim.conf | 2 |
11 files changed, 11 insertions, 11 deletions
diff --git a/distro-configs/Jenkins/LibreOfficeLinuxUpdater.conf b/distro-configs/Jenkins/LibreOfficeLinuxUpdater.conf index 0ccf7b4f1a14..3e34040ebe55 100644 --- a/distro-configs/Jenkins/LibreOfficeLinuxUpdater.conf +++ b/distro-configs/Jenkins/LibreOfficeLinuxUpdater.conf @@ -18,7 +18,7 @@ --with-external-dict-dir=/usr/share/hunspell --enable-dbus --enable-extension-integration -# --enable-kde5 +# --enable-kf5 --enable-gstreamer-1-0 --enable-evolution2 --enable-gio diff --git a/distro-configs/Jenkins/Linux_dev_master.conf b/distro-configs/Jenkins/Linux_dev_master.conf index 505e03568ad0..0f997e12ff29 100644 --- a/distro-configs/Jenkins/Linux_dev_master.conf +++ b/distro-configs/Jenkins/Linux_dev_master.conf @@ -1,4 +1,4 @@ --enable-dbgutil ---enable-kde5 +--enable-kf5 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 e98840407052..23b105fbe6b8 100644 --- a/distro-configs/Jenkins/Linux_rel_master.conf +++ b/distro-configs/Jenkins/Linux_rel_master.conf @@ -1,3 +1,3 @@ ---enable-kde5 +--enable-kf5 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_clang_dbgutil_64 b/distro-configs/Jenkins/linux_clang_dbgutil_64 index 2feee4326da6..c4f130f6d47e 100644 --- a/distro-configs/Jenkins/linux_clang_dbgutil_64 +++ b/distro-configs/Jenkins/linux_clang_dbgutil_64 @@ -1,4 +1,4 @@ --enable-dbgutil --enable-compiler-plugins COMPILER_PLUGINS_CXX=ccache g++ -std=c++11 ---enable-kde5 +--enable-kf5 diff --git a/distro-configs/Jenkins/linux_gcc_release_64 b/distro-configs/Jenkins/linux_gcc_release_64 index e2e56dc802eb..bda437aa57f0 100644 --- a/distro-configs/Jenkins/linux_gcc_release_64 +++ b/distro-configs/Jenkins/linux_gcc_release_64 @@ -1,3 +1,3 @@ CC=/opt/rh/devtoolset-7/root/usr/bin/gcc CXX=/opt/rh/devtoolset-7/root/usr/bin/g++ ---enable-kde5 +--enable-kf5 diff --git a/distro-configs/LibreOfficeCoverity.conf b/distro-configs/LibreOfficeCoverity.conf index eee0914ca2f0..e657f937fffe 100644 --- a/distro-configs/LibreOfficeCoverity.conf +++ b/distro-configs/LibreOfficeCoverity.conf @@ -13,7 +13,7 @@ --enable-dbus --enable-extension-integration --enable-gtk3 ---enable-kde5 +--enable-kf5 --enable-evolution2 --enable-scripting-beanshell --enable-scripting-javascript diff --git a/distro-configs/LibreOfficeLinux.conf b/distro-configs/LibreOfficeLinux.conf index d4337c4b2dfb..00a70c75010b 100644 --- a/distro-configs/LibreOfficeLinux.conf +++ b/distro-configs/LibreOfficeLinux.conf @@ -21,7 +21,7 @@ --enable-extension-integration --enable-odk --enable-gtk3-kde5 ---enable-kde5 +--enable-kf5 --enable-gstreamer-1-0 --enable-evolution2 --enable-gio diff --git a/distro-configs/LibreOfficeOnline.conf b/distro-configs/LibreOfficeOnline.conf index ed6de3293432..70b7824164f4 100644 --- a/distro-configs/LibreOfficeOnline.conf +++ b/distro-configs/LibreOfficeOnline.conf @@ -11,7 +11,7 @@ --disable-gtk --disable-gtk3 --disable-qt5 ---disable-kde5 +--disable-kf5 --disable-odk --disable-online-update --enable-pdfimport diff --git a/distro-configs/LibreOfficeOpenBSD.conf b/distro-configs/LibreOfficeOpenBSD.conf index 5bcfcaf76621..241b0153b605 100644 --- a/distro-configs/LibreOfficeOpenBSD.conf +++ b/distro-configs/LibreOfficeOpenBSD.conf @@ -1,6 +1,6 @@ --disable-dbus --disable-epm ---disable-kde5 +--disable-kf5 --disable-nss-module --disable-odk --enable-ext-wiki-publisher diff --git a/distro-configs/LibreOfficeiOS.conf b/distro-configs/LibreOfficeiOS.conf index 7786120e2279..9a15ad6b083f 100644 --- a/distro-configs/LibreOfficeiOS.conf +++ b/distro-configs/LibreOfficeiOS.conf @@ -19,7 +19,7 @@ --disable-database-connectivity --disable-dconf --disable-extensions ---disable-kde5 +--disable-kf5 --disable-odk --disable-openssl --disable-pdfium diff --git a/distro-configs/LibreOfficeiOS_Sim.conf b/distro-configs/LibreOfficeiOS_Sim.conf index 146be2bd3bcc..1a4b4dbafea1 100644 --- a/distro-configs/LibreOfficeiOS_Sim.conf +++ b/distro-configs/LibreOfficeiOS_Sim.conf @@ -19,7 +19,7 @@ --disable-database-connectivity --disable-dconf --disable-extensions ---disable-kde5 +--disable-kf5 --disable-odk --disable-openssl --disable-pdfium |