From 2b3c452672ef3b188e2c1363a0a8ac2f3bfa3933 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andreas=20M=C3=BCller?= Date: Tue, 27 Apr 2021 00:43:22 +0200 Subject: [PATCH] liri-materialdecoration: upgrade to latest & fix build with Qt 5.15.2 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Andreas Müller --- .../0001-Fix-build-with-Qt-5.15.patch | 30 ------------------- .../liri-materialdecoration_git.bb | 9 ++++-- 2 files changed, 7 insertions(+), 32 deletions(-) delete mode 100644 recipes-liri/liri-materialdecoration/liri-materialdecoration/0001-Fix-build-with-Qt-5.15.patch diff --git a/recipes-liri/liri-materialdecoration/liri-materialdecoration/0001-Fix-build-with-Qt-5.15.patch b/recipes-liri/liri-materialdecoration/liri-materialdecoration/0001-Fix-build-with-Qt-5.15.patch deleted file mode 100644 index 6c664f10..00000000 --- a/recipes-liri/liri-materialdecoration/liri-materialdecoration/0001-Fix-build-with-Qt-5.15.patch +++ /dev/null @@ -1,30 +0,0 @@ -From 3de9eb59c0fe39c4a4ecb182b3bc7f53981024b5 Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Andreas=20M=C3=BCller?= -Date: Fri, 12 Jun 2020 21:19:00 +0200 -Subject: [PATCH] Fix build with Qt 5.15 -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - -Upstream-Status: Submitted[https://github.com/lirios/materialdecoration/pull/9] - -Signed-off-by: Andreas Müller ---- - src/plugins/decorations/material/materialdecoration.cpp | 1 + - 1 file changed, 1 insertion(+) - -diff --git a/src/plugins/decorations/material/materialdecoration.cpp b/src/plugins/decorations/material/materialdecoration.cpp -index 73073f9..3a4a9b6 100644 ---- a/src/plugins/decorations/material/materialdecoration.cpp -+++ b/src/plugins/decorations/material/materialdecoration.cpp -@@ -31,6 +31,7 @@ - ***************************************************************************/ - - #include -+#include - - #include "materialdecoration.h" - --- -2.26.2 - diff --git a/recipes-liri/liri-materialdecoration/liri-materialdecoration_git.bb b/recipes-liri/liri-materialdecoration/liri-materialdecoration_git.bb index 7592149e..c19d0434 100644 --- a/recipes-liri/liri-materialdecoration/liri-materialdecoration_git.bb +++ b/recipes-liri/liri-materialdecoration/liri-materialdecoration_git.bb @@ -6,10 +6,15 @@ LIC_FILES_CHKSUM = " \ inherit liri +# HACK +# support qtwayland's qwaylanddisplay_p.h find +# +# have no idea where to fix properly +CXXFLAGS += "-I${STAGING_INCDIR}/QtXkbCommonSupport/5.15.2" + PV = "1.1.0+git${SRCPV}" -SRC_URI += "file://0001-Fix-build-with-Qt-5.15.patch" -SRCREV = "6eb7686bb0538d815f52d6bb96a415d41e15b636" +SRCREV = "6a5de23f2e5162fbee39d16f938473ff970a2ec0" S = "${WORKDIR}/git" FILES_${PN} += " \