Commit e674a6f9 authored by Kazuhiko Shiozaki's avatar Kazuhiko Shiozaki

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

parents 98489598 5e7798f8
...@@ -13,8 +13,8 @@ parts = ...@@ -13,8 +13,8 @@ parts =
[fontconfig] [fontconfig]
recipe = slapos.recipe.cmmi recipe = slapos.recipe.cmmi
url = http://fontconfig.org/release/fontconfig-2.11.0.tar.bz2 url = http://fontconfig.org/release/fontconfig-2.11.1.tar.bz2
md5sum = 000bd4baf7aefa828e03414d0c8c7dc5 md5sum = 824d000eb737af6e16c826dd3b2d6c90
pkg_config_depends = ${freetype:location}/lib/pkgconfig:${libxml2:location}/lib/pkgconfig:${zlib:location}/lib/pkgconfig pkg_config_depends = ${freetype:location}/lib/pkgconfig:${libxml2:location}/lib/pkgconfig:${zlib: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 =
......
...@@ -8,8 +8,8 @@ parts = ...@@ -8,8 +8,8 @@ parts =
[grep] [grep]
recipe = slapos.recipe.cmmi recipe = slapos.recipe.cmmi
url = http://ftp.gnu.org/gnu/grep/grep-2.17.tar.xz url = http://ftp.gnu.org/gnu/grep/grep-2.18.tar.xz
md5sum = 3b1f0cbf1139e76171f790665b1b41cf md5sum = 7439f8266f50844b56cc3e2721606541
environment = environment =
PATH=${xz-utils:location}/bin:%(PATH)s PATH=${xz-utils:location}/bin:%(PATH)s
CPPFLAGS=-I${pcre:location}/include CPPFLAGS=-I${pcre:location}/include
......
...@@ -9,8 +9,8 @@ parts = haproxy ...@@ -9,8 +9,8 @@ parts = haproxy
[haproxy] [haproxy]
recipe = slapos.recipe.cmmi recipe = slapos.recipe.cmmi
url = http://haproxy.1wt.eu/download/1.4/src/haproxy-1.4.24.tar.gz url = http://haproxy.1wt.eu/download/1.4/src/haproxy-1.4.25.tar.gz
md5sum = 86422620faa9759907563d5e0524b98c md5sum = 74b5ec1f0f9b4d148c8083bcfb512ccd
configure-command = true configure-command = true
# If the system is running on Linux 2.6, we use "linux26" as the TARGET, # If the system is running on Linux 2.6, we use "linux26" as the TARGET,
# otherwise use "generic". # otherwise use "generic".
......
...@@ -15,8 +15,8 @@ extends = ...@@ -15,8 +15,8 @@ extends =
[poppler] [poppler]
recipe = slapos.recipe.cmmi recipe = slapos.recipe.cmmi
url = http://poppler.freedesktop.org/poppler-0.24.5.tar.xz url = http://poppler.freedesktop.org/poppler-0.26.0.tar.xz
md5sum = 334f2ac95cc8039f2a57fe63e4a81c69 md5sum = 76c3b2f18002a0f1e2bbbc7cccd1b957
depends = depends =
${libtiff:version} ${libtiff:version}
${libpng:so_version} ${libpng:so_version}
......
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