From e03aaf2922c32334c21ef64545f89128f821a5ed Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Thu, 16 Feb 2023 00:36:45 +0000 Subject: lxqt-base/lxqt-session : revision bump --- .../files/lxqt-session-platform-plugin.patch | 16 +++++ lxqt-base/lxqt-session/files/platform-plugin.patch | 16 ----- .../lxqt-session/lxqt-session-1.2.0-r1.ebuild | 77 ---------------------- .../lxqt-session/lxqt-session-1.2.0-r2.ebuild | 75 +++++++++++++++++++++ 4 files changed, 91 insertions(+), 93 deletions(-) create mode 100644 lxqt-base/lxqt-session/files/lxqt-session-platform-plugin.patch delete mode 100644 lxqt-base/lxqt-session/files/platform-plugin.patch delete mode 100644 lxqt-base/lxqt-session/lxqt-session-1.2.0-r1.ebuild create mode 100644 lxqt-base/lxqt-session/lxqt-session-1.2.0-r2.ebuild (limited to 'lxqt-base') diff --git a/lxqt-base/lxqt-session/files/lxqt-session-platform-plugin.patch b/lxqt-base/lxqt-session/files/lxqt-session-platform-plugin.patch new file mode 100644 index 00000000..e61c6ef5 --- /dev/null +++ b/lxqt-base/lxqt-session/files/lxqt-session-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/platform-plugin.patch b/lxqt-base/lxqt-session/files/platform-plugin.patch deleted file mode 100644 index e61c6ef5..00000000 --- a/lxqt-base/lxqt-session/files/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/lxqt-session-1.2.0-r1.ebuild b/lxqt-base/lxqt-session/lxqt-session-1.2.0-r1.ebuild deleted file mode 100644 index 33038ea8..00000000 --- a/lxqt-base/lxqt-session/lxqt-session-1.2.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 - -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" -} diff --git a/lxqt-base/lxqt-session/lxqt-session-1.2.0-r2.ebuild b/lxqt-base/lxqt-session/lxqt-session-1.2.0-r2.ebuild new file mode 100644 index 00000000..55d72065 --- /dev/null +++ b/lxqt-base/lxqt-session/lxqt-session-1.2.0-r2.ebuild @@ -0,0 +1,75 @@ +# 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 + 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" +} -- cgit v1.2.3