lxqt-panel: update to latest sources

Signed-off-by: Andreas Müller <schnitzeltony@googlemail.com>
This commit is contained in:
Andreas Müller
2015-07-24 16:48:50 +02:00
parent 9a6f22b6f9
commit 09e6f03996
2 changed files with 15 additions and 14 deletions

View File

@@ -1,6 +1,6 @@
From 8b0b57e8a8813e62aeb7fc67007c67507c5c306d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andreas=20M=C3=BCller?= <schnitzeltony@googlemail.com>
Date: Wed, 3 Jun 2015 22:40:17 +0200
Date: Fri, 24 Jul 2015 16:34:48 +0200
Subject: [PATCH] panel: link against Qt5::X11Extras
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
@@ -12,22 +12,21 @@ Upstream-Status: Inappropriate [configuration]
Signed-off-by: Andreas Müller <schnitzeltony@googlemail.com>
---
panel/CMakeLists.txt | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
panel/CMakeLists.txt | 1 +
1 file changed, 1 insertion(+)
diff --git a/panel/CMakeLists.txt b/panel/CMakeLists.txt
index 1ef3a32..41294bc 100644
index fe634a9..26b455b 100644
--- a/panel/CMakeLists.txt
+++ b/panel/CMakeLists.txt
@@ -93,7 +93,7 @@ lxqt_app_translation_loader(QM_LOADER ${PROJECT_NAME})
@@ -100,6 +100,7 @@ target_link_libraries(${PROJECT}
${LIBRARIES}
${QTX_LIBRARIES}
KF5::WindowSystem
+ Qt5::X11Extras
${STATIC_PLUGINS}
)
add_executable(${PROJECT} ${lxqt-panel_PUB_H_FILES} ${lxqt-panel_PRIV_H_FILES} ${lxqt-panel_CPP_FILES} ${MOC_SOURCES} ${lxqt-runner_QM_FILES} ${QRC_SOURCES} ${UI_HEADERS} ${QM_LOADER})
-target_link_libraries(${PROJECT} ${LIBRARIES} ${QTX_LIBRARIES} KF5::WindowSystem)
+target_link_libraries(${PROJECT} ${LIBRARIES} ${QTX_LIBRARIES} Qt5::X11Extras KF5::WindowSystem)
install(TARGETS ${PROJECT} RUNTIME DESTINATION bin)
install(FILES ${CONFIG_FILES} DESTINATION ${LXQT_ETC_XDG_DIR}/lxqt)
--
1.9.3

View File

@@ -9,14 +9,16 @@ REQUIRED_DISTRO_FEATURES = "x11"
DEPENDS += " \
liblxqt \
lxqt-globalkeys \
libdbusmenu-qt5 \
menu-cache \
kwindowsystem \
kguiaddons \
solid \
"
SRC_URI += "file://0001-panel-link-against-Qt5-X11Extras.patch"
SRCREV = "703a7aff3d5b7324fe6ef9f32527a24cda35b50f"
PV = "0.9.0"
SRCREV = "3da78ed149191d213cef6c0b66918c09963c3954"
PV = "0.9.0+git${SRCPV}"
PACKAGECONFIG[cpu_plugin] = "-DCPULOAD_PLUGIN=Yes,-DCPULOAD_PLUGIN=No, libstatgrab"
PACKAGECONFIG[mount_plugin] = "-DMOUNT_PLUGIN=Yes,-DMOUNT_PLUGIN=No, liblxqt-mount"