From f6e20bc6c308556ba296264be68bd88f2ad6bcc8 Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Tue, 18 Oct 2022 17:06:24 +0100 Subject: lxqt-base/lxqt-config : with qgtk2 as default style, these become unfunctional, wipe them out --- lxqt-base/lxqt-config/Manifest | 1 + lxqt-base/lxqt-config/files/qgtk2.patch | 83 +++++++++++++++++++++++ lxqt-base/lxqt-config/lxqt-config-1.1.0-r1.ebuild | 80 ++++++++++++++++++++++ 3 files changed, 164 insertions(+) create mode 100644 lxqt-base/lxqt-config/Manifest create mode 100644 lxqt-base/lxqt-config/files/qgtk2.patch create mode 100644 lxqt-base/lxqt-config/lxqt-config-1.1.0-r1.ebuild (limited to 'lxqt-base/lxqt-config') diff --git a/lxqt-base/lxqt-config/Manifest b/lxqt-base/lxqt-config/Manifest new file mode 100644 index 00000000..e7195c7c --- /dev/null +++ b/lxqt-base/lxqt-config/Manifest @@ -0,0 +1 @@ +DIST lxqt-config-1.1.0.tar.xz 359900 BLAKE2B 42621ccdd62af82e6d933d71b74fe4f8d27aad4a2c8aab8d04747670d87df2379f5877c0e4aacc29958e273e095c849d261456ef142021857e5da29c3abbd7f8 SHA512 f0272737c5127492f9cd560a831720a7df6ced326109739fcd0f429c45f8d62e4685c438424c5efe4f4927339de7a5f6849560ee5f9901768db5d8511406bb21 diff --git a/lxqt-base/lxqt-config/files/qgtk2.patch b/lxqt-base/lxqt-config/files/qgtk2.patch new file mode 100644 index 00000000..bf684cdf --- /dev/null +++ b/lxqt-base/lxqt-config/files/qgtk2.patch @@ -0,0 +1,83 @@ +diff -Nur a/lxqt-config-appearance/main.cpp b/lxqt-config-appearance/main.cpp +--- a/lxqt-config-appearance/main.cpp 2022-04-16 13:47:00.000000000 +0100 ++++ b/lxqt-config-appearance/main.cpp 2022-10-18 17:02:41.305914551 +0100 +@@ -33,12 +33,8 @@ + #include + #include + +-#include "iconthemeconfig.h" + #include "lxqtthemeconfig.h" +-#include "styleconfig.h" +-#include "fontsconfig.h" + #include "configothertoolkits.h" +-#include "gtkconfig.h" + + #include "../liblxqt-config-cursor/selectwnd.h" + +@@ -70,24 +66,6 @@ + + QSettings& qtSettings = *settings; // use lxqt config file for Qt settings in Qt5. + +- /*** Widget Style ***/ +- StyleConfig* stylePage = new StyleConfig(settings, &qtSettings, dialog); +- dialog->addPage(stylePage, QObject::tr("Widget Style"), QStringList() << QStringLiteral("preferences-desktop-theme") << QStringLiteral("preferences-desktop")); +- QObject::connect(dialog, &LXQt::ConfigDialog::reset, stylePage, &StyleConfig::initControls); +- QObject::connect(stylePage, &StyleConfig::settingsChanged, dialog, [dialog] { +- dialog->enableButton(QDialogButtonBox::Apply, true); // enable Apply button when something is changed +- }); +- QObject::connect(stylePage, &StyleConfig::updateOtherSettings, configOtherToolKits, &ConfigOtherToolKits::setConfig); +- +- /*** Icon Theme ***/ +- IconThemeConfig* iconPage = new IconThemeConfig(settings, dialog); +- dialog->addPage(iconPage, QObject::tr("Icons Theme"), QStringList() << QStringLiteral("preferences-desktop-icons") << QStringLiteral("preferences-desktop")); +- QObject::connect(dialog, &LXQt::ConfigDialog::reset, iconPage, &IconThemeConfig::initControls); +- QObject::connect(iconPage, &IconThemeConfig::settingsChanged, dialog, [dialog] { +- dialog->enableButton(QDialogButtonBox::Apply, true); +- }); +- QObject::connect(iconPage, &IconThemeConfig::updateOtherSettings, configOtherToolKits, &ConfigOtherToolKits::setConfig); +- + /*** LXQt Theme ***/ + LXQtThemeConfig* themePage = new LXQtThemeConfig(settings, dialog); + dialog->addPage(themePage, QObject::tr("LXQt Theme"), QStringList() << QStringLiteral("preferences-desktop-color") << QStringLiteral("preferences-desktop")); +@@ -96,15 +74,6 @@ + dialog->enableButton(QDialogButtonBox::Apply, true); + }); + +- /*** Font ***/ +- FontsConfig* fontsPage = new FontsConfig(settings, &qtSettings, dialog); +- dialog->addPage(fontsPage, QObject::tr("Font"), QStringList() << QStringLiteral("preferences-desktop-font") << QStringLiteral("preferences-desktop")); +- QObject::connect(dialog, &LXQt::ConfigDialog::reset, fontsPage, &FontsConfig::initControls); +- QObject::connect(fontsPage, &FontsConfig::updateOtherSettings, configOtherToolKits, &ConfigOtherToolKits::setConfig); +- QObject::connect(fontsPage, &FontsConfig::settingsChanged, dialog, [dialog] { +- dialog->enableButton(QDialogButtonBox::Apply, true); +- }); +- + /*** Cursor Theme ***/ + SelectWnd* cursorPage = new SelectWnd(sessionSettings, dialog); + cursorPage->setCurrent(); +@@ -113,25 +82,13 @@ + dialog->enableButton(QDialogButtonBox::Apply, true); + }); + +- /*** GTK Theme ***/ +- GTKConfig* GTKPage = new GTKConfig(&mConfigAppearanceSettings, configOtherToolKits, dialog); +- dialog->addPage(GTKPage, QObject::tr("GTK Style"), QStringList() << QStringLiteral("gtk-preferences") << QStringLiteral("preferences-desktop")); +- QObject::connect(dialog, &LXQt::ConfigDialog::reset, GTKPage, >KConfig::initControls); +- QObject::connect(GTKPage, >KConfig::settingsChanged, dialog, [dialog] { +- dialog->enableButton(QDialogButtonBox::Apply, true); +- }); +- + // apply all changes on clicking Apply + QObject::connect(dialog, &LXQt::ConfigDialog::clicked, [=] (QDialogButtonBox::StandardButton btn) { + if (btn == QDialogButtonBox::Apply) + { + // FIXME: Update cursor style on Qt apps on wayland and GTK on X11. +- iconPage->applyIconTheme(); + themePage->applyLxqtTheme(); +- fontsPage->updateQtFont(); + cursorPage->applyCusorTheme(); +- GTKPage->applyGTKStyle(); +- stylePage->applyStyle(); // Cursor and font have to be set before style + // disable Apply button after changes are applied + dialog->enableButton(btn, false); + } diff --git a/lxqt-base/lxqt-config/lxqt-config-1.1.0-r1.ebuild b/lxqt-base/lxqt-config/lxqt-config-1.1.0-r1.ebuild new file mode 100644 index 00000000..ced25d45 --- /dev/null +++ b/lxqt-base/lxqt-config/lxqt-config-1.1.0-r1.ebuild @@ -0,0 +1,80 @@ +# Copyright 1999-2022 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +MY_PV="$(ver_cut 1-2)" + +inherit cmake xdg-utils + +DESCRIPTION="LXQt system configuration control center" +HOMEPAGE="https://lxqt-project.org/" + +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 ~loong ~ppc64 ~riscv x86" +fi + +LICENSE="GPL-2 GPL-2+ GPL-3 LGPL-2 LGPL-2+ LGPL-2.1+ WTFPL-2" +SLOT="0" +IUSE="gtk +monitor +touchpad" + +BDEPEND=" + >=dev-qt/linguist-tools-5.15:5 +" +DEPEND=" + >=dev-libs/libqtxdg-3.9.0 + >=dev-qt/qtcore-5.15:5 + >=dev-qt/qtgui-5.15:5 + >=dev-qt/qtwidgets-5.15:5 + >=dev-qt/qtsvg-5.15:5 + >=dev-qt/qtx11extras-5.15:5 + >=dev-qt/qtxml-5.15:5 + =lxqt-base/liblxqt-${MY_PV}*:= + 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/libXi + ) +" +RDEPEND="${DEPEND}" + +src_prepare() { + if use gtk; then + eapply "${FILESDIR}"/qgtk2.patch + cmake_src_prepare + else + cmake_src_prepare + fi +} + +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 +} -- cgit v1.2.3