Hello community, here is the log from the commit of package cmake for openSUSE:Factory checked in at 2020-04-25 20:05:31 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/cmake (Old) and /work/SRC/openSUSE:Factory/.cmake.new.2738 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "cmake" Sat Apr 25 20:05:31 2020 rev:173 rq:795309 version:3.17.1 Changes: -------- --- /work/SRC/openSUSE:Factory/cmake/cmake.changes 2020-04-14 16:17:37.219396048 +0200 +++ /work/SRC/openSUSE:Factory/.cmake.new.2738/cmake.changes 2020-04-25 20:05:56.423252565 +0200 @@ -1,0 +2,6 @@ +Fri Apr 17 20:53:02 UTC 2020 - Vitaly Yermolchyk <[email protected]> + +- Add cmake-fix-png-include-dir.patch to fix the png include dir + search. + +------------------------------------------------------------------- New: ---- cmake-fix-png-include-dir.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ cmake.spec ++++++ --- /var/tmp/diff_new_pack.XVBb8A/_old 2020-04-25 20:06:01.427262918 +0200 +++ /var/tmp/diff_new_pack.XVBb8A/_new 2020-04-25 20:06:01.427262918 +0200 @@ -54,6 +54,7 @@ Patch0: cmake-fix-ruby-test.patch # Search for python interpreters from newest to oldest rather then picking up /usr/bin/python as first choice Patch1: feature-suse-python-interp-search-order.patch +Patch2: cmake-fix-png-include-dir.patch BuildRequires: fdupes BuildRequires: gcc-c++ BuildRequires: pkgconfig ++++++ cmake-fix-png-include-dir.patch ++++++ Index: b/Modules/FindPNG.cmake =================================================================== --- a/Modules/FindPNG.cmake +++ b/Modules/FindPNG.cmake @@ -52,11 +52,15 @@ find_package(ZLIB ${_FIND_ZLIB_ARG}) if(ZLIB_FOUND) - find_path(PNG_PNG_INCLUDE_DIR png.h PATH_SUFFIXES include/libpng) + set(_PNG_VERSION_SUFFIXES 17 16 15 14 12) + foreach(v IN LISTS _PNG_VERSION_SUFFIXES) + list(APPEND _PNG_INCLUDE_SUFFIXES libpng${v}) + endforeach() + find_path(PNG_PNG_INCLUDE_DIR png.h PATH_SUFFIXES include/libpng ${_PNG_INCLUDE_SUFFIXES}) + unset(_PNG_INCLUDE_SUFFIXES) list(APPEND PNG_NAMES png libpng) unset(PNG_NAMES_DEBUG) - set(_PNG_VERSION_SUFFIXES 17 16 15 14 12) if (PNG_FIND_VERSION MATCHES "^([0-9]+)\\.([0-9]+)(\\..*)?$") set(_PNG_VERSION_SUFFIX_MIN "${CMAKE_MATCH_1}${CMAKE_MATCH_2}") if (PNG_FIND_VERSION_EXACT)
