| 1 |
bicatali 09/01/15 10:24:28 |
| 2 |
|
| 3 |
Added: enable-3.0.2-nofreetype.patch |
| 4 |
Log: |
| 5 |
Initial import |
| 6 |
(Portage version: 2.2_rc20/cvs/Linux 2.6.25-gentoo-r7 x86_64) |
| 7 |
|
| 8 |
Revision Changes Path |
| 9 |
1.1 dev-python/enable/files/enable-3.0.2-nofreetype.patch |
| 10 |
|
| 11 |
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-python/enable/files/enable-3.0.2-nofreetype.patch?rev=1.1&view=markup |
| 12 |
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 |
| 13 |
|
| 14 |
Index: enable-3.0.2-nofreetype.patch |
| 15 |
=================================================================== |
| 16 |
Index: python-enable-3.0.1/enthought/kiva/agg/setup.py |
| 17 |
=================================================================== |
| 18 |
--- python-enable-3.0.1.orig/enthought/kiva/agg/setup.py 2008-09-27 00:07:39.000000000 -0400 |
| 19 |
+++ python-enable-3.0.1/enthought/kiva/agg/setup.py 2008-09-27 00:11:45.000000000 -0400 |
| 20 |
@@ -5,39 +5,6 @@ |
| 21 |
import platform |
| 22 |
|
| 23 |
|
| 24 |
- |
| 25 |
- |
| 26 |
-freetype2_sources =['autohint/autohint.c', |
| 27 |
- 'base/ftbase.c','base/ftsystem.c','base/ftinit.c', |
| 28 |
- 'base/ftglyph.c','base/ftmm.c','base/ftbdf.c', |
| 29 |
- 'base/ftbbox.c','base/ftdebug.c','base/ftxf86.c', |
| 30 |
- 'base/fttype1.c','bdf/bdf.c', |
| 31 |
- 'cff/cff.c', |
| 32 |
- 'cid/type1cid.c', |
| 33 |
- 'pcf/pcf.c','pfr/pfr.c', |
| 34 |
- 'psaux/psaux.c', |
| 35 |
- 'pshinter/pshinter.c', |
| 36 |
- 'psnames/psnames.c', |
| 37 |
- 'raster/raster.c', |
| 38 |
- 'sfnt/sfnt.c', |
| 39 |
- 'smooth/smooth.c', |
| 40 |
- 'truetype/truetype.c', |
| 41 |
- 'type1/type1.c', |
| 42 |
- 'type42/type42.c', |
| 43 |
- 'winfonts/winfnt.c', |
| 44 |
- 'gzip/ftgzip.c', |
| 45 |
- 'base/ftmac.c', |
| 46 |
- ] |
| 47 |
- |
| 48 |
-freetype2_dirs = [ |
| 49 |
- 'base','bdf','cache','cff','cid','pcf','pfr', |
| 50 |
- 'psaux','pshinter','psnames','raster','sfnt', |
| 51 |
- 'smooth','truetype','type1','type42','winfonts', |
| 52 |
- 'gzip' |
| 53 |
- ] |
| 54 |
- |
| 55 |
- |
| 56 |
- |
| 57 |
def configuration(parent_package='',top_path=None): |
| 58 |
from numpy.distutils.misc_util import Configuration |
| 59 |
from numpy.distutils.system_info import dict_append, get_info |
| 60 |
@@ -68,35 +35,10 @@ |
| 61 |
|
| 62 |
|
| 63 |
#------------------------------------------------------------------------- |
| 64 |
- # Add the freetype library (agg 2.4 links against this) |
| 65 |
- #------------------------------------------------------------------------- |
| 66 |
- |
| 67 |
- prefix = config.paths('freetype2/src')[0] |
| 68 |
- freetype_lib = 'freetype2_src' |
| 69 |
- |
| 70 |
- def get_ft2_sources((lib_name, build_info), build_dir): |
| 71 |
- sources = [prefix + "/" + s for s in freetype2_sources] |
| 72 |
- if sys.platform=='darwin': |
| 73 |
- return sources[:] |
| 74 |
- return sources[:-1] |
| 75 |
- |
| 76 |
- ft2_incl_dirs = ['freetype2/src/' + s for s in freetype2_dirs] \ |
| 77 |
- + ['freetype2/include', 'freetype2/src'] |
| 78 |
- ft2_incl_dirs = config.paths(*ft2_incl_dirs) |
| 79 |
- if sys.platform == 'darwin': |
| 80 |
- ft2_incl_dirs.append("/Developer/Headers/FlatCarbon") |
| 81 |
- |
| 82 |
- config.add_library(freetype_lib, |
| 83 |
- sources = [get_ft2_sources], |
| 84 |
- include_dirs = ft2_incl_dirs, |
| 85 |
- depends = ['freetype2'] |
| 86 |
- ) |
| 87 |
- |
| 88 |
- #------------------------------------------------------------------------- |
| 89 |
# Add the Agg sources |
| 90 |
#------------------------------------------------------------------------- |
| 91 |
|
| 92 |
- agg_include_dirs = [agg_dir+'/include',agg_dir+'/font_freetype'] + ft2_incl_dirs |
| 93 |
+ agg_include_dirs = [agg_dir+'/include',agg_dir+'/font_freetype'] + ["/usr/include/freetype2/"] |
| 94 |
agg_sources = [agg_dir+'/src/*.cpp', |
| 95 |
agg_dir+'/font_freetype/*.cpp'] |
| 96 |
config.add_library(agg_lib, |
| 97 |
@@ -110,7 +52,7 @@ |
| 98 |
if sys.platform == 'darwin': |
| 99 |
define_macros = [('__DARWIN__', None)] |
| 100 |
macros = [('__DARWIN__', None)] |
| 101 |
- extra_link_args = ['-framework', 'Carbon'] |
| 102 |
+ extra_link_args = ['-framework', 'Carbon', '-Wl,-search_paths_first'] |
| 103 |
else: |
| 104 |
define_macros = [] |
| 105 |
macros = [] |
| 106 |
@@ -163,7 +105,7 @@ |
| 107 |
|
| 108 |
build_info = {} |
| 109 |
kiva_lib = 'kiva_src' |
| 110 |
- build_libraries = [kiva_lib, agg_lib, freetype_lib] |
| 111 |
+ build_libraries = [kiva_lib, agg_lib, "freetype"] |
| 112 |
if sys.platform == "win32": |
| 113 |
build_libraries += ["opengl32", "glu32"] |
| 114 |
elif sys.platform == "darwin": |
Archives