Script 'mail_helper' called by obssrc
Hello community,
here is the log from the commit of package subtitlecomposer for
openSUSE:Factory checked in at 2024-05-28 17:29:20
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/subtitlecomposer (Old)
and /work/SRC/openSUSE:Factory/.subtitlecomposer.new.24587 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "subtitlecomposer"
Tue May 28 17:29:20 2024 rev:15 rq:1177187 version:0.8.0
Changes:
--------
--- /work/SRC/openSUSE:Factory/subtitlecomposer/subtitlecomposer.changes
2023-11-06 21:15:20.345607444 +0100
+++
/work/SRC/openSUSE:Factory/.subtitlecomposer.new.24587/subtitlecomposer.changes
2024-05-28 17:30:18.787287531 +0200
@@ -1,0 +2,6 @@
+Mon May 27 19:56:20 UTC 2024 - Christophe Marin <[email protected]>
+
+- Add upstream build fix:
+ * 0001-Increased-required-std-to-C-17-100.patch
+
+-------------------------------------------------------------------
New:
----
0001-Increased-required-std-to-C-17-100.patch
BETA DEBUG BEGIN:
New:- Add upstream build fix:
* 0001-Increased-required-std-to-C-17-100.patch
BETA DEBUG END:
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ subtitlecomposer.spec ++++++
--- /var/tmp/diff_new_pack.enj3GB/_old 2024-05-28 17:30:19.935329512 +0200
+++ /var/tmp/diff_new_pack.enj3GB/_new 2024-05-28 17:30:19.935329512 +0200
@@ -26,6 +26,8 @@
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 @@
# 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
++++++ 0001-Increased-required-std-to-C-17-100.patch ++++++
>From fe3cfc6455981cb6c7beae95713d22c431f3439e Mon Sep 17 00:00:00 2001
From: Mladen Milinkovic <[email protected]>
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
