lxqt-base/lxqt-config : revision bump

2 files changed, 43 insertions, 1 deletions

diff --git a/lxqt-base/lxqt-config/files/lxqt-config-hide-unwanted-appearance-settings.patch b/lxqt-base/lxqt-config/files/lxqt-config-hide-unwanted-appearance-settings.patch
new file mode 100644
index 00000000..872a41b3
--- /dev/null
+++ b/lxqt-base/lxqt-config/files/lxqt-config-hide-unwanted-appearance-settings.patch
@@ -0,0 +1,37 @@
+diff -Nur a/lxqt-config-appearance/main.cpp b/lxqt-config-appearance/main.cpp
+--- a/lxqt-config-appearance/main.cpp	2017-10-21 20:10:53.000000000 +0100
++++ b/lxqt-config-appearance/main.cpp	2017-12-17 10:18:16.454195148 +0000
+@@ -30,10 +30,7 @@
+ #include <LXQt/Settings>
+ #include <LXQt/ConfigDialog>
+ #include <QCommandLineParser>
+-#include "iconthemeconfig.h"
+ #include "lxqtthemeconfig.h"
+-#include "styleconfig.h"
+-#include "fontsconfig.h"
+ 
+ #include "../liblxqt-config-cursor/selectwnd.h"
+ 
+@@ -59,22 +56,11 @@
+     app.setActivationWindow(dialog);
+ 
+     QSettings& qtSettings = *settings; // use lxqt config file for Qt settings in Qt5.
+-    StyleConfig* stylePage = new StyleConfig(settings, &qtSettings, dialog);
+-    dialog->addPage(stylePage, QObject::tr("Widget Style"), QStringList() << "preferences-desktop-theme" << "preferences-desktop");
+-    QObject::connect(dialog, SIGNAL(reset()), stylePage, SLOT(initControls()));
+-
+-    IconThemeConfig* iconPage = new IconThemeConfig(settings, dialog);
+-    dialog->addPage(iconPage, QObject::tr("Icons Theme"), QStringList() << "preferences-desktop-icons" << "preferences-desktop");
+-    QObject::connect(dialog, SIGNAL(reset()), iconPage, SLOT(initControls()));
+ 
+     LXQtThemeConfig* themePage = new LXQtThemeConfig(settings, dialog);
+     dialog->addPage(themePage, QObject::tr("LXQt Theme"), QStringList() << "preferences-desktop-color" << "preferences-desktop");
+     QObject::connect(dialog, SIGNAL(reset()), themePage, SLOT(initControls()));
+ 
+-    FontsConfig* fontsPage = new FontsConfig(settings, &qtSettings, dialog);
+-    dialog->addPage(fontsPage, QObject::tr("Font"), QStringList() << "preferences-desktop-font" << "preferences-desktop");
+-    QObject::connect(dialog, SIGNAL(reset()), fontsPage, SLOT(initControls()));
+-
+     SelectWnd* cursorPage = new SelectWnd(sessionSettings, dialog);
+     cursorPage->setCurrent();
+     dialog->addPage(cursorPage, QObject::tr("Cursor"), QStringList() << "input-mouse" << "preferences-desktop");
diff --git a/lxqt-base/lxqt-config/lxqt-config-0.12.0-r1.ebuild b/lxqt-base/lxqt-config/lxqt-config-0.12.0-r2.ebuild
index 2a159420..1b5e9866 100644
--- a/lxqt-base/lxqt-config/lxqt-config-0.12.0-r1.ebuild
+++ b/lxqt-base/lxqt-config/lxqt-config-0.12.0-r2.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
-inherit cmake-utils
+inherit cmake-utils eutils
 
 DESCRIPTION="LXQt system configuration control center"
 HOMEPAGE="http://lxqt.org/"
@@ -43,6 +43,11 @@ DEPEND="${CDEPEND}
 RDEPEND="${CDEPEND}
 	x11-apps/setxkbmap"
 
+src_prepare() {
+	epatch "${FILESDIR}"/"${PN}"-hide-unwanted-appearance-settings.patch
+	cmake-utils_src_prepare
+}
+
 src_configure() {
 	local mycmakeargs=( -DPULL_TRANSLATIONS=OFF )
 	cmake-utils_src_configure