[packages/kf5-extra-cmake-modules] Revert "- updated to 5.249.0; rel 0.1"

witekfl witekfl at pld-linux.org
Thu Mar 14 17:31:43 CET 2024


commit 232f1766fe53a27ac51e66f430ed580fb1b89a26
Author: Witold Filipczyk <witekfl at poczta.onet.pl>
Date:   Thu Mar 14 15:54:39 2024 +0100

    Revert "- updated to 5.249.0; rel 0.1"
    
    This reverts commit 0b5530da477657e695d9524f83c72d7fca4b392e.

 kf5-extra-cmake-modules.spec | 22 +++++++++++-----------
 no-fatal-warnings.patch      | 12 ++++++------
 2 files changed, 17 insertions(+), 17 deletions(-)
---
diff --git a/kf5-extra-cmake-modules.spec b/kf5-extra-cmake-modules.spec
index c08a4ca..765e5cc 100644
--- 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.249.0
-Summary:	Extra Cmake Modules for KF6
-Summary(pl.UTF-8):	Dodatkowe moduły Cmake'a dla KF6
+%define		kdeframever	5.114
+Summary:	Extra Cmake Modules for KF5
+Summary(pl.UTF-8):	Dodatkowe moduły Cmake'a dla KF5
 Name:		kf5-%{orgname}
-Version:	5.249.0
-Release:	0.1
+Version:	5.114.0
+Release:	1
 License:	BSD
 Group:		Development/Building
-Source0:	https://download.kde.org/unstable/frameworks/%{kdeframever}/%{orgname}-%{version}.tar.xz
-# Source0-md5:	e8cd307af19777f5ef99edf8e713387b
+Source0:	https://download.kde.org/stable/frameworks/%{kdeframever}/%{orgname}-%{version}.tar.xz
+# Source0-md5:	475f189080f5d249de3f53d1aece9416
 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:	Qt6Core-devel >= 5.9.0
-BuildRequires:	Qt6Quick-devel >= 5.9.0
+BuildRequires:	Qt5Core-devel >= 5.9.0
+BuildRequires:	Qt5Quick-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-categories6
+install -d $RPM_BUILD_ROOT%{_datadir}/qlogging-categories5
 
 %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-categories6
+%{_datadir}/qlogging-categories5
 %{_mandir}/man7/ecm*.7*
 
 %if %{with doc}
diff --git a/no-fatal-warnings.patch b/no-fatal-warnings.patch
index d8f30b3..0d796e3 100644
--- a/no-fatal-warnings.patch
+++ b/no-fatal-warnings.patch
@@ -1,7 +1,7 @@
-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
+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
          (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.249.0/kde-modules/KDECompilerSettings.cmake.orig
 +    ##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")
+     # 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
================================================================

---- gitweb:

http://git.pld-linux.org/gitweb.cgi/packages/kf5-extra-cmake-modules.git/commitdiff/e3ae1c26191921b6e76523e8a127f619b6616a59



More information about the pld-cvs-commit mailing list