lxqt-base/lxqt-meta : version bump

9 files changed, 77 insertions, 335 deletions

diff --git a/lxqt-base/lxqt-config/Manifest b/lxqt-base/lxqt-config/Manifest
deleted file mode 100644
index cb27c412..00000000
--- a/lxqt-base/lxqt-config/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST lxqt-config-1.4.0.tar.xz 371628 BLAKE2B d7be05fdd55bfe2efe977184008ed6324e16e85c2bceb6b9c15e8ef11978d34ba0961b671978618ce4b7a836653477c4fa5cbc9b5dfead7a1c8a87e00c408bbd SHA512 a3e6722c3f63b3c7382ec84723e3a4d838d99b2c42ce731565f940873b275ef025b7bc1a570f165b7fce521eb77bb7b83b02e922bee251507b773c8de4f785fc
diff --git a/lxqt-base/lxqt-config/files/lxqt-config-qgtk2.patch b/lxqt-base/lxqt-config/files/lxqt-config-qgtk2.patch
deleted file mode 100644
index bf684cdf..00000000
--- a/lxqt-base/lxqt-config/files/lxqt-config-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 <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"
- 
-@@ -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, &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/lxqt-config-1.4.0-r1.ebuild b/lxqt-base/lxqt-config/lxqt-config-1.4.0-r1.ebuild
deleted file mode 100644
index 1d2b2fe2..00000000
--- a/lxqt-base/lxqt-config/lxqt-config-1.4.0-r1.ebuild
+++ /dev/null
@@ -1,79 +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.11.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}*:=
-	=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:5= )
-	touchpad? (
-		virtual/libudev:=
-		x11-drivers/xf86-input-libinput
-		x11-libs/libXi
-	)
-"
-RDEPEND="${DEPEND}"
-
-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
-}
diff --git a/lxqt-base/lxqt-meta/lxqt-meta-1.4.0-r1.ebuild b/lxqt-base/lxqt-meta/lxqt-meta-1.4.0-r1.ebuild
deleted file mode 100644
index 6cf3043c..00000000
--- a/lxqt-base/lxqt-meta/lxqt-meta-1.4.0-r1.ebuild
+++ /dev/null
@@ -1,77 +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)"
-
-DESCRIPTION="Meta ebuild for LXQt, the Lightweight Desktop Environment"
-HOMEPAGE="https://lxqt-project.org/"
-
-if [[ ${PV} != *9999* ]]; then
-	KEYWORDS="amd64 ~arm arm64 ~loong ~ppc64 ~riscv x86"
-fi
-
-LICENSE="metapackage"
-SLOT="0"
-
-IUSE="+about admin archiver +desktop-portal discover +display-manager +filemanager gtk
-lximage minimal networkmanager nls +policykit powermanagement processviewer screenshot
-+sddm ssh-askpass sudo terminal +trash"
-
-REQUIRED_USE="trash? ( filemanager )"
-
-# Note: we prefer kde-frameworks/oxygen-icons over other icon sets, as the initial
-# install expects oxygen icons, until the user specifies otherwise (bug 543380)
-
-# For lxqt-themes there is no release 1.4.0 at this time.
-
-RDEPEND="
-	kde-frameworks/oxygen-icons
-	>=lxde-base/lxmenu-data-0.1.5
-	>=lxde-base/lxappearance-0.5.5
-	=lxqt-base/lxqt-config-${MY_PV}*
-	=lxqt-base/lxqt-globalkeys-${MY_PV}*
-	=lxqt-base/lxqt-menu-data-${MY_PV}*
-	=lxqt-base/lxqt-notificationd-${MY_PV}*
-	=lxqt-base/lxqt-panel-${MY_PV}*
-	=lxqt-base/lxqt-runner-${MY_PV}*
-	=lxqt-base/lxqt-session-${MY_PV}*
-	virtual/ttf-fonts
-	x11-terms/xterm
-	>=x11-themes/lxqt-themes-1.3.0
-	about? ( =lxqt-base/lxqt-about-${MY_PV}* )
-	admin? ( =lxqt-base/lxqt-admin-${MY_PV}* )
-	archiver? ( app-arch/lxqt-archiver )
-	desktop-portal? ( gui-libs/xdg-desktop-portal-lxqt )
-	discover? ( kde-plasma/discover )
-	display-manager? (
-		sddm? ( >=x11-misc/sddm-0.11.0 )
-		!sddm? ( x11-misc/lightdm )
-	)
-	filemanager? ( =x11-misc/pcmanfm-qt-${MY_PV}* )
-	gtk? (
-		dev-qt/qtstyleplugins
-		x11-libs/gtk+:2
-	)
-	!gtk? ( =lxqt-base/lxqt-qtplugin-${MY_PV}* )
-	lximage? ( media-gfx/lximage-qt )
-	!minimal? (
-		x11-wm/openbox
-		x11-misc/obconf-qt
-	)
-	networkmanager? (
-		net-misc/networkmanager
-		gnome-extra/nm-applet
-	)
-	nls? ( dev-qt/qttranslations:5 )
-	policykit? ( =lxqt-base/lxqt-policykit-${MY_PV}* )
-	powermanagement? ( =lxqt-base/lxqt-powermanagement-${MY_PV}* )
-	processviewer? ( x11-misc/qps:0 )
-	screenshot? ( x11-misc/screengrab:0 )
-	sddm? ( >=x11-misc/sddm-0.11.0 )
-	ssh-askpass? ( =lxqt-base/lxqt-openssh-askpass-${MY_PV}* )
-	sudo? ( =lxqt-base/lxqt-sudo-${MY_PV}* )
-	terminal? ( x11-terms/qterminal:0 )
-	trash? ( gnome-base/gvfs )
-"
diff --git a/lxqt-base/lxqt-meta/lxqt-meta-2.0.0-r1.ebuild b/lxqt-base/lxqt-meta/lxqt-meta-2.0.0-r1.ebuild
new file mode 100644
index 00000000..c3274aa1
--- /dev/null
+++ b/lxqt-base/lxqt-meta/lxqt-meta-2.0.0-r1.ebuild
@@ -0,0 +1,77 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+MY_PV="$(ver_cut 1-2)"
+
+DESCRIPTION="Meta ebuild for LXQt, the Lightweight Desktop Environment"
+HOMEPAGE="https://lxqt-project.org/"
+
+if [[ ${PV} != 9999 ]]; then
+	KEYWORDS="~amd64"
+fi
+
+LICENSE="metapackage"
+SLOT="0"
+
+IUSE="
+	+about admin +archiver +desktop-portal discover +display-manager +filemanager
+	+lximage networkmanager nls +openbox +policykit powermanagement +processviewer
+	+screenshot +sddm ssh-askpass +sudo +terminal +trash +window-manager
+"
+
+REQUIRED_USE="trash? ( filemanager )"
+
+# Pull in 'kde-frameworks/breeze-icons' as an upstream default.
+# https://bugs.gentoo.org/543380
+# https://github.com/lxqt/lxqt-session/commit/5d32ff434d4
+RDEPEND="
+	kde-frameworks/breeze-icons:6
+	=lxqt-base/lxqt-config-${MY_PV}*
+	=lxqt-base/lxqt-globalkeys-${MY_PV}*
+	=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}*
+	about? ( =lxqt-base/lxqt-about-${MY_PV}* )
+	admin? ( =lxqt-base/lxqt-admin-${MY_PV}* )
+	archiver? ( >=app-arch/lxqt-archiver-1.0 )
+	desktop-portal? ( >=gui-libs/xdg-desktop-portal-lxqt-1.0 )
+	discover? ( kde-plasma/discover )
+	display-manager? (
+		sddm? ( x11-misc/sddm )
+		!sddm? ( x11-misc/lightdm )
+	)
+	filemanager? ( =x11-misc/pcmanfm-qt-${MY_PV}* )
+	lximage? ( =media-gfx/lximage-qt-${MY_PV}* )
+	networkmanager? (
+		net-misc/networkmanager
+		gnome-extra/nm-applet
+	)
+	nls? ( dev-qt/qttranslations:6 )
+	policykit? ( =lxqt-base/lxqt-policykit-${MY_PV}* )
+	powermanagement? ( =lxqt-base/lxqt-powermanagement-${MY_PV}* )
+	processviewer? ( >=x11-misc/qps-2.9 )
+	screenshot? ( >=x11-misc/screengrab-2.8 )
+	sddm? ( x11-misc/sddm )
+	ssh-askpass? ( =lxqt-base/lxqt-openssh-askpass-${MY_PV}* )
+	sudo? ( =lxqt-base/lxqt-sudo-${MY_PV}* )
+	terminal? ( =x11-terms/qterminal-${MY_PV}* )
+	trash? ( gnome-base/gvfs )
+	window-manager? (
+		openbox? (
+			x11-wm/openbox
+			x11-misc/obconf-qt
+		)
+		!openbox? (
+			kde-plasma/kwin:6
+			kde-plasma/systemsettings:6
+		)
+	)
+"
diff --git a/lxqt-base/lxqt-session/Manifest b/lxqt-base/lxqt-session/Manifest
deleted file mode 100644
index cba1f55f..00000000
--- a/lxqt-base/lxqt-session/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST lxqt-session-1.4.0.tar.xz 188324 BLAKE2B 508509a783f747c3dd72984264056466d8f9ef901b4a7731fbecca575951c528231cdb71a799ab7d617ed86c29d9026d9feb8fbb2b795a39958c1948d75812c2 SHA512 4f5731969582222eef9d0d2f2b37c4a160c3c6469f3a16cb4b1804ba76a9320d36b0ed91cada6ee905339ed8cfbd443851804086d978424c4d79045cc90e1629
diff --git a/lxqt-base/lxqt-session/files/lxqt-session-platform-plugin.patch b/lxqt-base/lxqt-session/files/lxqt-session-platform-plugin.patch
deleted file mode 100644
index e61c6ef5..00000000
--- a/lxqt-base/lxqt-session/files/lxqt-session-platform-plugin.patch
+++ /dev/null
@@ -1,16 +0,0 @@
-diff -Nur a/startlxqt.in b/startlxqt.in
---- a/startlxqt.in	2022-05-08 07:43:56.000000000 +0100
-+++ b/startlxqt.in	2022-10-18 16:22:31.073853351 +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=gtk2
- 
- # use lxqt-applications.menu for main app menu
- export XDG_MENU_PREFIX="lxqt-"
diff --git a/lxqt-base/lxqt-session/files/session.conf b/lxqt-base/lxqt-session/files/session.conf
deleted file mode 100644
index af3161f8..00000000
--- a/lxqt-base/lxqt-session/files/session.conf
+++ /dev/null
@@ -1,3 +0,0 @@
-[General]
-__userfile__=true
-window_manager=/usr/bin/openbox
diff --git a/lxqt-base/lxqt-session/lxqt-session-1.4.0-r1.ebuild b/lxqt-base/lxqt-session/lxqt-session-1.4.0-r1.ebuild
deleted file mode 100644
index 09c8856c..00000000
--- a/lxqt-base/lxqt-session/lxqt-session-1.4.0-r1.ebuild
+++ /dev/null
@@ -1,75 +0,0 @@
-# Copyright 1999-2022 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 ~arm ~arm64 ~loong ~ppc64 ~riscv ~x86"
-fi
-
-IUSE="gtk +udev"
-
-LICENSE="LGPL-2.1 LGPL-2.1+"
-SLOT="0"
-
-BDEPEND="
-	>=dev-qt/linguist-tools-5.15:5
-	>=dev-util/lxqt-build-tools-0.13.0
-"
-DEPEND="
-	>=app-misc/qtxdg-tools-3.11.0
-	>=dev-libs/libqtxdg-3.12.0
-	>=dev-qt/qtcore-5.15:5
-	>=dev-qt/qtdbus-5.15:5
-	>=dev-qt/qtgui-5.15:5
-	>=dev-qt/qtwidgets-5.15:5
-	>=dev-qt/qtx11extras-5.15:5
-	kde-frameworks/kwindowsystem:5[X]
-	=lxqt-base/liblxqt-${MY_PV}*:=
-	sys-process/procps:=
-	x11-libs/libX11
-	x11-misc/xdg-user-dirs
-	udev? ( virtual/libudev:= )
-"
-RDEPEND="${DEPEND}"
-
-src_prepare() {
-	if use gtk; then
-		PATCHES=( "${FILESDIR}"/"${PN}"-platform-plugin.patch )
-	fi
-	cmake_src_prepare
-}
-
-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_
-
-	dodir "/etc/xdg/lxqt"
-	insinto "/etc/xdg/lxqt"
-	doins "${FILESDIR}/session.conf"
-
-	dodir "/etc/X11/Sessions"
-	dosym  "/usr/bin/startlxqt" "/etc/X11/Sessions/lxqt"
-}