From b57ab45d323a5f705adedd0d105e1da6084a45b4 Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Thu, 16 Feb 2023 00:29:52 +0000 Subject: lxqt-base/lxqt-config : revision bump --- lxqt-base/lxqt-config/files/kscreen.patch | 80 --------------------- .../files/lxqt-config-kscreen-52690.patch | 80 +++++++++++++++++++++ .../lxqt-config/files/lxqt-config-qgtk2.patch | 83 ++++++++++++++++++++++ lxqt-base/lxqt-config/files/qgtk2.patch | 83 ---------------------- lxqt-base/lxqt-config/lxqt-config-1.2.0-r2.ebuild | 83 ---------------------- lxqt-base/lxqt-config/lxqt-config-1.2.0-r3.ebuild | 80 +++++++++++++++++++++ 6 files changed, 243 insertions(+), 246 deletions(-) delete mode 100644 lxqt-base/lxqt-config/files/kscreen.patch create mode 100644 lxqt-base/lxqt-config/files/lxqt-config-kscreen-52690.patch create mode 100644 lxqt-base/lxqt-config/files/lxqt-config-qgtk2.patch delete mode 100644 lxqt-base/lxqt-config/files/qgtk2.patch delete mode 100644 lxqt-base/lxqt-config/lxqt-config-1.2.0-r2.ebuild create mode 100644 lxqt-base/lxqt-config/lxqt-config-1.2.0-r3.ebuild (limited to 'lxqt-base') diff --git a/lxqt-base/lxqt-config/files/kscreen.patch b/lxqt-base/lxqt-config/files/kscreen.patch deleted file mode 100644 index be6c0164..00000000 --- a/lxqt-base/lxqt-config/files/kscreen.patch +++ /dev/null @@ -1,80 +0,0 @@ -From 6add4e4f0040693e7c4242fbae48c9d32007686c Mon Sep 17 00:00:00 2001 -From: Mamoru TASAKA -Date: Fri, 3 Feb 2023 08:11:04 +0900 -Subject: [PATCH] lxqt-config-monitor: add more header file inclusion for - libkscreen 5.26.90 (#915) - -With https://github.com/KDE/libkscreen/commit/94f330959b0eda775418aef7faee80ce69144e63 , -`#include ` no longer includes "mode.h" implicitly. -So in lxqt-config-monitor, files using `class KScreen::Mode` should include -`#include ` explicitly. - -Related: #903 . ---- - lxqt-config-monitor/kscreenutils.cpp | 1 + - lxqt-config-monitor/loadsettings.cpp | 1 + - lxqt-config-monitor/monitorpicture.cpp | 1 + - lxqt-config-monitor/monitorsettingsdialog.cpp | 1 + - lxqt-config-monitor/monitorwidget.cpp | 1 + - 5 files changed, 5 insertions(+) - -diff --git a/lxqt-config-monitor/kscreenutils.cpp b/lxqt-config-monitor/kscreenutils.cpp -index 9515e789..be2634d7 100644 ---- a/lxqt-config-monitor/kscreenutils.cpp -+++ b/lxqt-config-monitor/kscreenutils.cpp -@@ -2,6 +2,7 @@ - #include "timeoutdialog.h" - - #include -+#include - #include - #include - #include -diff --git a/lxqt-config-monitor/loadsettings.cpp b/lxqt-config-monitor/loadsettings.cpp -index 0c7bd73c..4e9331ba 100644 ---- a/lxqt-config-monitor/loadsettings.cpp -+++ b/lxqt-config-monitor/loadsettings.cpp -@@ -23,6 +23,7 @@ - #include "kscreenutils.h" - #include - #include -+#include - #include - #include - #include -diff --git a/lxqt-config-monitor/monitorpicture.cpp b/lxqt-config-monitor/monitorpicture.cpp -index 0d06ab82..4cb14894 100644 ---- a/lxqt-config-monitor/monitorpicture.cpp -+++ b/lxqt-config-monitor/monitorpicture.cpp -@@ -24,6 +24,7 @@ - #include - #include - #include -+#include - #include - - #include "configure.h" -diff --git a/lxqt-config-monitor/monitorsettingsdialog.cpp b/lxqt-config-monitor/monitorsettingsdialog.cpp -index 6172019f..bfd8c1dd 100644 ---- a/lxqt-config-monitor/monitorsettingsdialog.cpp -+++ b/lxqt-config-monitor/monitorsettingsdialog.cpp -@@ -28,6 +28,7 @@ - #include "kscreenutils.h" - - #include -+#include - #include - #include - #include -diff --git a/lxqt-config-monitor/monitorwidget.cpp b/lxqt-config-monitor/monitorwidget.cpp -index e0fcf0a8..41883c25 100644 ---- a/lxqt-config-monitor/monitorwidget.cpp -+++ b/lxqt-config-monitor/monitorwidget.cpp -@@ -22,6 +22,7 @@ - #include - #include - #include -+#include - #include - - #include diff --git a/lxqt-base/lxqt-config/files/lxqt-config-kscreen-52690.patch b/lxqt-base/lxqt-config/files/lxqt-config-kscreen-52690.patch new file mode 100644 index 00000000..be6c0164 --- /dev/null +++ b/lxqt-base/lxqt-config/files/lxqt-config-kscreen-52690.patch @@ -0,0 +1,80 @@ +From 6add4e4f0040693e7c4242fbae48c9d32007686c Mon Sep 17 00:00:00 2001 +From: Mamoru TASAKA +Date: Fri, 3 Feb 2023 08:11:04 +0900 +Subject: [PATCH] lxqt-config-monitor: add more header file inclusion for + libkscreen 5.26.90 (#915) + +With https://github.com/KDE/libkscreen/commit/94f330959b0eda775418aef7faee80ce69144e63 , +`#include ` no longer includes "mode.h" implicitly. +So in lxqt-config-monitor, files using `class KScreen::Mode` should include +`#include ` explicitly. + +Related: #903 . +--- + lxqt-config-monitor/kscreenutils.cpp | 1 + + lxqt-config-monitor/loadsettings.cpp | 1 + + lxqt-config-monitor/monitorpicture.cpp | 1 + + lxqt-config-monitor/monitorsettingsdialog.cpp | 1 + + lxqt-config-monitor/monitorwidget.cpp | 1 + + 5 files changed, 5 insertions(+) + +diff --git a/lxqt-config-monitor/kscreenutils.cpp b/lxqt-config-monitor/kscreenutils.cpp +index 9515e789..be2634d7 100644 +--- a/lxqt-config-monitor/kscreenutils.cpp ++++ b/lxqt-config-monitor/kscreenutils.cpp +@@ -2,6 +2,7 @@ + #include "timeoutdialog.h" + + #include ++#include + #include + #include + #include +diff --git a/lxqt-config-monitor/loadsettings.cpp b/lxqt-config-monitor/loadsettings.cpp +index 0c7bd73c..4e9331ba 100644 +--- a/lxqt-config-monitor/loadsettings.cpp ++++ b/lxqt-config-monitor/loadsettings.cpp +@@ -23,6 +23,7 @@ + #include "kscreenutils.h" + #include + #include ++#include + #include + #include + #include +diff --git a/lxqt-config-monitor/monitorpicture.cpp b/lxqt-config-monitor/monitorpicture.cpp +index 0d06ab82..4cb14894 100644 +--- a/lxqt-config-monitor/monitorpicture.cpp ++++ b/lxqt-config-monitor/monitorpicture.cpp +@@ -24,6 +24,7 @@ + #include + #include + #include ++#include + #include + + #include "configure.h" +diff --git a/lxqt-config-monitor/monitorsettingsdialog.cpp b/lxqt-config-monitor/monitorsettingsdialog.cpp +index 6172019f..bfd8c1dd 100644 +--- a/lxqt-config-monitor/monitorsettingsdialog.cpp ++++ b/lxqt-config-monitor/monitorsettingsdialog.cpp +@@ -28,6 +28,7 @@ + #include "kscreenutils.h" + + #include ++#include + #include + #include + #include +diff --git a/lxqt-config-monitor/monitorwidget.cpp b/lxqt-config-monitor/monitorwidget.cpp +index e0fcf0a8..41883c25 100644 +--- a/lxqt-config-monitor/monitorwidget.cpp ++++ b/lxqt-config-monitor/monitorwidget.cpp +@@ -22,6 +22,7 @@ + #include + #include + #include ++#include + #include + + #include diff --git a/lxqt-base/lxqt-config/files/lxqt-config-qgtk2.patch b/lxqt-base/lxqt-config/files/lxqt-config-qgtk2.patch new file mode 100644 index 00000000..bf684cdf --- /dev/null +++ b/lxqt-base/lxqt-config/files/lxqt-config-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/files/qgtk2.patch b/lxqt-base/lxqt-config/files/qgtk2.patch deleted file mode 100644 index bf684cdf..00000000 --- a/lxqt-base/lxqt-config/files/qgtk2.patch +++ /dev/null @@ -1,83 +0,0 @@ -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.2.0-r2.ebuild b/lxqt-base/lxqt-config/lxqt-config-1.2.0-r2.ebuild deleted file mode 100644 index 936fe47f..00000000 --- a/lxqt-base/lxqt-config/lxqt-config-1.2.0-r2.ebuild +++ /dev/null @@ -1,83 +0,0 @@ -# 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 has_version ">=kde-plasma/libkscreen-5.26.90" ; then - eapply "${FILESDIR}"/kscreen.patch - fi - 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 -} diff --git a/lxqt-base/lxqt-config/lxqt-config-1.2.0-r3.ebuild b/lxqt-base/lxqt-config/lxqt-config-1.2.0-r3.ebuild new file mode 100644 index 00000000..b4492330 --- /dev/null +++ b/lxqt-base/lxqt-config/lxqt-config-1.2.0-r3.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}" + +PATCHES=( "${FILESDIR}"/"${PN}"-kscreen-52690.patch ) + +src_prepare() { + if use gtk; then + PATCHES+=( "${FILESDIR}"/"${PN}"-qgtk2.patch ) + fi + cmake_src_prepare +} + +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