From 6763ce908315e912e9ff2f67fcefa3c74e38c815 Mon Sep 17 00:00:00 2001 From: Silvan Calarco Date: Sat, 6 Jan 2024 06:35:21 +0100 Subject: [PATCH] added upstram patch to fix build with kde plasma 5.27 (see https://github.com/lxqt/lxqt-config/issues/919) [release 0.12.0-2mamba;Tue Feb 21 2023] --- ...ild-tools-0.12.0-upstream-bump-cxx17.patch | 27 +++++++++++++++++++ lxqt-build-tools.spec | 8 ++++-- 2 files changed, 33 insertions(+), 2 deletions(-) create mode 100644 lxqt-build-tools-0.12.0-upstream-bump-cxx17.patch diff --git a/lxqt-build-tools-0.12.0-upstream-bump-cxx17.patch b/lxqt-build-tools-0.12.0-upstream-bump-cxx17.patch new file mode 100644 index 0000000..48fd1f2 --- /dev/null +++ b/lxqt-build-tools-0.12.0-upstream-bump-cxx17.patch @@ -0,0 +1,27 @@ +From 4a3a7038b1927dc43942a930db103023efdcbe2c Mon Sep 17 00:00:00 2001 +From: Simon Quigley +Date: Wed, 25 Jan 2023 09:39:41 -0600 +Subject: [PATCH] Bump the minimum compatibility level to C++17. + +--- + cmake/modules/LXQtCompilerSettings.cmake | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +diff --git a/cmake/modules/LXQtCompilerSettings.cmake b/cmake/modules/LXQtCompilerSettings.cmake +index a8cb16d..acba891 100644 +--- a/cmake/modules/LXQtCompilerSettings.cmake ++++ b/cmake/modules/LXQtCompilerSettings.cmake +@@ -181,11 +181,11 @@ endif() + + + #----------------------------------------------------------------------------- +-# CXX14 requirements - no checks, we just set it ++# CXX17 requirements - no checks, we just set it + #----------------------------------------------------------------------------- + set(CMAKE_CXX_STANDARD_REQUIRED True) + set(CMAKE_CXX_EXTENSIONS OFF) +-set(CMAKE_CXX_STANDARD 14 CACHE STRING "C++ ISO Standard") ++set(CMAKE_CXX_STANDARD 17 CACHE STRING "C++ ISO Standard") + + + #----------------------------------------------------------------------------- diff --git a/lxqt-build-tools.spec b/lxqt-build-tools.spec index 0156a33..a2a0499 100644 --- a/lxqt-build-tools.spec +++ b/lxqt-build-tools.spec @@ -1,14 +1,14 @@ Name: lxqt-build-tools Version: 0.12.0 -Release: 1mamba +Release: 2mamba Summary: Various packaging tools and scripts for LXQt applications Group: Applications/Development Vendor: openmamba Distribution: openmamba Packager: Silvan Calarco URL: https://github.com/lxqt/lxqt-build-tools -## GITSOURCE https://github.com/lxde/lxqt-build-tools.git 0.4.0 Source: https://github.com/lxde/lxqt-build-tools.git/%{version}/lxqt-build-tools-%{version}.tar.bz2 +Patch0: lxqt-build-tools-0.12.0-upstream-bump-cxx17.patch License: BSD ## AUTOBUILDREQ-BEGIN ## AUTOBUILDREQ-END @@ -26,6 +26,7 @@ Various packaging tools and scripts for LXQt applications. %prep %setup -q +%patch0 -p1 -b .upstream-bump-cxx17 %build %cmake -d build @@ -46,6 +47,9 @@ Various packaging tools and scripts for LXQt applications. %doc AUTHORS %changelog +* Tue Feb 21 2023 Silvan Calarco 0.12.0-2mamba +- added upstram patch to fix build with kde plasma 5.27 (see https://github.com/lxqt/lxqt-config/issues/919) + * Tue Nov 08 2022 Automatic Build System 0.12.0-1mamba - automatic version update by autodist