[gentoo-commits] gentoo-x86 commit in dev-python/enable/files: enable-3.0.2-nofreetype.patch

[gentoo-commits] gentoo-x86 commit in dev-python/enable/files: enable-3.0.2-nofreetype.patch

[Sebastien Fabbro (bicatali)]

bicatali    09/01/15 10:24:28

  Added:                enable-3.0.2-nofreetype.patch
  Log:
  Initial import
  (Portage version: 2.2_rc20/cvs/Linux 2.6.25-gentoo-r7 x86_64)

Revision  Changes    Path
1.1                  dev-python/enable/files/enable-3.0.2-nofreetype.patch

file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-python/enable/files/enable-3.0.2-nofreetype.patch?rev=1.1&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-python/enable/files/enable-3.0.2-nofreetype.patch?rev=1.1&content-type=text/plain

Index: enable-3.0.2-nofreetype.patch
===================================================================
Index: python-enable-3.0.1/enthought/kiva/agg/setup.py
===================================================================
--- python-enable-3.0.1.orig/enthought/kiva/agg/setup.py	2008-09-27 00:07:39.000000000 -0400
+++ python-enable-3.0.1/enthought/kiva/agg/setup.py	2008-09-27 00:11:45.000000000 -0400
@@ -5,39 +5,6 @@
 import platform
 
 
-
-
-freetype2_sources =['autohint/autohint.c',
-                    'base/ftbase.c','base/ftsystem.c','base/ftinit.c',
-                    'base/ftglyph.c','base/ftmm.c','base/ftbdf.c',
-                    'base/ftbbox.c','base/ftdebug.c','base/ftxf86.c',
-                    'base/fttype1.c','bdf/bdf.c',
-                    'cff/cff.c',
-                    'cid/type1cid.c',
-                    'pcf/pcf.c','pfr/pfr.c',
-                    'psaux/psaux.c',
-                    'pshinter/pshinter.c',
-                    'psnames/psnames.c',
-                    'raster/raster.c',
-                    'sfnt/sfnt.c',
-                    'smooth/smooth.c',
-                    'truetype/truetype.c',
-                    'type1/type1.c',
-                    'type42/type42.c',
-                    'winfonts/winfnt.c',
-                    'gzip/ftgzip.c',
-                    'base/ftmac.c',
-                    ]
-
-freetype2_dirs = [
-    'base','bdf','cache','cff','cid','pcf','pfr',
-    'psaux','pshinter','psnames','raster','sfnt',
-    'smooth','truetype','type1','type42','winfonts',
-    'gzip'
-    ]
-
-
-
 def configuration(parent_package='',top_path=None):
     from numpy.distutils.misc_util import Configuration
     from numpy.distutils.system_info import dict_append, get_info
@@ -68,35 +35,10 @@
 
 
     #-------------------------------------------------------------------------
-    # Add the freetype library (agg 2.4 links against this)
-    #-------------------------------------------------------------------------
-
-    prefix = config.paths('freetype2/src')[0]
-    freetype_lib = 'freetype2_src'
-
-    def get_ft2_sources((lib_name, build_info), build_dir):
-        sources = [prefix + "/" + s for s in freetype2_sources]
-        if sys.platform=='darwin':
-            return sources[:]
-        return sources[:-1]
-
-    ft2_incl_dirs = ['freetype2/src/' + s for s in freetype2_dirs] \
-                    + ['freetype2/include', 'freetype2/src']
-    ft2_incl_dirs = config.paths(*ft2_incl_dirs)
-    if sys.platform == 'darwin':
-        ft2_incl_dirs.append("/Developer/Headers/FlatCarbon")
-
-    config.add_library(freetype_lib,
-                       sources = [get_ft2_sources],
-                       include_dirs = ft2_incl_dirs,
-                       depends = ['freetype2']
-                       )
-
-    #-------------------------------------------------------------------------
     # Add the Agg sources
     #-------------------------------------------------------------------------
 
-    agg_include_dirs = [agg_dir+'/include',agg_dir+'/font_freetype'] + ft2_incl_dirs
+    agg_include_dirs = [agg_dir+'/include',agg_dir+'/font_freetype'] + ["/usr/include/freetype2/"]
     agg_sources = [agg_dir+'/src/*.cpp',
                     agg_dir+'/font_freetype/*.cpp']
     config.add_library(agg_lib,
@@ -110,7 +52,7 @@
     if sys.platform == 'darwin':
         define_macros = [('__DARWIN__', None)]
         macros = [('__DARWIN__', None)]
-        extra_link_args = ['-framework', 'Carbon']
+        extra_link_args = ['-framework', 'Carbon', '-Wl,-search_paths_first']
     else:
         define_macros = []
         macros = []
@@ -163,7 +105,7 @@
 
     build_info = {}
     kiva_lib = 'kiva_src'
-    build_libraries = [kiva_lib, agg_lib, freetype_lib]
+    build_libraries = [kiva_lib, agg_lib, "freetype"]
     if sys.platform == "win32":
         build_libraries += ["opengl32", "glu32"]
     elif sys.platform == "darwin":

[gentoo-commits] gentoo-x86 commit in dev-python/enable/files: enable-3.0.2-nofreetype.patch

[Arfrever Frehtes Taifersar Arahesis (arfrever)]

arfrever    11/01/30 17:01:59

  Removed:              enable-3.0.2-nofreetype.patch
  Log:
  Delete older ebuild.