Merge ~wxl/ubuntu/+source/libreoffice:ubuntu-cosmic-6.1 into ~libreoffice/ubuntu/+source/libreoffice:ubuntu-cosmic-6.1

[Walter Lapchynski]

Set default icons to Breeze for LXQt.

[Olivier Tilloy (osomon)]

"LXQT" is not a valid value for desktopEnvironment, see https://github.com/LibreOffice/core/blob/libreoffice-6-1-2/vcl/unx/generic/plugadapt/salplug.cxx#L290.

This would also need to be added to https://github.com/LibreOffice/core/blob/libreoffice-6-1-2/vcl/inc/unx/desktops.hxx#L27 and to get_desktop_environment() in https://github.com/LibreOffice/core/blob/libreoffice-6-1-2/vcl/unx/generic/desktopdetect/desktopdetector.cxx#L284.

Please submit such a change upstream, and once merged in master we can include it as a distro-patch.

review: Disapprove

[Simon Quigley (tsimonq2)]

Submitted upstream here, for the record: https://gerrit.libreoffice.org/#/c/61641/

Unmerged commits

cac4674... by Walter Lapchynski on 2018-10-10

Set default icons to Breeze for LXQt

diff --git a/changelog b/changelog
index e12f0b8..45a779d 100644
--- a/changelog
+++ b/changelog
@@ -1,8 +1,12 @@
-libreoffice (1:6.1.2-0ubuntu1) UNRELEASED; urgency=medium
+libreoffice (1:6.1.2-0ubuntu2) UNRELEASED; urgency=medium
 
+  [ Rico Tzschichholz ]
   * New upstream release
 
- -- Rico Tzschichholz <[e-mail]>  Mon, 01 Oct 2018 16:31:09 +0200
+  [ Walter Lapchynski ]
+  * Set default icons to Breeze for LXQt.
+
+ -- Walter Lapchynski <[e-mail]>  Tue, 09 Oct 2018 22:41:15 -0700
 
 libreoffice (1:6.1.2-1) unstable; urgency=medium
 
diff --git a/patches/series b/patches/series
index d56229e..9e1a8e6 100644
--- a/patches/series
+++ b/patches/series
@@ -39,3 +39,4 @@ apparmor-kde.diff
 #lp-753627-readd-updated-Ubuntu-brand-palette-colors.diff
 #integraltrans.diff
 hide-startcenter-desktop-file.patch
+set-default-icons-to-breeze-for-lxqt.patch
diff --git a/patches/set-default-icons-to-breeze-for-lxqt.patch b/patches/set-default-icons-to-breeze-for-lxqt.patch
new file mode 100644
index 0000000..8c11281
--- /dev/null
+++ b/patches/set-default-icons-to-breeze-for-lxqt.patch
@@ -0,0 +1,15 @@
+Description: Set default icons to Breeze for LXQt.
+Author: Hans P. Möller <[e-mail]>
+Last-Update: 2018-10-09
+--- a/vcl/source/app/IconThemeSelector.cxx
++++ b/vcl/source/app/IconThemeSelector.cxx
+@@ -57,7 +57,8 @@ IconThemeSelector::GetIconThemeForDeskto
+     (void)desktopEnvironment;
+ #else
+     if ( desktopEnvironment.equalsIgnoreAsciiCase("kde4") ||
+-         desktopEnvironment.equalsIgnoreAsciiCase("kde5") ) {
++         desktopEnvironment.equalsIgnoreAsciiCase("kde5") ||
++         desktopEnvironment.equalsIgnoreAsciiCase("lxqt") ) {
+         r = "breeze";
+     } else
+     if ( desktopEnvironment.equalsIgnoreAsciiCase("macosx") ) {