Package: mygui
Severity: serious
Tags: patch

http://buildd.raspbian.org/status/fetch.php?pkg=mygui&arch=armhf&ver=3.2.0-3%2Bb1&stamp=1387738789

-- Looking for FREETYPE...
-- Found PkgConfig: /usr/bin/pkg-config (found version "0.26") -- checking for module 'freetype2'
--   found freetype2, version 17.0.11
-- CMAKE_PREFIX_PATH: 
Dependencies;/«PKGBUILDDIR»/obj-arm-linux-gnueabihf/Dependencies;/«PKGBUILDDIR»/Dependencies;/«PKGBUILDDIR»/obj-arm-linux-gnueabihf/../Dependencies;/«PKGBUILDDIR»/../Dependencies;/usr/local
-- Could not locate FREETYPE
<--snip-->
 -----------------------------------------------------------------------------


 -- The following REQUIRED packages could NOT be located on your system.

 -- Please install them before continuing this software installation.

 -- If you are in Windows, try passing -DMYGUI_DEPENDENCIES_DIR=<path to
 dependencies>

 -- Also check that you buildind with RenderSystem that you need or set
 another with -DMYGUI_RENDERSYSTEM=<1 2 or 3 for Direct3D_9 OGRE or OpenGL>

-----------------------------------------------------------------------------


 + freetype: Portable font engine <http://www.freetype.org>

-----------------------------------------------------------------------------



This bug was intially noticed in raspbian jessie but I also reproduced it locally in debian sid.

Debdiff is attatched (note: the fix has only been tested in raspbian jessie, there is nothing raspbian specific about it though), no intent to NMU.

Note that the fix I applied may well not be the best fix, I belive cmake can find freetype on it's own nowadays so there is no need for local logic but given I have no clue about cmake I doubt I could convert the package.
diff -Nru mygui-3.2.0/debian/changelog mygui-3.2.0/debian/changelog
--- mygui-3.2.0/debian/changelog        2013-04-30 18:19:21.000000000 +0000
+++ mygui-3.2.0/debian/changelog        2013-12-23 06:51:23.000000000 +0000
@@ -1,3 +1,11 @@
+mygui (3.2.0-3+rpi1) jessie-staging; urgency=medium
+
+  * Adjust cmake stuff for new freetype.
+  * Build-depend on jessie version of freetype since it's not clear exactly
+    when the location was changed.
+
+ -- Peter Michael Green <plugw...@raspbian.org>  Mon, 23 Dec 2013 06:36:01 
+0000
+
 mygui (3.2.0-3) unstable; urgency=low
 
   * Build against libogre 1.8 (Closes: #705010)
diff -Nru mygui-3.2.0/debian/control mygui-3.2.0/debian/control
--- mygui-3.2.0/debian/control  2013-04-30 18:18:38.000000000 +0000
+++ mygui-3.2.0/debian/control  2013-12-23 06:51:38.000000000 +0000
@@ -3,7 +3,7 @@
 Maintainer: Scott Howard <show...@debian.org>
 Uploaders: Bret Curtis <psi...@gmail.com>
 Build-Depends: cmake, doxygen, debhelper (>= 9), libogre-1.8-dev,
- libfreetype6-dev, libois-dev, pkg-config, graphviz, libglu1-mesa-dev,
+ libfreetype6-dev (>= 2.5.1-1), libois-dev, pkg-config, graphviz, 
libglu1-mesa-dev,
  libgl1-mesa-dev, libglew-dev
 Homepage: http://www.ogre3d.org/tikiwiki/MyGUI
 Standards-Version: 3.9.3
diff -Nru mygui-3.2.0/debian/patches/new-freetype.h-location 
mygui-3.2.0/debian/patches/new-freetype.h-location
--- mygui-3.2.0/debian/patches/new-freetype.h-location  1970-01-01 
00:00:00.000000000 +0000
+++ mygui-3.2.0/debian/patches/new-freetype.h-location  2013-12-23 
06:53:15.000000000 +0000
@@ -0,0 +1,29 @@
+Description: Adjust cmake stuff for new freetype.
+ freetype.h no longer has a freetype/ in it's path, adjust the cmake files
+ to match.
+Author: Peter Michael Green <plugw...@raspbian.org>
+
+---
+The information above should follow the Patch Tagging Guidelines, please
+checkout http://dep.debian.net/deps/dep3/ to learn about the format. Here
+are templates for supplementary fields that you might want to add:
+
+Origin: <vendor|upstream|other>, <url of original patch>
+Bug: <url in upstream bugtracker>
+Bug-Debian: http://bugs.debian.org/<bugnumber>
+Bug-Ubuntu: https://launchpad.net/bugs/<bugnumber>
+Forwarded: <no|not-needed|url proving that it has been forwarded>
+Reviewed-By: <name and email of someone who approved the patch>
+Last-Update: <YYYY-MM-DD>
+
+--- mygui-3.2.0.orig/CMake/Packages/FindFreetype.cmake
++++ mygui-3.2.0/CMake/Packages/FindFreetype.cmake
+@@ -33,7 +33,7 @@ set(CMAKE_FIND_FRAMEWORK "LAST")
+ findpkg_framework(FREETYPE)
+ message(STATUS "CMAKE_PREFIX_PATH: ${CMAKE_PREFIX_PATH}")
+ 
+-find_path(FREETYPE_INCLUDE_DIR NAMES freetype/freetype.h HINTS 
${FREETYPE_INC_SEARCH_PATH} ${FREETYPE_PKGC_INCLUDE_DIRS} PATH_SUFFIXES 
freetype2)
++find_path(FREETYPE_INCLUDE_DIR NAMES freetype.h HINTS 
${FREETYPE_INC_SEARCH_PATH} ${FREETYPE_PKGC_INCLUDE_DIRS} PATH_SUFFIXES 
freetype2)
+ find_path(FREETYPE_FT2BUILD_INCLUDE_DIR NAMES ft2build.h HINTS 
${FREETYPE_INC_SEARCH_PATH} ${FREETYPE_PKGC_INCLUDE_DIRS})
+ find_library(FREETYPE_LIBRARY_REL NAMES ${FREETYPE_LIBRARY_NAMES} HINTS 
${FREETYPE_LIB_SEARCH_PATH} ${FREETYPE_PKGC_LIBRARY_DIRS} PATH_SUFFIXES "" 
release relwithdebinfo minsizerel)
+ find_library(FREETYPE_LIBRARY_DBG NAMES ${FREETYPE_LIBRARY_NAMES_DBG} HINTS 
${FREETYPE_LIB_SEARCH_PATH} ${FREETYPE_PKGC_LIBRARY_DIRS} PATH_SUFFIXES "" 
debug)
diff -Nru mygui-3.2.0/debian/patches/series mygui-3.2.0/debian/patches/series
--- mygui-3.2.0/debian/patches/series   2013-04-08 12:28:44.000000000 +0000
+++ mygui-3.2.0/debian/patches/series   2013-12-23 06:52:25.000000000 +0000
@@ -1,2 +1,3 @@
 disable_sse.patch
 shared_libraries.patch
+new-freetype.h-location

Reply via email to