Control: tag -1 patch pending upstream Darren Salt <bugs...@moreofthesa.me.uk> (2013-12-01): > With libfreetype6-dev 2.5.1-1 installed: > > CMake Error at > /usr/share/cmake-2.8/Modules/FindPackageHandleStandardArgs.cmake:108 > (message): > Could NOT find Freetype (missing: FREETYPE_INCLUDE_DIRS) > Call Stack (most recent call first): > /usr/share/cmake-2.8/Modules/FindPackageHandleStandardArgs.cmake:315 > (_FPHSA_FAILURE_MESSAGE) > /usr/share/cmake-2.8/Modules/FindFreetype.cmake:119 > (FIND_PACKAGE_HANDLE_STANDARD_ARGS) > CMakeLists.txt:1167 (find_package) > > All is well if 2.4.9-1.1 is installed. > > cmake should (probably) be using freetype-config where available.
Since we're looking for a quick fix (ICU transition), I want the easiest way, namely getting rid of the extraneous freetype/ directory in the FindFreetype macro. While testing the attached patch, I stumbled upon #732182. Checking with a random package build-depending on both cmake and freetype (graphite2), it appears the current package is indeed failing to find freetype headers while the fixed one makes it alright. I've uploaded the fixed package to DELAYED/2. Please tell me if I should reschedule it to a different DELAYED queue. Mraw, KiBi.
diff -Nru cmake-2.8.12.1/debian/changelog cmake-2.8.12.1/debian/changelog --- cmake-2.8.12.1/debian/changelog 2013-11-06 22:56:53.000000000 +0000 +++ cmake-2.8.12.1/debian/changelog 2013-12-15 10:31:36.000000000 +0000 @@ -1,3 +1,11 @@ +cmake (2.8.12.1-1.1) unstable; urgency=high + + * Non-maintainer upload. + * Make sure to find freetype headers in their new location (without an + extra freetype/ directory, fix-FindFreetype.diff). (Closes: #731089) + + -- Cyril Brulebois <k...@debian.org> Sun, 15 Dec 2013 10:30:54 +0000 + cmake (2.8.12.1-1) unstable; urgency=low * New upstream release: diff -Nru cmake-2.8.12.1/debian/patches/fix-FindFreetype.diff cmake-2.8.12.1/debian/patches/fix-FindFreetype.diff --- cmake-2.8.12.1/debian/patches/fix-FindFreetype.diff 1970-01-01 00:00:00.000000000 +0000 +++ cmake-2.8.12.1/debian/patches/fix-FindFreetype.diff 2013-12-15 10:29:35.000000000 +0000 @@ -0,0 +1,17 @@ +Description: Fix FindFreetype after headers location breakage. + Make sure to find freetype headers in their new location (without an + extra freetype/ directory). +Author: Cyril Brulebois <k...@debian.org> +Bug-Debian: http://bugs.debian.org/731089 + +--- a/Modules/FindFreetype.cmake ++++ b/Modules/FindFreetype.cmake +@@ -56,7 +56,7 @@ find_path(FREETYPE_INCLUDE_DIR_ft2build + PATH_SUFFIXES include/freetype2 include + ) + +-find_path(FREETYPE_INCLUDE_DIR_freetype2 freetype/config/ftheader.h ++find_path(FREETYPE_INCLUDE_DIR_freetype2 config/ftheader.h + HINTS + ENV FREETYPE_DIR + PATHS diff -Nru cmake-2.8.12.1/debian/patches/series cmake-2.8.12.1/debian/patches/series --- cmake-2.8.12.1/debian/patches/series 2013-11-06 22:55:53.000000000 +0000 +++ cmake-2.8.12.1/debian/patches/series 2013-12-15 10:30:13.000000000 +0000 @@ -6,3 +6,4 @@ FindPHP4_fix_typo.diff FindJNI_amd64_ppc_biarch.diff fix-ftbfs-on-kfreebsd.patch +fix-FindFreetype.diff
signature.asc
Description: Digital signature
