From bcfe57e31b6607448b95596c350224653af0db3e Mon Sep 17 00:00:00 2001 From: MaxKrummenacher Date: Tue, 2 Jan 2018 12:33:19 +0100 Subject: [PATCH] Fix build error and don't force gtk into an image (#37) * kwindowsystem: add libxrender to depends fixes do_configure in rocko: | CMake Error at src/CMakeLists.txt:36 (message): | The XRender library could not be found. Please install the development | package for it. Signed-off-by: Max Krummenacher * lxqt-panel: rdepend on the pulseaudio qt bindings This avoids pulling in (unneeded) gtk+ rdepends. Signed-off-by: Max Krummenacher --- recipes-kde/kf5/tier1/kwindowsystem/kwindowsystem.bb | 2 +- recipes-lxqt/lxqt-panel/lxqt-panel_git.bb | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/recipes-kde/kf5/tier1/kwindowsystem/kwindowsystem.bb b/recipes-kde/kf5/tier1/kwindowsystem/kwindowsystem.bb index fc087a5c..acb1bca7 100644 --- a/recipes-kde/kf5/tier1/kwindowsystem/kwindowsystem.bb +++ b/recipes-kde/kf5/tier1/kwindowsystem/kwindowsystem.bb @@ -6,7 +6,7 @@ LIC_FILES_CHKSUM = " \ inherit kde-kf5 cmake_auto_align_paths cmake_lib -DEPENDS += "${@bb.utils.contains("DISTRO_FEATURES", "x11", "virtual/xserver qtx11extras", "", d)}" +DEPENDS += "${@bb.utils.contains("DISTRO_FEATURES", "x11", "virtual/xserver qtx11extras libxrender", "", d)}" PV = "${KF5_VERSION}" SRC_URI[md5sum] = "c37711fc60fba6f59e3d12202615384b" diff --git a/recipes-lxqt/lxqt-panel/lxqt-panel_git.bb b/recipes-lxqt/lxqt-panel/lxqt-panel_git.bb index 8c760a60..743acc80 100644 --- a/recipes-lxqt/lxqt-panel/lxqt-panel_git.bb +++ b/recipes-lxqt/lxqt-panel/lxqt-panel_git.bb @@ -27,7 +27,7 @@ PACKAGECONFIG[networkmonitor_plugin] = "-DNETWORKMONITOR_PLUGIN=Yes,-DNETWORKMON PACKAGECONFIG[sensor_plugin] = "-DSENSORS_PLUGIN=Yes,-DSENSORS_PLUGIN=No, lmsensors" PACKAGECONFIG[sysstat_plugin] = "-DSYSSTAT_PLUGIN=Yes,-DSYSSTAT_PLUGIN=No, libsysstat" PACKAGECONFIG[volume_alsa_plugin] = "-DVOLUME_USE_ALSA=Yes,-DVOLUME_USE_ALSA=No, alsa-lib" -PACKAGECONFIG[volume_pulse_plugin] = "-DVOLUME_USE_PULSEAUDIO=Yes,-DVOLUME_USE_PULSEAUDIO=No, pulseaudio, pavucontrol" +PACKAGECONFIG[volume_pulse_plugin] = "-DVOLUME_USE_PULSEAUDIO=Yes,-DVOLUME_USE_PULSEAUDIO=No, pulseaudio, pavucontrol-qt" PACKAGECONFIG ??= "cpu_plugin mount_plugin networkmonitor_plugin sensor_plugin sysstat_plugin volume_alsa_plugin volume_pulse_plugin"