lxqt-base/lxqt-{meta,session} : revision bump

5 files changed, 103 insertions, 2 deletions

diff --git a/lxqt-base/lxqt-meta-1.1.0-r1.ebuild b/lxqt-base/lxqt-meta/lxqt-meta-1.1.0-r2.ebuild
index 367d253d..286b1408 100644
--- a/lxqt-base/lxqt-meta-1.1.0-r1.ebuild
+++ b/lxqt-base/lxqt-meta/lxqt-meta-1.1.0-r2.ebuild
@@ -15,7 +15,7 @@ fi
 LICENSE="metapackage"
 SLOT="0"
 
-IUSE="+about admin archiver +desktop-portal discover +display-manager +filemanager
+IUSE="+about admin archiver +desktop-portal discover +display-manager +filemanager gtk
 lximage minimal nls +policykit powermanagement processviewer screenshot
 +sddm ssh-askpass sudo terminal +trash"
 
@@ -30,7 +30,6 @@ RDEPEND="
 	=lxqt-base/lxqt-globalkeys-${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
@@ -46,6 +45,11 @@ RDEPEND="
 		!sddm? ( x11-misc/lightdm )
 	)
 	filemanager? ( =x11-misc/pcmanfm-qt-${MY_PV}* )
+	gtk? (
+		dev-qt/qt5-styleplugins
+		x11-libs/gtk+:2
+	)
+	!gtk? ( =lxqt-base/lxqt-qtplugin-${MY_PV}* )
 	lximage? ( media-gfx/lximage-qt )
 	!minimal? (
 		x11-wm/openbox
diff --git a/lxqt-base/lxqt-session/Manifest b/lxqt-base/lxqt-session/Manifest
new file mode 100644
index 00000000..012ca5f2
--- /dev/null
+++ b/lxqt-base/lxqt-session/Manifest
@@ -0,0 +1 @@
+DIST lxqt-session-1.1.1.tar.xz 184532 BLAKE2B 6eaa9f15080c527ac325ce4c48eccd4ad7eff108ff6457dcb1cb080b9758147b382cc474b92641d00d0272a88fb0f0955adbd80a35b4f24c864bb4145f26f145 SHA512 a0447fdd3299cc6b82c81bc2767eb690af19326ef0f7c9cf349de368072e7a5eb2bce3e5afd32b1c0f21d3e28a6f2e0eb47d00f76aadbf1651be76b82770a456
diff --git a/lxqt-base/lxqt-session/files/platform-plugin.patch b/lxqt-base/lxqt-session/files/platform-plugin.patch
new file mode 100644
index 00000000..e61c6ef5
--- /dev/null
+++ b/lxqt-base/lxqt-session/files/platform-plugin.patch
@@ -0,0 +1,16 @@
+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
new file mode 100644
index 00000000..af3161f8
--- /dev/null
+++ b/lxqt-base/lxqt-session/files/session.conf
@@ -0,0 +1,3 @@
+[General]
+__userfile__=true
+window_manager=/usr/bin/openbox
diff --git a/lxqt-base/lxqt-session/lxqt-session-1.1.1-r1.ebuild b/lxqt-base/lxqt-session/lxqt-session-1.1.1-r1.ebuild
new file mode 100644
index 00000000..33038ea8
--- /dev/null
+++ b/lxqt-base/lxqt-session/lxqt-session-1.1.1-r1.ebuild
@@ -0,0 +1,77 @@
+# 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.11.0
+"
+DEPEND="
+	>=app-misc/qtxdg-tools-3.9.1
+	>=dev-libs/libqtxdg-3.9.1
+	>=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
+		eapply ${FILESDIR}/platform-plugin.patch
+		cmake_src_prepare
+	else
+		cmake_src_prepare
+	fi
+}
+
+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"
+}