products/patches/matplotlib_1_4_2_patch_freetype_detection_for_SAT.patch

   1 diff -rupN matplotlib-1.4.2_old/setupext.py matplotlib-1.4.2_new/setupext.py
   2 --- matplotlib-1.4.2_old/setupext.py    2014-10-23 03:54:01.000000000 +0200
   3 +++ matplotlib-1.4.2_new/setupext.py    2014-12-12 14:43:21.000000000 +0100
   4 @@ -448,6 +448,11 @@ class SetupPackage(object):
   5                      "Requires %s %s or later.  Found %s." %
   6                      (package, min_version, version))
   7
   8 +        if package=='freetype2':
   9 +            include_dirs_hack = [os.path.join(os.environ['FREETYPE_ROOT_DIR'], 'include'),  os.path.join(os.environ['FREETYPE_ROOT_DIR'], 'include', 'freetype2') ]
  10 +            check_include_file(include_dirs_hack, include_file, package)
  11 +            return 'version %s' % version
  12 +
  13          ext = self.get_extension()
  14          if ext is None:
  15              ext = make_extension('test', [])
  16 @@ -984,18 +989,22 @@ class FreeType(SetupPackage):
  17                  return '.'.join([major, minor, patch])
  18
  19      def add_flags(self, ext):
  20 +        ## SALOME HACK
  21 +        freetype_include_path = os.path.join(os.environ['FREETYPE_ROOT_DIR'], 'include')
  22 +        freetype_include_freetype2_path = os.path.join(freetype_include_path, 'freetype2')
  23 +        freetype_include_freetype2_freetype_path = os.path.join(freetype_include_path, 'freetype2', 'freetype')
  24 +        freetype_lib_path = os.path.join(os.environ['FREETYPE_ROOT_DIR'], 'lib')
  25 +
  26          pkg_config.setup_extension(
  27              ext, 'freetype2',
  28 -            default_include_dirs=[
  29 -                'include/freetype2', 'freetype2',
  30 -                'lib/freetype2/include',
  31 +            default_include_dirs=[freetype_include_path, freetype_include_freetype2_path, freetype_include_freetype2_freetype_path,
  32 +                'freetype2', 'lib/freetype2/include',
  33                  'lib/freetype2/include/freetype2'],
  34 -            default_library_dirs=[
  35 +            default_library_dirs=[ freetype_lib_path,
  36                  'freetype2/lib'],
  37              default_libraries=['freetype', 'z'])
  38
  39
  40 -
  41  class FT2Font(SetupPackage):
  42      name = 'ft2font'
  43