From 6fc73b611357a801444bedf93df8d9d8ffb67cdcc87f966d084d4085711a5c2e Mon Sep 17 00:00:00 2001 From: Michael Vetter Date: Tue, 14 Feb 2023 12:45:30 +0000 Subject: [PATCH] - boo#1208217: Bump required C++ version See also: gh/lxqt/lxqt-config#903 Add lxqt-build-tools-0.12.0-cpp17.patch OBS-URL: https://build.opensuse.org/package/show/X11:LXQt/lxqt-build-tools?expand=0&rev=29 --- lxqt-build-tools-0.12.0-cpp17.patch | 27 +++++++++++++++++++++++++++ lxqt-build-tools.changes | 7 +++++++ lxqt-build-tools.spec | 4 +++- 3 files changed, 37 insertions(+), 1 deletion(-) create mode 100644 lxqt-build-tools-0.12.0-cpp17.patch diff --git a/lxqt-build-tools-0.12.0-cpp17.patch b/lxqt-build-tools-0.12.0-cpp17.patch new file mode 100644 index 0000000..91a5231 --- /dev/null +++ b/lxqt-build-tools-0.12.0-cpp17.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.changes b/lxqt-build-tools.changes index 3bb9a0a..893094a 100644 --- a/lxqt-build-tools.changes +++ b/lxqt-build-tools.changes @@ -1,3 +1,10 @@ +------------------------------------------------------------------- +Tue Feb 14 12:41:31 UTC 2023 - Michael Vetter + +- boo#1208217: Bump required C++ version + See also: gh/lxqt/lxqt-config#903 + Add lxqt-build-tools-0.12.0-cpp17.patch + ------------------------------------------------------------------- Sat Nov 5 16:28:08 UTC 2022 - Shawn Dunn diff --git a/lxqt-build-tools.spec b/lxqt-build-tools.spec index 9f9bcf4..582762a 100644 --- a/lxqt-build-tools.spec +++ b/lxqt-build-tools.spec @@ -1,7 +1,7 @@ # # spec file for package lxqt-build-tools # -# Copyright (c) 2022 SUSE LLC +# Copyright (c) 2023 SUSE LLC # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -25,6 +25,7 @@ Group: Development/Libraries/C and C++ URL: http://www.lxqt.org Source: https://github.com/lxqt/%{name}/releases/download/%{version}/%{name}-%{version}.tar.xz Source1: https://github.com/lxqt/%{name}/releases/download/%{version}/%{name}-%{version}.tar.xz.asc +Patch0: https://github.com/lxqt/lxqt-build-tools/commit/4a3a7038b1927dc43942a930db103023efdcbe2c.patch#/lxqt-build-tools-0.12.0-cpp17.patch BuildRequires: cmake >= 3.1.0 BuildRequires: pkgconfig BuildRequires: pkgconfig(Qt5Core) >= 5.15 @@ -47,6 +48,7 @@ These tools used to be spread over the repositories of various other components %prep %setup -q +%patch0 -p1 %build %cmake -DPULL_TRANSLATIONS=No