zepto-forks/meta-qt5-extra
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

lxqt-panel: update to 0.13.0

Browse Source 
- remove patch now applied upstream.
- deploy additional installed files.

Signed-off-by: Max Krummenacher <max.krummenacher@toradex.com>
This commit is contained in:
Max Krummenacher
2018-05-25 20:15:37 +02:00
parent abb268ac03
commit 8a2a26f389
2 changed files with 3 additions and 34 deletions
Download Patch File Download Diff File Expand all files Collapse all files

31
recipes-lxqt/lxqt-panel/lxqt-panel/0001-lxqtmainmenuconfiguration.cpp-include-QAction-explic.patch
View File

@@ -1,31 +0,0 @@
From cb2d1d8d5bab855f15e96dec6410ae1477e658ba Mon Sep 17 00:00:00 2001
From: Max Krummenacher <max.krummenacher@toradex.com>
Date: Sun, 6 May 2018 09:39:03 +0000
Subject: [PATCH] lxqtmainmenuconfiguration.cpp: include QAction explicitely
5.11 Qt headers do not indirectly include QAction resulting in compile
time errors like:
| lxqtmainmenuconfiguration.cpp:71:105: error: no matching function for call to 'LXQtMainMenuConfiguration::connect(QAction*, const char [13], LXQtMainMenuConfiguration*, const char [17])'
Upstream-Status: Submitted [https://github.com/lxqt/lxqt-panel/pull/467]
Signed-off-by: Max Krummenacher <max.krummenacher@toradex.com>
---
plugin-mainmenu/lxqtmainmenuconfiguration.cpp | 1 +
1 file changed, 1 insertion(+)
diff --git a/plugin-mainmenu/lxqtmainmenuconfiguration.cpp b/plugin-mainmenu/lxqtmainmenuconfiguration.cpp
index b5c5f003..63a4c2ad 100644
--- a/plugin-mainmenu/lxqtmainmenuconfiguration.cpp
+++ b/plugin-mainmenu/lxqtmainmenuconfiguration.cpp
@@ -33,6 +33,7 @@
#include <lxqt-globalkeys.h>
#include <LXQt/Settings>
+#include <QAction>
#include <QFileDialog>
LXQtMainMenuConfiguration::LXQtMainMenuConfiguration(PluginSettings *settings, GlobalKeyShortcut::Action * shortcut, const QString &defaultShortcut, QWidget *parent) :
--
2.13.6

6
recipes-lxqt/lxqt-panel/lxqt-panel_git.bb
View File

@@ -17,10 +17,9 @@ DEPENDS += " \
SRC_URI += " \
file://0001-add-Qt5-X11Extras-to-QTX_LIBRARIES.patch \
file://0001-lxqtmainmenuconfiguration.cpp-include-QAction-explic.patch \
"
SRCREV = "4b20a41f3442b121485664333f457ee9abc228b8"
PV = "0.12.0"
SRCREV = "7d97a5e331a05b4fd06a729a58d47cef0f584c5f"
PV = "0.13.0"
PACKAGECONFIG[cpu_plugin] = "-DCPULOAD_PLUGIN=Yes,-DCPULOAD_PLUGIN=No, libstatgrab"
PACKAGECONFIG[mount_plugin] = "-DMOUNT_PLUGIN=Yes,-DMOUNT_PLUGIN=No, solid"
@@ -33,6 +32,7 @@ PACKAGECONFIG[volume_pulse_plugin] = "-DVOLUME_USE_PULSEAUDIO=Yes,-DVOLUME_USE_P
PACKAGECONFIG ??= "cpu_plugin mount_plugin networkmonitor_plugin sensor_plugin sysstat_plugin volume_alsa_plugin volume_pulse_plugin"
FILES_${PN} += " \
${datadir}/lxqt/panel.conf \
${datadir}/lxqt/lxqt-panel/*.desktop \
${datadir}/desktop-directories \
"