From fbaeee3dd7e9655f3aa8000a2ed346bca5878749 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andreas=20M=C3=BCller?= Date: Tue, 12 Jan 2021 21:23:23 +0100 Subject: [PATCH] krita: add upstreamed patch to fix build with latest boost MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Andreas Müller --- recipes-kde/apps/krita/krita.bb | 5 +++- .../krita/krita/0001-Make-C++14-default.patch | 29 +++++++++++++++++++ 2 files changed, 33 insertions(+), 1 deletion(-) create mode 100644 recipes-kde/apps/krita/krita/0001-Make-C++14-default.patch diff --git a/recipes-kde/apps/krita/krita.bb b/recipes-kde/apps/krita/krita.bb index 81536024..e3c7e177 100644 --- a/recipes-kde/apps/krita/krita.bb +++ b/recipes-kde/apps/krita/krita.bb @@ -38,7 +38,10 @@ DEPENDS += " \ PV = "4.4.1" PVEXT = "" -SRC_URI = "${KDE_MIRROR}/stable/${BPN}/${PV}/${BPN}-${PV}${PVEXT}.tar.xz" +SRC_URI = " \ + ${KDE_MIRROR}/stable/${BPN}/${PV}/${BPN}-${PV}${PVEXT}.tar.xz \ + file://0001-Make-C++14-default.patch \ +" SRC_URI[sha256sum] = "799770a624b4fbb9ab1b889f14b5b3e446355de7b9e939f182915aaeea76b5ae" S = "${WORKDIR}/${BPN}-${PV}${PVEXT}" diff --git a/recipes-kde/apps/krita/krita/0001-Make-C++14-default.patch b/recipes-kde/apps/krita/krita/0001-Make-C++14-default.patch new file mode 100644 index 00000000..cbd52c53 --- /dev/null +++ b/recipes-kde/apps/krita/krita/0001-Make-C++14-default.patch @@ -0,0 +1,29 @@ +From 1e25a2415bf4c51888188f5df88e7c614d70c927 Mon Sep 17 00:00:00 2001 +From: Boudewijn Rempt +Date: Tue, 15 Dec 2020 13:59:31 +0100 +Subject: [PATCH] Make C++14 default in master + +As discussed during the meeting. + +Upstream-Status: Accepted [https://invent.kde.org/graphics/krita/-/commit/1e25a2415bf4c51888188f5df88e7c614d70c927] +--- + CMakeLists.txt | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 48d445b030..fe9bcb4765 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -7,7 +7,7 @@ cmake_minimum_required(VERSION 3.0.0 FATAL_ERROR) + set(MIN_QT_VERSION 5.9.0) + set(MIN_FRAMEWORKS_VERSION 5.44.0) + +-set( CMAKE_CXX_STANDARD 11 ) ++set( CMAKE_CXX_STANDARD 14 ) + set( CMAKE_CXX_STANDARD_REQUIRED ON ) + + +-- +GitLab + +