From d3b3f17eebe45129408e9c179fd2cbc66a3c3a3501de41e41fd02ab772146ed0 Mon Sep 17 00:00:00 2001 From: Christophe Marin Date: Mon, 27 May 2024 19:57:07 +0000 Subject: [PATCH] OBS-URL: https://build.opensuse.org/package/show/KDE:Extra/subtitlecomposer?expand=0&rev=41 --- 0001-Increased-required-std-to-C-17-100.patch | 36 +++++++++++++++++++ subtitlecomposer.changes | 6 ++++ subtitlecomposer.spec | 4 ++- 3 files changed, 45 insertions(+), 1 deletion(-) create mode 100644 0001-Increased-required-std-to-C-17-100.patch diff --git a/0001-Increased-required-std-to-C-17-100.patch b/0001-Increased-required-std-to-C-17-100.patch new file mode 100644 index 0000000..5082513 --- /dev/null +++ b/0001-Increased-required-std-to-C-17-100.patch @@ -0,0 +1,36 @@ +From fe3cfc6455981cb6c7beae95713d22c431f3439e Mon Sep 17 00:00:00 2001 +From: Mladen Milinkovic +Date: Wed, 22 May 2024 21:35:41 +0200 +Subject: [PATCH] Increased required std to C++17 #100 + +C++17 is supported since gcc7 and ICU 75 headers require it. +--- + CMakeLists.txt | 3 +-- + 1 file changed, 1 insertion(+), 2 deletions(-) + +diff --git a/CMakeLists.txt b/CMakeLists.txt +index e60e910a..fade001b 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -7,17 +7,16 @@ if(QT_MAJOR_VERSION EQUAL 6) + set(QT_MIN_VERSION "6.0.0") + set(KF_MAJOR_VERSION "6") + set(KF_MIN_VERSION "5.240.0") +- set(CMAKE_CXX_STANDARD 17) + else() + set(QT_EXTRA_COMPONENTS) + set(QT_MAJOR_VERSION 5) + set(QT_MIN_VERSION "5.9.0") + set(KF_MAJOR_VERSION "5") + set(KF_MIN_VERSION "5.44.0") +- set(CMAKE_CXX_STANDARD 11) + endif() + + set(CMAKE_CXX_STANDARD_REQUIRED ON) ++set(CMAKE_CXX_STANDARD 17) + + find_package(ECM REQUIRED NO_MODULE) + set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} ${ECM_MODULE_PATH} "${CMAKE_CURRENT_SOURCE_DIR}/cmake") +-- +2.45.1 + diff --git a/subtitlecomposer.changes b/subtitlecomposer.changes index 09ea50b..acc273b 100644 --- a/subtitlecomposer.changes +++ b/subtitlecomposer.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Mon May 27 19:56:20 UTC 2024 - Christophe Marin + +- Add upstream build fix: + * 0001-Increased-required-std-to-C-17-100.patch + ------------------------------------------------------------------- Mon Nov 6 17:44:47 UTC 2023 - Luigi Baldoni diff --git a/subtitlecomposer.spec b/subtitlecomposer.spec index 1d20cd7..ac8ca2a 100644 --- a/subtitlecomposer.spec +++ b/subtitlecomposer.spec @@ -26,6 +26,8 @@ URL: https://invent.kde.org/multimedia/subtitlecomposer Source0: https://download.kde.org/stable/subtitlecomposer/%{name}-%{version}.tar.xz Source1: https://download.kde.org/stable/subtitlecomposer/%{name}-%{version}.tar.xz.sig Source2: subtitlecomposer.keyring +# PATCH-FIX-UPSTREAM -- icu 75 compatibility +Patch0: 0001-Increased-required-std-to-C-17-100.patch BuildRequires: cmake >= 3.10 BuildRequires: extra-cmake-modules BuildRequires: libQt5Widgets-private-headers-devel @@ -82,7 +84,7 @@ has speech Recognition using PocketSphinx. # Fix rpmlint error (devel-file-in-non-devel-package) and install header files as doc (since they are installed just for help) mkdir files_for_doc cp -a %{buildroot}%{_kf5_appsdir}/%{name}/scripts/api/ files_for_doc/ -rm -rf %{buildroot}%{_kf5_appsdir}/%{name}/scripts/api/ +rm -r %{buildroot}%{_kf5_appsdir}/%{name}/scripts/api/ # Point to the correct path of the header files directory (doc) perl -pi -e "s|'api'|'%{_docdir}/subtitlecomposer/api'|" %{buildroot}%{_kf5_appsdir}/%{name}/scripts/README