Hello community, here is the log from the commit of package cmake for openSUSE:Factory checked in at 2013-12-09 16:53:46 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/cmake (Old) and /work/SRC/openSUSE:Factory/.cmake.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "cmake" Changes: -------- --- /work/SRC/openSUSE:Factory/cmake/cmake.changes 2013-11-25 16:58:38.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.cmake.new/cmake.changes 2013-12-09 16:53:47.000000000 +0100 @@ -1,0 +2,8 @@ +Sun Dec 8 23:00:40 UTC 2013 - hrvoje.sen...@gmail.com + +- Added fix-check-for-freetype251.patch, for resolving + build problems with Freetype2 2.5.1. For more details see: + http://www.cmake.org/Bug/view.php?id=14601 and + http://www.cmake.org/Bug/view.php?id=13959 + +------------------------------------------------------------------- New: ---- fix-check-for-freetype251.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ cmake.spec ++++++ --- /var/tmp/diff_new_pack.kgFdzk/_old 2013-12-09 16:53:48.000000000 +0100 +++ /var/tmp/diff_new_pack.kgFdzk/_new 2013-12-09 16:53:48.000000000 +0100 @@ -24,6 +24,8 @@ Source1: cmake.macros Source2: opensuse_rules.cmake Patch2: cmake-fix-ruby-test.patch +# PATCH-FIX-UPSTREAM fix-check-for-freetype251.patch -- http://www.cmake.org/Bug/view.php?id=13959, http://www.cmake.org/Bug/view.php?id=14601 +Patch3: fix-check-for-freetype251.patch Summary: Cross-platform, open-source make system License: BSD-3-Clause Group: Development/Tools/Building @@ -53,6 +55,7 @@ %prep %setup -q -n %{name}-%{version} %patch2 +%patch3 -p1 %build export CXXFLAGS="$RPM_OPT_FLAGS" ++++++ fix-check-for-freetype251.patch ++++++ diff -Naur cmake-2.8.12.1.orig/Modules/FindFreetype.cmake cmake-2.8.12.1/Modules/FindFreetype.cmake --- cmake-2.8.12.1.orig/Modules/FindFreetype.cmake 2013-11-05 20:07:22.000000000 +0100 +++ cmake-2.8.12.1/Modules/FindFreetype.cmake 2013-12-09 01:12:02.967856671 +0100 @@ -70,6 +70,19 @@ PATH_SUFFIXES include/freetype2 include ) +if(NOT FREETYPE_INCLUDE_DIR_freetype2) + find_path(FREETYPE_INCLUDE_DIR_freetype2 config/ftheader.h + HINTS + ENV FREETYPE_DIR + PATHS + /usr/X11R6 + /usr/local/X11R6 + /usr/local/X11 + /usr/freeware + PATH_SUFFIXES include/freetype2 include + ) +endif() + find_library(FREETYPE_LIBRARY NAMES freetype libfreetype freetype219 HINTS @@ -91,8 +104,14 @@ endif() set(FREETYPE_LIBRARIES "${FREETYPE_LIBRARY}") -if(FREETYPE_INCLUDE_DIR_freetype2 AND EXISTS "${FREETYPE_INCLUDE_DIR_freetype2}/freetype/freetype.h") - file(STRINGS "${FREETYPE_INCLUDE_DIR_freetype2}/freetype/freetype.h" freetype_version_str +if(EXISTS "${FREETYPE_INCLUDE_DIR_freetype2}/freetype/freetype.h") + set(FREETYPE_H "${FREETYPE_INCLUDE_DIR_freetype2}/freetype/freetype.h") +elseif(EXISTS "${FREETYPE_INCLUDE_DIR_freetype2}/freetype.h") + set(FREETYPE_H "${FREETYPE_INCLUDE_DIR_freetype2}/freetype.h") +endif() + +if(FREETYPE_INCLUDE_DIR_freetype2 AND FREETYPE_H) + file(STRINGS "${FREETYPE_H}" freetype_version_str REGEX "^#[\t ]*define[\t ]+FREETYPE_(MAJOR|MINOR|PATCH)[\t ]+[0-9]+$") unset(FREETYPE_VERSION_STRING) -- To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org For additional commands, e-mail: opensuse-commit+h...@opensuse.org
