| 1 |
commit: 7f93de7768bc79e4a4c50689d04a987045ecc5e0 |
| 2 |
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Wed Sep 22 18:44:41 2021 +0000 |
| 4 |
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Wed Sep 22 19:09:26 2021 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/proj/qt.git/commit/?id=7f93de77 |
| 7 |
|
| 8 |
lxqt-base/lxqt-panel: Sync with Gentoo ebuild repo |
| 9 |
|
| 10 |
Package-Manager: Portage-3.0.23, Repoman-3.0.3 |
| 11 |
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org> |
| 12 |
|
| 13 |
lxqt-base/lxqt-panel/lxqt-panel-9999.ebuild | 27 ++++++++++++++++----------- |
| 14 |
lxqt-base/lxqt-panel/metadata.xml | 5 ++--- |
| 15 |
2 files changed, 18 insertions(+), 14 deletions(-) |
| 16 |
|
| 17 |
diff --git a/lxqt-base/lxqt-panel/lxqt-panel-9999.ebuild b/lxqt-base/lxqt-panel/lxqt-panel-9999.ebuild |
| 18 |
index eeda5f32..23dcad5c 100644 |
| 19 |
--- a/lxqt-base/lxqt-panel/lxqt-panel-9999.ebuild |
| 20 |
+++ b/lxqt-base/lxqt-panel/lxqt-panel-9999.ebuild |
| 21 |
@@ -18,11 +18,13 @@ else |
| 22 |
KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86" |
| 23 |
fi |
| 24 |
|
| 25 |
-LICENSE="LGPL-2.1+" |
| 26 |
+LICENSE="LGPL-2.1 LGPL-2.1+" |
| 27 |
SLOT="0" |
| 28 |
-IUSE="+alsa colorpicker cpuload +desktopswitch +directorymenu dom +kbindicator +mainmenu |
| 29 |
- +mount networkmonitor pulseaudio +quicklaunch sensors +showdesktop |
| 30 |
- +spacer statusnotifier sysstat +taskbar +tray +volume +worldclock" |
| 31 |
+IUSE="+alsa colorpicker cpuload +desktopswitch +directorymenu dom +kbindicator |
| 32 |
++mainmenu +mount networkmonitor pulseaudio +quicklaunch lm-sensors +showdesktop |
| 33 |
++spacer +statusnotifier sysstat +taskbar tray +volume +worldclock" |
| 34 |
+ |
| 35 |
+# Work around a missing header issue: https://bugs.gentoo.org/666278 |
| 36 |
REQUIRED_USE=" |
| 37 |
|| ( desktopswitch mainmenu showdesktop taskbar ) |
| 38 |
volume? ( || ( alsa pulseaudio ) ) |
| 39 |
@@ -30,10 +32,10 @@ REQUIRED_USE=" |
| 40 |
|
| 41 |
BDEPEND=" |
| 42 |
dev-qt/linguist-tools:5 |
| 43 |
- >=dev-util/lxqt-build-tools-0.6.0 |
| 44 |
+ >=dev-util/lxqt-build-tools-0.9.0 |
| 45 |
virtual/pkgconfig |
| 46 |
" |
| 47 |
-RDEPEND=" |
| 48 |
+DEPEND=" |
| 49 |
>=dev-libs/libqtxdg-3.3.1 |
| 50 |
dev-qt/qtcore:5 |
| 51 |
dev-qt/qtdbus:5 |
| 52 |
@@ -50,10 +52,13 @@ RDEPEND=" |
| 53 |
x11-libs/libX11 |
| 54 |
cpuload? ( sys-libs/libstatgrab ) |
| 55 |
kbindicator? ( x11-libs/libxkbcommon ) |
| 56 |
+ lm-sensors? ( sys-apps/lm-sensors ) |
| 57 |
mount? ( kde-frameworks/solid:5 ) |
| 58 |
networkmonitor? ( sys-libs/libstatgrab ) |
| 59 |
- sensors? ( sys-apps/lm-sensors ) |
| 60 |
- statusnotifier? ( dev-libs/libdbusmenu-qt[qt5(+)] ) |
| 61 |
+ statusnotifier? ( |
| 62 |
+ dev-libs/libdbusmenu-qt[qt5(+)] |
| 63 |
+ dev-qt/qtconcurrent:5 |
| 64 |
+ ) |
| 65 |
sysstat? ( >=lxqt-base/libsysstat-0.4.1 ) |
| 66 |
tray? ( |
| 67 |
x11-libs/libxcb:= |
| 68 |
@@ -70,7 +75,7 @@ RDEPEND=" |
| 69 |
) |
| 70 |
) |
| 71 |
" |
| 72 |
-DEPEND="${RDEPEND}" |
| 73 |
+RDEPEND="${DEPEND}" |
| 74 |
|
| 75 |
src_configure() { |
| 76 |
local mycmakeargs=( |
| 77 |
@@ -85,7 +90,7 @@ src_configure() { |
| 78 |
-DMOUNT_PLUGIN=$(usex mount) |
| 79 |
-DNETWORKMONITOR_PLUGIN=$(usex networkmonitor) |
| 80 |
-DQUICKLAUNCH_PLUGIN=$(usex quicklaunch) |
| 81 |
- -DSENSORS_PLUGIN=$(usex sensors) |
| 82 |
+ -DSENSORS_PLUGIN=$(usex lm-sensors) |
| 83 |
-DSHOWDESKTOP_PLUGIN=$(usex showdesktop) |
| 84 |
-DSPACER_PLUGIN=$(usex spacer) |
| 85 |
-DSTATUSNOTIFIER_PLUGIN=$(usex statusnotifier) |
| 86 |
@@ -106,7 +111,7 @@ src_configure() { |
| 87 |
cmake_src_configure |
| 88 |
} |
| 89 |
|
| 90 |
-src_install(){ |
| 91 |
+src_install() { |
| 92 |
cmake_src_install |
| 93 |
doman panel/man/*.1 |
| 94 |
} |
| 95 |
|
| 96 |
diff --git a/lxqt-base/lxqt-panel/metadata.xml b/lxqt-base/lxqt-panel/metadata.xml |
| 97 |
index 4519e700..ac1ead07 100644 |
| 98 |
--- a/lxqt-base/lxqt-panel/metadata.xml |
| 99 |
+++ b/lxqt-base/lxqt-panel/metadata.xml |
| 100 |
@@ -9,17 +9,16 @@ |
| 101 |
<flag name="colorpicker">Build colorpicker plugin</flag> |
| 102 |
<flag name="cpuload">Build cpuload plugin</flag> |
| 103 |
<flag name="desktopswitch">Build desktopswitch plugin</flag> |
| 104 |
- <flag name="directorymenu" restrict=">=lxqt-base/lxqt-panel-0.13.0">Build directorymenu plugin</flag> |
| 105 |
+ <flag name="directorymenu">Build directorymenu plugin</flag> |
| 106 |
<flag name="dom">Build dom plugin</flag> |
| 107 |
<flag name="kbindicator">Build kbindicator plugin</flag> |
| 108 |
<flag name="mainmenu">Build mainmenu plugin</flag> |
| 109 |
<flag name="mount">Build mount plugin</flag> |
| 110 |
<flag name="networkmonitor">Build networkmonitor plugin</flag> |
| 111 |
<flag name="quicklaunch">Build quicklaunch plugin</flag> |
| 112 |
- <flag name="sensors">Build sensors plugin</flag> |
| 113 |
<flag name="showdesktop">Build showdesktop plugin</flag> |
| 114 |
<flag name="statusnotifier">Build statusnotifier plugin</flag> |
| 115 |
- <flag name="spacer" restrict=">=lxqt-base/lxqt-panel-0.13.0">Build spacer plugin</flag> |
| 116 |
+ <flag name="spacer">Build spacer plugin</flag> |
| 117 |
<flag name="sysstat">Build sysstat plugin</flag> |
| 118 |
<flag name="taskbar">Build taskbar plugin</flag> |
| 119 |
<flag name="tray">Build tray plugin</flag> |
Archives