Commit 90e87e5f authored by Kazuhiko Shiozaki's avatar Kazuhiko Shiozaki

Merge remote-tracking branch 'origin/master' into erp5testnode

parents f391c4c1 130bfbf9
...@@ -15,7 +15,7 @@ parts = ...@@ -15,7 +15,7 @@ parts =
recipe = slapos.recipe.cmmi recipe = slapos.recipe.cmmi
url = http://fontconfig.org/release/fontconfig-2.11.1.tar.bz2 url = http://fontconfig.org/release/fontconfig-2.11.1.tar.bz2
md5sum = 824d000eb737af6e16c826dd3b2d6c90 md5sum = 824d000eb737af6e16c826dd3b2d6c90
pkg_config_depends = ${freetype:location}/lib/pkgconfig:${libxml2:location}/lib/pkgconfig:${zlib:location}/lib/pkgconfig pkg_config_depends = ${freetype:pkg_config_depends}:${freetype:location}/lib/pkgconfig:${libxml2:location}/lib/pkgconfig
# XXX-Cedric : should we use --with-add-fonts={somefont:location}/share,{someotherfont:location}/share? # XXX-Cedric : should we use --with-add-fonts={somefont:location}/share,{someotherfont:location}/share?
configure-options = configure-options =
--disable-static --disable-static
......
...@@ -5,6 +5,7 @@ ...@@ -5,6 +5,7 @@
extends = extends =
../bzip2/buildout.cfg ../bzip2/buildout.cfg
../libpng/buildout.cfg ../libpng/buildout.cfg
../pkgconfig/buildout.cfg
../zlib/buildout.cfg ../zlib/buildout.cfg
parts = parts =
...@@ -14,14 +15,16 @@ parts = ...@@ -14,14 +15,16 @@ parts =
recipe = slapos.recipe.cmmi recipe = slapos.recipe.cmmi
url = http://download.savannah.gnu.org/releases/freetype/freetype-2.5.3.tar.bz2 url = http://download.savannah.gnu.org/releases/freetype/freetype-2.5.3.tar.bz2
md5sum = d6b60f06bfc046e43ab2a6cbfd171d65 md5sum = d6b60f06bfc046e43ab2a6cbfd171d65
pkg_config_depends = ${zlib:location}/lib/pkgconfig:${libpng:location}/lib/pkgconfig
depends = depends =
${libpng:so_version} ${libpng:so_version}
location = ${buildout:parts-directory}/${:_buildout_section_name_} location = ${buildout:parts-directory}/${:_buildout_section_name_}
configure-options = configure-options =
--disable-static --disable-static
environment = environment =
PATH=${pkgconfig:location}/bin:%(PATH)s
PKG_CONFIG_PATH=${:pkg_config_depends}
CPPFLAGS=-I${bzip2:location}/include -I${zlib:location}/include CPPFLAGS=-I${bzip2:location}/include -I${zlib:location}/include
LDFLAGS=-L${bzip2:location}/lib -Wl,-rpath=${bzip2:location}/lib -L${zlib:location}/lib -Wl,-rpath=${zlib:location}/lib LDFLAGS=-L${bzip2:location}/lib -Wl,-rpath=${bzip2:location}/lib -L${zlib:location}/lib -Wl,-rpath=${zlib:location}/lib
PATH=${libpng:location}/bin:%(PATH)s
make-targets = make-targets =
install && ln -s . ${:location}/include/freetype2/freetype install && ln -s . ${:location}/include/freetype2/freetype
...@@ -41,8 +41,8 @@ environment = ...@@ -41,8 +41,8 @@ environment =
[harfbuzz] [harfbuzz]
recipe = slapos.recipe.cmmi recipe = slapos.recipe.cmmi
url = http://www.freedesktop.org/software/harfbuzz/release/harfbuzz-0.9.25.tar.bz2 url = http://www.freedesktop.org/software/harfbuzz/release/harfbuzz-0.9.28.tar.bz2
md5sum = 491b631239f51dcd4f7934775306c4e7 md5sum = accbeb679f39d839038b95a87e40870e
pkg_config_depends = ${cairo:location}/lib/pkgconfig:${cairo:pkg_config_depends} pkg_config_depends = ${cairo:location}/lib/pkgconfig:${cairo:pkg_config_depends}
configure-options = configure-options =
--disable-static --disable-static
......
...@@ -686,7 +686,7 @@ paramiko = 1.13.0 ...@@ -686,7 +686,7 @@ paramiko = 1.13.0
plone.recipe.command = 1.1 plone.recipe.command = 1.1
ply = 3.4 ply = 3.4
polib = 1.0.4 polib = 1.0.4
pprofile = 1.7.1 pprofile = 1.7.2
psutil = 2.1.1 psutil = 2.1.1
pyflakes = 0.8.1 pyflakes = 0.8.1
pylint = 1.2.1 pylint = 1.2.1
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment