- updated to 6.1.0

diff --git a/kdefetchtranslations-test.patch b/kdefetchtranslations-test.patch
index dd084779f699c5117a990859c9a9cbf3c06cfa71..39b479778de7156c25b892c4af654b2cbafdc2ee 100644 (file)
--- a/kdefetchtranslations-test.patch
+++ b/kdefetchtranslations-test.patch
@@ -1,11 +1,12 @@
---- tests/KDEFetchTranslations/CMakeLists.txt.orig     2021-02-05 16:18:39.000000000 +0100
-+++ tests/KDEFetchTranslations/CMakeLists.txt  2021-03-06 19:41:09.226109189 +0100
-@@ -19,7 +19,7 @@
+diff -up extra-cmake-modules-6.1.0/tests/KDEFetchTranslations/CMakeLists.txt.orig extra-cmake-modules-6.1.0/tests/KDEFetchTranslations/CMakeLists.txt
+--- extra-cmake-modules-6.1.0/tests/KDEFetchTranslations/CMakeLists.txt.orig   2024-04-09 15:33:51.000000000 +0200
++++ extra-cmake-modules-6.1.0/tests/KDEFetchTranslations/CMakeLists.txt        2024-04-14 14:03:53.211821405 +0200
+@@ -19,7 +19,7 @@ endforeach()
  
  _repository_name(name "${CMAKE_CURRENT_SOURCE_DIR}/../../")
- if (NOT ${name} STREQUAL "frameworks/extra-cmake-modules")
--    message(FATAL_ERROR "Wrong repository name: ${name}, should be 'frameworks/extra-cmake-modules'")
-+#    message(FATAL_ERROR "Wrong repository name: ${name}, should be 'frameworks/extra-cmake-modules'")
+ if (NOT ${name} MATCHES ".*/extra-cmake-modules")
+-    message(FATAL_ERROR "Wrong repository name: ${name}, should match '*/extra-cmake-modules'")
++##    message(FATAL_ERROR "Wrong repository name: ${name}, should match '*/extra-cmake-modules'")
  endif()
  add_executable(dummy ../ExecuteKDEModules/main.c)
  ecm_mark_nongui_executable(dummy)

diff --git a/kf6-extra-cmake-modules.spec b/kf6-extra-cmake-modules.spec
index 8eeed1da7072ed122280e0a8124d525648685523..d82c1f5047a5964f1cf4ab7b5920376bb9594fb9 100644 (file)
--- a/kf6-extra-cmake-modules.spec
+++ b/kf6-extra-cmake-modules.spec
@@ -4,16 +4,16 @@
 %bcond_without tests           # build without tests
 
 %define                orgname         extra-cmake-modules
-%define                kdeframever     6.0
+%define                kdeframever     6.1
 Summary:       Extra Cmake Modules for KF6
 Summary(pl.UTF-8):     Dodatkowe moduły Cmake'a dla KF6
 Name:          kf6-%{orgname}
-Version:       6.0.0
+Version:       6.1.0
 Release:       1
 License:       BSD
 Group:         Development/Building
 Source0:       https://download.kde.org/stable/frameworks/%{kdeframever}/%{orgname}-%{version}.tar.xz
-# Source0-md5: 3e1b640fc5c3b4d96484029d1034c48a
+# Source0-md5: 1109efb1a8e84918f74c2e8e650a049a
 Patch0:                %{orgname}-tests.patch
 Patch1:                kdefetchtranslations-test.patch
 Patch2:                no-fatal-warnings.patch
@@ -77,7 +77,7 @@ Dokumentacja API dla %{orgname}.
 %prep
 %setup -q -n %{orgname}-%{version}
 %patch0 -p1
-%patch1 -p0
+%patch1 -p1
 %patch2 -p1
 
 # causes make install failure after running tests

diff --git a/no-fatal-warnings.patch b/no-fatal-warnings.patch
index d8f30b3e572275bc11b266cdd29d32a7127fad69..03fabcb8a67e7ee8a95aef43e6561d5a448ba2b9 100644 (file)
--- a/no-fatal-warnings.patch
+++ b/no-fatal-warnings.patch
@@ -1,14 +1,14 @@
-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
+diff -up extra-cmake-modules-6.1.0/kde-modules/KDECompilerSettings.cmake.orig extra-cmake-modules-6.1.0/kde-modules/KDECompilerSettings.cmake
+--- extra-cmake-modules-6.1.0/kde-modules/KDECompilerSettings.cmake.orig       2024-04-09 15:33:51.000000000 +0200
++++ extra-cmake-modules-6.1.0/kde-modules/KDECompilerSettings.cmake    2024-04-14 13:58:15.469923426 +0200
 @@ -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
 -    set(CMAKE_SHARED_LINKER_FLAGS "-Wl,--fatal-warnings ${CMAKE_SHARED_LINKER_FLAGS}")
 -    set(CMAKE_MODULE_LINKER_FLAGS "-Wl,--fatal-warnings ${CMAKE_MODULE_LINKER_FLAGS}")
-+    ##set(CMAKE_SHARED_LINKER_FLAGS "-Wl,--fatal-warnings ${CMAKE_SHARED_LINKER_FLAGS}")
-+    ##set(CMAKE_MODULE_LINKER_FLAGS "-Wl,--fatal-warnings ${CMAKE_MODULE_LINKER_FLAGS}")
++##    set(CMAKE_SHARED_LINKER_FLAGS "-Wl,--fatal-warnings ${CMAKE_SHARED_LINKER_FLAGS}")
++##    set(CMAKE_MODULE_LINKER_FLAGS "-Wl,--fatal-warnings ${CMAKE_MODULE_LINKER_FLAGS}")
  
      string(TOUPPER "CMAKE_CXX_FLAGS_${CMAKE_BUILD_TYPE}" compileflags)
      if("${CMAKE_CXX_FLAGS} ${${compileflags}}" MATCHES "-fsanitize")