gentoo resync : 21.06.2020

10 files changed, 563 insertions, 0 deletions

diff --git a/lxqt-base/Manifest.gz b/lxqt-base/Manifest.gz
index 15b6fe432d9f..94667080fe16 100644
--- a/lxqt-base/Manifest.gz
+++ b/lxqt-base/Manifest.gz
diff --git a/lxqt-base/liblxqt/Manifest b/lxqt-base/liblxqt/Manifest
index 3ee77984b2a4..a2df36707a25 100644
--- a/lxqt-base/liblxqt/Manifest
+++ b/lxqt-base/liblxqt/Manifest
@@ -1,6 +1,8 @@
 AUX liblxqt-0.14.1-qt-5.14-build.patch 599 BLAKE2B cd09cdd37c3c4ba497ef7264eccd12b8df4385c797fb658255f39c885b259776f70dd15759fda04808f42e58baca8d3471860c6976970f6f7c41457c1a9a66d0 SHA512 09929870c04aeab8d70bff04367da429d43f1258d35f1bb367795e8827d43d3b450ad90843d70199cb4e42d9bdfc67a66cf33fa67a21c6387ed181c1fee512f6
 DIST liblxqt-0.14.1.tar.xz 81704 BLAKE2B 9aa190fce337068d02962af90c1847acd51a63c44019c9ccdc729dea00d52cd65826e50850e913306f5e6f0a20d1e25b4f90cd09ebb9012c2c3337aaeaa3665f SHA512 28ce5e924d136f9907f84e40d4823c412df071009a9d5da4e061ce969d7575b21210d5178103f9bfc73baa87ccafc87dcb6e29a737467ca1a459c1fd3c1071ba
 DIST liblxqt-0.15.0.tar.xz 80624 BLAKE2B 0f5b1fede9460dddd2a506e4945ad81c8e7121e74178833664b838c3acd88451a3c17e8e4db2e6a34e14ef0638760fee36273abb4c6d3f93014d402d069633c3 SHA512 6693be070fe641d590e3187abb2797ea470af5101efc4e9aed88a12cb28cc31aff60b6086cf717cd778353b50164d2365d88968a96a7fa00f6bc53e6855ddf7f
+DIST liblxqt-0.15.1.tar.xz 80040 BLAKE2B f729bf1b10a35b97d71f2e95a35999d3f246b4e59cdce25e32ab2a72ed5be50a443db0c841dcd0d41deb25e130c91cf75a5ba384ae4c1e6d92aa306e0b4eb75d SHA512 a0eb00ca5b228ef32d1a3952d3cb4702273dda16c9e70cc75046bfe1f51e5a7849d5306cca9d616ff82bd91715d97d703c458d406ba9e2425aa3fd26f155493c
 EBUILD liblxqt-0.14.1.ebuild 921 BLAKE2B e6422d743906d0b25c2c06b047f1115380297bd87c6318f2e4a7d710bd559c5c404ec219fbb709240974885cccab55a82935e727d1c5aabe3b7cf988ceccc2c7 SHA512 3b0ff68fe141e1597cc6016948a1a0805c86015549ebb48a099d4c9b06f9518420ffbdee976db3cd507a7faf024287020a3a04a7390439d399de15816aa88350
 EBUILD liblxqt-0.15.0.ebuild 1014 BLAKE2B 6d503f2d768c14e42884ae25af54b943d486d6e300646bc26adebd4833247aaf214ef00f434c6a7f3494b7ec89884441b303e56cff389e695f1d3513aacd171f SHA512 bb15dfab5f8b2f874b6db41d403e6a22f7ff9d3ff88811aba69c9c0034ee49770bf2e8fadfd5cec81760a127dfc668548601597c9cc3a676cd1888150690b629
+EBUILD liblxqt-0.15.1.ebuild 1014 BLAKE2B 6d503f2d768c14e42884ae25af54b943d486d6e300646bc26adebd4833247aaf214ef00f434c6a7f3494b7ec89884441b303e56cff389e695f1d3513aacd171f SHA512 bb15dfab5f8b2f874b6db41d403e6a22f7ff9d3ff88811aba69c9c0034ee49770bf2e8fadfd5cec81760a127dfc668548601597c9cc3a676cd1888150690b629
 MISC metadata.xml 395 BLAKE2B 8f890c4837644e26eeed09ff318d3058271adf60b91b7f94246107ab748c36c8adac766a3020ab50ba900e3287cd891f4a6e708784a2835f3629736429ea60b4 SHA512 2dd16d3ce72b587d4ae4589202a7a06ad34d58067d706ce757d89b3c7da23ef2a2af4ea39f93dc22246557e3ebb62f65d6a0b50961614ce7e3218693b9d664cc
diff --git a/lxqt-base/liblxqt/liblxqt-0.15.1.ebuild b/lxqt-base/liblxqt/liblxqt-0.15.1.ebuild
new file mode 100644
index 000000000000..70e3a186da24
--- /dev/null
+++ b/lxqt-base/liblxqt/liblxqt-0.15.1.ebuild
@@ -0,0 +1,49 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit cmake
+
+DESCRIPTION="Common base library for the LXQt desktop environment"
+HOMEPAGE="https://lxqt.github.io/"
+
+if [[ ${PV} = *9999* ]]; then
+	inherit git-r3
+	EGIT_REPO_URI="https://github.com/lxqt/${PN}.git"
+else
+	SRC_URI="https://github.com/lxqt/${PN}/releases/download/${PV}/${P}.tar.xz"
+	KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
+fi
+
+LICENSE="LGPL-2.1+ BSD"
+SLOT="0/$(ver_cut 1-2)"
+IUSE="+backlight"
+
+BDEPEND="
+	dev-qt/linguist-tools:5
+	>=dev-util/lxqt-build-tools-0.7.0
+"
+DEPEND="
+	>=dev-libs/libqtxdg-3.5.0
+	dev-qt/qtcore:5
+	dev-qt/qtdbus:5
+	dev-qt/qtgui:5
+	dev-qt/qtwidgets:5
+	dev-qt/qtx11extras:5
+	dev-qt/qtxml:5
+	kde-frameworks/kwindowsystem:5[X]
+	x11-libs/libX11
+	x11-libs/libXScrnSaver
+	backlight? ( sys-auth/polkit-qt )
+"
+RDEPEND="${DEPEND}
+	!lxqt-base/lxqt-l10n
+"
+
+src_configure() {
+	local mycmakeargs=(
+		-DBUILD_BACKLIGHT_LINUX_BACKEND=$(usex backlight)
+	)
+	cmake_src_configure
+}
diff --git a/lxqt-base/lxqt-config/Manifest b/lxqt-base/lxqt-config/Manifest
index 467afa94efc8..0a90b928af4a 100644
--- a/lxqt-base/lxqt-config/Manifest
+++ b/lxqt-base/lxqt-config/Manifest
@@ -1,6 +1,8 @@
 AUX lxqt-config-0.14.1-qt-5.14-build.patch 648 BLAKE2B 181699115b64c6ae5d0d4269a932d14ba13842af2adcddcd0287fb1d2343512a2c0100d920fc2f6acef9797405ff6a51f2cecb3245bef025f2062ecbe4855cf5 SHA512 e4f02a01c6f857b2f9c9402baa8779e902e0df3ca92d364e55395f19691d8f4399e0b9337126609b4b2c6a342b389658eeb79a9cd69781f71432f9bffe0d3b53
+AUX lxqt-config-0.15.0-window-colour-option.patch 12529 BLAKE2B 5abfe6c0ca54878cbeb9258c39347ed8453ef5479d34bc3befec3294a98fc3a3f02a178110e8ae57c84a5bfbf0dac9841dc637cff8d2ddc9c1d5e9961ae16964 SHA512 40542b2b0a5594799f123ccba30d1a133e2a94b23ed0610fceb72049d4b9e55ca831f43a63f62bebc04461db651f097efbdcde3c099dda0e28a9f7783e936b52
 DIST lxqt-config-0.14.1.tar.xz 293304 BLAKE2B f090d7878815edc4f3f0078301a099ffc8ff57865516a9097db75faa1627af33c60d76b75cef8a7da5e9e790869e6768f54c3b17c59b038578f22d645c3c22fd SHA512 747644f8e0623cb2e8eadda57c7307387423152a089d5b423b06650fbf235371764a26e82363cbee9db5c1145e3fdb754e6ecdcf0930dccec375dda424c8b13f
 DIST lxqt-config-0.15.0.tar.xz 312468 BLAKE2B 2b3eb43141f3b46996b785b7cd19b709028c8cecc455a63578c93a9ae580148bc35df1192591bf0fdb5584d2cf66f589dbdde0d43c6848dda263d1f0b80e8c59 SHA512 68dc8ecc38033a7a93167fb0afbe45b3e14eb1132c3faf3395ebed1fc96b5836e8db003ecffde0417dfaf9e73b70fcc69a06523319f1f858cd2020eb61113a0d
 EBUILD lxqt-config-0.14.1-r1.ebuild 1520 BLAKE2B 01d067c42d6a5b77b5b06c5c30204da8d3a79e1a9d35f488a5bbe1ea0ce0d29d1498721f93962ec7968bb193d22f94d1750af83987a3ff9c42492e5884025630 SHA512 b3c7ab4fe6ce89b2dd9238d164d792aa3367c6937ed23125c302ab1b732055a23d7d706e2045175bb3dd85d02bc32b14a2c0f0d782e67c81c82435e2ef179011
+EBUILD lxqt-config-0.15.0-r1.ebuild 1538 BLAKE2B 942ff5c18fca343b61abd53c0608f4cd20cd4b18f7111b7b3ffdddf55bcd1780c2b49395198ffa70e581cfa751113bb2c4f1fb2c1cc086f660fa5d4eb87a5758 SHA512 e5cbb728b68411e170a03ab774d5b3d675265e63a3537b932549460fd9bb0842e7205dd35c857c8fbb6c77ef086a6385dca7f67701ddd8ac773c14d48c031523
 EBUILD lxqt-config-0.15.0.ebuild 1471 BLAKE2B 5a10e760e5964c7b1059de314e036ab5ab697605721d7e8d9f05c99cc43de7236539e8cb55dd384d1a91e954530bd0c272f699018a9a993146f6658371f67835 SHA512 87a9d073b092c1b2069ba78a384e1ec2d18bca7da648172f9d6fea1eeec241e983ffdf06d32ebc484cb264812e396061826a6e14c527781862e10fcd48aba884
 MISC metadata.xml 450 BLAKE2B 6f59cf0984e8e6c625eef75e01275d3d9e0b09fdbc1fc82fffb8611b44654da27da256148350c632673352ebc397f07b4696efad6f1f0d35489468752a4293cb SHA512 9e74d2cdc46c1c7797ac91f141995fbab7e11f4f05bef094e2af89d3cfe7d47d209de3de5726eee2eb45926185803ff7c7f012aad994f1acbc43feca88e798fc
diff --git a/lxqt-base/lxqt-config/files/lxqt-config-0.15.0-window-colour-option.patch b/lxqt-base/lxqt-config/files/lxqt-config-0.15.0-window-colour-option.patch
new file mode 100644
index 000000000000..813cd7e4bca8
--- /dev/null
+++ b/lxqt-base/lxqt-config/files/lxqt-config-0.15.0-window-colour-option.patch
@@ -0,0 +1,333 @@
+From 0edcc373698189f27ac24fb0985570ef2ecd8b0d Mon Sep 17 00:00:00 2001
+From: Tsu Jan <tsujan2000@gmail.com>
+Date: Sun, 31 May 2020 18:04:48 +0430
+Subject: [PATCH 1/4] Added an option to change window color
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+It is in LXQt Appearance Configuration → Widget Style.
+
+Note: For the option to work, lxqt-qtplugin 0.15.1 should be installed; otherwise, it will have no effect.
+---
+ lxqt-config-appearance/CMakeLists.txt  |  1 +
+ lxqt-config-appearance/colorLabel.cpp  | 65 ++++++++++++++++++++++++++
+ lxqt-config-appearance/colorLabel.h    | 53 +++++++++++++++++++++
+ lxqt-config-appearance/styleconfig.cpp | 16 ++++++-
+ lxqt-config-appearance/styleconfig.ui  | 34 ++++++++++++++
+ 5 files changed, 168 insertions(+), 1 deletion(-)
+ create mode 100644 lxqt-config-appearance/colorLabel.cpp
+ create mode 100644 lxqt-config-appearance/colorLabel.h
+
+diff --git a/lxqt-config-appearance/CMakeLists.txt b/lxqt-config-appearance/CMakeLists.txt
+index 184a8309..1ec118b7 100644
+--- a/lxqt-config-appearance/CMakeLists.txt
++++ b/lxqt-config-appearance/CMakeLists.txt
+@@ -27,6 +27,7 @@ set(CPP_FILES
+     styleconfig.cpp
+     fontconfigfile.cpp
+     configothertoolkits.cpp
++    colorLabel.cpp
+ )
+ 
+ set(UI_FILES
+diff --git a/lxqt-config-appearance/colorLabel.cpp b/lxqt-config-appearance/colorLabel.cpp
+new file mode 100644
+index 00000000..a3e22df0
+--- /dev/null
++++ b/lxqt-config-appearance/colorLabel.cpp
+@@ -0,0 +1,65 @@
++/* BEGIN_COMMON_COPYRIGHT_HEADER
++ * (c)LGPL2+
++ *
++ * LXQt - a lightweight, Qt based, desktop toolset
++ * https://lxqt.org/
++ *
++ * Copyright: 2020 LXQt team
++ *
++ * This program or library is free software; you can redistribute it
++ * and/or modify it under the terms of the GNU Lesser General Public
++ * License as published by the Free Software Foundation; either
++ * version 2.1 of the License, or (at your option) any later version.
++ *
++ * This library is distributed in the hope that it will be useful,
++ * but WITHOUT ANY WARRANTY; without even the implied warranty of
++ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
++ * Lesser General Public License for more details.
++
++ * You should have received a copy of the GNU Lesser General
++ * Public License along with this library; if not, write to the
++ * Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
++ * Boston, MA 02110-1301 USA
++ *
++ * END_COMMON_COPYRIGHT_HEADER */
++
++#include "colorLabel.h"
++#include <QColorDialog>
++
++ColorLabel::ColorLabel(QWidget* parent, Qt::WindowFlags f)
++    : QLabel(parent, f)
++{
++    setFrameStyle(QFrame::Panel | QFrame::Sunken);
++    setFixedWidth(100);
++    setToolTip(tr("Click to change color."));
++}
++
++ColorLabel::~ColorLabel() {}
++
++void ColorLabel::setColor(const QColor& color)
++{
++    if (!color.isValid())
++        return;
++    stylesheetColor_ = color;
++    // ignore translucency
++    stylesheetColor_.setAlpha(255);
++    setStyleSheet(QStringLiteral("QLabel{background-color: rgb(%1, %2, %3);}")
++                  .arg(color.red()).arg(color.green()).arg(color.blue()));
++}
++
++QColor ColorLabel::getColor() const
++{
++    if (stylesheetColor_.isValid())
++        return stylesheetColor_; // the window color may be different from the stylesheet color
++    return palette().color(QPalette::Window);
++}
++
++void ColorLabel::mousePressEvent(QMouseEvent* /*event*/) {
++    QColor prevColor = getColor();
++    QColor color = QColorDialog::getColor(prevColor, window(), tr("Select Color"));
++    if (color.isValid() && color != prevColor)
++    {
++        emit colorChanged();
++        setColor(color);
++    }
++}
+diff --git a/lxqt-config-appearance/colorLabel.h b/lxqt-config-appearance/colorLabel.h
+new file mode 100644
+index 00000000..1ea1b62c
+--- /dev/null
++++ b/lxqt-config-appearance/colorLabel.h
+@@ -0,0 +1,53 @@
++/* BEGIN_COMMON_COPYRIGHT_HEADER
++ * (c)LGPL2+
++ *
++ * LXQt - a lightweight, Qt based, desktop toolset
++ * https://lxqt.org/
++ *
++ * Copyright: 2020 LXQt team
++ *
++ * This program or library is free software; you can redistribute it
++ * and/or modify it under the terms of the GNU Lesser General Public
++ * License as published by the Free Software Foundation; either
++ * version 2.1 of the License, or (at your option) any later version.
++ *
++ * This library is distributed in the hope that it will be useful,
++ * but WITHOUT ANY WARRANTY; without even the implied warranty of
++ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
++ * Lesser General Public License for more details.
++
++ * You should have received a copy of the GNU Lesser General
++ * Public License along with this library; if not, write to the
++ * Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
++ * Boston, MA 02110-1301 USA
++ *
++ * END_COMMON_COPYRIGHT_HEADER */
++
++#ifndef COLORLABEL_H
++#define COLORLABEL_H
++
++#include <QLabel>
++#include <QWidget>
++#include <Qt>
++
++class ColorLabel : public QLabel {
++    Q_OBJECT
++
++public:
++    explicit ColorLabel(QWidget* parent = nullptr, Qt::WindowFlags f = Qt::WindowFlags());
++    ~ColorLabel();
++
++    void setColor(const QColor& color);
++    QColor getColor() const;
++
++signals:
++    void colorChanged();
++
++protected:
++    void mousePressEvent(QMouseEvent* event);
++
++private:
++    QColor stylesheetColor_;
++};
++
++#endif // COLORLABEL_H
+diff --git a/lxqt-config-appearance/styleconfig.cpp b/lxqt-config-appearance/styleconfig.cpp
+index 73f336e7..ce10aff1 100644
+--- a/lxqt-config-appearance/styleconfig.cpp
++++ b/lxqt-config-appearance/styleconfig.cpp
+@@ -61,6 +61,7 @@ StyleConfig::StyleConfig(LXQt::Settings* settings, QSettings* qtSettings, LXQt::
+     connect(ui->gtk3ComboBox, QOverload<int>::of(&QComboBox::activated), this, &StyleConfig::settingsChanged);
+     connect(ui->toolButtonStyle, QOverload<int>::of(&QComboBox::activated), this, &StyleConfig::settingsChanged);
+     connect(ui->singleClickActivate, &QAbstractButton::clicked, this, &StyleConfig::settingsChanged);
++    connect(ui->winColorLabel, &ColorLabel::colorChanged, this, &StyleConfig::settingsChanged);
+ }
+ 
+ 
+@@ -97,7 +98,6 @@ void StyleConfig::initControls()
+     // activate item views with single click
+     ui->singleClickActivate->setChecked( mSettings->value(QStringLiteral("single_click_activate"), false).toBool());
+ 
+-
+     // Fill Qt themes
+     ui->qtComboBox->clear();
+     ui->qtComboBox->addItems(qtThemes);
+@@ -108,8 +108,16 @@ void StyleConfig::initControls()
+ 
+     ui->gtk2ComboBox->setCurrentText(mConfigOtherToolKits->getGTKThemeFromRCFile(QStringLiteral("2.0")));
+     ui->gtk3ComboBox->setCurrentText(mConfigOtherToolKits->getGTKThemeFromRCFile(QStringLiteral("3.0")));
++
+     mSettings->beginGroup(QLatin1String("Qt"));
++    // Qt style
+     ui->qtComboBox->setCurrentText(mSettings->value(QStringLiteral("style")).toString());
++    // Qt window color
++    QColor color;
++    color.setNamedColor(mSettings->value(QStringLiteral("window_color")).toString());
++    if (!color.isValid())
++        color = QGuiApplication::palette().color(QPalette::Active,QPalette::Window);
++    ui->winColorLabel->setColor(color);
+     mSettings->endGroup();
+ 
+     update();
+@@ -122,6 +130,12 @@ void StyleConfig::applyStyle()
+     mQtSettings->beginGroup(QLatin1String("Qt"));
+     if(mQtSettings->value(QStringLiteral("style")).toString() != themeName)
+         mQtSettings->setValue(QStringLiteral("style"), themeName);
++    // Qt window color
++    QColor winColor = ui->winColorLabel->getColor();
++    QColor oldWinColor;
++    oldWinColor.setNamedColor(mQtSettings->value(QStringLiteral("window_color")).toString());
++    if (winColor != oldWinColor)
++        mQtSettings->setValue(QStringLiteral("window_color"), winColor.name());
+     mQtSettings->endGroup();
+ 
+     // single click setting
+diff --git a/lxqt-config-appearance/styleconfig.ui b/lxqt-config-appearance/styleconfig.ui
+index 15394024..6edbe470 100644
+--- a/lxqt-config-appearance/styleconfig.ui
++++ b/lxqt-config-appearance/styleconfig.ui
+@@ -146,8 +146,42 @@ Make sure 'xsettingsd' is installed to help GTK applications apply themes on the
+      </property>
+     </widget>
+    </item>
++   <item row="2" column="0" colspan="2">
++    <layout class="QFormLayout" name="formLayout_3">
++     <property name="horizontalSpacing">
++      <number>5</number>
++     </property>
++     <property name="topMargin">
++      <number>10</number>
++     </property>
++     <property name="bottomMargin">
++      <number>10</number>
++     </property>
++     <item row="0" column="0">
++      <widget class="QLabel" name="label_6">
++       <property name="text">
++        <string>Window Color:</string>
++       </property>
++      </widget>
++     </item>
++     <item row="0" column="1">
++      <widget class="ColorLabel" name="winColorLabel">
++       <property name="text">
++        <string/>
++       </property>
++      </widget>
++     </item>
++    </layout>
++   </item>
+   </layout>
+  </widget>
++ <customwidgets>
++  <customwidget>
++   <class>ColorLabel</class>
++   <extends>QLabel</extends>
++   <header>colorLabel.h</header>
++  </customwidget>
++ </customwidgets>
+  <resources/>
+  <connections/>
+ </ui>
+
+From 99ecfabccceb827256b7ef32c75c6aa6434d2d9f Mon Sep 17 00:00:00 2001
+From: Tsu Jan <tsujan2000@gmail.com>
+Date: Mon, 1 Jun 2020 23:46:49 +0430
+Subject: [PATCH 2/4] Added a distinguishable border to the color label
+
+---
+ lxqt-config-appearance/colorLabel.cpp | 6 ++++--
+ 1 file changed, 4 insertions(+), 2 deletions(-)
+
+diff --git a/lxqt-config-appearance/colorLabel.cpp b/lxqt-config-appearance/colorLabel.cpp
+index a3e22df0..c3b69d8d 100644
+--- a/lxqt-config-appearance/colorLabel.cpp
++++ b/lxqt-config-appearance/colorLabel.cpp
+@@ -43,8 +43,10 @@ void ColorLabel::setColor(const QColor& color)
+     stylesheetColor_ = color;
+     // ignore translucency
+     stylesheetColor_.setAlpha(255);
+-    setStyleSheet(QStringLiteral("QLabel{background-color: rgb(%1, %2, %3);}")
+-                  .arg(color.red()).arg(color.green()).arg(color.blue()));
++    QString borderColor = qGray(stylesheetColor_.rgb()) < 255 / 2
++                            ? QStringLiteral("white") : QStringLiteral("black");
++    setStyleSheet(QStringLiteral("QLabel{background-color: rgb(%1, %2, %3); border: 1px solid %4;}}")
++                  .arg(color.red()).arg(color.green()).arg(color.blue()).arg(borderColor));
+ }
+ 
+ QColor ColorLabel::getColor() const
+
+From 37f55579da91bfd78310a0e2c28c8551ad484414 Mon Sep 17 00:00:00 2001
+From: Tsu Jan <tsujan2000@gmail.com>
+Date: Thu, 4 Jun 2020 15:47:22 +0430
+Subject: [PATCH 3/4] Removed an extra curly bracket in stylesheet
+
+---
+ lxqt-config-appearance/colorLabel.cpp | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/lxqt-config-appearance/colorLabel.cpp b/lxqt-config-appearance/colorLabel.cpp
+index c3b69d8d..de730baf 100644
+--- a/lxqt-config-appearance/colorLabel.cpp
++++ b/lxqt-config-appearance/colorLabel.cpp
+@@ -45,7 +45,7 @@ void ColorLabel::setColor(const QColor& color)
+     stylesheetColor_.setAlpha(255);
+     QString borderColor = qGray(stylesheetColor_.rgb()) < 255 / 2
+                             ? QStringLiteral("white") : QStringLiteral("black");
+-    setStyleSheet(QStringLiteral("QLabel{background-color: rgb(%1, %2, %3); border: 1px solid %4;}}")
++    setStyleSheet(QStringLiteral("QLabel{background-color: rgb(%1, %2, %3); border: 1px solid %4;}")
+                   .arg(color.red()).arg(color.green()).arg(color.blue()).arg(borderColor));
+ }
+ 
+
+From 30cf8267ce4af08f9953b169f9d8109fb9437f7d Mon Sep 17 00:00:00 2001
+From: Tsu Jan <tsujan2000@gmail.com>
+Date: Sat, 6 Jun 2020 14:15:53 +0430
+Subject: [PATCH 4/4] A small improvement
+
+---
+ lxqt-config-appearance/colorLabel.cpp | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/lxqt-config-appearance/colorLabel.cpp b/lxqt-config-appearance/colorLabel.cpp
+index de730baf..98d01729 100644
+--- a/lxqt-config-appearance/colorLabel.cpp
++++ b/lxqt-config-appearance/colorLabel.cpp
+@@ -46,7 +46,7 @@ void ColorLabel::setColor(const QColor& color)
+     QString borderColor = qGray(stylesheetColor_.rgb()) < 255 / 2
+                             ? QStringLiteral("white") : QStringLiteral("black");
+     setStyleSheet(QStringLiteral("QLabel{background-color: rgb(%1, %2, %3); border: 1px solid %4;}")
+-                  .arg(color.red()).arg(color.green()).arg(color.blue()).arg(borderColor));
++                  .arg(QString::number(color.red()), QString::number(color.green()), QString::number(color.blue()), borderColor));
+ }
+ 
+ QColor ColorLabel::getColor() const
diff --git a/lxqt-base/lxqt-config/lxqt-config-0.15.0-r1.ebuild b/lxqt-base/lxqt-config/lxqt-config-0.15.0-r1.ebuild
new file mode 100644
index 000000000000..af99f9d0116e
--- /dev/null
+++ b/lxqt-base/lxqt-config/lxqt-config-0.15.0-r1.ebuild
@@ -0,0 +1,76 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit cmake xdg-utils
+
+DESCRIPTION="LXQt system configuration control center"
+HOMEPAGE="https://lxqt.github.io/"
+
+if [[ ${PV} = *9999* ]]; then
+	inherit git-r3
+	EGIT_REPO_URI="https://github.com/lxqt/${PN}.git"
+else
+	SRC_URI="https://github.com/lxqt/${PN}/releases/download/${PV}/${P}.tar.xz"
+	KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
+fi
+
+LICENSE="GPL-2 GPL-2+ GPL-3 LGPL-2 LGPL-2+ LGPL-2.1+ WTFPL-2"
+SLOT="0"
+IUSE="+monitor +touchpad"
+
+BDEPEND="
+	dev-qt/linguist-tools:5
+	>=dev-util/lxqt-build-tools-0.7.0
+"
+DEPEND="
+	>=dev-libs/libqtxdg-3.3.1
+	dev-qt/qtcore:5
+	dev-qt/qtdbus:5
+	dev-qt/qtgui:5
+	dev-qt/qtwidgets:5
+	dev-qt/qtx11extras:5
+	dev-qt/qtxml:5
+	kde-frameworks/kwindowsystem:5
+	=lxqt-base/liblxqt-$(ver_cut 1-2)*
+	sys-libs/zlib:=
+	x11-apps/setxkbmap
+	x11-libs/libxcb:=
+	x11-libs/libX11
+	x11-libs/libXcursor
+	x11-libs/libXfixes
+	monitor? ( kde-plasma/libkscreen:5= )
+	touchpad? (
+		virtual/libudev
+		x11-drivers/xf86-input-libinput
+		x11-libs/libXext
+		x11-libs/libXi
+	)
+"
+RDEPEND="${DEPEND}
+	!lxqt-base/lxqt-l10n
+"
+
+PATCHES=( "${FILESDIR}/${PN}-0.15.0-window-colour-option.patch" )
+
+src_configure() {
+	local mycmakeargs=(
+		-DWITH_MONITOR=$(usex monitor)
+		-DWITH_TOUCHPAD=$(usex touchpad)
+	)
+	cmake_src_configure
+}
+
+src_install() {
+	cmake_src_install
+	doman man/*.1 liblxqt-config-cursor/man/*.1 lxqt-config-appearance/man/*.1
+}
+
+pkg_postinst() {
+	xdg_icon_cache_update
+}
+
+pkg_postrm() {
+	xdg_icon_cache_update
+}
diff --git a/lxqt-base/lxqt-qtplugin/Manifest b/lxqt-base/lxqt-qtplugin/Manifest
index 9bc77ac57a5a..77650203df7c 100644
--- a/lxqt-base/lxqt-qtplugin/Manifest
+++ b/lxqt-base/lxqt-qtplugin/Manifest
@@ -1,5 +1,9 @@
+AUX lxqt-qtplugin-0.15.1-adjust-highlight-colour.patch 1176 BLAKE2B 852339a8c528003a9b1936280c0395bdc98d436a9d56b8724af38e9f0da5b592b4f14fe3b8dbd772ebbc93767b92081d51b1a836fd88bb5a9259e34d8684729c SHA512 5464945e89664dc549219c79c0543f2cd3808c3343b9a2414e96cf22a8d991536a89f788850c2d42d0b154b240babc920cb9639c6caab3d3d2668bfd3f6167e9
+AUX lxqt-qtplugin-0.15.1-no-widget-reset.patch 1425 BLAKE2B bfadcf1d815544c25c6854a193e82c5421f49782351298b93558f8925147396a750df006c82b3e681b30769cc7cf892166b9f8427412bc07d7bdc9ab75b405d2 SHA512 0058e56b9731c49732d59863b5923b5d52830111e8f690f2433a5fe48efbc840ab014e7882ffe96110c5ec439bec3b82b95057dc2825ce9061dd18b707c23880
 DIST lxqt-qtplugin-0.14.0.tar.xz 22336 BLAKE2B 8155722880cff279aa26676ed425a011b2259ba94bf92122c59643a0ac6dd89b2841bcbeeac26ac24ef1e351dcdbcabf339c4a2bcee2dac30f2f9298434f7294 SHA512 33188bc03ee48a9b6e3cc5823cdcb5c96dba0cda65da511fe603d952c5de24e292cb02208cf357b04718df90f98d53bf48eaf6793d70d043214e429f57ccf53c
 DIST lxqt-qtplugin-0.15.0.tar.xz 22776 BLAKE2B 642270939ddaf9884da611d800c6ccae518a2c259e2da37c3e0025e24a6a11bae1d21cc9d4141821dfcf2e6e4c9b383e800dc68ff9d5f9b39f2e27e121d158c7 SHA512 9a73b9d38e1c2e2e030b551f92d53afef69fedee8f0ff4c7147680c0037a3eacb98f5514e09f16762c03cdaded7e5f760a89d66461bab4d7e8877ebaba28160e
+DIST lxqt-qtplugin-0.15.1.tar.xz 23100 BLAKE2B 91f6a90f435a33fd19863f9989b0603590c51f5921ad0837c025437b6fbd50105c70a47028137562af1deb6892fadea05ca3924eee8e2ba8b91a41069ad2ca47 SHA512 6fc19cf5f763d7879e5a052c5638b5b396f659f4e199493c8b87cdb661c910921ecda865de2900a047c96dd63c3ef6dbfa486d1dbe0257c26984a25a139dce2f
 EBUILD lxqt-qtplugin-0.14.0.ebuild 759 BLAKE2B ab40da027a91ca08d3463b7ccd0327d35b54f7f4c31c94e1715af8be860d51ad4ec6cf78f8eb28c83bbf92ed7f7d8fff52de3a1938f89be57c2d9a1e6e2ca0a1 SHA512 1c6d44ddc628ea86b95f138177f714c8b070d85d7f4b5fbe102a4703ffb5406dd510e743e69ea07125c91b2a185a89ec350540e90a9e9c3824964790172fb617
 EBUILD lxqt-qtplugin-0.15.0-r1.ebuild 766 BLAKE2B b660e7693e7208ff939d901d27a4cd2862ed04d5a0fa1f338b7f866c7d616fccc0f3dfa99baf3622dc3fabb1040ecab8df813486338a9285c667d0f322e40844 SHA512 f76ad68199feb6054b01e50e747797e0f326ad0d55a653b3d383f6e672e1e73e942f26d1ab0c0997b6eb0e004b8fbb21f7905143835f43758eecc8d0c6c50df4
+EBUILD lxqt-qtplugin-0.15.1.ebuild 937 BLAKE2B 8bb925be7a11fa376bc6ac740ec3da5af5e1a2eeca372f5e50654742015e6743fb5b355a4654f7ce726a08b608b9cc2b078a8054d32b233646c542c86e3dbbc6 SHA512 1e0a88a9cd8d2c4fa4a19b2d74726a3d3f53abc1f2f2f3034ed9d60f042a93c24f702fde9d1d95373406d9a7ad35151d4994f1b604a63cb9fc5f7d2b939781c0
 MISC metadata.xml 319 BLAKE2B ed7979a51580013c60fc88f432f2d8a0597a4970fe80282c91bac412d9e742d563972b30099fef401a5fa2d9bd66fc94b139e082f9eca9f0be9426a0cb8bf9de SHA512 960097272754abbf37028a661cc950852cc2a5573081acc2eb8f101ee865513d639a18f3dafe720a92b52ec5b8b48f52f4c79823dee88d0ffc59df432e506a78
diff --git a/lxqt-base/lxqt-qtplugin/files/lxqt-qtplugin-0.15.1-adjust-highlight-colour.patch b/lxqt-base/lxqt-qtplugin/files/lxqt-qtplugin-0.15.1-adjust-highlight-colour.patch
new file mode 100644
index 000000000000..b25b3254173d
--- /dev/null
+++ b/lxqt-base/lxqt-qtplugin/files/lxqt-qtplugin-0.15.1-adjust-highlight-colour.patch
@@ -0,0 +1,26 @@
+From 5858386839d499c032d62c9d10301dc09421de27 Mon Sep 17 00:00:00 2001
+From: Tsu Jan <tsujan2000@gmail.com>
+Date: Mon, 8 Jun 2020 01:49:41 +0430
+Subject: [PATCH] Enforce Fusion's highlight color when setting window color
+
+Because Qt's default highlight color is `#000080` while that of Fusion is `#3c8ce6`. Not only the latter is more elegant but also the patch fixes the color change after restarting apps.
+
+Also, the highlighted text color is set to white for the sake of certainty.
+---
+ src/lxqtplatformtheme.cpp | 3 +++
+ 1 file changed, 3 insertions(+)
+
+diff --git a/src/lxqtplatformtheme.cpp b/src/lxqtplatformtheme.cpp
+index 76f6483..3edc5b1 100644
+--- a/src/lxqtplatformtheme.cpp
++++ b/src/lxqtplatformtheme.cpp
+@@ -134,6 +134,9 @@ void LXQtPlatformTheme::loadSettings() {
+         if(LXQtPalette_)
+             delete LXQtPalette_;
+         LXQtPalette_ = new QPalette(winColor_);
++        // Qt's default highlight color and that of Fusion may be different. This is a workaround:
++        LXQtPalette_->setColor(QPalette::Highlight, QColor(60, 140, 230));
++        LXQtPalette_->setColor(QPalette::HighlightedText, QColor(255, 255, 255));
+     }
+ 
+     // SystemFont
diff --git a/lxqt-base/lxqt-qtplugin/files/lxqt-qtplugin-0.15.1-no-widget-reset.patch b/lxqt-base/lxqt-qtplugin/files/lxqt-qtplugin-0.15.1-no-widget-reset.patch
new file mode 100644
index 000000000000..85258c851f74
--- /dev/null
+++ b/lxqt-base/lxqt-qtplugin/files/lxqt-qtplugin-0.15.1-no-widget-reset.patch
@@ -0,0 +1,30 @@
+From 8cc32d94b4c9de74b5bcf27fae2d10e6b2b11caf Mon Sep 17 00:00:00 2001
+From: Tsu Jan <tsujan2000@gmail.com>
+Date: Mon, 1 Jun 2020 22:20:22 +0430
+Subject: [PATCH] Do not reset widget palettes on changing style
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+Generally, resetting a widget's palette from outside its code is a bad practice because the palette may have been changed for a reason.
+
+If the custom palette of a widget needs an update when the style changes, the program itself is responsible for that; otherwise, the program has a bug — as in libfm-qt's places view (which I'll fix soon) and Dolphin's main view (which will never be fixed).
+---
+ src/lxqtplatformtheme.cpp | 4 ----
+ 1 file changed, 4 deletions(-)
+
+diff --git a/src/lxqtplatformtheme.cpp b/src/lxqtplatformtheme.cpp
+index 2df9f8f..76f6483 100644
+--- a/src/lxqtplatformtheme.cpp
++++ b/src/lxqtplatformtheme.cpp
+@@ -234,10 +234,6 @@ void LXQtPlatformTheme::onSettingsChanged() {
+         // Qt5 added a QEvent::ThemeChange event.
+         QEvent event(QEvent::ThemeChange);
+         QApplication::sendEvent(widget, &event);
+-        // Also, set the palette because it may not be updated for some widgets.
+-        // WARNING: The app palette should be used, not LXQtPalette_, because
+-        // some widget styles have their own palettes.
+-        widget->setPalette(QApplication::palette());
+     }
+ }
+ 
diff --git a/lxqt-base/lxqt-qtplugin/lxqt-qtplugin-0.15.1.ebuild b/lxqt-base/lxqt-qtplugin/lxqt-qtplugin-0.15.1.ebuild
new file mode 100644
index 000000000000..8e1b6244cc75
--- /dev/null
+++ b/lxqt-base/lxqt-qtplugin/lxqt-qtplugin-0.15.1.ebuild
@@ -0,0 +1,41 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit cmake
+
+DESCRIPTION="LXQt system integration plugin for Qt"
+HOMEPAGE="https://lxqt.github.io/"
+
+if [[ ${PV} = *9999* ]]; then
+	inherit git-r3
+	EGIT_REPO_URI="https://github.com/lxqt/${PN}.git"
+else
+	SRC_URI="https://github.com/lxqt/${PN}/releases/download/${PV}/${P}.tar.xz"
+	KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
+fi
+
+LICENSE="LGPL-2.1+"
+SLOT="0"
+
+BDEPEND="
+	dev-qt/linguist-tools:5
+	>=dev-util/lxqt-build-tools-0.7.0
+"
+DEPEND="
+	dev-libs/libdbusmenu-qt:=[qt5(+)]
+	>=dev-libs/libqtxdg-3.5.0
+	dev-qt/qtcore:5
+	dev-qt/qtdbus:5
+	dev-qt/qtgui:5=
+	dev-qt/qtwidgets:5
+	dev-qt/qtx11extras:5
+	=x11-libs/libfm-qt-$(ver_cut 1-2)*
+"
+RDEPEND="${DEPEND}"
+
+PATCHES=(
+	"${FILESDIR}/${PN}-0.15.1-no-widget-reset.patch" # Fixed in next release.
+	"${FILESDIR}/${PN}-0.15.1-adjust-highlight-colour.patch" # Fixed in next release.
+)