Mercurial > repos > iuc > package_cairo_1_12_14

changeset 1:8673ff1d430b 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 dea7b185eeb3d94f02527d82d1e4e635daf338aa
author iuc
date Thu, 08 Oct 2015 10:23:03 -0400
parents 84c45dea6b9e
children c41942395d25
files tool_dependencies.xml
diffstat 1 files changed, 13 insertions(+), 6 deletions(-) [+]
line wrap: on
line diff
--- a/tool_dependencies.xml	Mon Sep 21 10:21:04 2015 -0400
+++ b/tool_dependencies.xml	Thu Oct 08 10:23:03 2015 -0400
@@ -1,13 +1,13 @@
 <?xml version="1.0"?>
 <tool_dependency>
-  <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 changeset_revision="efddae64d543" name="package_pixman_0_32_4" owner="iuc" prior_installation_required="True" toolshed="https://toolshed.g2.bx.psu.edu" />
     </package>
     <package name="libpng" version="1.6.7">
-      <repository changeset_revision="05df724aefbb" name="package_libpng_1_6_7" owner="iuc" prior_installation_required="True" toolshed="https://toolshed.g2.bx.psu.edu" />
+        <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="831c84793e0f" name="package_freetype_2_5_2" owner="iuc" prior_installation_required="True" toolshed="https://toolshed.g2.bx.psu.edu" />
+        <repository changeset_revision="289d7796a1f1" 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">
@@ -20,18 +20,21 @@
                     <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" />
                     </repository>
-                    <repository changeset_revision="831c84793e0f" name="package_freetype_2_5_2" owner="iuc" prior_installation_required="True" toolshed="https://toolshed.g2.bx.psu.edu">
+                    <repository changeset_revision="289d7796a1f1" 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 &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-xlib-xrender=no \
+                        --enable-gtk-doc-html=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. -->
@@ -40,6 +43,10 @@
                   <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="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>
+                    <environment_variable action="prepend_to" name="C_INCLUDE_PATH">$INSTALL_DIR/include/cairo</environment_variable>
+                    <environment_variable action="prepend_to" name="CPLUS_INCLUDE_PATH">$INSTALL_DIR/include/cairo</environment_variable>
                     <environment_variable action="prepend_to" name="PKG_CONFIG_PATH">$INSTALL_DIR/lib/pkgconfig</environment_variable>
                 </action>
             </actions>