summaryrefslogtreecommitdiff
path: root/lxqt-base
diff options
context:
space:
mode:
Diffstat (limited to 'lxqt-base')
-rw-r--r--lxqt-base/lxqt-config/Manifest1
-rw-r--r--lxqt-base/lxqt-config/files/lxqt-config-qt5ct.patch83
-rw-r--r--lxqt-base/lxqt-config/files/revert-2aff948ea19508317c185d87bc5f5e20fe64a30f.patch394
-rw-r--r--lxqt-base/lxqt-config/lxqt-config-2.1.0-r1.ebuild74
-rw-r--r--lxqt-base/lxqt-meta/lxqt-meta-2.1.0.ebuild (renamed from lxqt-base/lxqt-meta/lxqt-meta-2.0.0-r1.ebuild)9
-rw-r--r--lxqt-base/lxqt-session/Manifest1
-rw-r--r--lxqt-base/lxqt-session/files/lxqt-session-qt5ct.patch16
-rw-r--r--lxqt-base/lxqt-session/lxqt-session-2.1.0-r1.ebuild60
8 files changed, 635 insertions, 3 deletions
diff --git a/lxqt-base/lxqt-config/Manifest b/lxqt-base/lxqt-config/Manifest
new file mode 100644
index 00000000..25e7138f
--- /dev/null
+++ b/lxqt-base/lxqt-config/Manifest
@@ -0,0 +1 @@
+DIST lxqt-config-2.1.0.tar.xz 391732 BLAKE2B 888e497f21e605f092495aded60fa717d833029423599fb9bee4b26e91a42233517099a3f7aa35c8cd3a71db2c6c40ca6f291ab247faa23c037fc979e871968b SHA512 4bbfbb4aa668c8c72cffc5df52299a91eb2ea791bd6f4d3e5a52bf3937658dfad84183c167ddc5f8c1db9daedc1b00e3033d8b7a246cbda8d54af61ca51ff536
diff --git a/lxqt-base/lxqt-config/files/lxqt-config-qt5ct.patch b/lxqt-base/lxqt-config/files/lxqt-config-qt5ct.patch
new file mode 100644
index 00000000..7b6dba8b
--- /dev/null
+++ b/lxqt-base/lxqt-config/files/lxqt-config-qt5ct.patch
@@ -0,0 +1,83 @@
+diff '--color=auto' -Nur a/lxqt-config-appearance/main.cpp b/lxqt-config-appearance/main.cpp
+--- a/lxqt-config-appearance/main.cpp 2024-04-17 12:00:51.000000000 +0100
++++ b/lxqt-config-appearance/main.cpp 2024-09-30 03:31:04.883188155 +0100
+@@ -33,12 +33,8 @@
+ #include <QMessageBox>
+ #include <QGuiApplication>
+
+-#include "iconthemeconfig.h"
+ #include "lxqtthemeconfig.h"
+-#include "styleconfig.h"
+-#include "fontsconfig.h"
+ #include "configothertoolkits.h"
+-#include "gtkconfig.h"
+
+ #include "../liblxqt-config-cursor/selectwnd.h"
+
+@@ -69,24 +65,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"));
+@@ -95,15 +73,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();
+@@ -112,25 +81,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, &GTKConfig::initControls);
+- QObject::connect(GTKPage, &GTKConfig::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/revert-2aff948ea19508317c185d87bc5f5e20fe64a30f.patch b/lxqt-base/lxqt-config/files/revert-2aff948ea19508317c185d87bc5f5e20fe64a30f.patch
new file mode 100644
index 00000000..f49e98a2
--- /dev/null
+++ b/lxqt-base/lxqt-config/files/revert-2aff948ea19508317c185d87bc5f5e20fe64a30f.patch
@@ -0,0 +1,394 @@
+diff '--color=auto' -Nur a/lxqt-config-appearance/lxqtthemeconfig.cpp b/lxqt-config-appearance/lxqtthemeconfig.cpp
+--- a/lxqt-config-appearance/lxqtthemeconfig.cpp 2024-11-05 05:22:05.000000000 +0000
++++ b/lxqt-config-appearance/lxqtthemeconfig.cpp 2024-11-08 18:39:06.790390985 +0000
+@@ -35,7 +35,6 @@
+ #include <QMenu>
+ #include <QDesktopServices>
+ #include <QUrl>
+-#include <QDir>
+
+ #include <XdgDirs>
+
+@@ -61,11 +60,10 @@
+ }
+ };
+
+-LXQtThemeConfig::LXQtThemeConfig(LXQt::Settings *settings, StyleConfig *stylePage, QWidget *parent) :
++LXQtThemeConfig::LXQtThemeConfig(LXQt::Settings *settings, QWidget *parent) :
+ QWidget(parent),
+ ui(new Ui::LXQtThemeConfig),
+- mSettings(settings),
+- mStylePage(stylePage)
++ mSettings(settings)
+ {
+ ui->setupUi(this);
+ {
+@@ -96,9 +94,8 @@
+
+ initControls();
+
+- connect(ui->lxqtThemeList, &QTreeWidget::currentItemChanged, this, &LXQtThemeConfig::onCurrentItemChanged);
++ connect(ui->lxqtThemeList, &QTreeWidget::currentItemChanged, this, &LXQtThemeConfig::settingsChanged);
+ connect(ui->wallpaperOverride, &QAbstractButton::clicked, this, &LXQtThemeConfig::settingsChanged);
+- connect(ui->paletteOverride, &QAbstractButton::clicked, this, &LXQtThemeConfig::onPaletteOverrideChanged);
+
+ connect(ui->lxqtThemeList, &QTreeWidget::itemDoubleClicked, this, &LXQtThemeConfig::doubleClicked);
+ connect(ui->lxqtThemeList, &QWidget::customContextMenuRequested, this, &LXQtThemeConfig::contextMenu);
+@@ -125,9 +122,6 @@
+ ++it;
+ }
+
+- ui->wallpaperOverride->setChecked(mSettings->value(QStringLiteral("wallpaper_override")).toBool());
+- ui->paletteOverride->setChecked(mSettings->value(QStringLiteral("palette_override")).toBool());
+-
+ update();
+ }
+
+@@ -155,12 +149,6 @@
+ }
+ }
+ }
+-
+- if(mSettings->value(QStringLiteral("wallpaper_override")) != ui->wallpaperOverride->isChecked())
+- mSettings->setValue(QStringLiteral("wallpaper_override"), ui->wallpaperOverride->isChecked());
+-
+- if(mSettings->value(QStringLiteral("palette_override")) != ui->paletteOverride->isChecked())
+- mSettings->setValue(QStringLiteral("palette_override"), ui->paletteOverride->isChecked());
+ }
+
+ void LXQtThemeConfig::doubleClicked(QTreeWidgetItem *item, int /*column*/)
+@@ -188,43 +176,3 @@
+ });
+ menu.exec(ui->lxqtThemeList->viewport()->mapToGlobal(p));
+ }
+-
+-void LXQtThemeConfig::loadThemePalette()
+-{
+- QTreeWidgetItem* current = ui->lxqtThemeList->currentItem();
+- if (!ui->paletteOverride->isChecked() || !mStylePage || !current)
+- return;
+- QString themeName = current->data(0, Qt::UserRole).toString();
+- if (themeName.isEmpty())
+- return;
+- themeName[0] = themeName[0].toTitleCase(); // palette names should be as they appear in GUI
+- auto paths = QStandardPaths::standardLocations(QStandardPaths::GenericDataLocation);
+- paths.removeDuplicates();
+- for (const auto &path : std::as_const(paths))
+- {
+- QDir dir(path + QLatin1String("/lxqt/palettes"));
+- if (dir.exists())
+- {
+- if (dir.exists(themeName))
+- {
+- const QString palettePath = path + QStringLiteral("/lxqt/palettes/") + themeName;
+- mStylePage->loadPaletteFile(palettePath);
+- break;
+- }
+- }
+- }
+-}
+-
+-void LXQtThemeConfig::onPaletteOverrideChanged(bool checked)
+-{
+- emit settingsChanged();
+- if (checked)
+- loadThemePalette();
+-}
+-
+-void LXQtThemeConfig::onCurrentItemChanged(QTreeWidgetItem*, QTreeWidgetItem*)
+-{
+- emit settingsChanged();
+- if (ui->paletteOverride->isChecked())
+- loadThemePalette();
+-}
+diff '--color=auto' -Nur a/lxqt-config-appearance/lxqtthemeconfig.h b/lxqt-config-appearance/lxqtthemeconfig.h
+--- a/lxqt-config-appearance/lxqtthemeconfig.h 2024-11-05 05:22:05.000000000 +0000
++++ b/lxqt-config-appearance/lxqtthemeconfig.h 2024-11-08 18:39:06.791390985 +0000
+@@ -30,7 +30,6 @@
+
+ #include <QWidget>
+ #include <LXQt/Settings>
+-#include "styleconfig.h"
+
+ class QTreeWidgetItem;
+
+@@ -43,7 +42,7 @@
+ Q_OBJECT
+
+ public:
+- explicit LXQtThemeConfig(LXQt::Settings *settings, StyleConfig *stylePage, QWidget *parent = nullptr);
++ explicit LXQtThemeConfig(LXQt::Settings *settings, QWidget *parent = nullptr);
+ ~LXQtThemeConfig();
+
+ void applyLxqtTheme();
+@@ -57,15 +56,10 @@
+ private slots:
+ void doubleClicked(QTreeWidgetItem *item, int column);
+ void contextMenu(const QPoint& p);
+- void onPaletteOverrideChanged(bool checked);
+- void onCurrentItemChanged(QTreeWidgetItem*, QTreeWidgetItem*);
+
+ private:
+- void loadThemePalette();
+-
+ Ui::LXQtThemeConfig *ui;
+ LXQt::Settings *mSettings;
+- StyleConfig *mStylePage;
+ };
+
+ #endif // LXQTTHEMECONFIG_H
+diff '--color=auto' -Nur a/lxqt-config-appearance/lxqtthemeconfig.ui b/lxqt-config-appearance/lxqtthemeconfig.ui
+--- a/lxqt-config-appearance/lxqtthemeconfig.ui 2024-11-05 05:22:05.000000000 +0000
++++ b/lxqt-config-appearance/lxqtthemeconfig.ui 2024-11-08 18:39:06.791390985 +0000
+@@ -58,13 +58,6 @@
+ </property>
+ </widget>
+ </item>
+- <item>
+- <widget class="QCheckBox" name="paletteOverride">
+- <property name="text">
+- <string>Use palette provided by theme</string>
+- </property>
+- </widget>
+- </item>
+ </layout>
+ </widget>
+ <resources/>
+diff '--color=auto' -Nur a/lxqt-config-appearance/main.cpp b/lxqt-config-appearance/main.cpp
+--- a/lxqt-config-appearance/main.cpp 2024-11-05 05:22:05.000000000 +0000
++++ b/lxqt-config-appearance/main.cpp 2024-11-08 18:39:06.791390985 +0000
+@@ -88,7 +88,7 @@
+ QObject::connect(iconPage, &IconThemeConfig::updateOtherSettings, configOtherToolKits, &ConfigOtherToolKits::setConfig);
+
+ /*** LXQt Theme ***/
+- LXQtThemeConfig* themePage = new LXQtThemeConfig(settings, stylePage, dialog);
++ LXQtThemeConfig* themePage = new LXQtThemeConfig(settings, dialog);
+ dialog->addPage(themePage, QObject::tr("LXQt Theme"), QStringList() << QStringLiteral("preferences-desktop-color") << QStringLiteral("preferences-desktop"));
+ QObject::connect(dialog, &LXQt::ConfigDialog::reset, themePage, &LXQtThemeConfig::initControls);
+ QObject::connect(themePage, &LXQtThemeConfig::settingsChanged, dialog, [dialog] {
+diff '--color=auto' -Nur a/lxqt-config-appearance/styleconfig.cpp b/lxqt-config-appearance/styleconfig.cpp
+--- a/lxqt-config-appearance/styleconfig.cpp 2024-11-05 05:22:05.000000000 +0000
++++ b/lxqt-config-appearance/styleconfig.cpp 2024-11-08 18:39:06.791390985 +0000
+@@ -485,70 +485,65 @@
+ dialog.setQuestion(tr("Do you really want to remove selected palette(s)?\nRoot palettes will remain intact if existing."));
+
+ if (dialog.exec() == QDialog::Accepted)
+- {
+- loadPaletteFile(dialog.currentPalette());
+- }
+-}
++ { // set color labels
++ auto paletteFile = dialog.currentPalette();
++ if (paletteFile.isEmpty())
++ return;
++ QSettings settings(paletteFile, QSettings::IniFormat);
++ settings.beginGroup(QStringLiteral("Palette"));
++
++ QColor color;
++ color = QColor::fromString(settings.value(QStringLiteral("window_color")).toString());
++ if (!color.isValid())
++ color = QGuiApplication::palette().color(QPalette::Active,QPalette::Window);
++ ui->winColorLabel->setColor(color, true);
++
++ color = QColor::fromString(settings.value(QStringLiteral("base_color")).toString());
++ if (!color.isValid())
++ color = QGuiApplication::palette().color(QPalette::Active,QPalette::Base);
++ ui->baseColorLabel->setColor(color, true);
++
++ color = QColor::fromString(settings.value(QStringLiteral("highlight_color")).toString());
++ if (!color.isValid())
++ color = QGuiApplication::palette().color(QPalette::Active,QPalette::Highlight);
++ ui->highlightColorLabel->setColor(color, true);
++
++ color = QColor::fromString(settings.value(QStringLiteral("window_text_color")).toString());
++ if (!color.isValid())
++ color = QGuiApplication::palette().color(QPalette::Active,QPalette::WindowText);
++ ui->windowTextColorLabel->setColor(color, true);
++
++ color = QColor::fromString(settings.value(QStringLiteral("text_color")).toString());
++ if (!color.isValid())
++ color = QGuiApplication::palette().color(QPalette::Active,QPalette::Text);
++ ui->viewTextColorLabel->setColor(color, true);
++
++ color = QColor::fromString(settings.value(QStringLiteral("highlighted_text_color")).toString());
++ if (!color.isValid())
++ color = QGuiApplication::palette().color(QPalette::Active,QPalette::HighlightedText);
++ ui->highlightedTextColorLabel->setColor(color, true);
++
++ color = QColor::fromString(settings.value(QStringLiteral("link_color")).toString());
++ if (!color.isValid())
++ color = QGuiApplication::palette().color(QPalette::Active,QPalette::Link);
++ ui->linkColorLabel->setColor(color, true);
++
++ color = QColor::fromString(settings.value(QStringLiteral("link_visited_color")).toString());
++ if (!color.isValid())
++ color = QGuiApplication::palette().color(QPalette::Active,QPalette::LinkVisited);
++ ui->linkVisitedColorLabel->setColor(color, true);
++
++ // tooltips use the Inactive color group
++ color = QColor::fromString(settings.value(QStringLiteral("tooltip_base_color")).toString());
++ if (!color.isValid())
++ color = QGuiApplication::palette().color(QPalette::Inactive,QPalette::ToolTipBase);
++ ui->tooltipColorLabel->setColor(color, true);
++
++ color = QColor::fromString(settings.value(QStringLiteral("tooltip_text_color")).toString());
++ if (!color.isValid())
++ color = QGuiApplication::palette().color(QPalette::Inactive,QPalette::ToolTipText);
++ ui->tooltipTextColorLabel->setColor(color, true);
+
+-void StyleConfig::loadPaletteFile(const QString& paletteFile)
+-{ // set color labels
+- if (paletteFile.isEmpty())
+- return;
+-
+- QSettings settings(paletteFile, QSettings::IniFormat);
+- settings.beginGroup(QStringLiteral("Palette"));
+-
+- QColor color;
+- color = QColor::fromString(settings.value(QStringLiteral("window_color")).toString());
+- if (!color.isValid())
+- color = QGuiApplication::palette().color(QPalette::Active,QPalette::Window);
+- ui->winColorLabel->setColor(color, true);
+-
+- color = QColor::fromString(settings.value(QStringLiteral("base_color")).toString());
+- if (!color.isValid())
+- color = QGuiApplication::palette().color(QPalette::Active,QPalette::Base);
+- ui->baseColorLabel->setColor(color, true);
+-
+- color = QColor::fromString(settings.value(QStringLiteral("highlight_color")).toString());
+- if (!color.isValid())
+- color = QGuiApplication::palette().color(QPalette::Active,QPalette::Highlight);
+- ui->highlightColorLabel->setColor(color, true);
+-
+- color = QColor::fromString(settings.value(QStringLiteral("window_text_color")).toString());
+- if (!color.isValid())
+- color = QGuiApplication::palette().color(QPalette::Active,QPalette::WindowText);
+- ui->windowTextColorLabel->setColor(color, true);
+-
+- color = QColor::fromString(settings.value(QStringLiteral("text_color")).toString());
+- if (!color.isValid())
+- color = QGuiApplication::palette().color(QPalette::Active,QPalette::Text);
+- ui->viewTextColorLabel->setColor(color, true);
+-
+- color = QColor::fromString(settings.value(QStringLiteral("highlighted_text_color")).toString());
+- if (!color.isValid())
+- color = QGuiApplication::palette().color(QPalette::Active,QPalette::HighlightedText);
+- ui->highlightedTextColorLabel->setColor(color, true);
+-
+- color = QColor::fromString(settings.value(QStringLiteral("link_color")).toString());
+- if (!color.isValid())
+- color = QGuiApplication::palette().color(QPalette::Active,QPalette::Link);
+- ui->linkColorLabel->setColor(color, true);
+-
+- color = QColor::fromString(settings.value(QStringLiteral("link_visited_color")).toString());
+- if (!color.isValid())
+- color = QGuiApplication::palette().color(QPalette::Active,QPalette::LinkVisited);
+- ui->linkVisitedColorLabel->setColor(color, true);
+-
+- // tooltips use the Inactive color group
+- color = QColor::fromString(settings.value(QStringLiteral("tooltip_base_color")).toString());
+- if (!color.isValid())
+- color = QGuiApplication::palette().color(QPalette::Inactive,QPalette::ToolTipBase);
+- ui->tooltipColorLabel->setColor(color, true);
+-
+- color = QColor::fromString(settings.value(QStringLiteral("tooltip_text_color")).toString());
+- if (!color.isValid())
+- color = QGuiApplication::palette().color(QPalette::Inactive,QPalette::ToolTipText);
+- ui->tooltipTextColorLabel->setColor(color, true);
+-
+- settings.endGroup();
++ settings.endGroup();
++ }
+ }
+diff '--color=auto' -Nur a/lxqt-config-appearance/styleconfig.h b/lxqt-config-appearance/styleconfig.h
+--- a/lxqt-config-appearance/styleconfig.h 2024-11-05 05:22:05.000000000 +0000
++++ b/lxqt-config-appearance/styleconfig.h 2024-11-08 18:39:06.791390985 +0000
+@@ -47,7 +47,6 @@
+ ~StyleConfig();
+
+ void applyStyle();
+- void loadPaletteFile(const QString& paletteFile);
+
+ public slots:
+ void initControls();
+diff '--color=auto' -Nur a/lxqt-config-appearance/styleconfig.ui b/lxqt-config-appearance/styleconfig.ui
+--- a/lxqt-config-appearance/styleconfig.ui 2024-11-05 05:22:05.000000000 +0000
++++ b/lxqt-config-appearance/styleconfig.ui 2024-11-08 18:39:06.791390985 +0000
+@@ -127,28 +127,28 @@
+ <widget class="ColorLabel" name="highlightColorLabel"/>
+ </item>
+ <item row="3" column="0">
+- <widget class="QLabel" name="label_3">
++ <widget class="QLabel" name="label_13">
+ <property name="text">
+- <string>Tooltip:</string>
++ <string>Link:</string>
+ </property>
+ </widget>
+ </item>
+ <item row="3" column="1">
+- <widget class="ColorLabel" name="tooltipColorLabel">
+- <property name="text">
+- <string/>
+- </property>
+- </widget>
++ <widget class="ColorLabel" name="linkColorLabel"/>
+ </item>
+ <item row="4" column="0">
+- <widget class="QLabel" name="label_13">
++ <widget class="QLabel" name="label_3">
+ <property name="text">
+- <string>Link:</string>
++ <string>Tooltip:</string>
+ </property>
+ </widget>
+ </item>
+ <item row="4" column="1">
+- <widget class="ColorLabel" name="linkColorLabel"/>
++ <widget class="ColorLabel" name="tooltipColorLabel">
++ <property name="text">
++ <string/>
++ </property>
++ </widget>
+ </item>
+ </layout>
+ </item>
+@@ -191,28 +191,28 @@
+ <widget class="ColorLabel" name="highlightedTextColorLabel"/>
+ </item>
+ <item row="3" column="0">
+- <widget class="QLabel" name="label_4">
++ <widget class="QLabel" name="label_14">
+ <property name="text">
+- <string>Tooltip Text:</string>
++ <string>Visited Link:</string>
+ </property>
+ </widget>
+ </item>
+ <item row="3" column="1">
+- <widget class="ColorLabel" name="tooltipTextColorLabel">
+- <property name="text">
+- <string/>
+- </property>
+- </widget>
++ <widget class="ColorLabel" name="linkVisitedColorLabel"/>
+ </item>
+ <item row="4" column="0">
+- <widget class="QLabel" name="label_14">
++ <widget class="QLabel" name="label_4">
+ <property name="text">
+- <string>Visited Link:</string>
++ <string>Tooltip Text:</string>
+ </property>
+ </widget>
+ </item>
+ <item row="4" column="1">
+- <widget class="ColorLabel" name="linkVisitedColorLabel"/>
++ <widget class="ColorLabel" name="tooltipTextColorLabel">
++ <property name="text">
++ <string/>
++ </property>
++ </widget>
+ </item>
+ </layout>
+ </item>
diff --git a/lxqt-base/lxqt-config/lxqt-config-2.1.0-r1.ebuild b/lxqt-base/lxqt-config/lxqt-config-2.1.0-r1.ebuild
new file mode 100644
index 00000000..8b21bad4
--- /dev/null
+++ b/lxqt-base/lxqt-config/lxqt-config-2.1.0-r1.ebuild
@@ -0,0 +1,74 @@
+# Copyright 1999-2024 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 ~arm64 ~riscv ~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/qttools-6.6:6[linguist]
+ >=dev-util/lxqt-build-tools-2.1.0
+"
+DEPEND="
+ >=dev-libs/libqtxdg-4.1.0
+ >=dev-qt/qtbase-6.6:6[gui,widgets,xml]
+ >=dev-qt/qtsvg-6.6:6
+ =lxqt-base/liblxqt-${MY_PV}*:=
+ =lxqt-base/lxqt-menu-data-${MY_PV}*
+ sys-libs/zlib:=
+ x11-apps/setxkbmap
+ x11-libs/libxcb:=
+ x11-libs/libX11
+ x11-libs/libXcursor
+ x11-libs/libXfixes
+ monitor? ( kde-plasma/libkscreen:6= )
+ touchpad? (
+ virtual/libudev:=
+ x11-drivers/xf86-input-libinput
+ x11-libs/libXi
+ )
+"
+RDEPEND="${DEPEND}"
+
+PATCHES=(
+ "${FILESDIR}"/revert-2aff948ea19508317c185d87bc5f5e20fe64a30f.patch
+ "${FILESDIR}"/"${PN}"-qt5ct.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-meta/lxqt-meta-2.0.0-r1.ebuild b/lxqt-base/lxqt-meta/lxqt-meta-2.1.0.ebuild
index 6020f2ac..9dc7f620 100644
--- a/lxqt-base/lxqt-meta/lxqt-meta-2.0.0-r1.ebuild
+++ b/lxqt-base/lxqt-meta/lxqt-meta-2.1.0.ebuild
@@ -16,9 +16,9 @@ LICENSE="metapackage"
SLOT="0"
IUSE="
- +about admin +archiver +desktop-portal discover +display-manager +filemanager
+ +about admin +archiver +desktop-portal discover +display-manager +filemanager gtk
+lximage networkmanager nls +openbox +policykit powermanagement +processviewer
- +screenshot +sddm ssh-askpass +sudo +terminal +trash +window-manager
+ qt5 qt6 +screenshot +sddm ssh-askpass +sudo +terminal +trash +window-manager
"
REQUIRED_USE="trash? ( filemanager )"
@@ -33,12 +33,12 @@ RDEPEND="
=lxqt-base/lxqt-menu-data-${MY_PV}*
=lxqt-base/lxqt-notificationd-${MY_PV}*
=lxqt-base/lxqt-panel-${MY_PV}*
- =lxqt-base/lxqt-qtplugin-${MY_PV}*
=lxqt-base/lxqt-runner-${MY_PV}*
=lxqt-base/lxqt-session-${MY_PV}*
virtual/ttf-fonts
x11-terms/xterm
=x11-themes/lxqt-themes-${MY_PV}*
+ x11-themes/redcore-theme-lxqt
about? ( =lxqt-base/lxqt-about-${MY_PV}* )
admin? ( =lxqt-base/lxqt-admin-${MY_PV}* )
archiver? ( >=app-arch/lxqt-archiver-1.0 )
@@ -49,6 +49,7 @@ RDEPEND="
!sddm? ( x11-misc/lightdm )
)
filemanager? ( =x11-misc/pcmanfm-qt-${MY_PV}* )
+ gtk? ( lxde-base/lxappearance )
lximage? ( =media-gfx/lximage-qt-${MY_PV}* )
networkmanager? (
net-misc/networkmanager
@@ -58,6 +59,8 @@ RDEPEND="
policykit? ( =lxqt-base/lxqt-policykit-${MY_PV}* )
powermanagement? ( =lxqt-base/lxqt-powermanagement-${MY_PV}* )
processviewer? ( >=x11-misc/qps-2.9 )
+ qt5? ( x11-misc/qt5ct )
+ qt6? ( gui-apps/qt6ct )
screenshot? ( >=x11-misc/screengrab-2.8 )
sddm? ( x11-misc/sddm )
ssh-askpass? ( =lxqt-base/lxqt-openssh-askpass-${MY_PV}* )
diff --git a/lxqt-base/lxqt-session/Manifest b/lxqt-base/lxqt-session/Manifest
new file mode 100644
index 00000000..54130789
--- /dev/null
+++ b/lxqt-base/lxqt-session/Manifest
@@ -0,0 +1 @@
+DIST lxqt-session-2.1.0.tar.xz 212308 BLAKE2B 4036295e6cb61b8f94ee0c56e46c3792894de55f32de0dcd2d121881d1f68450bf9fa9c36f0b9740cb6eaccbbd11aa8e210eaa77e16e97c8f03de1008def4d00 SHA512 b0f70ef1f166fd5c48394f66794c655f1a26411d69c831f671c07ca5eaf9434d2902fbcda507f3b75b69d165a6e234a774c5f8f3f85d7cb924fa3152866d88b5
diff --git a/lxqt-base/lxqt-session/files/lxqt-session-qt5ct.patch b/lxqt-base/lxqt-session/files/lxqt-session-qt5ct.patch
new file mode 100644
index 00000000..ef83e373
--- /dev/null
+++ b/lxqt-base/lxqt-session/files/lxqt-session-qt5ct.patch
@@ -0,0 +1,16 @@
+diff '--color=auto' -Nur a/startlxqt.in b/startlxqt.in
+--- a/startlxqt.in 2024-04-17 12:22:25.000000000 +0100
++++ b/startlxqt.in 2024-09-30 03:19:21.606222756 +0100
+@@ -53,11 +53,8 @@
+ fi
+ fi
+
+-# Qt4 platform plugin
+-export QT_PLATFORM_PLUGIN=lxqt
+-
+ # Qt5 platform plugin
+-export QT_QPA_PLATFORMTHEME=lxqt
++export QT_QPA_PLATFORMTHEME=qt5ct
+
+ # use lxqt-applications.menu for main app menu
+ export XDG_MENU_PREFIX="lxqt-"
diff --git a/lxqt-base/lxqt-session/lxqt-session-2.1.0-r1.ebuild b/lxqt-base/lxqt-session/lxqt-session-2.1.0-r1.ebuild
new file mode 100644
index 00000000..6b914af7
--- /dev/null
+++ b/lxqt-base/lxqt-session/lxqt-session-2.1.0-r1.ebuild
@@ -0,0 +1,60 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit cmake
+
+DESCRIPTION="LXQt Session Manager"
+HOMEPAGE="https://lxqt-project.org/"
+
+MY_PV="$(ver_cut 1-2)"
+
+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 ~arm64 ~riscv ~x86"
+fi
+
+LICENSE="LGPL-2.1 LGPL-2.1+"
+SLOT="0"
+IUSE="+udev"
+
+BDEPEND="
+ >=dev-qt/qttools-6.6:6[linguist]
+ >=dev-util/lxqt-build-tools-2.1.0
+"
+DEPEND="
+ >=app-misc/qtxdg-tools-4.1.0
+ >=dev-libs/libqtxdg-4.1.0
+ >=dev-qt/qtbase-6.6:6[dbus,gui,widgets]
+ kde-frameworks/kwindowsystem:6[X]
+ kde-plasma/layer-shell-qt:6
+ =lxqt-base/liblxqt-${MY_PV}*:=
+ sys-process/procps:=
+ x11-libs/libX11
+ x11-misc/xdg-user-dirs
+ udev? ( virtual/libudev:= )
+"
+RDEPEND="${DEPEND}"
+
+PATCHES=( "${FILESDIR}"/"${PN}"-qt5ct.patch )
+
+src_configure() {
+ local mycmakeargs=(
+ -DWITH_LIBUDEV=$(usex udev)
+ )
+
+ cmake_src_configure
+}
+
+src_install() {
+ cmake_src_install
+ doman lxqt-config-session/man/*.1 lxqt-session/man/*.1
+
+ newenvd - 91lxqt-config-dir <<- _EOF_
+ XDG_CONFIG_DIRS='${EPREFIX}/usr/share'
+ _EOF_
+}
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-12 01:07:10 +0000