Previous changeset 3:9d4be6036975 (2015-12-01) |
Commit message:
planemo upload for repository https://github.com/galaxyproject/tools-devteam/tree/master/legacy/package_cairo_1_12_14 commit 084becc773e236aed5dfa8d0d692c88dabee8436 |
modified:
tool_dependencies.xml |
b |
diff -r 9d4be6036975 -r cd2ed5717e38 tool_dependencies.xml --- a/tool_dependencies.xml Tue Dec 01 16:57:13 2015 -0500 +++ b/tool_dependencies.xml Fri Dec 04 13:00:53 2015 -0500 |
b |
@@ -9,6 +9,9 @@ <package name="freetype" version="2.5.2"> <repository changeset_revision="a65217367e4a" name="package_freetype_2_5_2" owner="devteam" prior_installation_required="True" toolshed="https://toolshed.g2.bx.psu.edu" /> </package> + <package name="fontconfig" version="2.11.1"> + <repository changeset_revision="2ce32675340e" name="package_fontconfig_2_11_1" 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> @@ -23,12 +26,15 @@ <repository changeset_revision="a65217367e4a" name="package_freetype_2_5_2" owner="devteam" prior_installation_required="True" toolshed="https://toolshed.g2.bx.psu.edu"> <package name="freetype" version="2.5.2" /> </repository> + <repository changeset_revision="2ce32675340e" name="package_fontconfig_2_11_1" owner="iuc" prior_installation_required="True" toolshed="https://toolshed.g2.bx.psu.edu"> + <package name="fontconfig" version="2.11.1" /> + </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 </action> - <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> + <action type="autoconf">--enable-quartz=no --enable-quartz-font=no --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"> |