diff --git a/recipes-lxqt/compton-conf/compton-conf_git.bb b/recipes-lxqt/compton-conf/compton-conf_git.bb new file mode 100644 index 00000000..a8211436 --- /dev/null +++ b/recipes-lxqt/compton-conf/compton-conf_git.bb @@ -0,0 +1,14 @@ +SUMMARY = "GUI configuration tool for compton X composite manager" +LICENSE = "LGPLv2.1" +LIC_FILES_CHKSUM = "file://COPYING;md5=0964c689fcf4c21c6797ea87408416b6" + +inherit lxqt pkgconfig + +DEPENDS += "libconfig" + +SRCREV = "3bd14bc34f7731812f3f2833bd4d796ecb36caa0" +PV = "0.1.0+git${SRCPV}" + +SRC_URI += "file://0001-CMakeLists.txt-do-not-completely-overwrite-CMAKE_CXX.patch" + +EXTRA_OECMAKE += "-DUSE_QT5=ON" diff --git a/recipes-lxqt/compton-conf/files/0001-CMakeLists.txt-do-not-completely-overwrite-CMAKE_CXX.patch b/recipes-lxqt/compton-conf/files/0001-CMakeLists.txt-do-not-completely-overwrite-CMAKE_CXX.patch new file mode 100644 index 00000000..39cae4ca --- /dev/null +++ b/recipes-lxqt/compton-conf/files/0001-CMakeLists.txt-do-not-completely-overwrite-CMAKE_CXX.patch @@ -0,0 +1,37 @@ +From 3ddcc88f24b09c7b53725ae43cc0742ac516aaf6 Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Andreas=20M=C3=BCller?= +Date: Fri, 13 Feb 2015 15:49:38 +0100 +Subject: [PATCH] CMakeLists.txt: do not completely overwrite CMAKE_CXX_FLAGS +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +fixes: + +| /usr/include/qt5/QtCore/qcompilerdetection.h:882:20: fatal error: utility: No such file or directory + +Upstream-Status: Submitted [1] + +[1] https://github.com/lxde/compton-conf/pull/14 + +Signed-off-by: Andreas Müller +--- + CMakeLists.txt | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/CMakeLists.txt b/CMakeLists.txt +index b5f3b65..268064a 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -36,7 +36,7 @@ pkg_check_modules(LIBCONFIG REQUIRED + + include(GNUInstallDirs REQUIRED) + +-set(CMAKE_CXX_FLAGS "-DQT_NO_KEYWORDS -fno-exceptions") ++set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -DQT_NO_KEYWORDS -fno-exceptions") + + if(USE_QT5) + set(QTX_INCLUDE_DIRS "") +-- +1.9.3 + diff --git a/recipes-lxqt/packagegroups/lxqt-world.bb b/recipes-lxqt/packagegroups/lxqt-world.bb index a2f10f22..a4f5bf22 100644 --- a/recipes-lxqt/packagegroups/lxqt-world.bb +++ b/recipes-lxqt/packagegroups/lxqt-world.bb @@ -5,6 +5,7 @@ LIC_FILES_CHKSUM = "file://${COREBASE}/LICENSE;md5=4d92cd373abda3937c2bc47fbc49d inherit packagegroup distro_features_check RDEPENDS_${PN} = " \ + compton-conf \ liblxqt \ liblxqt-mount \ libqtxdg \