Compare commits

..

No commits in common. "b7d7bbd93b211f3a55c519f3449439c3c73ceb25" and "de388e0e01d52eee99c55d6413909d38955897d0" have entirely different histories.

6 changed files with 14 additions and 76 deletions

Binary file not shown.

View File

@ -1,12 +0,0 @@
diff -up extra-cmake-modules-5.39.0/find-modules/FindPoppler.cmake.poppler_overlinking extra-cmake-modules-5.39.0/find-modules/FindPoppler.cmake
--- extra-cmake-modules-5.39.0/find-modules/FindPoppler.cmake.poppler_overlinking 2017-09-09 07:07:55.000000000 -0500
+++ extra-cmake-modules-5.39.0/find-modules/FindPoppler.cmake 2017-11-06 14:26:33.473536485 -0600
@@ -85,7 +85,7 @@ set(Poppler_known_components
)
foreach(_comp ${Poppler_known_components})
string(TOLOWER "${_comp}" _lc_comp)
- set(Poppler_${_comp}_component_deps "Core")
+ #set(Poppler_${_comp}_component_deps "Core")
set(Poppler_${_comp}_pkg_config "poppler-${_lc_comp}")
set(Poppler_${_comp}_lib "poppler-${_lc_comp}")
set(Poppler_${_comp}_header_subdir "poppler/${_lc_comp}")

Binary file not shown.

View File

@ -1,25 +0,0 @@
From 296dfb9eb4a408d40a8c99d710bdf86f19d3149e Mon Sep 17 00:00:00 2001
From: loong_C <loong_c@yeah.net>
Date: Mon, 4 Jul 2022 14:56:38 +0800
Subject: [PATCH] extra-cmake-modules-5.89.0-qt_prefix
---
kde-modules/KDEInstallDirs5.cmake | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/kde-modules/KDEInstallDirs5.cmake b/kde-modules/KDEInstallDirs5.cmake
index 0341196..55282a7 100644
--- a/kde-modules/KDEInstallDirs5.cmake
+++ b/kde-modules/KDEInstallDirs5.cmake
@@ -236,7 +236,7 @@ include("${ECM_MODULE_DIR}/ECMQueryQt.cmake")
set(_default_KDE_INSTALL_USE_QT_SYS_PATHS OFF)
if(NOT DEFINED KDE_INSTALL_USE_QT_SYS_PATHS)
ecm_query_qt(qt_install_prefix_dir QT_INSTALL_PREFIX TRY)
- if(qt_install_prefix_dir STREQUAL "${CMAKE_INSTALL_PREFIX}")
+ if( (qt_install_prefix_dir STREQUAL "${CMAKE_INSTALL_PREFIX}") OR ( ("${CMAKE_INSTALL_PREFIX}" STREQUAL "/usr") AND (qt_install_prefix_dir STREQUAL "${CMAKE_INSTALL_FULL_LIBDIR}/qt5")) )
message(STATUS "Installing in the same prefix as Qt, adopting their path scheme.")
set(_default_KDE_INSTALL_USE_QT_SYS_PATHS ON)
endif()
--
2.20.1

View File

@ -1,27 +1,22 @@
Name: extra-cmake-modules
Summary: Additional modules for CMake build system
Version: 5.100.0
Release: 1
Version: 5.59.0
Release: 2
License: BSD
URL: https://api.kde.org/ecm/
%global versiondir %(echo %{version} | cut -d. -f1-2)
%global revision %(echo %{version} | cut -d. -f3)
%if %{revision} >= 50
%global stable unstable
%else
%global stable stable
%endif
Source0: http://download.kde.org/%{stable}/frameworks/%{versiondir}/%{name}-%{version}.tar.xz
Patch01: extra-cmake-modules-5.39.0-poppler_overlinking.patch
Patch02: extra-cmake-modules-5.89.0-qt_prefix.patch
Source0: http://download.kde.org/stable/frameworks/5.59/extra-cmake-modules-%{version}.tar.xz
BuildArch: noarch
BuildRequires: kf5-rpm-macros qt5-qttools-devel python3-sphinx
Requires: kf5-rpm-macros qt5-linguist
Requires: kf5-rpm-macros appstream cmake(Qt5LinguistTools) qt5-linguist
%description
Additional modules for CMake build system needed by KDE Frameworks.
The package provides additional modules for CMake build system needed by KDE Frameworks.
%package help
Summary: Documentation for extra-cmake-modules
%description help
Documentation for extra-cmake-modules.
%prep
%autosetup -p1
@ -44,32 +39,16 @@ export CTEST_OUTPUT_ON_FAILURE=1
make test ARGS="--output-on-failure --timeout 300" -C %{_target_platform} ||:
%files
%doc README.rst
%license LICENSES/*.txt
%license COPYING-CMAKE-SCRIPTS
%{_datadir}/ECM/
%files help
%doc README.rst
%{_kf5_docdir}/ECM/html/
%{_kf5_mandir}/man7/ecm*.7*
%changelog
* Fri Dec 09 2022 jiangxinyu <jiangxinyu@kylinos.cn> - 5.100.0-1
- Update to upstream version 5.100.0
* Mon Sep 05 2022 liweiganga <liweiganga@uniontech.com> - 5.97.0-1
- update to upstream version 5.97.0
* Mon Jul 04 2022 loong_C <loong_c@yeah.net> - 5.95.0-1
- update to upstream version 5.95.0
* Fri Feb 11 2022 pei-jiankang<peijiankang@kylinos.cn> - 5.90.0-1
- update to upstream version 5.90.0
* Wed Jan 12 2022 pei-jiankang<peijiankang@kylinos.cn> - 5.88.0-1
- update to upstream version 5.88.0
* Thu Mar 12 2020 lingsheng <lingsheng@huawei.com> - 5.59.0-3
- Remove install require appstream
* Tue Mar 10 2020 zhujunhao <zhujunhao5@huawei.com> - 5.59.0-2
- Package init

View File

@ -1,4 +0,0 @@
version_control: github
src_repo: https://github.com/KDE/extra-cmake-modules
tag_prefix: "v"
seperator: "."