Mercurial > repos > iuc > package_cairo_1_12_14

diff tool_dependencies.xml @ 3:8181dc284f85 draft

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
planemo upload for repository https://github.com/galaxyproject/tools-iuc/tree/master/packages/package_cairo_1_12_14 commit e6f0b88b7a59f0a10827fd55436b137b13cd1921
author iuc
date Fri, 09 Oct 2015 05:30:15 -0400
parents ee2eb3c816f9
children 19c3c9a4ac33
line wrap: on
line diff
--- a/tool_dependencies.xml	Thu Oct 08 10:22:01 2015 -0400
+++ b/tool_dependencies.xml	Fri Oct 09 05:30:15 2015 -0400
@@ -7,7 +7,7 @@
         <repository changeset_revision="ac6ef08bf0e6" 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="55f81025bcb0" name="package_freetype_2_5_2" owner="iuc" prior_installation_required="True" toolshed="https://testtoolshed.g2.bx.psu.edu" />
+        <repository changeset_revision="eacda3c604a1" name="package_freetype_2_5_2" owner="iuc" prior_installation_required="True" toolshed="https://testtoolshed.g2.bx.psu.edu" />
     </package>
     <package name="cairo" version="1.12.14">
       <install version="1.0">
@@ -20,21 +20,18 @@
                     <repository changeset_revision="ac6ef08bf0e6" 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="55f81025bcb0" name="package_freetype_2_5_2" owner="iuc" prior_installation_required="True" toolshed="https://testtoolshed.g2.bx.psu.edu">
+                    <repository changeset_revision="eacda3c604a1" name="package_freetype_2_5_2" owner="iuc" prior_installation_required="True" toolshed="https://testtoolshed.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 &amp;&amp; \
                     export LDFLAGS="-Wl,-rpath,$PIXMAN_LIB_PATH -Wl,-rpath,$LIBPNG_ROOT/lib -Wl,-rpath,$FREETYPE_LIB_PATH" &amp;&amp; \ 
                     ./configure --prefix=$INSTALL_DIR \
                         --with-x=no \
                         --enable-xcb-shm=no \
                         --enable-xlib-xcb=no \
                         --enable-xcb=no \
-                        --enable-xlib-xrender=no \
-                        --enable-gtk-doc-html=no
+                        --enable-xlib-xrender=no
                 </action>
                 <action type="make_install" />
                 <!-- Create an empty cairo-xlib.h file, because R's configure script explicitly includes it even if X is disabled. -->