diff tool_dependencies.xml @ 6:68655ac42eec draft

planemo upload for repository https://github.com/galaxyproject/tools-iuc/tree/master/packages/package_cairo_1_14_2 commit baa6a1ec8b3c440cdf73409ccaafcd303e9f4e72
author iuc
date Mon, 30 Nov 2015 20:20:37 -0500
parents 407f2b58e08a
children b93168da88a5
line wrap: on
line diff
--- a/tool_dependencies.xml	Thu Nov 19 13:07:48 2015 -0500
+++ b/tool_dependencies.xml	Mon Nov 30 20:20:37 2015 -0500
@@ -1,10 +1,10 @@
 <?xml version="1.0"?>
 <tool_dependency>
     <package name="pixman" version="0.32.6">
-        <repository changeset_revision="2db67636b074" name="package_pixman_0_32_6" owner="iuc" prior_installation_required="True" toolshed="https://testtoolshed.g2.bx.psu.edu" />
+        <repository changeset_revision="da812568a136" name="package_pixman_0_32_6" owner="iuc" prior_installation_required="True" toolshed="https://testtoolshed.g2.bx.psu.edu" />
     </package>
     <package name="libpng" version="1.6.7">
-        <repository changeset_revision="ac6ef08bf0e6" name="package_libpng_1_6_7" owner="iuc" prior_installation_required="True" toolshed="https://testtoolshed.g2.bx.psu.edu" />
+        <repository changeset_revision="3571cd50dda2" name="package_libpng_1_6_7" owner="iuc" prior_installation_required="True" toolshed="https://testtoolshed.g2.bx.psu.edu" />
     </package>
     <package name="freetype" version="2.5.2">
         <repository changeset_revision="cf755e7c7aba" name="package_freetype_2_5_2" owner="iuc" prior_installation_required="True" toolshed="https://testtoolshed.g2.bx.psu.edu" />
@@ -17,10 +17,10 @@
           <actions>
               <action type="download_by_url">https://github.com/bgruening/download_store/raw/master/cairo/cairo-1.14.2.tar.bz2</action>
                 <action type="set_environment_for_install">
-                    <repository changeset_revision="2db67636b074" name="package_pixman_0_32_6" owner="iuc" prior_installation_required="True" toolshed="https://testtoolshed.g2.bx.psu.edu">
+                    <repository changeset_revision="da812568a136" name="package_pixman_0_32_6" owner="iuc" prior_installation_required="True" toolshed="https://testtoolshed.g2.bx.psu.edu">
                         <package name="pixman" version="0.32.6" />
                     </repository>
-                    <repository changeset_revision="ac6ef08bf0e6" name="package_libpng_1_6_7" owner="iuc" prior_installation_required="True" toolshed="https://testtoolshed.g2.bx.psu.edu">
+                    <repository changeset_revision="3571cd50dda2" name="package_libpng_1_6_7" owner="iuc" prior_installation_required="True" toolshed="https://testtoolshed.g2.bx.psu.edu">
                         <package name="libpng" version="1.6.7" />
                     </repository>
                     <repository changeset_revision="cf755e7c7aba" name="package_freetype_2_5_2" owner="iuc" prior_installation_required="True" toolshed="https://testtoolshed.g2.bx.psu.edu">
@@ -30,22 +30,7 @@
                         <package name="fontconfig" version="2.11.1" />
                     </repository>
                 </action>
-                <action type="shell_command">
-                    export LDFLAGS="-Wl,-rpath,$PIXMAN_LIB_PATH -Wl,-rpath,$LIBPNG_ROOT/lib -Wl,-rpath,$FREETYPE_LIB_PATH" &amp;&amp;
-                    ./configure --prefix=$INSTALL_DIR \
-                        --disable-dependency-tracking \
-                        --with-x=no \
-                        --enable-xcb-shm=no \
-                        --enable-xlib-xcb=no \
-                        --enable-xcb=no \
-                        --enable-xlib-xrender=no \
-                        --enable-gtk-doc=no \
-                        --enable-gtk-doc-html=no \
-                        --enable-ft=yes \
-                        --enable-svg=yes \
-                        --enable-tee=yes
-                </action>
-                <action type="make_install" />
+                <action type="autoconf">--disable-dependency-tracking --with-x=no --enable-xcb-shm=no --enable-xlib-xcb=no --enable-xcb=no --enable-xlib-xrender=no --enable-gtk-doc=no --enable-gtk-doc-html=no --enable-ft=yes --enable-svg=yes --enable-tee=yes</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">