diff --git a/debian/changelog b/debian/changelog index d059d8d..3c4ee09 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,6 +1,7 @@ lxqt-build-tools (0.13.0-0ubuntu1) UNRELEASED; urgency=medium * New upstream release. + * Remove reverse-applicable cpp17.patch. -- Simon Quigley Wed, 10 May 2023 11:18:09 -0500 diff --git a/debian/patches/cpp17.patch b/debian/patches/cpp17.patch deleted file mode 100644 index 3d1db2e..0000000 --- a/debian/patches/cpp17.patch +++ /dev/null @@ -1,24 +0,0 @@ -Description: Bump the minimum compatibility level to C++17 -Author: Simon Quigley -Origin: vendor -Bug-Debian: https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=1029611 -Forwarded: https://github.com/lxqt/lxqt-build-tools/pull/83 -Last-Update: 2023-01-25 ---- -This patch header follows DEP-3: http://dep.debian.net/deps/dep3/ ---- 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/debian/patches/series b/debian/patches/series deleted file mode 100644 index d24af3f..0000000 --- a/debian/patches/series +++ /dev/null @@ -1 +0,0 @@ -cpp17.patch