| Previous changeset 3:8294add5c76e (2015-11-04) Next changeset 5:3d4edf152b1b (2015-12-03) |
|
Commit message:
planemo upload for repository https://github.com/galaxyproject/tools-iuc/tree/master/packages/package_cairo_1_12_14 commit f6ee6a549b9c121ee69914a2fdde392de74e4b19 |
|
modified:
tool_dependencies.xml |
| b |
| diff -r 8294add5c76e -r 63d45dc9fd01 tool_dependencies.xml --- a/tool_dependencies.xml Wed Nov 04 09:51:38 2015 -0500 +++ b/tool_dependencies.xml Wed Dec 02 16:15:26 2015 -0500 |
| b |
| @@ -7,42 +7,34 @@ <repository changeset_revision="05df724aefbb" name="package_libpng_1_6_7" owner="iuc" prior_installation_required="True" toolshed="https://toolshed.g2.bx.psu.edu" /> </package> <package name="freetype" version="2.5.2"> - <repository changeset_revision="ee307f3ce5dc" name="package_freetype_2_5_2" owner="iuc" prior_installation_required="True" toolshed="https://toolshed.g2.bx.psu.edu" /> + <repository changeset_revision="3b09e7916896" name="package_freetype_2_5_2" owner="iuc" prior_installation_required="True" toolshed="https://toolshed.g2.bx.psu.edu" /> </package> <package name="cairo" version="1.12.14"> - <install version="1.0"> - <actions> - <action type="download_by_url">http://depot.galaxyproject.org/package/source/cairo/cairo-1.12.14.tar.bz2</action> + <install version="1.0"> + <actions> + <action type="download_by_url">http://depot.galaxyproject.org/package/source/cairo/cairo-1.12.14.tar.bz2</action> <action type="set_environment_for_install"> - <repository changeset_revision="efddae64d543" name="package_pixman_0_32_4" owner="iuc" prior_installation_required="True" toolshed="https://toolshed.g2.bx.psu.edu"> - <package name="pixman" version="0.32.4" /> + <repository changeset_revision="efddae64d543" name="package_pixman_0_32_4" owner="iuc" prior_installation_required="True" toolshed="https://toolshed.g2.bx.psu.edu"> + <package name="pixman" version="0.32.4" /> </repository> <repository changeset_revision="05df724aefbb" name="package_libpng_1_6_7" owner="iuc" prior_installation_required="True" toolshed="https://toolshed.g2.bx.psu.edu"> - <package name="libpng" version="1.6.7" /> + <package name="libpng" version="1.6.7" /> </repository> - <repository changeset_revision="ee307f3ce5dc" name="package_freetype_2_5_2" owner="iuc" prior_installation_required="True" toolshed="https://toolshed.g2.bx.psu.edu"> - <package name="freetype" version="2.5.2" /> + <repository changeset_revision="3b09e7916896" name="package_freetype_2_5_2" owner="iuc" prior_installation_required="True" toolshed="https://toolshed.g2.bx.psu.edu"> + <package name="freetype" version="2.5.2" /> </repository> </action> <!-- edit configure and build/configure.ac.warnings to allow compiling cairo on gcc-4.9. Fixed in more recent versions of cairo --> <action type="shell_command"> - sed -i.bak 's|MAYBE_WARN="$MAYBE_WARN -flto"|MAYBE_WARN="$MAYBE_WARN -flto -ffat-lto-objects -fuse-linker-plugin" |' configure build/configure.ac.warnings && - export LDFLAGS="-Wl,-rpath,$PIXMAN_LIB_PATH -Wl,-rpath,$LIBPNG_ROOT/lib -Wl,-rpath,$FREETYPE_LIB_PATH" && - ./configure --prefix=$INSTALL_DIR \ - --with-x=no \ - --enable-xcb-shm=no \ - --enable-xlib-xcb=no \ - --enable-xcb=no \ - --enable-gtk-doc=no \ - --enable-gtk-doc-html=no \ - --enable-xlib-xrender=no \ + sed -i.bak 's|MAYBE_WARN="$MAYBE_WARN -flto"|MAYBE_WARN="$MAYBE_WARN -flto -ffat-lto-objects -fuse-linker-plugin" |' configure build/configure.ac.warnings </action> - <action type="make_install" /> + <action type="autoconf">--with-x=no --enable-xcb-shm=no --enable-xlib-xcb=no --enable-xcb=no --enable-gtk-doc=no --enable-gtk-doc-html=no --enable-xlib-xrender=no</action> <!-- Create an empty cairo-xlib.h file, because R's configure script explicitly includes it even if X is disabled. --> <action type="shell_command">touch $INSTALL_DIR/include/cairo/cairo-xlib.h</action> <action type="set_environment"> - <environment_variable action="prepend_to" name="PATH">$INSTALL_DIR/bin</environment_variable> + <environment_variable action="prepend_to" name="PATH">$INSTALL_DIR/bin</environment_variable> <environment_variable action="prepend_to" name="CAIRO_LIB_PATH">$INSTALL_DIR/lib</environment_variable> + <environment_variable action="prepend_to" name="LD_LIBRARY_PATH">$INSTALL_DIR/lib</environment_variable> <environment_variable action="prepend_to" name="CAIRO_INCLUDE_PATH">$INSTALL_DIR/include</environment_variable> <environment_variable action="prepend_to" name="C_INCLUDE_PATH">$INSTALL_DIR/include</environment_variable> <environment_variable action="prepend_to" name="CPLUS_INCLUDE_PATH">$INSTALL_DIR/include</environment_variable> |