From dd631fe14bf663efcba35eee2a3f097822278263 Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Sat, 16 Dec 2017 12:22:43 +0000 Subject: lxqt-base/lxqt-session : lxqt platformtheme seems to be broken with qt5.9, so override it --- ...t-session-override-default-platformplugin.patch | 16 ++++++ .../lxqt-session/lxqt-session-0.12.0-r2.ebuild | 53 -------------------- .../lxqt-session/lxqt-session-0.12.0-r3.ebuild | 58 ++++++++++++++++++++++ 3 files changed, 74 insertions(+), 53 deletions(-) create mode 100644 lxqt-base/lxqt-session/files/lxqt-session-override-default-platformplugin.patch delete mode 100644 lxqt-base/lxqt-session/lxqt-session-0.12.0-r2.ebuild create mode 100644 lxqt-base/lxqt-session/lxqt-session-0.12.0-r3.ebuild (limited to 'lxqt-base') diff --git a/lxqt-base/lxqt-session/files/lxqt-session-override-default-platformplugin.patch b/lxqt-base/lxqt-session/files/lxqt-session-override-default-platformplugin.patch new file mode 100644 index 00000000..b026a0fa --- /dev/null +++ b/lxqt-base/lxqt-session/files/lxqt-session-override-default-platformplugin.patch @@ -0,0 +1,16 @@ +diff -Nur a/startlxqt.in b/startlxqt.in +--- a/startlxqt.in 2017-10-21 20:39:00.000000000 +0100 ++++ b/startlxqt.in 2017-12-16 12:15:51.224228628 +0000 +@@ -84,11 +84,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-0.12.0-r2.ebuild b/lxqt-base/lxqt-session/lxqt-session-0.12.0-r2.ebuild deleted file mode 100644 index 626d986f..00000000 --- a/lxqt-base/lxqt-session/lxqt-session-0.12.0-r2.ebuild +++ /dev/null @@ -1,53 +0,0 @@ -# Copyright 1999-2016 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=5 - -inherit cmake-utils - -DESCRIPTION="LXQT session manager" -HOMEPAGE="http://lxqt.org/" - -if [[ ${PV} = *9999* ]]; then - inherit git-r3 - EGIT_REPO_URI="git://git.lxde.org/git/lxde/${PN}.git" -else - SRC_URI="https://github.com/lxde/${PN}/releases/download/${PV}/${P}.tar.xz" - KEYWORDS="~amd64 ~arm ~arm64 ~x86" -fi - -LICENSE="GPL-2 LGPL-2.1+" -SLOT="0" - -CDEPEND=" - >=dev-libs/libqtxdg-3.1.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" -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_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" -} diff --git a/lxqt-base/lxqt-session/lxqt-session-0.12.0-r3.ebuild b/lxqt-base/lxqt-session/lxqt-session-0.12.0-r3.ebuild new file mode 100644 index 00000000..7f2881c0 --- /dev/null +++ b/lxqt-base/lxqt-session/lxqt-session-0.12.0-r3.ebuild @@ -0,0 +1,58 @@ +# 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/" + +if [[ ${PV} = *9999* ]]; then + inherit git-r3 + EGIT_REPO_URI="git://git.lxde.org/git/lxde/${PN}.git" +else + SRC_URI="https://github.com/lxde/${PN}/releases/download/${PV}/${P}.tar.xz" + KEYWORDS="~amd64 ~arm ~arm64 ~x86" +fi + +LICENSE="GPL-2 LGPL-2.1+" +SLOT="0" + +CDEPEND=" + >=dev-libs/libqtxdg-3.1.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" +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 () { + epatch ${FILESDIR}/${PN}-override-default-platformplugin.patch + cmake-utils_src_prepare +} + +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