products/patches/matplotlib_1_4_3_patch_freetype_detection_for_SAT.patch

   1 diff -rupN matplotlib-1.4.3p1_old/setupext.py matplotlib-1.4.3p1_new/setupext.py
   2 --- matplotlib-1.4.3p1_old/setupext.py  2015-02-16 04:46:36.000000000 +0100
   3 +++ matplotlib-1.4.3p1_new/setupext.py  2015-04-02 11:09:28.623280000 +0200
   4 @@ -446,8 +446,14 @@ class SetupPackage(object):
   5                  raise CheckFailed(
   6                      "Requires %s %s or later.  Found %s." %
   7                      (package, min_version, version))
   8 -
   9 -        ext = self.get_extension()
  10 +        # BEGIN SALOME patch
  11 +        if package=='freetype2':
  12 +            include_dirs_hack = [os.path.join(os.environ['FREETYPE_ROOT_DIR'], 'include'),  os.path.join(os.environ['FREETYPE_ROOT_DIR'], 'include', 'freetype2') ]
  13 +            check_include_file(include_dirs_hack, include_file, package)
  14 +            return 'version %s' % version
  15 +        # END SALOME patch
  16 +
  17 +        ext = self.get_extension()
  18          if ext is None:
  19              ext = make_extension('test', [])
  20              pkg_config.setup_extension(ext, package)
  21 @@ -983,16 +989,22 @@ class FreeType(SetupPackage):
  22                  return '.'.join([major, minor, patch])
  23
  24      def add_flags(self, ext):
  25 +        ## BEGIN SALOME HACK
  26 +        freetype_include_path = os.path.join(os.environ['FREETYPE_ROOT_DIR'], 'include')
  27 +        freetype_include_freetype2_path = os.path.join(freetype_include_path, 'freetype2')
  28 +        freetype_include_freetype2_freetype_path = os.path.join(freetype_include_path, 'freetype2', 'freetype')
  29 +        freetype_lib_path = os.path.join(os.environ['FREETYPE_ROOT_DIR'], 'lib')
  30 +
  31          pkg_config.setup_extension(
  32              ext, 'freetype2',
  33 -            default_include_dirs=[
  34 -                'include/freetype2', 'freetype2',
  35 -                'lib/freetype2/include',
  36 -                'lib/freetype2/include/freetype2'],
  37 -            default_library_dirs=[
  38 +            default_include_dirs=[freetype_include_path, freetype_include_freetype2_path, freetype_include_freetype2_freetype_path,
  39 +                 'freetype2', 'lib/freetype2/include',
  40 +                 'lib/freetype2/include/freetype2'],
  41 +            default_library_dirs=[ freetype_lib_path,
  42                  'freetype2/lib'],
  43              default_libraries=['freetype', 'z'])
  44
  45 +        ## END SALOME HACK
  46
  47
  48  class FT2Font(SetupPackage):