[lxqt] commit 0.12 without Manifest

lxqt-base/lxqt-panel/files/lxqt-panel-0.11.0-fix-undef-explicit.patch

@@ -1,32 +0,0 @@
-From ec62109e0fa678875a9b10fc6f1975267432712d Mon Sep 17 00:00:00 2001
-From: Palo Kisa <palo.kisa@gmail.com>
-Date: Mon, 30 Jan 2017 12:21:10 +0100
-Subject: [PATCH] plugin-kbindicator: Undef the "explicit" workaround
-
-..after include and add explanation of the workaround.
-
-closes lxde/lxqt#1251
----
- plugin-kbindicator/src/x11/kbdlayout.cpp | 7 +++++++
- 1 file changed, 7 insertions(+)
-
-diff --git a/plugin-kbindicator/src/x11/kbdlayout.cpp b/plugin-kbindicator/src/x11/kbdlayout.cpp
-index c4aa4e27..883df074 100644
---- a/plugin-kbindicator/src/x11/kbdlayout.cpp
-+++ b/plugin-kbindicator/src/x11/kbdlayout.cpp
-@@ -33,8 +33,15 @@
- 
- #include <xkbcommon/xkbcommon-x11.h>
- #include <xcb/xcb.h>
-+
-+// Note: We need to override "explicit" as this is a C++ keyword. But it is
-+// used as variable name in xkb.h. This is causing a failure in C++ compile
-+// time.
-+// Similar bug here: https://bugs.freedesktop.org/show_bug.cgi?id=74080
- #define explicit _explicit
- #include <xcb/xkb.h>
-+#undef explicit
-+
- #include "../kbdinfo.h"
- #include "../controls.h"
- 

lxqt-base/lxqt-panel/files/lxqt-panel-0.12.0-fix-worldclock-size-updating.patch

@@ -0,0 +1,30 @@
+From c9df6bc1c79e1032ff9750f14165dd7bdd67b53c Mon Sep 17 00:00:00 2001
+From: Palo Kisa <palo.kisa@gmail.com>
+Date: Mon, 23 Oct 2017 10:30:04 +0200
+Subject: [PATCH] worldclock: Fix widget size updating
+
+If the content change resulted in need of different size to show all
+the content, the parent widget(s) didn't get the change. This resulted
+in cut text or waste of space in panel.
+---
+ plugin-worldclock/lxqtworldclock.cpp | 4 ++++
+ 1 file changed, 4 insertions(+)
+
+diff --git a/plugin-worldclock/lxqtworldclock.cpp b/plugin-worldclock/lxqtworldclock.cpp
+index 34c36967..d6fe9c07 100644
+--- a/plugin-worldclock/lxqtworldclock.cpp
++++ b/plugin-worldclock/lxqtworldclock.cpp
+@@ -132,9 +132,13 @@ void LXQtWorldClock::updateTimeText()
+ 
+     if (!isUpToDate)
+     {
++        const QSize old_size = mContent->sizeHint();
+         mContent->setText(tzNow.toString(preformat(mFormat, timeZone, tzNow)));
++        if (old_size != mContent->sizeHint())
++            mRotatedWidget->adjustContentSize();
+         mRotatedWidget->update();
+         updatePopupContent();
++
+     }
+ }
+ 

lxqt-base/lxqt-panel/files/lxqt-panel-0.12.0-fix-wrongly-positioned-popups.patch

@@ -0,0 +1,35 @@
+From 7391172f5c60bfdb62c71f832c4ee4a4477366a2 Mon Sep 17 00:00:00 2001
+From: Palo Kisa <palo.kisa@gmail.com>
+Date: Tue, 14 Nov 2017 09:12:34 +0100
+Subject: [PATCH] lxqtpanel: Fix wrongly positioned popups
+
+..by avoiding of usage the QWidget::mapToGlobal(), which is unreliable
+sometimes.
+---
+ panel/lxqtpanel.cpp | 6 ++++--
+ 1 file changed, 4 insertions(+), 2 deletions(-)
+
+diff --git a/panel/lxqtpanel.cpp b/panel/lxqtpanel.cpp
+index 24a27155..7a33e05d 100644
+--- a/panel/lxqtpanel.cpp
++++ b/panel/lxqtpanel.cpp
+@@ -987,7 +987,8 @@ void LXQtPanel::setReserveSpace(bool reserveSpace, bool save)
+  ************************************************/
+ QRect LXQtPanel::globalGometry() const
+ {
+-    return QRect(mapToGlobal(QPoint(0, 0)), this->size());
++    // panel is the the top-most widget/window, no calculation needed
++    return geometry();
+ }
+ 
+ 
+@@ -1204,7 +1205,8 @@ QRect LXQtPanel::calculatePopupWindowPos(const ILXQtPanelPlugin *plugin, const Q
+         return QRect();
+     }
+ 
+-    return calculatePopupWindowPos(panel_plugin->mapToGlobal(QPoint(0, 0)), windowSize);
++    // Note: assuming there are not contentMargins around the "BackgroundWidget" (LXQtPanelWidget)
++    return calculatePopupWindowPos(globalGometry().topLeft() + panel_plugin->geometry().topLeft(), windowSize);
+ }
+ 
+ 

lxqt-base/lxqt-panel/lxqt-panel-0.12.0.ebuild

@@ -2,12 +2,12 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
-inherit cmake-utils versionator
+inherit cmake-utils eapi7-ver
 
 DESCRIPTION="LXQt desktop panel and plugins"
 HOMEPAGE="https://lxqt.org/"
 
-MY_PV="$(get_version_component_range 1-2)*"
+MY_PV="$(ver_cut 1-2)*"
 
 if [[ ${PV} = *9999* ]]; then
 	inherit git-r3
@@ -19,22 +19,23 @@ fi
 
 LICENSE="LGPL-2.1+"
 SLOT="0"
-IUSE="+alsa +clock colorpicker cpuload +desktopswitch dom +kbindicator +mainmenu
+IUSE="+alsa clock colorpicker cpuload +desktopswitch +directorymenu dom +kbindicator +mainmenu
 	+mount networkmonitor pulseaudio +quicklaunch sensors +showdesktop
-	statusnotifier sysstat +taskbar +tray +volume worldclock"
+	+spacer statusnotifier sysstat +taskbar +tray +volume +worldclock"
 REQUIRED_USE="volume? ( || ( alsa pulseaudio ) )"
 
-CDEPEND="
-	>=dev-libs/libqtxdg-1.0.0
+RDEPEND="
+	dev-libs/libqtxdg:0/3
 	dev-qt/qtcore:5
 	dev-qt/qtdbus:5
 	dev-qt/qtgui:5
+	dev-qt/qtsvg: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
+	>=lxde-base/lxmenu-data-0.1.5
+	>=lxde-base/menu-cache-1.1.0
 	=lxqt-base/liblxqt-${MY_PV}
 	=lxqt-base/lxqt-globalkeys-${MY_PV}
 	x11-libs/libX11
@@ -44,22 +45,44 @@ CDEPEND="
 	networkmonitor? ( sys-libs/libstatgrab )
 	sensors? ( sys-apps/lm_sensors )
 	statusnotifier? ( dev-libs/libdbusmenu-qt[qt5(+)] )
-	sysstat? ( =lxqt-base/libsysstat-0.3* )
-	tray? ( x11-libs/libXcomposite
+	sysstat? ( >=lxqt-base/libsysstat-0.4.0 )
+	tray? (
+		x11-libs/libxcb:=
+		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"
-RDEPEND="${CDEPEND}
-	dev-qt/qtsvg:5
-	>=lxde-base/lxmenu-data-0.1.2"
+		x11-libs/libXrender
+		x11-libs/xcb-util
+	)
+	volume? (
+		alsa? ( media-libs/alsa-lib )
+		pulseaudio? (
+			media-sound/pavucontrol-qt
+			media-sound/pulseaudio
+		)
+	)
+	!lxqt-base/lxqt-common
+"
+DEPEND="${RDEPEND}
+	>=dev-util/lxqt-build-tools-0.4.0
+	dev-qt/linguist-tools:5
+	virtual/pkgconfig
+"
 
 PATCHES=(
-	"${FILESDIR}"/${PN}-0.11.0-fix-undef-explicit.patch
+	"${FILESDIR}/${P}-fix-worldclock-size-updating.patch"
+	"${FILESDIR}/${P}-fix-wrongly-positioned-popups.patch"
 )
 
+src_prepare() {
+	cmake-utils_src_prepare
+
+	sed -e "s|,clock,|,worldclock,|" \
+	    -i panel/resources/panel.conf || die
+
+	sed -e "s|pavucontrol|pavucontrol-qt|" \
+	    -i plugin-volume/lxqtvolumeconfiguration.h || die
+}
+
 src_configure() {
 	local mycmakeargs=(
 		-DPULL_TRANSLATIONS=OFF
@@ -69,6 +92,7 @@ src_configure() {
 		-DCOLORPICKER_PLUGIN=$(usex colorpicker)
 		-DCPULOAD_PLUGIN=$(usex cpuload)
 		-DDESKTOPSWITCH_PLUGIN=$(usex desktopswitch)
+		-DDIRECTORYMENU_PLUGIN=$(usex directorymenu)
 		-DDOM_PLUGIN=$(usex dom)
 		-DKBINDICATOR_PLUGIN=$(usex kbindicator)
 		-DMAINMENU_PLUGIN=$(usex mainmenu)
@@ -77,6 +101,7 @@ src_configure() {
 		-DQUICKLAUNCH_PLUGIN=$(usex quicklaunch)
 		-DSENSORS_PLUGIN=$(usex sensors)
 		-DSHOWDESKTOP_PLUGIN=$(usex showdesktop)
+		-DSPACER_PLUGIN=$(usex spacer)
 		-DSTATUSNOTIFIER_PLUGIN=$(usex statusnotifier)
 		-DSYSSTAT_PLUGIN=$(usex sysstat)
 		-DTASKBAR_PLUGIN=$(usex taskbar)