pool/subtitlecomposer
SHA256
3
0
Fork 1
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

OBS-URL: https://build.opensuse.org/package/show/KDE:Extra/subtitlecomposer?expand=0&rev=41

Browse Source
This commit is contained in:
Christophe Marin 2024-05-27 19:57:07 +00:00 committed by Git OBS Bridge
parent ef36baad2e
commit d3b3f17eeb
3 changed files with 45 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

36
0001-Increased-required-std-to-C-17-100.patch Normal file
View File

@ -0,0 +1,36 @@
From fe3cfc6455981cb6c7beae95713d22c431f3439e Mon Sep 17 00:00:00 2001
From: Mladen Milinkovic <maxrd2@smoothware.net>
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

6
subtitlecomposer.changes
View File

@ -1,3 +1,9 @@
-------------------------------------------------------------------
Mon May 27 19:56:20 UTC 2024 - Christophe Marin <christophe@krop.fr>
- Add upstream build fix:
* 0001-Increased-required-std-to-C-17-100.patch
-------------------------------------------------------------------
Mon Nov 6 17:44:47 UTC 2023 - Luigi Baldoni <aloisio@gmx.com>

4
subtitlecomposer.spec
View File

@ -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