From c3422ca5e354590ab76d2ea1b567948861f51ccf Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Wed, 15 Aug 2018 10:58:12 +0100 Subject: lxqt-base/lxqt-session : bugfix https://bugs.redcorelinux.org/show_bug.cgi?id=96 --- lxqt-base/lxqt-session/files/session.conf | 3 ++ .../lxqt-session/lxqt-session-0.13.0-r1.ebuild | 63 ++++++++++++++++++++++ lxqt-base/lxqt-session/lxqt-session-0.13.0.ebuild | 60 --------------------- 3 files changed, 66 insertions(+), 60 deletions(-) create mode 100644 lxqt-base/lxqt-session/files/session.conf create mode 100644 lxqt-base/lxqt-session/lxqt-session-0.13.0-r1.ebuild delete mode 100644 lxqt-base/lxqt-session/lxqt-session-0.13.0.ebuild 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-0.13.0-r1.ebuild b/lxqt-base/lxqt-session/lxqt-session-0.13.0-r1.ebuild new file mode 100644 index 00000000..cf6db38c --- /dev/null +++ b/lxqt-base/lxqt-session/lxqt-session-0.13.0-r1.ebuild @@ -0,0 +1,63 @@ +# Copyright 1999-2016 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 + +EAPI=5 + +inherit cmake-utils eutils + +DESCRIPTION="LXQT session manager" +HOMEPAGE="http://lxqt.org/" + +SRC_URI="https://github.com/lxde/${PN}/releases/download/${PV}/${P}.tar.xz" +KEYWORDS="amd64" +IUSE="+gtk" + +LICENSE="GPL-2 LGPL-2.1+" +SLOT="0" + +CDEPEND=" + >=dev-libs/libqtxdg-3.2.0 + dev-qt/qtcore:5 + dev-qt/qtdbus:5 + dev-qt/qtgui:5 + dev-qt/qtwidgets:5 + dev-qt/qtx11extras:5 + dev-qt/qtxml:5 + kde-frameworks/kwindowsystem:5[X] + ~lxqt-base/liblxqt-${PV} + x11-libs/libX11 + x11-misc/xdg-user-dirs + gtk? ( ~lxqt-base/lxqt-config-${PV}[gtk] )" +DEPEND="${CDEPEND} + dev-qt/linguist-tools:5 + dev-util/intltool + !!lxqt-base/lxqt-common + sys-devel/gettext + virtual/pkgconfig" +RDEPEND="${CDEPEND} + ~lxqt-base/lxqt-themes-${PV}" + +src_prepare () { + if use gtk; then + # Redcore patch, to override default platform plugin to qgtk2 + epatch ${FILESDIR}/${PN}-override-default-platformplugin.patch + cmake-utils_src_prepare + else + cmake-utils_src_prepare + fi +} + +src_configure() { + local mycmakeargs=( -DPULL_TRANSLATIONS=OFF ) + cmake-utils_src_configure +} + +src_install(){ + cmake-utils_src_install + dodir "/etc/xdg/lxqt" + insinto "/etc/xdg/lxqt" + doins "${FILESDIR}/session.conf" + doman lxqt-config-session/man/*.1 lxqt-session/man/*.1 + dodir "/etc/X11/Sessions" + dosym "/usr/bin/startlxqt" "/etc/X11/Sessions/lxqt" +} diff --git a/lxqt-base/lxqt-session/lxqt-session-0.13.0.ebuild b/lxqt-base/lxqt-session/lxqt-session-0.13.0.ebuild deleted file mode 100644 index 61264ad1..00000000 --- a/lxqt-base/lxqt-session/lxqt-session-0.13.0.ebuild +++ /dev/null @@ -1,60 +0,0 @@ -# Copyright 1999-2016 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=5 - -inherit cmake-utils eutils - -DESCRIPTION="LXQT session manager" -HOMEPAGE="http://lxqt.org/" - -SRC_URI="https://github.com/lxde/${PN}/releases/download/${PV}/${P}.tar.xz" -KEYWORDS="amd64" -IUSE="+gtk" - -LICENSE="GPL-2 LGPL-2.1+" -SLOT="0" - -CDEPEND=" - >=dev-libs/libqtxdg-3.2.0 - dev-qt/qtcore:5 - dev-qt/qtdbus:5 - dev-qt/qtgui:5 - dev-qt/qtwidgets:5 - dev-qt/qtx11extras:5 - dev-qt/qtxml:5 - kde-frameworks/kwindowsystem:5[X] - ~lxqt-base/liblxqt-${PV} - x11-libs/libX11 - x11-misc/xdg-user-dirs - gtk? ( ~lxqt-base/lxqt-config-${PV}[gtk] )" -DEPEND="${CDEPEND} - dev-qt/linguist-tools:5 - dev-util/intltool - !!lxqt-base/lxqt-common - sys-devel/gettext - virtual/pkgconfig" -RDEPEND="${CDEPEND} - ~lxqt-base/lxqt-themes-${PV}" - -src_prepare () { - if use gtk; then - # Redcore patch, to override default platform plugin to qgtk2 - epatch ${FILESDIR}/${PN}-override-default-platformplugin.patch - cmake-utils_src_prepare - else - cmake-utils_src_prepare - fi -} - -src_configure() { - local mycmakeargs=( -DPULL_TRANSLATIONS=OFF ) - cmake-utils_src_configure -} - -src_install(){ - cmake-utils_src_install - doman lxqt-config-session/man/*.1 lxqt-session/man/*.1 - dodir "/etc/X11/Sessions" - dosym "/usr/bin/startlxqt" "/etc/X11/Sessions/lxqt" -} -- cgit v1.2.3