update to upstream version 5.88.0
This commit is contained in:
parent
de2b71bf91
commit
adfbdd19fa
12
extra-cmake-modules-5.39.0-poppler_overlinking.patch
Normal file
12
extra-cmake-modules-5.39.0-poppler_overlinking.patch
Normal file
@ -0,0 +1,12 @@
|
|||||||
|
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}")
|
||||||
12
extra-cmake-modules-5.47.0-qt_prefix.patch
Normal file
12
extra-cmake-modules-5.47.0-qt_prefix.patch
Normal file
@ -0,0 +1,12 @@
|
|||||||
|
diff -up extra-cmake-modules-5.47.0/kde-modules/KDEInstallDirs.cmake.qt_prefix extra-cmake-modules-5.47.0/kde-modules/KDEInstallDirs.cmake
|
||||||
|
--- extra-cmake-modules-5.47.0/kde-modules/KDEInstallDirs.cmake.qt_prefix 2018-05-31 03:10:15.000000000 -0500
|
||||||
|
+++ extra-cmake-modules-5.47.0/kde-modules/KDEInstallDirs.cmake 2018-06-02 15:41:25.948999508 -0500
|
||||||
|
@@ -461,7 +461,7 @@ include("${ECM_MODULE_DIR}/ECMQueryQmake
|
||||||
|
set(_default_KDE_INSTALL_USE_QT_SYS_PATHS OFF)
|
||||||
|
if(NOT DEFINED KDE_INSTALL_USE_QT_SYS_PATHS)
|
||||||
|
query_qmake(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()
|
||||||
Binary file not shown.
BIN
extra-cmake-modules-5.88.0.tar.xz
Normal file
BIN
extra-cmake-modules-5.88.0.tar.xz
Normal file
Binary file not shown.
@ -1,22 +1,19 @@
|
|||||||
Name: extra-cmake-modules
|
Name: extra-cmake-modules
|
||||||
Summary: Additional modules for CMake build system
|
Summary: Additional modules for CMake build system
|
||||||
Version: 5.59.0
|
Version: 5.88.0
|
||||||
Release: 3
|
Release: 1
|
||||||
License: BSD
|
License: BSD
|
||||||
URL: https://api.kde.org/ecm/
|
URL: https://api.kde.org/ecm/
|
||||||
Source0: http://download.kde.org/stable/frameworks/5.59/extra-cmake-modules-%{version}.tar.xz
|
Source0: http://download.kde.org/stable/frameworks/5.88/extra-cmake-modules-%{version}.tar.xz
|
||||||
|
Patch01: extra-cmake-modules-5.39.0-poppler_overlinking.patch
|
||||||
|
Patch02: extra-cmake-modules-5.47.0-qt_prefix.patch
|
||||||
BuildArch: noarch
|
BuildArch: noarch
|
||||||
BuildRequires: kf5-rpm-macros qt5-qttools-devel python3-sphinx
|
BuildRequires: kf5-rpm-macros qt5-qttools-devel python3-sphinx
|
||||||
Requires: kf5-rpm-macros cmake(Qt5LinguistTools) qt5-linguist
|
Requires: kf5-rpm-macros qt5-linguist
|
||||||
|
|
||||||
%description
|
%description
|
||||||
The package provides additional modules for CMake build system needed by KDE Frameworks.
|
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
|
%prep
|
||||||
%autosetup -p1
|
%autosetup -p1
|
||||||
@ -39,16 +36,17 @@ export CTEST_OUTPUT_ON_FAILURE=1
|
|||||||
make test ARGS="--output-on-failure --timeout 300" -C %{_target_platform} ||:
|
make test ARGS="--output-on-failure --timeout 300" -C %{_target_platform} ||:
|
||||||
|
|
||||||
%files
|
%files
|
||||||
%license COPYING-CMAKE-SCRIPTS
|
|
||||||
%{_datadir}/ECM/
|
|
||||||
|
|
||||||
%files help
|
|
||||||
%doc README.rst
|
%doc README.rst
|
||||||
|
%license LICENSES/*.txt
|
||||||
|
%{_datadir}/ECM/
|
||||||
%{_kf5_docdir}/ECM/html/
|
%{_kf5_docdir}/ECM/html/
|
||||||
%{_kf5_mandir}/man7/ecm*.7*
|
%{_kf5_mandir}/man7/ecm*.7*
|
||||||
|
|
||||||
|
|
||||||
%changelog
|
%changelog
|
||||||
|
* Wed Jan 12 2022 pei-jiankang<peijiankang@kylinos.com> - 5.88.0-1
|
||||||
|
- update to upstream version 5.88.0
|
||||||
|
|
||||||
* Thu Mar 12 2020 lingsheng <lingsheng@huawei.com> - 5.59.0-3
|
* Thu Mar 12 2020 lingsheng <lingsheng@huawei.com> - 5.59.0-3
|
||||||
- Remove install require appstream
|
- Remove install require appstream
|
||||||
|
|
||||||
|
|||||||
Loading…
x
Reference in New Issue
Block a user