From 18fe80a8a174707c1d4500b2a374c70b8e70fa9b Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Sun, 22 Oct 2017 13:06:54 +0100 Subject: lxqt-base/lxqt-panel : don't display redundant entries in application menu --- lxqt-base/lxqt-panel/files/lxqt-menu-cleanup.patch | 88 ++++++++++++++++++++++ lxqt-base/lxqt-panel/lxqt-panel-0.12.0-r1.ebuild | 82 -------------------- lxqt-base/lxqt-panel/lxqt-panel-0.12.0-r2.ebuild | 86 +++++++++++++++++++++ 3 files changed, 174 insertions(+), 82 deletions(-) create mode 100644 lxqt-base/lxqt-panel/files/lxqt-menu-cleanup.patch delete mode 100644 lxqt-base/lxqt-panel/lxqt-panel-0.12.0-r1.ebuild create mode 100644 lxqt-base/lxqt-panel/lxqt-panel-0.12.0-r2.ebuild diff --git a/lxqt-base/lxqt-panel/files/lxqt-menu-cleanup.patch b/lxqt-base/lxqt-panel/files/lxqt-menu-cleanup.patch new file mode 100644 index 00000000..5076f40e --- /dev/null +++ b/lxqt-base/lxqt-panel/files/lxqt-menu-cleanup.patch @@ -0,0 +1,88 @@ +diff -Nur a/menu/lxqt-applications.menu b/menu/lxqt-applications.menu +--- a/menu/lxqt-applications.menu 2017-10-21 20:47:44.000000000 +0100 ++++ b/menu/lxqt-applications.menu 2017-10-22 13:04:08.035578669 +0100 +@@ -20,12 +20,13 @@ + + + Utility +- + Accessibility + System ++ Graphics + + + +@@ -61,6 +62,7 @@ + + + Education ++ Office + + + +@@ -83,7 +85,7 @@ + + + Graphics +- Utility ++ Office + + + +@@ -95,6 +97,7 @@ + + + Network ++ Game + + + +@@ -125,6 +128,8 @@ + + + Office ++ Network ++ AudioVideo + + + +@@ -140,26 +145,10 @@ + PackageManager + X-Leave + Screensaver +- lxqt-about.desktop + + + + +- +- +- Other +- lxde-other.directory +- +- +- +- Core +- Settings +- Screensaver +- +- +- +- +- + + DesktopSettings + lxde-settings.directory +@@ -204,7 +193,7 @@ + + + +- ++ + + X-Leave + lxqt-leave.directory diff --git a/lxqt-base/lxqt-panel/lxqt-panel-0.12.0-r1.ebuild b/lxqt-base/lxqt-panel/lxqt-panel-0.12.0-r1.ebuild deleted file mode 100644 index 278a953a..00000000 --- a/lxqt-base/lxqt-panel/lxqt-panel-0.12.0-r1.ebuild +++ /dev/null @@ -1,82 +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 desktop panel and plugins" -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="LGPL-2.1+" -SLOT="0" -IUSE="+alsa +clock colorpicker cpuload +desktopswitch dom +kbindicator +mainmenu - +mount networkmonitor pulseaudio +quicklaunch sensors +showdesktop - statusnotifier sysstat +taskbar +tray +volume worldclock" -REQUIRED_USE="volume? ( || ( alsa pulseaudio ) )" - -CDEPEND=" - dev-libs/glib:2 - >=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/kguiaddons:5 - kde-frameworks/kwindowsystem:5[X] - >=lxde-base/menu-cache-0.3.3 - ~lxqt-base/liblxqt-${PV} - ~lxqt-base/lxqt-globalkeys-${PV} - x11-libs/libX11 - cpuload? ( sys-libs/libstatgrab ) - kbindicator? ( x11-libs/libxkbcommon ) - mount? ( kde-frameworks/solid:5 ) - networkmonitor? ( sys-libs/libstatgrab ) - sensors? ( sys-apps/lm_sensors ) - statusnotifier? ( dev-libs/libdbusmenu-qt[qt5(+)] ) - sysstat? ( =lxqt-base/libsysstat-0.4* ) - tray? ( x11-libs/libXcomposite - x11-libs/libXdamage - x11-libs/libXrender ) - volume? ( alsa? ( media-libs/alsa-lib ) - pulseaudio? ( media-sound/pulseaudio ) )" -DEPEND="${CDEPEND} - dev-qt/linguist-tools:5 - !lxqt-base/lxqt-common" -RDEPEND="${CDEPEND} - dev-qt/qtsvg:5 - >=lxde-base/lxmenu-data-0.1.2" - -src_configure() { - local mycmakeargs i y - mycmakeargs=( -DPULL_TRANSLATIONS=OFF ) - for i in clock colorpicker cpuload desktopswitch dom kbindicator mainmenu mount \ - networkmonitor quicklaunch sensors showdesktop statusnotifier \ - sysstat taskbar tray volume worldclock; do - #Switch to ^^ when we switch to EAPI=6. - #y=${i^^} - y=$(tr '[:lower:]' '[:upper:]' <<< "${i}") - mycmakeargs+=( $(cmake-utils_use ${i} ${y}_PLUGIN) ) - done - - if use volume; then - mycmakeargs+=( $(cmake-utils_use alsa VOLUME_USE_ALSA) - $(cmake-utils_use pulseaudio VOLUME_USE_PULSEAUDIO) ) - fi - - cmake-utils_src_configure -} - -src_install(){ - cmake-utils_src_install - doman panel/man/*.1 -} diff --git a/lxqt-base/lxqt-panel/lxqt-panel-0.12.0-r2.ebuild b/lxqt-base/lxqt-panel/lxqt-panel-0.12.0-r2.ebuild new file mode 100644 index 00000000..bff93bf2 --- /dev/null +++ b/lxqt-base/lxqt-panel/lxqt-panel-0.12.0-r2.ebuild @@ -0,0 +1,86 @@ +# Copyright 1999-2016 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 + +EAPI=5 +inherit cmake-utils + +DESCRIPTION="LXQt desktop panel and plugins" +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="LGPL-2.1+" +SLOT="0" +IUSE="+alsa +clock colorpicker cpuload +desktopswitch dom +kbindicator +mainmenu + +mount networkmonitor pulseaudio +quicklaunch sensors +showdesktop + statusnotifier sysstat +taskbar +tray +volume worldclock" +REQUIRED_USE="volume? ( || ( alsa pulseaudio ) )" + +CDEPEND=" + dev-libs/glib:2 + >=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/kguiaddons:5 + kde-frameworks/kwindowsystem:5[X] + >=lxde-base/menu-cache-0.3.3 + ~lxqt-base/liblxqt-${PV} + ~lxqt-base/lxqt-globalkeys-${PV} + x11-libs/libX11 + cpuload? ( sys-libs/libstatgrab ) + kbindicator? ( x11-libs/libxkbcommon ) + mount? ( kde-frameworks/solid:5 ) + networkmonitor? ( sys-libs/libstatgrab ) + sensors? ( sys-apps/lm_sensors ) + statusnotifier? ( dev-libs/libdbusmenu-qt[qt5(+)] ) + sysstat? ( =lxqt-base/libsysstat-0.4* ) + tray? ( x11-libs/libXcomposite + x11-libs/libXdamage + x11-libs/libXrender ) + volume? ( alsa? ( media-libs/alsa-lib ) + pulseaudio? ( media-sound/pulseaudio ) )" +DEPEND="${CDEPEND} + dev-qt/linguist-tools:5 + !lxqt-base/lxqt-common" +RDEPEND="${CDEPEND} + dev-qt/qtsvg:5 + >=lxde-base/lxmenu-data-0.1.2" + +src_prepare() { + epatch "${FILESDIR}"/lxqt-menu-cleanup.patch +} + +src_configure() { + local mycmakeargs i y + mycmakeargs=( -DPULL_TRANSLATIONS=OFF ) + for i in clock colorpicker cpuload desktopswitch dom kbindicator mainmenu mount \ + networkmonitor quicklaunch sensors showdesktop statusnotifier \ + sysstat taskbar tray volume worldclock; do + #Switch to ^^ when we switch to EAPI=6. + #y=${i^^} + y=$(tr '[:lower:]' '[:upper:]' <<< "${i}") + mycmakeargs+=( $(cmake-utils_use ${i} ${y}_PLUGIN) ) + done + + if use volume; then + mycmakeargs+=( $(cmake-utils_use alsa VOLUME_USE_ALSA) + $(cmake-utils_use pulseaudio VOLUME_USE_PULSEAUDIO) ) + fi + + cmake-utils_src_configure +} + +src_install(){ + cmake-utils_src_install + doman panel/man/*.1 +} -- cgit v1.2.3