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

Proposed by Walter Lapchynski
Status: Needs review
Proposed branch: ~wxl/ubuntu/+source/libreoffice:ubuntu-cosmic-6.1
Merge into: ~libreoffice/ubuntu/+source/libreoffice:ubuntu-cosmic-6.1
Diff against target: 49 lines (+22/-2)
3 files modified
changelog (+6/-2)
patches/series (+1/-0)
patches/set-default-icons-to-breeze-for-lxqt.patch (+15/-0)
Reviewer Review Type Date Requested Status
Olivier Tilloy Disapprove
Björn Michaelsen Pending
Review via email: mp+356378@code.launchpad.net

Commit message

Set default icons to Breeze for LXQt.

To post a comment you must log in.
Revision history for this message
Olivier Tilloy (osomon) wrote :

"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
Revision history for this message
Simon Quigley (tsimonq2) wrote :

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

Unmerged commits

cac4674... by Walter Lapchynski

Set default icons to Breeze for LXQt

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1diff --git a/changelog b/changelog
2index e12f0b8..45a779d 100644
3--- a/changelog
4+++ b/changelog
5@@ -1,8 +1,12 @@
6-libreoffice (1:6.1.2-0ubuntu1) UNRELEASED; urgency=medium
7+libreoffice (1:6.1.2-0ubuntu2) UNRELEASED; urgency=medium
8
9+ [ Rico Tzschichholz ]
10 * New upstream release
11
12- -- Rico Tzschichholz <ricotz@ubuntu.com> Mon, 01 Oct 2018 16:31:09 +0200
13+ [ Walter Lapchynski ]
14+ * Set default icons to Breeze for LXQt.
15+
16+ -- Walter Lapchynski <wxl@ubuntu.com> Tue, 09 Oct 2018 22:41:15 -0700
17
18 libreoffice (1:6.1.2-1) unstable; urgency=medium
19
20diff --git a/patches/series b/patches/series
21index d56229e..9e1a8e6 100644
22--- a/patches/series
23+++ b/patches/series
24@@ -39,3 +39,4 @@ apparmor-kde.diff
25 #lp-753627-readd-updated-Ubuntu-brand-palette-colors.diff
26 #integraltrans.diff
27 hide-startcenter-desktop-file.patch
28+set-default-icons-to-breeze-for-lxqt.patch
29diff --git a/patches/set-default-icons-to-breeze-for-lxqt.patch b/patches/set-default-icons-to-breeze-for-lxqt.patch
30new file mode 100644
31index 0000000..8c11281
32--- /dev/null
33+++ b/patches/set-default-icons-to-breeze-for-lxqt.patch
34@@ -0,0 +1,15 @@
35+Description: Set default icons to Breeze for LXQt.
36+Author: Hans P. Möller <hmoller@gmail.com>
37+Last-Update: 2018-10-09
38+--- a/vcl/source/app/IconThemeSelector.cxx
39++++ b/vcl/source/app/IconThemeSelector.cxx
40+@@ -57,7 +57,8 @@ IconThemeSelector::GetIconThemeForDeskto
41+ (void)desktopEnvironment;
42+ #else
43+ if ( desktopEnvironment.equalsIgnoreAsciiCase("kde4") ||
44+- desktopEnvironment.equalsIgnoreAsciiCase("kde5") ) {
45++ desktopEnvironment.equalsIgnoreAsciiCase("kde5") ||
46++ desktopEnvironment.equalsIgnoreAsciiCase("lxqt") ) {
47+ r = "breeze";
48+ } else
49+ if ( desktopEnvironment.equalsIgnoreAsciiCase("macosx") ) {

Subscribers

People subscribed via source and target branches