diff --git a/extra-cmake-modules-5.39.0-poppler_overlinking.patch b/extra-cmake-modules-5.39.0-poppler_overlinking.patch new file mode 100644 index 0000000..4d895ed --- /dev/null +++ b/extra-cmake-modules-5.39.0-poppler_overlinking.patch @@ -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}") diff --git a/extra-cmake-modules.spec b/extra-cmake-modules.spec index cc1a7b8..38171bc 100644 --- a/extra-cmake-modules.spec +++ b/extra-cmake-modules.spec @@ -9,7 +9,7 @@ Name: extra-cmake-modules Summary: Additional modules for CMake build system Version: 5.39.0 -Release: 1%{?dist} +Release: 2%{?dist} License: BSD URL: https://api.kde.org/ecm/ @@ -38,6 +38,8 @@ BuildRequires: python2-PyQt5-devel ## upstreamable patches Patch1: extra-cmake-modules-5.38.0-clang.patch +# do not unconditionally link in base/core libpoppler library +Patch2: extra-cmake-modules-5.39.0-poppler_overlinking.patch BuildRequires: kf5-rpm-macros %if 0%{?docs} @@ -123,6 +125,9 @@ make test ARGS="--output-on-failure --timeout 300" -C %{_target_platform} ||: %changelog +* Mon Nov 06 2017 Rex Dieter - 5.39.0-2 +- FindPoppler.cmake: avoid overlinking base/core libpoppler + * Sun Oct 08 2017 Rex Dieter - 5.39.0-1 - 5.39.0