- updated to 5.249.0; rel 0.1

diff --git a/kf5-extra-cmake-modules.spec b/kf5-extra-cmake-modules.spec
index 765e5ccbb5d0b04b12d7f78e57b7a4f7c2f5ef28..c08a4ca167510dc3fb44ce345f2d2248ea76e237 100644 (file)
--- a/kf5-extra-cmake-modules.spec
+++ b/kf5-extra-cmake-modules.spec
@@ -4,16 +4,16 @@
 %bcond_without tests           # build without tests
 
 %define                orgname         extra-cmake-modules
-%define                kdeframever     5.114
-Summary:       Extra Cmake Modules for KF5
-Summary(pl.UTF-8):     Dodatkowe moduły Cmake'a dla KF5
+%define                kdeframever     5.249.0
+Summary:       Extra Cmake Modules for KF6
+Summary(pl.UTF-8):     Dodatkowe moduły Cmake'a dla KF6
 Name:          kf5-%{orgname}
-Version:       5.114.0
-Release:       1
+Version:       5.249.0
+Release:       0.1
 License:       BSD
 Group:         Development/Building
-Source0:       https://download.kde.org/stable/frameworks/%{kdeframever}/%{orgname}-%{version}.tar.xz
-# Source0-md5: 475f189080f5d249de3f53d1aece9416
+Source0:       https://download.kde.org/unstable/frameworks/%{kdeframever}/%{orgname}-%{version}.tar.xz
+# Source0-md5: e8cd307af19777f5ef99edf8e713387b
 Patch0:                %{orgname}-tests.patch
 Patch1:                kdefetchtranslations-test.patch
 Patch2:                no-fatal-warnings.patch
@@ -27,8 +27,8 @@ BuildRequires:        sed >= 4.0
 BuildRequires: tar >= 1:1.22
 BuildRequires: xz
 %if %{with tests}
-BuildRequires: Qt5Core-devel >= 5.9.0
-BuildRequires: Qt5Quick-devel >= 5.9.0
+BuildRequires: Qt6Core-devel >= 5.9.0
+BuildRequires: Qt6Quick-devel >= 5.9.0
 BuildRequires: libstdc++-devel >= 6:5
 %endif
 BuildConflicts:        qmake
@@ -109,7 +109,7 @@ sed -i -e 's#/usr/bin/env bash#/bin/bash#' $RPM_BUILD_ROOT%{_datadir}/ECM/kde-mo
 %if %{with doc}
 %{__mv} $RPM_BUILD_ROOT%{_docdir}/ECM ECM-doc
 %endif
-install -d $RPM_BUILD_ROOT%{_datadir}/qlogging-categories5
+install -d $RPM_BUILD_ROOT%{_datadir}/qlogging-categories6
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -118,7 +118,7 @@ rm -rf $RPM_BUILD_ROOT
 %defattr(644,root,root,755)
 %doc COPYING-CMAKE-SCRIPTS README.rst
 %{_datadir}/ECM
-%{_datadir}/qlogging-categories5
+%{_datadir}/qlogging-categories6
 %{_mandir}/man7/ecm*.7*
 
 %if %{with doc}

diff --git a/no-fatal-warnings.patch b/no-fatal-warnings.patch
index 0d796e36a8566075562bfe2252592a25be1ebcf9..d8f30b3e572275bc11b266cdd29d32a7127fad69 100644 (file)
--- a/no-fatal-warnings.patch
+++ b/no-fatal-warnings.patch
@@ -1,7 +1,7 @@
-diff -up extra-cmake-modules-5.97.0/kde-modules/KDECompilerSettings.cmake.dd extra-cmake-modules-5.97.0/kde-modules/KDECompilerSettings.cmake
---- extra-cmake-modules-5.97.0/kde-modules/KDECompilerSettings.cmake.dd        2022-07-15 16:05:38.000000000 +0200
-+++ extra-cmake-modules-5.97.0/kde-modules/KDECompilerSettings.cmake   2022-08-16 11:33:34.681624244 +0200
-@@ -537,8 +537,8 @@ if ((CMAKE_CXX_COMPILER_ID STREQUAL "GNU
+diff -up extra-cmake-modules-5.249.0/kde-modules/KDECompilerSettings.cmake.orig extra-cmake-modules-5.249.0/kde-modules/KDECompilerSettings.cmake
+--- extra-cmake-modules-5.249.0/kde-modules/KDECompilerSettings.cmake.orig     2024-02-03 10:14:12.611733929 +0100
++++ extra-cmake-modules-5.249.0/kde-modules/KDECompilerSettings.cmake  2024-02-03 10:15:03.631553247 +0100
+@@ -546,8 +546,8 @@ if ((CMAKE_CXX_COMPILER_ID STREQUAL "GNU
          (CMAKE_CXX_COMPILER_ID MATCHES "Clang" AND NOT APPLE) OR
          (CMAKE_CXX_COMPILER_ID STREQUAL "Intel" AND NOT WIN32))
      # Linker warnings should be treated as errors
@@ -10,5 +10,5 @@ diff -up extra-cmake-modules-5.97.0/kde-modules/KDECompilerSettings.cmake.dd ext
 +    ##set(CMAKE_SHARED_LINKER_FLAGS "-Wl,--fatal-warnings ${CMAKE_SHARED_LINKER_FLAGS}")
 +    ##set(CMAKE_MODULE_LINKER_FLAGS "-Wl,--fatal-warnings ${CMAKE_MODULE_LINKER_FLAGS}")
  
-     # Do not allow undefined symbols, even in non-symbolic shared libraries
-     # On OpenBSD we must disable this to allow the stuff to properly compile without explicit libc specification
+     string(TOUPPER "CMAKE_CXX_FLAGS_${CMAKE_BUILD_TYPE}" compileflags)
+     if("${CMAKE_CXX_FLAGS} ${${compileflags}}" MATCHES "-fsanitize")